one 1.25.12 → 1.25.15

package/dist/cjs/cli/build.native.js

@@ -55,6 +55,7 @@ var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneO
 var import_isRolldown = require("../utils/isRolldown.native.js");
 var import_toAbsolute = require("../utils/toAbsolute.native.js");
 var import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory.native.js");
+var import_cloudflareWranglerConfig = require("../vite/cloudflareWranglerConfig.native.js");
 var import_getManifest = require("../vite/getManifest.native.js");
 var import_loadConfig = require("../vite/loadConfig.native.js");
 var import_one_server_only = require("../vite/one-server-only.native.js");
@@ -63,6 +64,7 @@ var import_checkNodeVersion = require("./checkNodeVersion.native.js");
 var import_workerPool = require("./workerPool.native.js");
 var import_generateSitemap = require("./generateSitemap.native.js");
 var import_label_process = require("./label-process.native.js");
+var import_serverRouteModules = require("./serverRouteModules.native.js");
 var import_pLimit = require("../utils/pLimit.native.js");
 var import_criticalCSSPlugin = require("../vite/plugins/criticalCSSPlugin.native.js");
 var import_install_error_handlers = require("./install-error-handlers.native.js");
@@ -83,198 +85,10 @@ function normalizeDeploy(deploy) {
   };
   return deploy;
 }
-var 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
-}];
 var CLOUDFLARE_DEPLOY_WRANGLER_RULES = [{
   type: "ESModule",
   globs: ["assets/**/*.js", "assets/**/*.mjs"]
 }];
