one 1.25.12 → 1.25.15

package/dist/cjs/cli/build.cjs

@@ -53,6 +53,7 @@ var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneO
 var import_isRolldown = require("../utils/isRolldown.cjs");
 var import_toAbsolute = require("../utils/toAbsolute.cjs");
 var import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory.cjs");
+var import_cloudflareWranglerConfig = require("../vite/cloudflareWranglerConfig.cjs");
 var import_getManifest = require("../vite/getManifest.cjs");
 var import_loadConfig = require("../vite/loadConfig.cjs");
 var import_one_server_only = require("../vite/one-server-only.cjs");
@@ -61,6 +62,7 @@ var import_checkNodeVersion = require("./checkNodeVersion.cjs");
 var import_workerPool = require("./workerPool.cjs");
 var import_generateSitemap = require("./generateSitemap.cjs");
 var import_label_process = require("./label-process.cjs");
+var import_serverRouteModules = require("./serverRouteModules.cjs");
 var import_pLimit = require("../utils/pLimit.cjs");
 var import_criticalCSSPlugin = require("../vite/plugins/criticalCSSPlugin.cjs");
 var import_install_error_handlers = require("./install-error-handlers.cjs");
@@ -76,161 +78,16 @@ function normalizeDeploy(deploy) {
   };
   return deploy;
 }
-const GENERATED_CLOUDFLARE_WRANGLER_RULES = [{
-  type: "ESModule",
-  globs: ["./server/**/*.js"],
-  fallthrough: true
-}, {
-  type: "ESModule",
-  globs: ["./api/**/*.js"],
-  fallthrough: true
-}, {
-  type: "ESModule",
-  globs: ["./middlewares/**/*.js"],
-  fallthrough: true
-}, {
-  type: "ESModule",
-  globs: ["./assets/**/*.js"],
-  fallthrough: true
-}];
 const CLOUDFLARE_DEPLOY_WRANGLER_RULES = [{
   type: "ESModule",
   globs: ["assets/**/*.js", "assets/**/*.mjs"]
 }];
