Fix API bundler. Use new esbuild context builder for it.
This commit is contained in:
parent
c4f7cf9164
commit
814a289460
1
dist/data/app-data.d.ts
vendored
1
dist/data/app-data.d.ts
vendored
@ -4,4 +4,5 @@ export declare const AppData: {
|
||||
readonly BunextStaticFilesCacheExpiry: number;
|
||||
readonly ClientHMRPath: "__bunext_client_hmr__";
|
||||
readonly BunextClientHydrationScriptID: "bunext-client-hydration-script";
|
||||
readonly BunextTmpFileExt: ".bunext_tmp.tsx";
|
||||
};
|
||||
|
||||
1
dist/data/app-data.js
vendored
1
dist/data/app-data.js
vendored
@ -4,4 +4,5 @@ export const AppData = {
|
||||
BunextStaticFilesCacheExpiry: 60 * 60 * 24 * 7,
|
||||
ClientHMRPath: "__bunext_client_hmr__",
|
||||
BunextClientHydrationScriptID: "bunext-client-hydration-script",
|
||||
BunextTmpFileExt: ".bunext_tmp.tsx",
|
||||
};
|
||||
|
||||
1
dist/functions/bundler/api-routes-bundler.d.ts
vendored
Normal file
1
dist/functions/bundler/api-routes-bundler.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
||||
export default function apiRoutesBundler(): Promise<void>;
|
||||
40
dist/functions/bundler/api-routes-bundler.js
vendored
Normal file
40
dist/functions/bundler/api-routes-bundler.js
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
import grabAllPages from "../../utils/grab-all-pages";
|
||||
import grabDirNames from "../../utils/grab-dir-names";
|
||||
import isDevelopment from "../../utils/is-development";
|
||||
import tailwindcss from "bun-plugin-tailwind";
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
export default async function apiRoutesBundler() {
|
||||
const api_routes = grabAllPages({ api_only: true });
|
||||
const dev = isDevelopment();
|
||||
try {
|
||||
const build = await Bun.build({
|
||||
entrypoints: api_routes.map((r) => r.local_path),
|
||||
target: "bun",
|
||||
format: "esm",
|
||||
jsx: {
|
||||
runtime: "automatic",
|
||||
development: dev,
|
||||
},
|
||||
minify: !dev,
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
|
||||
},
|
||||
outdir: BUNX_CWD_MODULE_CACHE_DIR,
|
||||
plugins: [tailwindcss],
|
||||
naming: {
|
||||
entry: "api/[dir]/[name].[ext]",
|
||||
chunk: "api/[dir]/chunks/[hash].[ext]",
|
||||
},
|
||||
// external: [
|
||||
// "react",
|
||||
// "react-dom",
|
||||
// "react-dom/client",
|
||||
// "react/jsx-runtime",
|
||||
// ],
|
||||
splitting: true,
|
||||
});
|
||||
}
|
||||
catch (error) {
|
||||
console.log(`API paths build ERROR:`, error);
|
||||
}
|
||||
}
|
||||
1
dist/functions/bundler/api-routes-context-bundler.d.ts
vendored
Normal file
1
dist/functions/bundler/api-routes-context-bundler.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
||||
export default function apiRoutesContextBundler(): Promise<void>;
|
||||
42
dist/functions/bundler/api-routes-context-bundler.js
vendored
Normal file
42
dist/functions/bundler/api-routes-context-bundler.js
vendored
Normal file
@ -0,0 +1,42 @@
|
||||
import * as esbuild from "esbuild";
|
||||
import grabAllPages from "../../utils/grab-all-pages";
|
||||
import grabDirNames from "../../utils/grab-dir-names";
|
||||
import isDevelopment from "../../utils/is-development";
|
||||
import tailwindEsbuildPlugin from "../server/web-pages/tailwind-esbuild-plugin";
|
||||
import apiRoutesCTXArtifactTracker from "./plugins/api-routes-ctx-artifact-tracker";
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
export default async function apiRoutesContextBundler() {
|
||||
const pages = grabAllPages({ api_only: true });
|
||||
const dev = isDevelopment();
|
||||
if (global.API_ROUTES_BUNDLER_CTX) {
|
||||
await global.API_ROUTES_BUNDLER_CTX.dispose();
|
||||
global.API_ROUTES_BUNDLER_CTX = undefined;
|
||||
}
|
||||
global.API_ROUTES_BUNDLER_CTX = await esbuild.context({
|
||||
entryPoints: pages.map((p) => p.local_path),
|
||||
outdir: BUNX_CWD_MODULE_CACHE_DIR,
|
||||
bundle: true,
|
||||
minify: !dev,
|
||||
format: "esm",
|
||||
target: "esnext",
|
||||
platform: "node",
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
|
||||
},
|
||||
entryNames: "api/[dir]/[hash]",
|
||||
metafile: true,
|
||||
plugins: [
|
||||
tailwindEsbuildPlugin,
|
||||
apiRoutesCTXArtifactTracker({ pages }),
|
||||
],
|
||||
jsx: "automatic",
|
||||
external: [
|
||||
"react",
|
||||
"react-dom",
|
||||
"react/jsx-runtime",
|
||||
"react/jsx-dev-runtime",
|
||||
"bun:*",
|
||||
],
|
||||
});
|
||||
await global.API_ROUTES_BUNDLER_CTX.rebuild();
|
||||
}
|
||||
@ -9,7 +9,7 @@ import ssrVirtualFilesPlugin from "./plugins/ssr-virtual-files-plugin";
|
||||
import ssrCTXArtifactTracker from "./plugins/ssr-ctx-artifact-tracker";
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
export default async function pagesSSRContextBundler(params) {
|
||||
const pages = grabAllPages();
|
||||
const pages = grabAllPages({ exclude_api: true });
|
||||
const dev = isDevelopment();
|
||||
if (global.SSR_BUNDLER_CTX) {
|
||||
await global.SSR_BUNDLER_CTX.dispose();
|
||||
@ -38,7 +38,7 @@ export default async function pagesSSRContextBundler(params) {
|
||||
bundle: true,
|
||||
minify: !dev,
|
||||
format: "esm",
|
||||
target: "es2020",
|
||||
target: "esnext",
|
||||
platform: "node",
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
|
||||
|
||||
7
dist/functions/bundler/plugins/api-routes-ctx-artifact-tracker.d.ts
vendored
Normal file
7
dist/functions/bundler/plugins/api-routes-ctx-artifact-tracker.d.ts
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
import { type Plugin } from "esbuild";
|
||||
import type { PageFiles } from "../../../types";
|
||||
type Params = {
|
||||
pages: PageFiles[];
|
||||
};
|
||||
export default function apiRoutesCTXArtifactTracker({ pages }: Params): Plugin;
|
||||
export {};
|
||||
62
dist/functions/bundler/plugins/api-routes-ctx-artifact-tracker.js
vendored
Normal file
62
dist/functions/bundler/plugins/api-routes-ctx-artifact-tracker.js
vendored
Normal file
@ -0,0 +1,62 @@
|
||||
import {} from "esbuild";
|
||||
import buildOnstartErrorHandler from "../build-on-start-error-handler";
|
||||
import path from "path";
|
||||
import grabDirNames from "../../../utils/grab-dir-names";
|
||||
import { log } from "../../../utils/log";
|
||||
let build_start = 0;
|
||||
let build_starts = 0;
|
||||
const MAX_BUILD_STARTS = 2;
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
export default function apiRoutesCTXArtifactTracker({ pages }) {
|
||||
const artifactTracker = {
|
||||
name: "ssr-artifact-tracker",
|
||||
setup(build) {
|
||||
build.onStart(async () => {
|
||||
build_starts++;
|
||||
build_start = performance.now();
|
||||
if (build_starts == MAX_BUILD_STARTS) {
|
||||
await buildOnstartErrorHandler();
|
||||
}
|
||||
});
|
||||
build.onEnd((result) => {
|
||||
if (result.errors.length > 0) {
|
||||
console.log("result.errors", result.errors);
|
||||
return;
|
||||
}
|
||||
const artifacts = Object.entries(result.metafile.outputs)
|
||||
.filter(([, meta]) => meta.entryPoint)
|
||||
.map(([outputPath, meta]) => {
|
||||
const entrypoint = meta.entryPoint
|
||||
? path.join(ROOT_DIR, meta.entryPoint)
|
||||
: undefined;
|
||||
const target_page = pages.find((p) => p.local_path == entrypoint);
|
||||
if (!target_page || !meta.entryPoint) {
|
||||
return undefined;
|
||||
}
|
||||
const { file_name, local_path, url_path } = target_page;
|
||||
return {
|
||||
path: outputPath,
|
||||
hash: path.basename(outputPath, path.extname(outputPath)),
|
||||
type: "text/javascript",
|
||||
entrypoint: meta.entryPoint,
|
||||
file_name,
|
||||
local_path,
|
||||
url_path,
|
||||
};
|
||||
});
|
||||
if (artifacts?.[0] && artifacts.length > 0) {
|
||||
for (let i = 0; i < artifacts.length; i++) {
|
||||
const artifact = artifacts[i];
|
||||
if (artifact?.local_path &&
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP) {
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP[artifact.local_path] = artifact;
|
||||
}
|
||||
}
|
||||
}
|
||||
// const elapsed = (performance.now() - build_start).toFixed(0);
|
||||
// log.success(`API Routes [Built] in ${elapsed}ms`);
|
||||
});
|
||||
},
|
||||
};
|
||||
return artifactTracker;
|
||||
}
|
||||
@ -3,6 +3,7 @@ import { log } from "../../../utils/log";
|
||||
import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-result";
|
||||
import pagesSSRContextBundler from "../pages-ssr-context-bundler";
|
||||
import buildOnstartErrorHandler from "../build-on-start-error-handler";
|
||||
import apiRoutesContextBundler from "../api-routes-context-bundler";
|
||||
let build_start = 0;
|
||||
let build_starts = 0;
|
||||
const MAX_BUILD_STARTS = 2;
|
||||
@ -46,6 +47,12 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
|
||||
else {
|
||||
pagesSSRContextBundler();
|
||||
}
|
||||
if (global.API_ROUTES_BUNDLER_CTX) {
|
||||
global.API_ROUTES_BUNDLER_CTX.rebuild();
|
||||
}
|
||||
else {
|
||||
apiRoutesContextBundler();
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
4
dist/functions/bunext-init.d.ts
vendored
4
dist/functions/bunext-init.d.ts
vendored
@ -22,6 +22,9 @@ declare global {
|
||||
var SSR_BUNDLER_CTX_MAP: {
|
||||
[k: string]: BundlerCTXMap;
|
||||
} | undefined;
|
||||
var API_ROUTES_BUNDLER_CTX_MAP: {
|
||||
[k: string]: BundlerCTXMap;
|
||||
} | undefined;
|
||||
var BUNDLER_REBUILDS: 0;
|
||||
var PAGES_SRC_WATCHER: FSWatcher | undefined;
|
||||
var CURRENT_VERSION: string | undefined;
|
||||
@ -30,6 +33,7 @@ declare global {
|
||||
var SKIPPED_BROWSER_MODULES: Set<string>;
|
||||
var BUNDLER_CTX: BuildContext | undefined;
|
||||
var SSR_BUNDLER_CTX: BuildContext | undefined;
|
||||
var API_ROUTES_BUNDLER_CTX: BuildContext | undefined;
|
||||
var DIR_NAMES: ReturnType<typeof grabDirNames>;
|
||||
var REACT_IMPORTS_MAP: {
|
||||
imports: Record<string, string>;
|
||||
|
||||
1
dist/functions/bunext-init.js
vendored
1
dist/functions/bunext-init.js
vendored
@ -14,6 +14,7 @@ export default async function bunextInit() {
|
||||
global.HMR_CONTROLLERS = [];
|
||||
global.BUNDLER_CTX_MAP = {};
|
||||
global.SSR_BUNDLER_CTX_MAP = {};
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP = {};
|
||||
global.BUNDLER_REBUILDS = 0;
|
||||
global.REBUILD_RETRIES = 0;
|
||||
global.PAGE_FILES = [];
|
||||
|
||||
37
dist/functions/server/handle-routes.js
vendored
37
dist/functions/server/handle-routes.js
vendored
@ -24,11 +24,14 @@ export default async function ({ req }) {
|
||||
},
|
||||
});
|
||||
}
|
||||
const routeParams = await grabRouteParams({ req });
|
||||
const routeParams = await grabRouteParams({
|
||||
req,
|
||||
query: match.query,
|
||||
});
|
||||
let module;
|
||||
const now = Date.now();
|
||||
if (global.SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
|
||||
const target_import = path.join(ROOT_DIR, global.SSR_BUNDLER_CTX_MAP[match.filePath].path);
|
||||
if (is_dev && global.API_ROUTES_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
|
||||
const target_import = path.join(ROOT_DIR, global.API_ROUTES_BUNDLER_CTX_MAP[match.filePath].path);
|
||||
module = await import(`${target_import}?t=${now}`);
|
||||
}
|
||||
else {
|
||||
@ -80,3 +83,31 @@ export default async function ({ req }) {
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
// const relative_path = match.filePath.replace(API_DIR, "");
|
||||
// const relative_module_js_file = relative_path.replace(/\.tsx?$/, ".js");
|
||||
// const bun_module_file = path.join(
|
||||
// BUNX_CWD_MODULE_CACHE_DIR,
|
||||
// "api",
|
||||
// relative_module_js_file,
|
||||
// );
|
||||
// if (existsSync(bun_module_file)) {
|
||||
// module = await import(`${bun_module_file}?t=${now}`);
|
||||
// } else {
|
||||
// const import_path = is_dev
|
||||
// ? `${match.filePath}?t=${now}`
|
||||
// : match.filePath;
|
||||
// module = await import(import_path);
|
||||
// }
|
||||
// if (is_dev) {
|
||||
// const tmp_path = `${match.filePath}.${now}${AppData["BunextTmpFileExt"]}`;
|
||||
// cpSync(match.filePath, tmp_path);
|
||||
// module = await import(`${tmp_path}?t=${now}`);
|
||||
// try {
|
||||
// unlinkSync(tmp_path);
|
||||
// } catch (error) {}
|
||||
// } else {
|
||||
// // const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
|
||||
// module = await import(match.filePath);
|
||||
// }
|
||||
// const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
|
||||
// module = await import(import_path);
|
||||
|
||||
4
dist/functions/server/watcher-esbuild-ctx.js
vendored
4
dist/functions/server/watcher-esbuild-ctx.js
vendored
@ -5,6 +5,7 @@ import { log } from "../../utils/log";
|
||||
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
|
||||
import serverPostBuildFn from "./server-post-build-fn";
|
||||
import fullRebuild from "./full-rebuild";
|
||||
import { AppData } from "../../data/app-data";
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
export default async function watcherEsbuildCTX() {
|
||||
const pages_src_watcher = watch(ROOT_DIR, {
|
||||
@ -16,6 +17,9 @@ export default async function watcherEsbuildCTX() {
|
||||
if (filename.match(/^\.\w+/)) {
|
||||
return;
|
||||
}
|
||||
if (filename.endsWith(AppData["BunextTmpFileExt"])) {
|
||||
return;
|
||||
}
|
||||
const full_file_path = path.join(ROOT_DIR, filename);
|
||||
const does_file_exist = existsSync(full_file_path);
|
||||
const file_stat = does_file_exist
|
||||
|
||||
1
dist/utils/grab-all-pages.d.ts
vendored
1
dist/utils/grab-all-pages.d.ts
vendored
@ -1,6 +1,7 @@
|
||||
import type { PageFiles } from "../types";
|
||||
type Params = {
|
||||
exclude_api?: boolean;
|
||||
api_only?: boolean;
|
||||
};
|
||||
export default function grabAllPages(params?: Params): PageFiles[];
|
||||
export {};
|
||||
|
||||
3
dist/utils/grab-all-pages.js
vendored
3
dist/utils/grab-all-pages.js
vendored
@ -9,6 +9,9 @@ export default function grabAllPages(params) {
|
||||
if (params?.exclude_api) {
|
||||
return pages.filter((p) => !Boolean(p.url_path.startsWith("/api/")));
|
||||
}
|
||||
if (params?.api_only) {
|
||||
return pages.filter((p) => Boolean(p.url_path.startsWith("/api/")));
|
||||
}
|
||||
return pages;
|
||||
}
|
||||
function grabPageDirRecursively({ page_dir }) {
|
||||
|
||||
3
dist/utils/grab-route-params.d.ts
vendored
3
dist/utils/grab-route-params.d.ts
vendored
@ -1,6 +1,7 @@
|
||||
import type { BunxRouteParams } from "../types";
|
||||
type Params = {
|
||||
req: Request;
|
||||
query?: any;
|
||||
};
|
||||
export default function grabRouteParams({ req, }: Params): Promise<BunxRouteParams>;
|
||||
export default function grabRouteParams({ req, query: passed_query, }: Params): Promise<BunxRouteParams>;
|
||||
export {};
|
||||
|
||||
5
dist/utils/grab-route-params.js
vendored
5
dist/utils/grab-route-params.js
vendored
@ -1,5 +1,6 @@
|
||||
import _ from "lodash";
|
||||
import deserializeQuery from "./deserialize-query";
|
||||
export default async function grabRouteParams({ req, }) {
|
||||
export default async function grabRouteParams({ req, query: passed_query, }) {
|
||||
const url = new URL(req.url);
|
||||
const query = deserializeQuery(Object.fromEntries(url.searchParams));
|
||||
const body = await (async () => {
|
||||
@ -13,7 +14,7 @@ export default async function grabRouteParams({ req, }) {
|
||||
const routeParams = {
|
||||
req,
|
||||
url,
|
||||
query,
|
||||
query: _.merge(query, passed_query),
|
||||
body,
|
||||
server: global.SERVER,
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@moduletrace/bunext",
|
||||
"version": "1.0.71",
|
||||
"version": "1.0.72",
|
||||
"main": "dist/index.js",
|
||||
"module": "index.ts",
|
||||
"dependencies": {
|
||||
|
||||
@ -4,4 +4,5 @@ export const AppData = {
|
||||
BunextStaticFilesCacheExpiry: 60 * 60 * 24 * 7,
|
||||
ClientHMRPath: "__bunext_client_hmr__",
|
||||
BunextClientHydrationScriptID: "bunext-client-hydration-script",
|
||||
BunextTmpFileExt: ".bunext_tmp.tsx",
|
||||
} as const;
|
||||
|
||||
44
src/functions/bundler/api-routes-bundler.ts
Normal file
44
src/functions/bundler/api-routes-bundler.ts
Normal file
@ -0,0 +1,44 @@
|
||||
import grabAllPages from "../../utils/grab-all-pages";
|
||||
import grabDirNames from "../../utils/grab-dir-names";
|
||||
import isDevelopment from "../../utils/is-development";
|
||||
import tailwindcss from "bun-plugin-tailwind";
|
||||
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
|
||||
export default async function apiRoutesBundler() {
|
||||
const api_routes = grabAllPages({ api_only: true });
|
||||
const dev = isDevelopment();
|
||||
|
||||
try {
|
||||
const build = await Bun.build({
|
||||
entrypoints: api_routes.map((r) => r.local_path),
|
||||
target: "bun",
|
||||
format: "esm",
|
||||
jsx: {
|
||||
runtime: "automatic",
|
||||
development: dev,
|
||||
},
|
||||
minify: !dev,
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(
|
||||
dev ? "development" : "production",
|
||||
),
|
||||
},
|
||||
outdir: BUNX_CWD_MODULE_CACHE_DIR,
|
||||
plugins: [tailwindcss],
|
||||
naming: {
|
||||
entry: "api/[dir]/[name].[ext]",
|
||||
chunk: "api/[dir]/chunks/[hash].[ext]",
|
||||
},
|
||||
// external: [
|
||||
// "react",
|
||||
// "react-dom",
|
||||
// "react-dom/client",
|
||||
// "react/jsx-runtime",
|
||||
// ],
|
||||
splitting: true,
|
||||
});
|
||||
} catch (error) {
|
||||
console.log(`API paths build ERROR:`, error);
|
||||
}
|
||||
}
|
||||
49
src/functions/bundler/api-routes-context-bundler.ts
Normal file
49
src/functions/bundler/api-routes-context-bundler.ts
Normal file
@ -0,0 +1,49 @@
|
||||
import * as esbuild from "esbuild";
|
||||
import grabAllPages from "../../utils/grab-all-pages";
|
||||
import grabDirNames from "../../utils/grab-dir-names";
|
||||
import isDevelopment from "../../utils/is-development";
|
||||
import tailwindEsbuildPlugin from "../server/web-pages/tailwind-esbuild-plugin";
|
||||
import apiRoutesCTXArtifactTracker from "./plugins/api-routes-ctx-artifact-tracker";
|
||||
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
|
||||
export default async function apiRoutesContextBundler() {
|
||||
const pages = grabAllPages({ api_only: true });
|
||||
const dev = isDevelopment();
|
||||
|
||||
if (global.API_ROUTES_BUNDLER_CTX) {
|
||||
await global.API_ROUTES_BUNDLER_CTX.dispose();
|
||||
global.API_ROUTES_BUNDLER_CTX = undefined;
|
||||
}
|
||||
|
||||
global.API_ROUTES_BUNDLER_CTX = await esbuild.context({
|
||||
entryPoints: pages.map((p) => p.local_path),
|
||||
outdir: BUNX_CWD_MODULE_CACHE_DIR,
|
||||
bundle: true,
|
||||
minify: !dev,
|
||||
format: "esm",
|
||||
target: "esnext",
|
||||
platform: "node",
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(
|
||||
dev ? "development" : "production",
|
||||
),
|
||||
},
|
||||
entryNames: "api/[dir]/[hash]",
|
||||
metafile: true,
|
||||
plugins: [
|
||||
tailwindEsbuildPlugin,
|
||||
apiRoutesCTXArtifactTracker({ pages }),
|
||||
],
|
||||
jsx: "automatic",
|
||||
external: [
|
||||
"react",
|
||||
"react-dom",
|
||||
"react/jsx-runtime",
|
||||
"react/jsx-dev-runtime",
|
||||
"bun:*",
|
||||
],
|
||||
});
|
||||
|
||||
await global.API_ROUTES_BUNDLER_CTX.rebuild();
|
||||
}
|
||||
@ -16,7 +16,7 @@ type Params = {
|
||||
};
|
||||
|
||||
export default async function pagesSSRContextBundler(params?: Params) {
|
||||
const pages = grabAllPages();
|
||||
const pages = grabAllPages({ exclude_api: true });
|
||||
const dev = isDevelopment();
|
||||
|
||||
if (global.SSR_BUNDLER_CTX) {
|
||||
@ -52,7 +52,7 @@ export default async function pagesSSRContextBundler(params?: Params) {
|
||||
bundle: true,
|
||||
minify: !dev,
|
||||
format: "esm",
|
||||
target: "es2020",
|
||||
target: "esnext",
|
||||
platform: "node",
|
||||
define: {
|
||||
"process.env.NODE_ENV": JSON.stringify(
|
||||
|
||||
@ -0,0 +1,90 @@
|
||||
import { type Plugin } from "esbuild";
|
||||
import type { BundlerCTXMap, PageFiles } from "../../../types";
|
||||
import buildOnstartErrorHandler from "../build-on-start-error-handler";
|
||||
import path from "path";
|
||||
import grabDirNames from "../../../utils/grab-dir-names";
|
||||
import { log } from "../../../utils/log";
|
||||
|
||||
let build_start = 0;
|
||||
let build_starts = 0;
|
||||
const MAX_BUILD_STARTS = 2;
|
||||
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
|
||||
type Params = {
|
||||
pages: PageFiles[];
|
||||
};
|
||||
|
||||
export default function apiRoutesCTXArtifactTracker({ pages }: Params) {
|
||||
const artifactTracker: Plugin = {
|
||||
name: "ssr-artifact-tracker",
|
||||
setup(build) {
|
||||
build.onStart(async () => {
|
||||
build_starts++;
|
||||
build_start = performance.now();
|
||||
if (build_starts == MAX_BUILD_STARTS) {
|
||||
await buildOnstartErrorHandler();
|
||||
}
|
||||
});
|
||||
|
||||
build.onEnd((result) => {
|
||||
if (result.errors.length > 0) {
|
||||
console.log("result.errors", result.errors);
|
||||
return;
|
||||
}
|
||||
|
||||
const artifacts: (BundlerCTXMap | undefined)[] = Object.entries(
|
||||
result.metafile!.outputs,
|
||||
)
|
||||
.filter(([, meta]) => meta.entryPoint)
|
||||
.map(([outputPath, meta]) => {
|
||||
const entrypoint = meta.entryPoint
|
||||
? path.join(ROOT_DIR, meta.entryPoint)
|
||||
: undefined;
|
||||
|
||||
const target_page = pages.find(
|
||||
(p) => p.local_path == entrypoint,
|
||||
);
|
||||
|
||||
if (!target_page || !meta.entryPoint) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const { file_name, local_path, url_path } = target_page;
|
||||
|
||||
return {
|
||||
path: outputPath,
|
||||
hash: path.basename(
|
||||
outputPath,
|
||||
path.extname(outputPath),
|
||||
),
|
||||
type: "text/javascript",
|
||||
entrypoint: meta.entryPoint,
|
||||
file_name,
|
||||
local_path,
|
||||
url_path,
|
||||
};
|
||||
});
|
||||
|
||||
if (artifacts?.[0] && artifacts.length > 0) {
|
||||
for (let i = 0; i < artifacts.length; i++) {
|
||||
const artifact = artifacts[i];
|
||||
if (
|
||||
artifact?.local_path &&
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP
|
||||
) {
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP[
|
||||
artifact.local_path
|
||||
] = artifact;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// const elapsed = (performance.now() - build_start).toFixed(0);
|
||||
// log.success(`API Routes [Built] in ${elapsed}ms`);
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
return artifactTracker;
|
||||
}
|
||||
@ -4,6 +4,7 @@ import { log } from "../../../utils/log";
|
||||
import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-result";
|
||||
import pagesSSRContextBundler from "../pages-ssr-context-bundler";
|
||||
import buildOnstartErrorHandler from "../build-on-start-error-handler";
|
||||
import apiRoutesContextBundler from "../api-routes-context-bundler";
|
||||
|
||||
let build_start = 0;
|
||||
let build_starts = 0;
|
||||
@ -69,6 +70,12 @@ export default function esbuildCTXArtifactTracker({
|
||||
} else {
|
||||
pagesSSRContextBundler();
|
||||
}
|
||||
|
||||
if (global.API_ROUTES_BUNDLER_CTX) {
|
||||
global.API_ROUTES_BUNDLER_CTX.rebuild();
|
||||
} else {
|
||||
apiRoutesContextBundler();
|
||||
}
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
@ -33,6 +33,7 @@ declare global {
|
||||
var LAST_BUILD_TIME: number;
|
||||
var BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
|
||||
var SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
|
||||
var API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
|
||||
var BUNDLER_REBUILDS: 0;
|
||||
var PAGES_SRC_WATCHER: FSWatcher | undefined;
|
||||
var CURRENT_VERSION: string | undefined;
|
||||
@ -41,6 +42,7 @@ declare global {
|
||||
var SKIPPED_BROWSER_MODULES: Set<string>;
|
||||
var BUNDLER_CTX: BuildContext | undefined;
|
||||
var SSR_BUNDLER_CTX: BuildContext | undefined;
|
||||
var API_ROUTES_BUNDLER_CTX: BuildContext | undefined;
|
||||
var DIR_NAMES: ReturnType<typeof grabDirNames>;
|
||||
var REACT_IMPORTS_MAP: { imports: Record<string, string> };
|
||||
var REACT_DOM_SERVER: any;
|
||||
@ -57,6 +59,7 @@ export default async function bunextInit() {
|
||||
global.HMR_CONTROLLERS = [];
|
||||
global.BUNDLER_CTX_MAP = {};
|
||||
global.SSR_BUNDLER_CTX_MAP = {};
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP = {};
|
||||
global.BUNDLER_REBUILDS = 0;
|
||||
global.REBUILD_RETRIES = 0;
|
||||
global.PAGE_FILES = [];
|
||||
|
||||
@ -44,15 +44,18 @@ export default async function ({ req }: Params): Promise<Response | undefined> {
|
||||
);
|
||||
}
|
||||
|
||||
const routeParams: BunxRouteParams = await grabRouteParams({ req });
|
||||
const routeParams: BunxRouteParams = await grabRouteParams({
|
||||
req,
|
||||
query: match.query,
|
||||
});
|
||||
|
||||
let module: any;
|
||||
const now = Date.now();
|
||||
|
||||
if (global.SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
|
||||
if (is_dev && global.API_ROUTES_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
|
||||
const target_import = path.join(
|
||||
ROOT_DIR,
|
||||
global.SSR_BUNDLER_CTX_MAP[match.filePath].path,
|
||||
global.API_ROUTES_BUNDLER_CTX_MAP[match.filePath].path,
|
||||
);
|
||||
|
||||
module = await import(`${target_import}?t=${now}`);
|
||||
@ -127,3 +130,35 @@ export default async function ({ req }: Params): Promise<Response | undefined> {
|
||||
|
||||
return undefined;
|
||||
}
|
||||
|
||||
// const relative_path = match.filePath.replace(API_DIR, "");
|
||||
// const relative_module_js_file = relative_path.replace(/\.tsx?$/, ".js");
|
||||
// const bun_module_file = path.join(
|
||||
// BUNX_CWD_MODULE_CACHE_DIR,
|
||||
// "api",
|
||||
// relative_module_js_file,
|
||||
// );
|
||||
|
||||
// if (existsSync(bun_module_file)) {
|
||||
// module = await import(`${bun_module_file}?t=${now}`);
|
||||
// } else {
|
||||
// const import_path = is_dev
|
||||
// ? `${match.filePath}?t=${now}`
|
||||
// : match.filePath;
|
||||
// module = await import(import_path);
|
||||
// }
|
||||
|
||||
// if (is_dev) {
|
||||
// const tmp_path = `${match.filePath}.${now}${AppData["BunextTmpFileExt"]}`;
|
||||
// cpSync(match.filePath, tmp_path);
|
||||
// module = await import(`${tmp_path}?t=${now}`);
|
||||
// try {
|
||||
// unlinkSync(tmp_path);
|
||||
// } catch (error) {}
|
||||
// } else {
|
||||
// // const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
|
||||
// module = await import(match.filePath);
|
||||
// }
|
||||
|
||||
// const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
|
||||
// module = await import(import_path);
|
||||
|
||||
@ -5,6 +5,7 @@ import { log } from "../../utils/log";
|
||||
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
|
||||
import serverPostBuildFn from "./server-post-build-fn";
|
||||
import fullRebuild from "./full-rebuild";
|
||||
import { AppData } from "../../data/app-data";
|
||||
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
|
||||
@ -22,6 +23,10 @@ export default async function watcherEsbuildCTX() {
|
||||
return;
|
||||
}
|
||||
|
||||
if (filename.endsWith(AppData["BunextTmpFileExt"])) {
|
||||
return;
|
||||
}
|
||||
|
||||
const full_file_path = path.join(ROOT_DIR, filename);
|
||||
const does_file_exist = existsSync(full_file_path);
|
||||
const file_stat = does_file_exist
|
||||
|
||||
@ -7,6 +7,7 @@ import pagePathTransform from "./page-path-transform";
|
||||
|
||||
type Params = {
|
||||
exclude_api?: boolean;
|
||||
api_only?: boolean;
|
||||
};
|
||||
|
||||
export default function grabAllPages(params?: Params) {
|
||||
@ -18,6 +19,10 @@ export default function grabAllPages(params?: Params) {
|
||||
return pages.filter((p) => !Boolean(p.url_path.startsWith("/api/")));
|
||||
}
|
||||
|
||||
if (params?.api_only) {
|
||||
return pages.filter((p) => Boolean(p.url_path.startsWith("/api/")));
|
||||
}
|
||||
|
||||
return pages;
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
import _ from "lodash";
|
||||
import type { BunxRouteParams } from "../types";
|
||||
import deserializeQuery from "./deserialize-query";
|
||||
|
||||
type Params = {
|
||||
req: Request;
|
||||
query?: any;
|
||||
};
|
||||
|
||||
export default async function grabRouteParams({
|
||||
req,
|
||||
query: passed_query,
|
||||
}: Params): Promise<BunxRouteParams> {
|
||||
const url = new URL(req.url);
|
||||
|
||||
@ -23,7 +26,7 @@ export default async function grabRouteParams({
|
||||
const routeParams: BunxRouteParams = {
|
||||
req,
|
||||
url,
|
||||
query,
|
||||
query: _.merge(query, passed_query),
|
||||
body,
|
||||
server: global.SERVER,
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user