-function isPlainObject(value) {
-  return !!value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value);
-}
-function mergeJsonObjects(base, overrides) {
-  var merged = {
-    ...base
-  };
-  var _iteratorNormalCompletion = true,
-    _didIteratorError = false,
-    _iteratorError = void 0;
-  try {
-    for (var _iterator = Object.entries(overrides)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var [key, value] = _step.value;
-      var baseValue = merged[key];
-      if (isPlainObject(baseValue) && isPlainObject(value)) {
-        merged[key] = mergeJsonObjects(baseValue, value);
-      } else {
-        merged[key] = value;
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return merged;
-}
-function dedupeJsonValues(values) {
-  var seen = /* @__PURE__ */new Set();
-  return values.filter(function (value) {
-    var key = JSON.stringify(value);
-    if (seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-}
-function mergeCloudflareCompatibilityFlags(flags) {
-  var userFlags = Array.isArray(flags) ? flags.filter(function (flag) {
-    return typeof flag === "string";
-  }) : [];
-  return dedupeJsonValues(["nodejs_compat", ...userFlags]);
-}
-function mergeCloudflareRules(rules) {
-  var userRules = Array.isArray(rules) ? rules.filter(function (rule) {
-    return isPlainObject(rule);
-  }) : [];
-  return dedupeJsonValues([...GENERATED_CLOUDFLARE_WRANGLER_RULES, ...userRules]);
-}
-function parseJsonc(text) {
-  var out = "";
-  var i = 0;
-  var inString = false;
-  var quote = "";
-  while (i < text.length) {
-    var ch = text[i];
-    var next = text[i + 1];
-    if (inString) {
-      if (ch === "\\") {
-        out += ch + (next !== null && next !== void 0 ? 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) {
-  var candidateRoots = [... /* @__PURE__ */new Set([root, process.cwd()])];
-  var _iteratorNormalCompletion = true,
-    _didIteratorError = false,
-    _iteratorError = void 0;
-  try {
-    for (var _iterator = candidateRoots[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var candidateRoot = _step.value;
-      for (var _i = 0, _iter = ["wrangler.jsonc", "wrangler.json"]; _i < _iter.length; _i++) {
-        var fileName = _iter[_i];
-        var configPath = (0, import_path.join)(candidateRoot, fileName);
-        if (!(await import_fs_extra.default.pathExists(configPath))) {
-          continue;
-        }
-        var contents = await import_fs_extra.default.readFile(configPath, "utf-8");
-        var parsed = void 0;
-        try {
-          parsed = parseJsonc(contents);
-        } catch (err) {
-          throw new Error(`Failed to parse ${(0, import_path.relative)(process.cwd(), configPath)}: ${err.message}`);
-        }
-        if (!isPlainObject(parsed)) {
-          throw new Error(`Expected ${(0, import_path.relative)(process.cwd(), configPath)} to contain a top-level JSON object`);
-        }
-        return {
-          path: configPath,
-          config: parsed
-        };
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return null;
-}
-function createCloudflareWranglerConfig(projectName, userConfig) {
-  var 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
-    }
-  };
-  var 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)) {
     var items = value.map(function (item) {
@@ -284,7 +98,7 @@ function omitEmptyJsonValues(value) {
     });
     return items.length > 0 ? items : void 0;
   }
-  if (isPlainObject(value)) {
+  if ((0, import_cloudflareWranglerConfig.isPlainObject)(value)) {
     var entries = Object.entries(value).map(function (param) {
       var [key, item] = param;
       return [key, omitEmptyJsonValues(item)];
@@ -297,26 +111,17 @@ function omitEmptyJsonValues(value) {
 }
 async function finalizeCloudflareWranglerDeployConfig(configPath) {
   var 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_path.relative)(process.cwd(), configPath)} to contain a JSON object`);
   }
   parsed.rules = CLOUDFLARE_DEPLOY_WRANGLER_RULES;
   var config = omitEmptyJsonValues(parsed);
-  if (!isPlainObject(config)) {
+  if (!(0, import_cloudflareWranglerConfig.isPlainObject)(config)) {
     throw new Error(`Expected ${(0, import_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 {
-    var pkg = JSON.parse(await import_fs_extra.default.readFile((0, import_path.join)(root, "package.json"), "utf-8"));
-    if (pkg.name) {
-      return pkg.name.replace(/^@[^/]+\//, "");
-    }
-  } catch (unused) {}
-  return "one-app";
-}
 process.env.ONE_CACHE_KEY = constants.CACHE_KEY;
 function shouldUseWorkers(oneOptions) {
   var _oneOptions_build;
@@ -417,7 +222,7 @@ async function build(args) {
   var deployConfig = normalizeDeploy((_oneOptions_web1 = oneOptions.web) === null || _oneOptions_web1 === void 0 ? void 0 : _oneOptions_web1.deploy);
   if (!process.env.ONE_SERVER_URL && deployConfig) {
     var _deployConfig_url;
-    var url = (_deployConfig_url = deployConfig.url) !== null && _deployConfig_url !== void 0 ? _deployConfig_url : deployConfig.target === "cloudflare" ? `https://${await getCloudflareProjectName(process.cwd())}.workers.dev` : void 0;
+    var url = (_deployConfig_url = deployConfig.url) !== null && _deployConfig_url !== void 0 ? _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(`
@@ -673,11 +478,33 @@ async function build(args) {
     try {
       for (var _iterator1 = vxrnOutput.clientOutput[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
         var chunk = _step1.value;
-        if (chunk.type === "chunk" && chunk.facadeModuleId) {
-          clientChunksBySource.set(chunk.facadeModuleId, {
-            fileName: chunk.fileName,
-            imports: chunk.imports || []
-          });
+        var _chunk_moduleIds;
+        if (chunk.type !== "chunk") continue;
+        var info = {
+          fileName: chunk.fileName,
+          imports: chunk.imports || []
+        };
+        var _iteratorNormalCompletion2 = true,
+          _didIteratorError2 = false,
+          _iteratorError2 = void 0;
+        try {
+          for (var _iterator2 = ((_chunk_moduleIds = chunk.moduleIds) !== null && _chunk_moduleIds !== void 0 ? _chunk_moduleIds : [])[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+            var moduleId = _step2.value;
+            clientChunksBySource.set(moduleId, info);
+          }
+        } catch (err) {
+          _didIteratorError2 = true;
+          _iteratorError2 = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+              _iterator2.return();
+            }
+          } finally {
+            if (_didIteratorError2) {
+              throw _iteratorError2;
+            }
+          }
         }
       }
     } catch (err) {
@@ -694,15 +521,66 @@ async function build(args) {
         }
       }
     }
+    var _iteratorNormalCompletion3 = true,
+      _didIteratorError3 = false,
+      _iteratorError3 = void 0;
+    try {
+      for (var _iterator3 = vxrnOutput.clientOutput[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+        var chunk1 = _step3.value;
+        if (chunk1.type !== "chunk" || !chunk1.facadeModuleId) continue;
+        clientChunksBySource.set(chunk1.facadeModuleId, {
+          fileName: chunk1.fileName,
+          imports: chunk1.imports || []
+        });
+      }
+    } catch (err) {
+      _didIteratorError3 = true;
+      _iteratorError3 = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+          _iterator3.return();
+        }
+      } finally {
+        if (_didIteratorError3) {
+          throw _iteratorError3;
+        }
+      }
+    }
+  }
+  var clientManifestByFile = /* @__PURE__ */new Map();
+  var _iteratorNormalCompletion4 = true,
+    _didIteratorError4 = false,
+    _iteratorError4 = void 0;
+  try {
+    for (var _iterator4 = Object.values(vxrnOutput.clientManifest)[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+      var entry = _step4.value;
+      if (entry.file) {
+        clientManifestByFile.set(entry.file, entry);
+      }
+    }
+  } catch (err) {
+    _didIteratorError4 = true;
+    _iteratorError4 = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
+        _iterator4.return();
+      }
+    } finally {
+      if (_didIteratorError4) {
+        throw _iteratorError4;
+      }
+    }
   }
   var outputEntries = [...vxrnOutput.serverOutput.entries()];
   var layoutServerPaths = /* @__PURE__ */new Map();
-  var _iteratorNormalCompletion2 = true,
-    _didIteratorError2 = false,
-    _iteratorError2 = void 0;
+  var _iteratorNormalCompletion5 = true,
+    _didIteratorError5 = false,
+    _iteratorError5 = void 0;
   try {
-    for (var _iterator2 = outputEntries[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-      var [, output] = _step2.value;
+    for (var _iterator5 = outputEntries[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+      var [, output] = _step5.value;
       if (output.type === "asset") continue;
       var id = output.facadeModuleId || "";
       var file = import_path.default.basename(id);
@@ -713,125 +591,125 @@ async function build(args) {
       }
     }
   } catch (err) {
-    _didIteratorError2 = true;
-    _iteratorError2 = err;
+    _didIteratorError5 = true;
+    _iteratorError5 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-        _iterator2.return();
+      if (!_iteratorNormalCompletion5 && _iterator5.return != null) {
+        _iterator5.return();
       }
     } finally {
-      if (_didIteratorError2) {
-        throw _iteratorError2;
+      if (_didIteratorError5) {
+        throw _iteratorError5;
       }
     }
   }
   var routeByPath = /* @__PURE__ */new Map();
-  var _iteratorNormalCompletion3 = true,
-    _didIteratorError3 = false,
-    _iteratorError3 = void 0;
+  var _iteratorNormalCompletion6 = true,
+    _didIteratorError6 = false,
+    _iteratorError6 = void 0;
   try {
-    for (var _iterator3 = manifest.pageRoutes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-      var route = _step3.value;
+    for (var _iterator6 = manifest.pageRoutes[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+      var route = _step6.value;
       if (route.file) {
         var routePath = `${routerRoot}${route.file.slice(1)}`;
         routeByPath.set(routePath, route);
       }
     }
   } catch (err) {
-    _didIteratorError3 = true;
-    _iteratorError3 = err;
+    _didIteratorError6 = true;
+    _iteratorError6 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-        _iterator3.return();
+      if (!_iteratorNormalCompletion6 && _iterator6.return != null) {
+        _iterator6.return();
       }
     } finally {
-      if (_didIteratorError3) {
-        throw _iteratorError3;
+      if (_didIteratorError6) {
+        throw _iteratorError6;
       }
     }
   }
-  var _iteratorNormalCompletion4 = true,
-    _didIteratorError4 = false,
-    _iteratorError4 = void 0;
+  var _iteratorNormalCompletion7 = true,
+    _didIteratorError7 = false,
+    _iteratorError7 = void 0;
   try {
-    for (var _iterator4 = outputEntries[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-      var [, output1] = _step4.value;
+    for (var _iterator7 = outputEntries[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+      var [, output1] = _step7.value;
       if (output1.type === "asset") {
         assets.push(output1);
       }
     }
   } catch (err) {
-    _didIteratorError4 = true;
-    _iteratorError4 = err;
+    _didIteratorError7 = true;
+    _iteratorError7 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-        _iterator4.return();
+      if (!_iteratorNormalCompletion7 && _iterator7.return != null) {
+        _iterator7.return();
       }
     } finally {
-      if (_didIteratorError4) {
-        throw _iteratorError4;
+      if (_didIteratorError7) {
+        throw _iteratorError7;
       }
     }
   }
   var moduleIdToServerChunk = /* @__PURE__ */new Map();
-  var _iteratorNormalCompletion5 = true,
-    _didIteratorError5 = false,
-    _iteratorError5 = void 0;
+  var _iteratorNormalCompletion8 = true,
+    _didIteratorError8 = false,
+    _iteratorError8 = void 0;
   try {
-    for (var _iterator5 = outputEntries[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-      var [, output2] = _step5.value;
+    for (var _iterator8 = outputEntries[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
+      var [, output2] = _step8.value;
       if (output2.type === "asset") continue;
       var moduleIds = output2.moduleIds || (output2.facadeModuleId ? [output2.facadeModuleId] : []);
-      var _iteratorNormalCompletion6 = true,
-        _didIteratorError6 = false,
-        _iteratorError6 = void 0;
+      var _iteratorNormalCompletion9 = true,
+        _didIteratorError9 = false,
+        _iteratorError9 = void 0;
       try {
-        for (var _iterator6 = moduleIds[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-          var moduleId = _step6.value;
-          moduleIdToServerChunk.set(moduleId, output2.fileName);
-          if (moduleId.includes("?one-spa-build")) {
-            moduleIdToServerChunk.set(moduleId.slice(0, moduleId.indexOf("?")), output2.fileName);
+        for (var _iterator9 = moduleIds[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+          var moduleId1 = _step9.value;
+          moduleIdToServerChunk.set(moduleId1, output2.fileName);
+          if (moduleId1.includes("?one-spa-build")) {
+            moduleIdToServerChunk.set(moduleId1.slice(0, moduleId1.indexOf("?")), output2.fileName);
           }
         }
       } catch (err) {
-        _didIteratorError6 = true;
-        _iteratorError6 = err;
+        _didIteratorError9 = true;
+        _iteratorError9 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion6 && _iterator6.return != null) {
-            _iterator6.return();
+          if (!_iteratorNormalCompletion9 && _iterator9.return != null) {
+            _iterator9.return();
           }
         } finally {
-          if (_didIteratorError6) {
-            throw _iteratorError6;
+          if (_didIteratorError9) {
+            throw _iteratorError9;
           }
         }
       }
     }
   } catch (err) {
-    _didIteratorError5 = true;
-    _iteratorError5 = err;
+    _didIteratorError8 = true;
+    _iteratorError8 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion5 && _iterator5.return != null) {
-        _iterator5.return();
+      if (!_iteratorNormalCompletion8 && _iterator8.return != null) {
+        _iterator8.return();
       }
     } finally {
-      if (_didIteratorError5) {
-        throw _iteratorError5;
+      if (_didIteratorError8) {
+        throw _iteratorError8;
       }
     }
   }
-  var _iteratorNormalCompletion7 = true,
-    _didIteratorError7 = false,
-    _iteratorError7 = void 0;
+  var _iteratorNormalCompletion10 = true,
+    _didIteratorError10 = false,
+    _iteratorError10 = void 0;
   try {
     var _loop1 = async function () {
-      var foundRoute = _step7.value;
-      var _ref2, _ref12;
+      var foundRoute = _step10.value;
+      var _vxrnOutput_clientManifest_manifestKey, _ref2, _ref12, _ref22;
       var _vxrnOutput_buildArgs, _foundRoute_layouts, _oneOptions_web3, _oneOptions_web12, _exported_generateStaticParams;
       if (!foundRoute.file) {
         return "continue";
@@ -854,7 +732,7 @@ async function build(args) {
       }
       var clientChunk = clientChunksBySource.get(routeModulePath);
       var manifestKey = `${routerRoot}${foundRoute.file.slice(1)}`;
-      var clientManifestEntry = vxrnOutput.clientManifest[manifestKey];
+      var clientManifestEntry = (_vxrnOutput_clientManifest_manifestKey = vxrnOutput.clientManifest[manifestKey]) !== null && _vxrnOutput_clientManifest_manifestKey !== void 0 ? _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}`);
         return "continue";
@@ -862,41 +740,41 @@ async function build(args) {
       foundRoute.loaderServerPath = serverFileName;
       var relativeId1 = foundRoute.file.replace(/^\.\//, "/");
       if (foundRoute.layouts) {
-        var _iteratorNormalCompletion12 = true,
-          _didIteratorError12 = false,
-          _iteratorError12 = void 0;
+        var _iteratorNormalCompletion14 = true,
+          _didIteratorError14 = false,
+          _iteratorError14 = void 0;
         try {
-          for (var _iterator12 = foundRoute.layouts[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-            var layout = _step12.value;
+          for (var _iterator14 = foundRoute.layouts[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+            var layout = _step14.value;
             var serverPath = layoutServerPaths.get(layout.contextKey);
             if (serverPath) {
               layout.loaderServerPath = serverPath;
             }
           }
         } catch (err) {
-          _didIteratorError12 = true;
-          _iteratorError12 = err;
+          _didIteratorError14 = true;
+          _iteratorError14 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion12 && _iterator12.return != null) {
-              _iterator12.return();
+            if (!_iteratorNormalCompletion14 && _iterator14.return != null) {
+              _iterator14.return();
             }
           } finally {
-            if (_didIteratorError12) {
-              throw _iteratorError12;
+            if (_didIteratorError14) {
+              throw _iteratorError14;
             }
           }
         }
       }
-      function collectImports(entry2) {
+      function collectImports(entry3) {
         var {
           type = "js"
         } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
         var {
           imports = [],
           css
-        } = entry2;
-        var cacheKey = `${entry2.file || imports.join(",")}:${type}`;
+        } = entry3;
+        var cacheKey = `${entry3.file || imports.join(",")}:${type}`;
         var cached = collectImportsCache.get(cacheKey);
         if (cached) return cached;
         if (collectImportsInFlight.has(cacheKey)) return [];
@@ -924,8 +802,8 @@ async function build(args) {
         var found = vxrnOutput.clientManifest[clientKey2];
         return found ? found : [];
       })) !== null && _ref2 !== void 0 ? _ref2 : [];
-      var layoutImports = layoutEntries.flatMap(function (entry2) {
-        return [entry2.file, ...collectImports(entry2)];
+      var layoutImports = layoutEntries.flatMap(function (entry3) {
+        return [entry3.file, ...collectImports(entry3)];
       });
       var routePreloads = {};
       var rootLayoutKey = `${routerRoot}/_layout.tsx`;
@@ -934,39 +812,36 @@ async function build(args) {
         routePreloads[`/${rootLayoutKey}`] = `/${rootLayoutEntry.file}`;
       }
       if (foundRoute.layouts) {
-        var _iteratorNormalCompletion13 = true,
-          _didIteratorError13 = false,
-          _iteratorError13 = void 0;
+        var _iteratorNormalCompletion15 = true,
+          _didIteratorError15 = false,
+          _iteratorError15 = void 0;
         try {
-          for (var _iterator13 = foundRoute.layouts[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
-            var layout1 = _step13.value;
+          for (var _iterator15 = foundRoute.layouts[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
+            var layout1 = _step15.value;
             var clientKey = `${routerRoot}${layout1.contextKey.slice(1)}`;
-            var entry = vxrnOutput.clientManifest[clientKey];
-            if (entry) {
-              routePreloads[`/${clientKey}`] = `/${entry.file}`;
+            var entry2 = vxrnOutput.clientManifest[clientKey];
+            if (entry2) {
+              routePreloads[`/${clientKey}`] = `/${entry2.file}`;
             }
           }
         } catch (err) {
-          _didIteratorError13 = true;
-          _iteratorError13 = err;
+          _didIteratorError15 = true;
+          _iteratorError15 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion13 && _iterator13.return != null) {
-              _iterator13.return();
+            if (!_iteratorNormalCompletion15 && _iterator15.return != null) {
+              _iterator15.return();
             }
           } finally {
-            if (_didIteratorError13) {
-              throw _iteratorError13;
+            if (_didIteratorError15) {
+              throw _iteratorError15;
             }
           }
         }
       }
-      if (clientChunk) {
-        var routeKey = `/${routerRoot}${foundRoute.file.slice(1)}`;
-        routePreloads[routeKey] = `/${clientChunk.fileName}`;
-      } else if (clientManifestEntry) {
-        var routeKey1 = `/${routerRoot}${foundRoute.file.slice(1)}`;
-        routePreloads[routeKey1] = `/${clientManifestEntry.file}`;
+      var routeChunkFile = (_ref12 = clientChunk === null || clientChunk === void 0 ? void 0 : clientChunk.fileName) !== null && _ref12 !== void 0 ? _ref12 : clientManifestEntry === null || clientManifestEntry === void 0 ? void 0 : clientManifestEntry.file;
+      if (routeChunkFile) {
+        routePreloads[`/${routerRoot}${foundRoute.file.slice(1)}`] = `/${routeChunkFile}`;
       }
       var preloadSetupFilePreloads = function () {
         if (!oneOptions.setupFile) return [];
@@ -975,8 +850,8 @@ async function build(args) {
         var needle = clientSetupFile.replace(/^\.\//, "");
         for (var file2 in vxrnOutput.clientManifest) {
           if (file2 === needle) {
-            var entry2 = vxrnOutput.clientManifest[file2];
-            return [entry2.file];
+            var entry3 = vxrnOutput.clientManifest[file2];
+            return [entry3.file];
           }
         }
         return [];
@@ -998,13 +873,13 @@ async function build(args) {
       // add the route entry js (like ./app/index.ts) - prefer direct chunk lookup
       ...(clientChunk ? [clientChunk.fileName] : clientManifestEntry ? [clientManifestEntry.file] : []),
       // add layout files (but not their deep imports)
-      ...layoutEntries.map(function (entry2) {
-        return entry2.file;
+      ...layoutEntries.map(function (entry3) {
+        return entry3.file;
       })])].map(function (path2) {
         return `/${path2}`;
       }) : void 0;
-      var deferredPreloads = needsSeparatedPreloads ? [... /* @__PURE__ */new Set([...entryImports, ...layoutEntries.flatMap(function (entry2) {
-        return collectImports(entry2);
+      var deferredPreloads = needsSeparatedPreloads ? [... /* @__PURE__ */new Set([...entryImports, ...layoutEntries.flatMap(function (entry3) {
+        return collectImports(entry3);
       })])].filter(function (path2) {
         return !criticalPreloads.includes(`/${path2}`);
       }).map(function (path2) {
@@ -1012,8 +887,8 @@ async function build(args) {
       }) : void 0;
       var preloads2 = needsSeparatedPreloads ? [...criticalPreloads, ...deferredPreloads] : allPreloads;
       var allEntries = [clientManifestEntry, ...layoutEntries].filter(Boolean);
-      var layoutCSS = [...new Set(layoutEntries.flatMap(function (entry2) {
-        return collectImports(entry2, {
+      var layoutCSS = [...new Set(layoutEntries.flatMap(function (entry3) {
+        return collectImports(entry3, {
           type: "css"
         });
       }).map(function (path2) {
@@ -1035,13 +910,13 @@ async function build(args) {
       // (the prod /download was loading 23 stylesheets with editor/IDE
       // chunks despite being a marketing route).
       ...Object.entries(vxrnOutput.clientManifest).filter(function (param) {
-        var [key, entry2] = param;
+        var [key, entry3] = param;
         if (!key.endsWith(".css")) return false;
-        var src = entry2.src;
+        var src = entry3.src;
         return src === "style.css";
       }).map(function (param) {
-        var [, entry2] = param;
-        return `/${entry2.file}`;
+        var [, entry3] = param;
+        return `/${entry3.file}`;
       })])];
       var hasCriticalCSS = allCSS.some(function (p) {
         return criticalCSSOutputPaths.has(p);
@@ -1079,10 +954,10 @@ async function build(args) {
       var serverJsPath = import_path.posix.join(outDir, "server", serverFileName);
       var exported = void 0;
       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
         });
       }
@@ -1098,7 +973,7 @@ async function build(args) {
 
 `);
       }
-      var paramsList = (_ref12 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref12 !== void 0 ? _ref12 : [{}];
+      var paramsList = (_ref22 = await ((_exported_generateStaticParams = exported.generateStaticParams) === null || _exported_generateStaticParams === void 0 ? void 0 : _exported_generateStaticParams.call(exported))) !== null && _ref22 !== void 0 ? _ref22 : [{}];
       console.info(`
  [build] page ${relativeId1} (with ${paramsList.length} routes)
 `);
@@ -1116,6 +991,7 @@ async function build(args) {
           console.info(`  \u21A6 route ${path2}`);
           return workerPool.buildPage({
             serverEntry: vxrnOutput.serverEntry,
+            routerRoot,
             path: path2,
             relativeId: relativeId1,
             params,
@@ -1144,7 +1020,7 @@ async function build(args) {
         return limit(async function () {
           console.info(`  \u21A6 route ${path2}`);
           var built2 = await (0, import_one_server_only.runWithAsyncLocalContext)(async function () {
-            return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, path2, relativeId1, 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, path2, relativeId1, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS, layoutCSS, routePreloads, allCSSContents, criticalPreloads, deferredPreloads, useAfterLCP, useAfterLCPAggressive);
           });
           return {
             built: built2,
@@ -1185,18 +1061,18 @@ async function build(args) {
         }
       }
     };
-    for (var _iterator7 = manifest.pageRoutes[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) await _loop1();
+    for (var _iterator10 = manifest.pageRoutes[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) await _loop1();
   } catch (err) {
-    _didIteratorError7 = true;
-    _iteratorError7 = err;
+    _didIteratorError10 = true;
+    _iteratorError10 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion7 && _iterator7.return != null) {
-        _iterator7.return();
+      if (!_iteratorNormalCompletion10 && _iterator10.return != null) {
+        _iterator10.return();
       }
     } finally {
-      if (_didIteratorError7) {
-        throw _iteratorError7;
+      if (_didIteratorError10) {
+        throw _iteratorError10;
       }
     }
   }
@@ -1217,12 +1093,12 @@ async function build(args) {
   var cssPreloads = {};
   var loaders = {};
   var cssContentsByPath;
-  var _iteratorNormalCompletion8 = true,
-    _didIteratorError8 = false,
-    _iteratorError8 = void 0;
+  var _iteratorNormalCompletion11 = true,
+    _didIteratorError11 = false,
+    _iteratorError11 = void 0;
   try {
     var _loop2 = function () {
-      var route2 = _step8.value;
+      var route2 = _step11.value;
       if (!route2.cleanPath.includes("*")) {
         routeMap[route2.cleanPath] = route2.htmlPath;
       }
@@ -1240,25 +1116,25 @@ async function build(args) {
         });
       }
       routeToBuildInfo[route2.routeFile] = rest;
-      var _iteratorNormalCompletion12 = true,
-        _didIteratorError12 = false,
-        _iteratorError12 = void 0;
+      var _iteratorNormalCompletion14 = true,
+        _didIteratorError14 = false,
+        _iteratorError14 = void 0;
       try {
-        for (var _iterator12 = getCleanPaths([route2.path, route2.cleanPath])[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-          var p = _step12.value;
+        for (var _iterator14 = getCleanPaths([route2.path, route2.cleanPath])[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+          var p = _step14.value;
           pathToRoute[p] = route2.routeFile;
         }
       } catch (err) {
-        _didIteratorError12 = true;
-        _iteratorError12 = err;
+        _didIteratorError14 = true;
+        _iteratorError14 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion12 && _iterator12.return != null) {
-            _iterator12.return();
+          if (!_iteratorNormalCompletion14 && _iterator14.return != null) {
+            _iterator14.return();
           }
         } finally {
-          if (_didIteratorError12) {
-            throw _iteratorError12;
+          if (_didIteratorError14) {
+            throw _iteratorError14;
           }
         }
       }
@@ -1266,18 +1142,18 @@ async function build(args) {
       cssPreloads[route2.cssPreloadPath] = true;
       loaders[route2.loaderPath] = true;
     };
-    for (var _iterator8 = builtRoutes[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) _loop2();
+    for (var _iterator11 = builtRoutes[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) _loop2();
   } catch (err) {
-    _didIteratorError8 = true;
-    _iteratorError8 = err;
+    _didIteratorError11 = true;
+    _iteratorError11 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion8 && _iterator8.return != null) {
-        _iterator8.return();
+      if (!_iteratorNormalCompletion11 && _iterator11.return != null) {
+        _iterator11.return();
       }
     } finally {
-      if (_didIteratorError8) {
-        throw _iteratorError8;
+      if (_didIteratorError11) {
+        throw _iteratorError11;
       }
     }
   }
@@ -1299,12 +1175,12 @@ async function build(args) {
       return x.routeFile === route2.file;
     });
     if (built.middlewares) {
-      var _iteratorNormalCompletion12 = true,
-        _didIteratorError12 = false,
-        _iteratorError12 = void 0;
+      var _iteratorNormalCompletion14 = true,
+        _didIteratorError14 = false,
+        _iteratorError14 = void 0;
       try {
-        for (var _iterator12 = built.middlewares.entries()[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-          var [index, mw] = _step12.value;
+        for (var _iterator14 = built.middlewares.entries()[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+          var [index, mw] = _step14.value;
           var _buildInfo_middlewares;
           var viaBuildInfo = buildInfo === null || buildInfo === void 0 ? void 0 : (_buildInfo_middlewares = buildInfo.middlewares) === null || _buildInfo_middlewares === void 0 ? void 0 : _buildInfo_middlewares[index];
           if (viaBuildInfo) {
@@ -1317,16 +1193,16 @@ async function build(args) {
           }
         }
       } catch (err) {
-        _didIteratorError12 = true;
-        _iteratorError12 = err;
+        _didIteratorError14 = true;
+        _iteratorError14 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion12 && _iterator12.return != null) {
-            _iterator12.return();
+          if (!_iteratorNormalCompletion14 && _iterator14.return != null) {
+            _iterator14.return();
           }
         } finally {
-          if (_didIteratorError12) {
-            throw _iteratorError12;
+          if (_didIteratorError14) {
+            throw _iteratorError14;
           }
         }
       }
@@ -1407,83 +1283,57 @@ async function build(args) {
     case "cloudflare":
       {
         var workerSrcDir = (0, import_path.join)(options.root, outDir);
-        var getWorkerSourceImportPath = function (routeFile2) {
-          var importPath3 = (0, import_vite.normalizePath)((0, import_path.relative)(workerSrcDir, (0, import_path.join)(options.root, routerRoot, routeFile2)));
-          return importPath3.startsWith(".") ? importPath3 : `./${importPath3}`;
+        var getWorkerSourceImportPath = function (routeFile) {
+          var importPath2 = (0, import_vite.normalizePath)((0, import_path.relative)(workerSrcDir, (0, import_path.join)(options.root, routerRoot, routeFile)));
+          return importPath2.startsWith(".") ? importPath2 : `./${importPath2}`;
         };
-        var pageRouteMap = [];
         var apiRouteMap = [];
         var middlewareRouteMap = [];
-        var _iteratorNormalCompletion9 = true,
-          _didIteratorError9 = false,
-          _iteratorError9 = void 0;
-        try {
-          for (var _iterator9 = Object.entries(buildInfoForWriting.routeToBuildInfo)[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
-            var [routeFile, info] = _step9.value;
-            if (info.serverJsPath) {
-              var importPath = "./" + info.serverJsPath.replace(new RegExp(`^${outDir}/`), "");
-              pageRouteMap.push(`  '${routeFile}': () => import('${importPath}')`);
-            }
-          }
-        } catch (err) {
-          _didIteratorError9 = true;
-          _iteratorError9 = err;
-        } finally {
-          try {
-            if (!_iteratorNormalCompletion9 && _iterator9.return != null) {
-              _iterator9.return();
-            }
-          } finally {
-            if (_didIteratorError9) {
-              throw _iteratorError9;
-            }
-          }
-        }
-        var _iteratorNormalCompletion10 = true,
-          _didIteratorError10 = false,
-          _iteratorError10 = void 0;
+        var _iteratorNormalCompletion12 = true,
+          _didIteratorError12 = false,
+          _iteratorError12 = void 0;
         try {
-          for (var _iterator10 = buildInfoForWriting.manifest.apiRoutes[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
-            var route1 = _step10.value;
+          for (var _iterator12 = buildInfoForWriting.manifest.apiRoutes[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
+            var route1 = _step12.value;
             if (route1.file) {
-              var importPath1 = getWorkerSourceImportPath(route1.file);
-              apiRouteMap.push(`  '${route1.page}': () => import('${importPath1}')`);
+              var importPath = getWorkerSourceImportPath(route1.file);
+              apiRouteMap.push(`  '${route1.page}': () => import('${importPath}')`);
             }
           }
         } catch (err) {
-          _didIteratorError10 = true;
-          _iteratorError10 = err;
+          _didIteratorError12 = true;
+          _iteratorError12 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion10 && _iterator10.return != null) {
-              _iterator10.return();
+            if (!_iteratorNormalCompletion12 && _iterator12.return != null) {
+              _iterator12.return();
             }
           } finally {
-            if (_didIteratorError10) {
-              throw _iteratorError10;
+            if (_didIteratorError12) {
+              throw _iteratorError12;
             }
           }
         }
-        var _iteratorNormalCompletion11 = true,
-          _didIteratorError11 = false,
-          _iteratorError11 = void 0;
+        var _iteratorNormalCompletion13 = true,
+          _didIteratorError13 = false,
+          _iteratorError13 = void 0;
         try {
-          for (var _iterator11 = Object.entries(builtMiddlewares)[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
-            var [sourceFile, builtPath] = _step11.value;
-            var importPath2 = getWorkerSourceImportPath(sourceFile);
-            middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath2}')`);
+          for (var _iterator13 = Object.entries(builtMiddlewares)[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
+            var [sourceFile, builtPath] = _step13.value;
+            var importPath1 = getWorkerSourceImportPath(sourceFile);
+            middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath1}')`);
           }
         } catch (err) {
-          _didIteratorError11 = true;
-          _iteratorError11 = err;
+          _didIteratorError13 = true;
+          _iteratorError13 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion11 && _iterator11.return != null) {
-              _iterator11.return();
+            if (!_iteratorNormalCompletion13 && _iterator13.return != null) {
+              _iterator13.return();
             }
           } finally {
-            if (_didIteratorError11) {
-              throw _iteratorError11;
+            if (_didIteratorError13) {
+              throw _iteratorError13;
             }
           }
         }
@@ -1503,9 +1353,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")}
   },
@@ -1566,9 +1413,9 @@ export default {
 }
 `;
         await import_fs_extra.default.writeFile(workerSrcPath, workerCode);
-        var projectName = await getCloudflareProjectName(options.root);
-        var userWranglerConfig = await loadUserWranglerConfig(options.root);
-        var wranglerInputConfig = createCloudflareWranglerConfig(projectName, userWranglerConfig === null || userWranglerConfig === void 0 ? void 0 : userWranglerConfig.config);
+        var projectName = await (0, import_cloudflareWranglerConfig.getCloudflareProjectName)(options.root);
+        var userWranglerConfig = await (0, import_cloudflareWranglerConfig.loadUserWranglerConfig)(options.root);
+        var wranglerInputConfig = (0, import_cloudflareWranglerConfig.createCloudflareWranglerConfig)(projectName, userWranglerConfig === null || userWranglerConfig === void 0 ? void 0 : userWranglerConfig.config);
         wranglerInputConfig.main = (0, import_vite.normalizePath)((0, import_path.relative)((0, import_path.join)(options.root, outDir), workerSrcPath));
         var wranglerInputPath = (0, import_path.join)(options.root, outDir, "_wrangler.input.jsonc");
         await import_fs_extra.default.writeFile(wranglerInputPath, `${JSON.stringify(wranglerInputConfig, null, 2)}