-function isPlainObject(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function mergeJsonObjects(base, overrides) {
-  const merged = {
-    ...base
-  };
-  for (const [key, value] of Object.entries(overrides)) {
-    const baseValue = merged[key];
-    if (isPlainObject(baseValue) && isPlainObject(value)) {
-      merged[key] = mergeJsonObjects(baseValue, value);
-    } else {
-      merged[key] = value;
-    }
-  }
-  return merged;
-}
-function dedupeJsonValues(values) {
-  const seen = /* @__PURE__ */new Set();
-  return values.filter(value => {
-    const key = JSON.stringify(value);
-    if (seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-}
-function mergeCloudflareCompatibilityFlags(flags) {
-  const userFlags = Array.isArray(flags) ? flags.filter(flag => typeof flag === "string") : [];
-  return dedupeJsonValues(["nodejs_compat", ...userFlags]);
-}
-function mergeCloudflareRules(rules) {
-  const userRules = Array.isArray(rules) ? rules.filter(rule => isPlainObject(rule)) : [];
-  return dedupeJsonValues([...GENERATED_CLOUDFLARE_WRANGLER_RULES, ...userRules]);
-}
-function parseJsonc(text) {
-  let out = "";
-  let i = 0;
-  let inString = false;
-  let quote = "";
-  while (i < text.length) {
-    const ch = text[i];
-    const next = text[i + 1];
-    if (inString) {
-      if (ch === "\\") {
-        out += ch + (next ?? "");
-        i += 2;
-        continue;
-      }
-      if (ch === quote) inString = false;
-      out += ch;
-      i++;
-      continue;
-    }
-    if (ch === '"' || ch === "'") {
-      inString = true;
-      quote = ch;
-      out += ch;
-      i++;
-      continue;
-    }
-    if (ch === "/" && next === "/") {
-      while (i < text.length && text[i] !== "\n") i++;
-      continue;
-    }
-    if (ch === "/" && next === "*") {
-      i += 2;
-      while (i < text.length - 1 && !(text[i] === "*" && text[i + 1] === "/")) i++;
-      i += 2;
-      continue;
-    }
-    out += ch;
-    i++;
-  }
-  return JSON.parse(out.replace(/,(\s*[}\]])/g, "$1"));
-}
-async function loadUserWranglerConfig(root) {
-  const candidateRoots = [... /* @__PURE__ */new Set([root, process.cwd()])];
-  for (const candidateRoot of candidateRoots) {
-    for (const fileName of ["wrangler.jsonc", "wrangler.json"]) {
-      const configPath = (0, import_node_path.join)(candidateRoot, fileName);
-      if (!(await import_fs_extra.default.pathExists(configPath))) {
-        continue;
-      }
-      const contents = await import_fs_extra.default.readFile(configPath, "utf-8");
-      let parsed;
-      try {
-        parsed = parseJsonc(contents);
-      } catch (err) {
-        throw new Error(`Failed to parse ${(0, import_node_path.relative)(process.cwd(), configPath)}: ${err.message}`);
-      }
-      if (!isPlainObject(parsed)) {
-        throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain a top-level JSON object`);
-      }
-      return {
-        path: configPath,
-        config: parsed
-      };
-    }
-  }
-  return null;
-}
-function createCloudflareWranglerConfig(projectName, userConfig) {
-  const generatedConfig = {
-    name: projectName,
-    main: "worker.js",
-    compatibility_date: "2024-12-05",
-    compatibility_flags: ["nodejs_compat"],
-    find_additional_modules: true,
-    rules: GENERATED_CLOUDFLARE_WRANGLER_RULES,
-    assets: {
-      directory: "client",
-      binding: "ASSETS",
-      run_worker_first: true
-    }
-  };
-  const mergedConfig = userConfig ? mergeJsonObjects(generatedConfig, userConfig) : generatedConfig;
-  mergedConfig.main = "worker.js";
-  mergedConfig.find_additional_modules = true;
-  mergedConfig.compatibility_flags = mergeCloudflareCompatibilityFlags(mergedConfig.compatibility_flags);
-  mergedConfig.rules = mergeCloudflareRules(mergedConfig.rules);
-  mergedConfig.assets = {
-    ...(isPlainObject(mergedConfig.assets) ? mergedConfig.assets : {}),
-    directory: "client",
-    binding: "ASSETS",
-    run_worker_first: true
-  };
-  return mergedConfig;
-}
 function omitEmptyJsonValues(value) {
   if (Array.isArray(value)) {
     const items = value.map(item => omitEmptyJsonValues(item)).filter(item => item !== void 0);
     return items.length > 0 ? items : void 0;
   }
-  if (isPlainObject(value)) {
+  if ((0, import_cloudflareWranglerConfig.isPlainObject)(value)) {
     const entries = Object.entries(value).map(([key, item]) => [key, omitEmptyJsonValues(item)]).filter(entry => entry[1] !== void 0);
     return entries.length > 0 ? Object.fromEntries(entries) : void 0;
   }
@@ -238,26 +95,17 @@ function omitEmptyJsonValues(value) {
 }
 async function finalizeCloudflareWranglerDeployConfig(configPath) {
   const parsed = JSON.parse(await import_fs_extra.default.readFile(configPath, "utf-8"));
-  if (!isPlainObject(parsed)) {
+  if (!(0, import_cloudflareWranglerConfig.isPlainObject)(parsed)) {
     throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain a JSON object`);
   }
   parsed.rules = CLOUDFLARE_DEPLOY_WRANGLER_RULES;
   const config = omitEmptyJsonValues(parsed);
-  if (!isPlainObject(config)) {
+  if (!(0, import_cloudflareWranglerConfig.isPlainObject)(config)) {
     throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain deploy config`);
   }
   await import_fs_extra.default.writeFile(configPath, `${JSON.stringify(config, null, 2)}
 `);
 }
-async function getCloudflareProjectName(root) {
-  try {
-    const pkg = JSON.parse(await import_fs_extra.default.readFile((0, import_node_path.join)(root, "package.json"), "utf-8"));
-    if (pkg.name) {
-      return pkg.name.replace(/^@[^/]+\//, "");
-    }
-  } catch {}
-  return "one-app";
-}
 process.env.ONE_CACHE_KEY = constants.CACHE_KEY;
 function shouldUseWorkers(oneOptions) {
   if (process.env.ONE_BUILD_WORKERS === "0") return false;
@@ -335,7 +183,7 @@ async function build(args) {
   }
   const deployConfig = normalizeDeploy(oneOptions.web?.deploy);
   if (!process.env.ONE_SERVER_URL && deployConfig) {
-    const url = deployConfig.url ?? (deployConfig.target === "cloudflare" ? `https://${await getCloudflareProjectName(process.cwd())}.workers.dev` : void 0);
+    const url = deployConfig.url ?? (deployConfig.target === "cloudflare" ? `https://${await (0, import_cloudflareWranglerConfig.getCloudflareProjectName)(process.cwd())}.workers.dev` : void 0);
     if (url) {
       process.env.ONE_SERVER_URL = url;
       console.info(`
@@ -554,13 +402,28 @@ async function build(args) {
   const clientChunksBySource = /* @__PURE__ */new Map();
   if (vxrnOutput.clientOutput) {
     for (const chunk of vxrnOutput.clientOutput) {
-      if (chunk.type === "chunk" && chunk.facadeModuleId) {
-        clientChunksBySource.set(chunk.facadeModuleId, {
-          fileName: chunk.fileName,
-          imports: chunk.imports || []
-        });
+      if (chunk.type !== "chunk") continue;
+      const info = {
+        fileName: chunk.fileName,
+        imports: chunk.imports || []
+      };
+      for (const moduleId of chunk.moduleIds ?? []) {
+        clientChunksBySource.set(moduleId, info);
       }
     }
+    for (const chunk of vxrnOutput.clientOutput) {
+      if (chunk.type !== "chunk" || !chunk.facadeModuleId) continue;
+      clientChunksBySource.set(chunk.facadeModuleId, {
+        fileName: chunk.fileName,
+        imports: chunk.imports || []
+      });
+    }
+  }
+  const clientManifestByFile = /* @__PURE__ */new Map();
+  for (const entry of Object.values(vxrnOutput.clientManifest)) {
+    if (entry.file) {
+      clientManifestByFile.set(entry.file, entry);
+    }
   }
   const outputEntries = [...vxrnOutput.serverOutput.entries()];
   const layoutServerPaths = /* @__PURE__ */new Map();
@@ -644,7 +507,7 @@ async function build(args) {
     }
     const clientChunk = clientChunksBySource.get(routeModulePath);
     const manifestKey = `${routerRoot}${foundRoute.file.slice(1)}`;
-    const clientManifestEntry = vxrnOutput.clientManifest[manifestKey];
+    const clientManifestEntry = vxrnOutput.clientManifest[manifestKey] ?? (clientChunk ? clientManifestByFile.get(clientChunk.fileName) : void 0);
     if (!clientChunk && foundRoute.type !== "spa" && foundRoute.type !== "ssg") {
       console.warn(`No client chunk found for route: ${routeModulePath}`);
       continue;
@@ -683,12 +546,9 @@ async function build(args) {
         }
       }
     }
-    if (clientChunk) {
-      const routeKey = `/${routerRoot}${foundRoute.file.slice(1)}`;
-      routePreloads[routeKey] = `/${clientChunk.fileName}`;
-    } else if (clientManifestEntry) {
-      const routeKey = `/${routerRoot}${foundRoute.file.slice(1)}`;
-      routePreloads[routeKey] = `/${clientManifestEntry.file}`;
+    const routeChunkFile = clientChunk?.fileName ?? clientManifestEntry?.file;
+    if (routeChunkFile) {
+      routePreloads[`/${routerRoot}${foundRoute.file.slice(1)}`] = `/${routeChunkFile}`;
     }
     const preloadSetupFilePreloads = (() => {
       if (!oneOptions.setupFile) return [];
@@ -779,10 +639,10 @@ async function build(args) {
     const serverJsPath = import_node_path.posix.join(outDir, "server", serverFileName);
     let exported;
     try {
-      exported = await import((0, import_toAbsolute.toAbsoluteUrl)(serverJsPath));
+      exported = await (0, import_serverRouteModules.getRouteExports)(vxrnOutput.serverEntry, routerRoot, foundRoute.file);
     } catch (err) {
       console.error(`Error importing page (original error)`, err);
-      throw new Error(`Error importing page: ${serverJsPath}`, {
+      throw new Error(`Error importing page: ${foundRoute.file}`, {
         cause: err
       });
     }
@@ -816,6 +676,7 @@ async function build(args) {
         console.info(`  \u21A6 route ${path}`);
         return workerPool.buildPage({
           serverEntry: vxrnOutput.serverEntry,
+          routerRoot,
           path,
           relativeId,
           params,
@@ -842,7 +703,7 @@ async function build(args) {
       return limit(async () => {
         console.info(`  \u21A6 route ${path}`);
         const built = await (0, import_one_server_only.runWithAsyncLocalContext)(async () => {
-          return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
+          return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, routerRoot, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
         });
         return {
           built,
@@ -1012,15 +873,8 @@ async function build(args) {
           const importPath = (0, import_vite.normalizePath)((0, import_node_path.relative)(workerSrcDir, (0, import_node_path.join)(options.root, routerRoot, routeFile)));
           return importPath.startsWith(".") ? importPath : `./${importPath}`;
         };
-        const pageRouteMap = [];
         const apiRouteMap = [];
         const middlewareRouteMap = [];
-        for (const [routeFile, info] of Object.entries(buildInfoForWriting.routeToBuildInfo)) {
-          if (info.serverJsPath) {
-            const importPath = "./" + info.serverJsPath.replace(new RegExp(`^${outDir}/`), "");
-            pageRouteMap.push(`  '${routeFile}': () => import('${importPath}')`);
-          }
-        }
         for (const route of buildInfoForWriting.manifest.apiRoutes) {
           if (route.file) {
             const importPath = getWorkerSourceImportPath(route.file);
@@ -1047,9 +901,6 @@ import { serve, setFetchStaticHtml } from 'one/serve-worker'
 // Lazy import map - modules load on-demand when route is matched
 const lazyRoutes = {
   serverEntry: () => import('./server/_virtual_one-entry.js'),
-  pages: {
-${pageRouteMap.join(",\n")}
-  },
   api: {
 ${apiRouteMap.join(",\n")}
   },
@@ -1110,9 +961,9 @@ export default {
 }
 `;
         await import_fs_extra.default.writeFile(workerSrcPath, workerCode);
-        const projectName = await getCloudflareProjectName(options.root);
-        const userWranglerConfig = await loadUserWranglerConfig(options.root);
-        const wranglerInputConfig = createCloudflareWranglerConfig(projectName, userWranglerConfig?.config);
+        const projectName = await (0, import_cloudflareWranglerConfig.getCloudflareProjectName)(options.root);
+        const userWranglerConfig = await (0, import_cloudflareWranglerConfig.loadUserWranglerConfig)(options.root);
+        const wranglerInputConfig = (0, import_cloudflareWranglerConfig.createCloudflareWranglerConfig)(projectName, userWranglerConfig?.config);
         wranglerInputConfig.main = (0, import_vite.normalizePath)((0, import_node_path.relative)((0, import_node_path.join)(options.root, outDir), workerSrcPath));
         const wranglerInputPath = (0, import_node_path.join)(options.root, outDir, "_wrangler.input.jsonc");
         await import_fs_extra.default.writeFile(wranglerInputPath, `${JSON.stringify(wranglerInputConfig, null, 2)}