one 1.25.13 → 1.25.15

package/dist/esm/vite/plugins/workerdDevPlugin.native.js

@@ -98,29 +98,23 @@ function generateWorkerdDevEntryModule(args) {
   if (!manifest) {
     throw new Error("[one] workerd dev: no routes manifest");
   }
-  var pageImports = /* @__PURE__ */new Map();
   var apiImports = /* @__PURE__ */new Map();
   var middlewareImports = /* @__PURE__ */new Map();
   var routeToBuildInfo = {};
-  var registerPage = function (routeFile) {
-    if (!routeFile) return;
-    if (pageImports.has(routeFile)) return;
-    pageImports.set(routeFile, toImportHref(root, routerRoot, routeFile));
-  };
   var _iteratorNormalCompletion = true,
     _didIteratorError = false,
     _iteratorError = void 0;
   try {
     for (var _iterator = manifest.pageRoutes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
-      registerPage(route.file);
       var _iteratorNormalCompletion1 = true,
         _didIteratorError1 = false,
         _iteratorError1 = void 0;
       try {
-        for (var _iterator1 = (route.layouts || [])[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-          var layout = _step1.value;
-          registerPage(layout.contextKey);
+        for (var _iterator1 = (route.middlewares || [])[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+          var middleware = _step1.value;
+          if (!middleware.contextKey || middlewareImports.has(middleware.contextKey)) continue;
+          middlewareImports.set(middleware.contextKey, toImportHref(root, routerRoot, middleware.contextKey));
         }
       } catch (err) {
         _didIteratorError1 = true;
@@ -136,29 +130,6 @@ function generateWorkerdDevEntryModule(args) {
           }
         }
       }
-      var _iteratorNormalCompletion2 = true,
-        _didIteratorError2 = false,
-        _iteratorError2 = void 0;
-      try {
-        for (var _iterator2 = (route.middlewares || [])[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-          var middleware = _step2.value;
-          if (!middleware.contextKey || middlewareImports.has(middleware.contextKey)) continue;
-          middlewareImports.set(middleware.contextKey, toImportHref(root, routerRoot, middleware.contextKey));
-        }
-      } catch (err) {
-        _didIteratorError2 = true;
-        _iteratorError2 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-            _iterator2.return();
-          }
-        } finally {
-          if (_didIteratorError2) {
-            throw _iteratorError2;
-          }
-        }
-      }
       if (route.file) {
         routeToBuildInfo[route.file] = stubRouteBuildInfo(route, preloads);
       }
@@ -177,50 +148,50 @@ function generateWorkerdDevEntryModule(args) {
       }
     }
   }
-  var _iteratorNormalCompletion3 = true,
-    _didIteratorError3 = false,
-    _iteratorError3 = void 0;
+  var _iteratorNormalCompletion2 = true,
+    _didIteratorError2 = false,
+    _iteratorError2 = void 0;
   try {
-    for (var _iterator3 = manifest.apiRoutes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-      var route1 = _step3.value;
+    for (var _iterator2 = manifest.apiRoutes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+      var route1 = _step2.value;
       if (route1.file) {
         apiImports.set(route1.page, toImportHref(root, routerRoot, route1.file));
       }
-      var _iteratorNormalCompletion4 = true,
-        _didIteratorError4 = false,
-        _iteratorError4 = void 0;
+      var _iteratorNormalCompletion3 = true,
+        _didIteratorError3 = false,
+        _iteratorError3 = void 0;
       try {
-        for (var _iterator4 = (route1.middlewares || [])[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-          var middleware1 = _step4.value;
+        for (var _iterator3 = (route1.middlewares || [])[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+          var middleware1 = _step3.value;
           if (!middleware1.contextKey || middlewareImports.has(middleware1.contextKey)) continue;
           middlewareImports.set(middleware1.contextKey, toImportHref(root, routerRoot, middleware1.contextKey));
         }
       } catch (err) {
-        _didIteratorError4 = true;
-        _iteratorError4 = err;
+        _didIteratorError3 = true;
+        _iteratorError3 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-            _iterator4.return();
+          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+            _iterator3.return();
           }
         } finally {
-          if (_didIteratorError4) {
-            throw _iteratorError4;
+          if (_didIteratorError3) {
+            throw _iteratorError3;
           }
         }
       }
     }
   } catch (err) {
-    _didIteratorError3 = true;
-    _iteratorError3 = err;
+    _didIteratorError2 = true;
+    _iteratorError2 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-        _iterator3.return();
+      if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+        _iterator2.return();
       }
     } finally {
-      if (_didIteratorError3) {
-        throw _iteratorError3;
+      if (_didIteratorError2) {
+        throw _iteratorError2;
       }
     }
   }
@@ -261,9 +232,6 @@ import { serve, setFetchStaticHtml } from 'one/serve-worker'
 
 const lazyRoutes = {
   serverEntry: () => import(${JSON.stringify(virtualEntryId)}),
-  pages: {
-${serializeImportMap([...pageImports])}
-  },
   api: {
 ${serializeImportMap([...apiImports])}
   },

package/dist/esm/vite/plugins/workerdDevPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["mkdirSync","writeFileSync","join","resolve","pathToFileURL","resolvePath","cloudflare","getPlatformEnvDefine","exactRegex","CACHE_KEY","virtalEntryIdClient","virtualEntryId","getManifest","getRouterRootFromOneOptions","createCloudflareWranglerConfig","getCloudflareProjectNameSync","loadUserWranglerConfigSync","shouldEnableWorkerdDev","workerdDevEntryId","resolvedWorkerdDevEntryId","WORKERD_DEV_DIR","serveOnly","plugin","existing","apply","config","env","command","toImportHref","root","routerRoot","routeFile","rel","replace","href","serializeImportMap","entries","map","param","key","JSON","stringify","stripRouteForWorker","route","layouts","middlewares","rest","type","layout","contextKey","middleware","stubRouteBuildInfo","preloads","_ref","_route_middlewares","pageType","path","page","file","preloadPath","cssPreloadPath","loaderPath","cleanPath","urlCleanPath","htmlPath","clientJsPath","serverJsPath","params","css","layoutCSS","generateWorkerdDevEntryModule","args","_options_router","options","routePaths","manifest","ignoredRouteFiles","router","Error","pageImports","Map","apiImports","middlewareImports","routeToBuildInfo","registerPage","has","set","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","pageRoutes","Symbol","iterator","_step","next","done","value","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","err","return","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","_step2","_iteratorNormalCompletion3","_didIteratorError3","_iteratorError3","_iterator3","apiRoutes","_step3","route1","_iteratorNormalCompletion4","_didIteratorError4","_iteratorError4","_iterator4","_step4","middleware1","buildInfo","constants","oneOptions","pathToRoute","routeMap","allRoutes","Object","fromEntries","preload","cssPreloads","loaders","spaPreloadScripts","createWorkerdDevPlugins","routeIndex","_options_web","_options_web1","web","deploy","cacheDir","wranglerInputPath","workerEntryPath","recursive","userWranglerConfig","projectName","wranglerInputConfig","main"],"sources":["../../../../src/vite/plugins/workerdDevPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["mkdirSync","writeFileSync","join","resolve","pathToFileURL","resolvePath","cloudflare","getPlatformEnvDefine","exactRegex","CACHE_KEY","virtalEntryIdClient","virtualEntryId","getManifest","getRouterRootFromOneOptions","createCloudflareWranglerConfig","getCloudflareProjectNameSync","loadUserWranglerConfigSync","shouldEnableWorkerdDev","workerdDevEntryId","resolvedWorkerdDevEntryId","WORKERD_DEV_DIR","serveOnly","plugin","existing","apply","config","env","command","toImportHref","root","routerRoot","routeFile","rel","replace","href","serializeImportMap","entries","map","param","key","JSON","stringify","stripRouteForWorker","route","layouts","middlewares","rest","type","layout","contextKey","middleware","stubRouteBuildInfo","preloads","_ref","_route_middlewares","pageType","path","page","file","preloadPath","cssPreloadPath","loaderPath","cleanPath","urlCleanPath","htmlPath","clientJsPath","serverJsPath","params","css","layoutCSS","generateWorkerdDevEntryModule","args","_options_router","options","routePaths","manifest","ignoredRouteFiles","router","Error","apiImports","Map","middlewareImports","routeToBuildInfo","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","pageRoutes","Symbol","iterator","_step","next","done","value","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","has","set","err","return","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","apiRoutes","_step2","route1","_iteratorNormalCompletion3","_didIteratorError3","_iteratorError3","_iterator3","_step3","middleware1","buildInfo","constants","oneOptions","pathToRoute","routeMap","allRoutes","Object","fromEntries","preload","cssPreloads","loaders","spaPreloadScripts","createWorkerdDevPlugins","routeIndex","_options_web","_options_web1","web","deploy","cacheDir","wranglerInputPath","workerEntryPath","recursive","userWranglerConfig","projectName","wranglerInputConfig","main","experimentalBundledDev","empty","rnWebPkg","rnWeb","safeArea","preparePlugin","name","enforce","environments","worker","define"],"sources":["../../../../src/vite/plugins/workerdDevPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite/replaceLoader.mjs

@@ -1,7 +1,9 @@
 const routeIdReturnRegex = /return\s*["'`]\.\/[^"'`]+["'`]/;
+const routeIdReturnRegexFor = routeId => new RegExp(`return\\s*["'\`]${routeId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["'\`]`);
 function replaceLoader({
   code,
-  loaderData
+  loaderData,
+  routeId
 }) {
   const stringifiedData = JSON.stringify(loaderData);
   const safeData = stringifiedData.replace(/\$/g, "$$$$");
@@ -13,8 +15,9 @@ function replaceLoader({
       // but if its null then it becomes returnnull
       " " + safeData);
     }
-    if (routeIdReturnRegex.test(code)) {
-      return code.replace(routeIdReturnRegex, "return " + safeData);
+    const stubRegex = routeId ? routeIdReturnRegexFor(routeId) : routeIdReturnRegex;
+    if (stubRegex.test(code)) {
+      return code.replace(stubRegex, "return " + safeData);
     }
     return code + `
 export const loader = () => (${stringifiedData})`;

package/dist/esm/vite/replaceLoader.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["routeIdReturnRegex","replaceLoader","code","loaderData","stringifiedData","JSON","stringify","safeData","replace","out","includes","test"],"sources":["../../../src/vite/replaceLoader.ts"],"sourcesContent":[null],"mappings":"AAIA,MAAMA,kBAAA,GAAqB;AAEpB,SAASC,cAAc;EAC5BC,IAAA;EACAC;AACF,GAGG;EACD,MAAMC,eAAA,GAAkBC,IAAA,CAAKC,SAAA,CAAUH,UAAU;EACjD,MAAMI,QAAA,GAAWH,eAAA,CAAgBI,OAAA,CAAQ,OAAO,MAAM;EAEtD,MAAMC,GAAA,IAAO,MAAM;IAEjB,IAAIP,IAAA,CAAKQ,QAAA,CAAS,kBAAkB,GAAG;MACrC,OAAOR,IAAA,CAAKM,OAAA,CACV;MAAA;MAAA;MAAA;MAIA,MAAMD,QACR;IACF;IAIA,IAAIP,kBAAA,CAAmBW,IAAA,CAAKT,IAAI,GAAG;MACjC,OAAOA,IAAA,CAAKM,OAAA,CAAQR,kBAAA,EAAoB,YAAYO,QAAQ;IAC9D;IAEA,OAAOL,IAAA,GAAO;AAAA,+BAAkCE,eAAe;EACjE,GAAG;EAEH,OAAOK,GAAA;AACT","ignoreList":[]}
+{"version":3,"names":["routeIdReturnRegex","routeIdReturnRegexFor","routeId","RegExp","replace","replaceLoader","code","loaderData","stringifiedData","JSON","stringify","safeData","out","includes","stubRegex","test"],"sources":["../../../src/vite/replaceLoader.ts"],"sourcesContent":[null],"mappings":"AAIA,MAAMA,kBAAA,GAAqB;AAI3B,MAAMC,qBAAA,GAAyBC,OAAA,IAC7B,IAAIC,MAAA,CAAO,mBAAmBD,OAAA,CAAQE,OAAA,CAAQ,uBAAuB,MAAM,CAAC,QAAQ;AAE/E,SAASC,cAAc;EAC5BC,IAAA;EACAC,UAAA;EACAL;AACF,GAIG;EACD,MAAMM,eAAA,GAAkBC,IAAA,CAAKC,SAAA,CAAUH,UAAU;EACjD,MAAMI,QAAA,GAAWH,eAAA,CAAgBJ,OAAA,CAAQ,OAAO,MAAM;EAEtD,MAAMQ,GAAA,IAAO,MAAM;IAEjB,IAAIN,IAAA,CAAKO,QAAA,CAAS,kBAAkB,GAAG;MACrC,OAAOP,IAAA,CAAKF,OAAA,CACV;MAAA;MAAA;MAAA;MAIA,MAAMO,QACR;IACF;IAIA,MAAMG,SAAA,GAAYZ,OAAA,GAAUD,qBAAA,CAAsBC,OAAO,IAAIF,kBAAA;IAC7D,IAAIc,SAAA,CAAUC,IAAA,CAAKT,IAAI,GAAG;MACxB,OAAOA,IAAA,CAAKF,OAAA,CAAQU,SAAA,EAAW,YAAYH,QAAQ;IACrD;IAEA,OAAOL,IAAA,GAAO;AAAA,+BAAkCE,eAAe;EACjE,GAAG;EAEH,OAAOI,GAAA;AACT","ignoreList":[]}

package/dist/esm/vite/replaceLoader.native.js

@@ -1,8 +1,12 @@
 var routeIdReturnRegex = /return\s*["'`]\.\/[^"'`]+["'`]/;
+var routeIdReturnRegexFor = function (routeId) {
+  return new RegExp(`return\\s*["'\`]${routeId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["'\`]`);
+};
 function replaceLoader(param) {
   var {
     code,
-    loaderData
+    loaderData,
+    routeId
   } = param;
   var stringifiedData = JSON.stringify(loaderData);
   var safeData = stringifiedData.replace(/\$/g, "$$$$");
@@ -14,8 +18,9 @@ function replaceLoader(param) {
       // but if its null then it becomes returnnull
       " " + safeData);
     }
-    if (routeIdReturnRegex.test(code)) {
-      return code.replace(routeIdReturnRegex, "return " + safeData);
+    var stubRegex = routeId ? routeIdReturnRegexFor(routeId) : routeIdReturnRegex;
+    if (stubRegex.test(code)) {
+      return code.replace(stubRegex, "return " + safeData);
     }
     return code + `
 export const loader = () => (${stringifiedData})`;

package/dist/esm/vite/replaceLoader.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["routeIdReturnRegex","replaceLoader","param","code","loaderData","stringifiedData","JSON","stringify","safeData","replace","out","includes","test"],"sources":["../../../src/vite/replaceLoader.ts"],"sourcesContent":[null],"mappings":"AAIA,IAAAA,kBAAM,mCAAqB;AAEpB,SAASC,cAAcC,KAAA;EAC5B;IAAAC,IAAA;IAAAC;EAAA,IAAAF,KAAA;EACA,IAAAG,eAAA,GAAAC,IAAA,CAAAC,SAAA,CAAAH,UAAA;EACF,IAGGI,QAAA,GAAAH,eAAA,CAAAI,OAAA;EACD,IAAAC,GAAM;IACN,IAAMP,IAAA,CAAAQ,QAAW,mBAAgB,GAAQ;MAEzC,OAAMR,IAAO,CAAAM,OAAM,CAEb,0BAAc;MAChB;MACE;MAAA;MAAA,MAAAD,QAAA;IAAA;IAIM,IACRR,kBAAA,CAAAY,IAAA,CAAAT,IAAA;MACF,OAAAA,IAAA,CAAAM,OAAA,CAAAT,kBAAA,cAAAQ,QAAA;IAIA;IACE,OAAAL,IAAO,GAAK;AAAgD,+BAC9DE,eAAA;EAEA;EAAc,OAAAK,GAAA;AAAiD;AAGjE,SACFT,aAAA","ignoreList":[]}
+{"version":3,"names":["routeIdReturnRegex","routeIdReturnRegexFor","routeId","RegExp","replace","replaceLoader","param","code","loaderData","stringifiedData","JSON","stringify","safeData","out","includes","stubRegex","test"],"sources":["../../../src/vite/replaceLoader.ts"],"sourcesContent":[null],"mappings":"AAIA,IAAAA,kBAAM,mCAAqB;AAI3B,IAAAC,qBAAM,YAAAA,CAAyBC,OAC7B;EAEK,OAAS,IAAAC,MAAA,oBAAcD,OAAA,CAAAE,OAAA;AAAA;AAC5B,SACAC,cAAAC,KAAA;EACA;IAAAC,IAAA;IAAAC,UAAA;IAAAN;EAAA,IAAAI,KAAA;EACF,IAIGG,eAAA,GAAAC,IAAA,CAAAC,SAAA,CAAAH,UAAA;EACD,IAAAI,QAAM,GAAAH,eAAuB,CAAAL,OAAA,CAAU,aAAU;EACjD,IAAAS,GAAM,eAAW;IAEjB,IAAMN,IAAA,CAAAO,QAAa;MAEjB,OAASP,IAAA,CAAAH,OAAS,CAChB,0BAAY;MACV;MAAA;MAAA;MAAA,MAAAQ,QAAA;IAIM;IAEV,IAAAG,SAAA,GAAAb,OAAA,GAAAD,qBAAA,CAAAC,OAAA,IAAAF,kBAAA;IAIA,IAAAe,SAAM,CAAAC,IAAY,CAAAT,IAAA;MAClB,OAAIA,IAAA,CAAUH,OAAK,CAAAW,SAAO,cAAAH,QAAA;IACxB;IACF,OAAAL,IAAA;AAEA,+BAAcE,eAAA;EAAA;EAChB,OAAGI,GAAA;AAEH;AACF,S","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.25.13",
+  "version": "1.25.15",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -193,18 +193,18 @@
     "@cloudflare/vite-plugin": "^1.33.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.25.13",
-    "@vxrn/compiler": "1.25.13",
-    "@vxrn/resolve": "1.25.13",
-    "@vxrn/tslib-lite": "1.25.13",
-    "@vxrn/use-isomorphic-layout-effect": "1.25.13",
-    "@vxrn/vite-plugin-metro": "1.25.13",
+    "@vxrn/color-scheme": "1.25.15",
+    "@vxrn/compiler": "1.25.15",
+    "@vxrn/resolve": "1.25.15",
+    "@vxrn/tslib-lite": "1.25.15",
+    "@vxrn/use-isomorphic-layout-effect": "1.25.15",
+    "@vxrn/vite-plugin-metro": "1.25.15",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-preset-expo": "~57.0.5",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.25.13",
+    "create-vxrn": "1.25.15",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~57.0.5",
     "expo-modules-core": "~57.0.10",
@@ -224,7 +224,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "1.25.13",
+    "vxrn": "1.25.15",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"

package/src/cli/build.ts

@@ -45,6 +45,7 @@ import { checkNodeVersion } from './checkNodeVersion'
 import { getWorkerPool, terminateWorkerPool } from './workerPool'
 import { generateSitemap, type RouteSitemapData } from './generateSitemap'
 import { labelProcess } from './label-process'
+import { getRouteExports } from './serverRouteModules'
 import { pLimit } from '../utils/pLimit'
 import { getCriticalCSSOutputPaths } from '../vite/plugins/criticalCSSPlugin'
 
@@ -537,17 +538,36 @@ export async function build(args: {
   }
 
   // build a direct mapping from source file path to client chunk info
-  // this is more reliable than manifest.json which can have ambiguous keys
+  // this is more reliable than manifest.json which can have ambiguous keys.
+  // index every module a chunk contains, not just its facade: a route that
+  // another route re-exports from stops being a dynamic entry and lands in a
+  // plain shared chunk, which has no facade and so gets no source-path key in
+  // the manifest either. the facade pass runs second so it wins where both hit.
   const clientChunksBySource = new Map<string, { fileName: string; imports: string[] }>()
   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 || [],
+      })
+    }
+  }
+
+  // the manifest keys chunks by source path only when they have a facade, so
+  // reach the rest through the chunk file name that clientChunksBySource gives us
+  const clientManifestByFile = new Map<string, ClientManifestEntry>()
+  for (const entry of Object.values(vxrnOutput.clientManifest) as ClientManifestEntry[]) {
+    if (entry.file) {
+      clientManifestByFile.set(entry.file, entry)
+    }
   }
 
   const outputEntries = [...vxrnOutput.serverOutput.entries()]
@@ -643,7 +663,9 @@ export async function build(args: {
 
     // also look up in manifest for additional info (css, nested imports, etc)
     const manifestKey = `${routerRoot}${foundRoute.file.slice(1)}`
-    const clientManifestEntry = vxrnOutput.clientManifest[manifestKey]
+    const clientManifestEntry: ClientManifestEntry | undefined =
+      vxrnOutput.clientManifest[manifestKey] ??
+      (clientChunk ? clientManifestByFile.get(clientChunk.fileName) : undefined)
 
     // SPA and SSG routes may not have client chunks - that's expected
     if (!clientChunk && foundRoute.type !== 'spa' && foundRoute.type !== 'ssg') {
@@ -668,7 +690,7 @@ export async function build(args: {
     }
 
     function collectImports(
-      entry: ClientManifestEntry,
+      entry: Partial<ClientManifestEntry>,
       { type = 'js' }: { type?: 'js' | 'css' } = {}
     ): string[] {
       const { imports = [], css } = entry
@@ -739,13 +761,9 @@ export async function build(args: {
     }
 
     // add the page itself using the direct chunk lookup (more reliable than manifest)
-    if (clientChunk) {
-      const routeKey = `/${routerRoot}${foundRoute.file.slice(1)}`
-      routePreloads[routeKey] = `/${clientChunk.fileName}`
-    } else if (clientManifestEntry) {
-      // fallback to manifest if no chunk (shouldn't happen normally)
-      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 = (() => {
@@ -921,11 +939,15 @@ export async function build(args: {
 
     let exported
     try {
-      exported = await import(toAbsoluteUrl(serverJsPath))
+      exported = await getRouteExports(
+        vxrnOutput.serverEntry,
+        routerRoot,
+        foundRoute.file
+      )
     } catch (err) {
       console.error(`Error importing page (original error)`, err)
       // err cause not showing in vite or something
-      throw new Error(`Error importing page: ${serverJsPath}`, {
+      throw new Error(`Error importing page: ${foundRoute.file}`, {
         cause: err,
       })
     }
@@ -995,6 +1017,7 @@ export async function build(args: {
         return workerPool
           .buildPage({
             serverEntry: vxrnOutput.serverEntry,
+            routerRoot,
             path,
             relativeId,
             params,
@@ -1024,6 +1047,7 @@ export async function build(args: {
         const built = await runWithAsyncLocalContext(async () => {
           return await buildPage(
             vxrnOutput.serverEntry,
+            routerRoot,
             path,
             relativeId,
             params,
@@ -1250,21 +1274,9 @@ export async function build(args: {
         )
         return importPath.startsWith('.') ? importPath : `./${importPath}`
       }
-      const pageRouteMap: string[] = []
       const apiRouteMap: string[] = []
       const middlewareRouteMap: string[] = []
 
-      // Generate lazy imports for SSR/SSG page server bundles
-      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}')`)
-        }
-      }
-
       // Generate lazy imports for API routes
       for (const route of buildInfoForWriting.manifest.apiRoutes) {
         if (route.file) {
@@ -1299,9 +1311,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')}
   },

package/src/cli/buildPage.ts

@@ -14,6 +14,7 @@ import { isResponse } from '../utils/isResponse'
 import { toAbsolute, toAbsoluteUrl } from '../utils/toAbsolute'
 import { replaceLoader } from '../vite/replaceLoader'
 import type { One, RouteInfo } from '../vite/types'
+import { getRouteExports } from './serverRouteModules'
 
 const { readFile, outputFile } = FSExtra
 
@@ -45,6 +46,7 @@ export function printBuildTimings() {
 
 export async function buildPage(
   serverEntry: string,
+  routerRoot: string,
   path: string,
   relativeId: string,
   params: any,
@@ -186,7 +188,7 @@ prefetchCSS()
     recordTiming('writeCSSPreload', performance.now() - t0)
 
     t0 = performance.now()
-    const exported = await import(toAbsoluteUrl(serverJsPath))
+    const exported = await getRouteExports(serverEntry, routerRoot, foundRoute.file)
     recordTiming('importServerModule', performance.now() - t0)
 
     const loaderProps: LoaderProps = { path, params }
@@ -200,14 +202,13 @@ prefetchCSS()
       const layoutResults = await Promise.all(
         foundRoute.layouts.map(async (layout) => {
           try {
-            const layoutServerPath = layout.loaderServerPath
-            if (!layoutServerPath) {
+            if (!layout.loaderServerPath) {
               return { contextKey: layout.contextKey, loaderData: undefined }
             }
-            // derive server dir from clientDir (e.g. dist/client -> dist/server)
-            const serverDir = join(clientDir, '..', 'server')
-            const layoutExported = await import(
-              toAbsoluteUrl(join(serverDir, layoutServerPath))
+            const layoutExported = await getRouteExports(
+              serverEntry,
+              routerRoot,
+              layout.contextKey
             )
             const layoutLoaderData = await layoutExported?.loader?.(loaderProps)
             return { contextKey: layout.contextKey, loaderData: layoutLoaderData }
@@ -301,6 +302,7 @@ if (typeof document === 'undefined') globalThis.document = {}
             replaceLoader({
               code,
               loaderData,
+              routeId: foundRoute.file,
             })
           await outputFile(loaderPartialPath, withLoader)
           // native-friendly CJS version with just the data (no ESM imports)

package/src/cli/buildPageWorker.ts

@@ -68,6 +68,7 @@ parentPort.on('message', async (msg: any) => {
       const result = await runWithAsyncLocalContext(async () => {
         return await buildPage(
           msg.args.serverEntry,
+          msg.args.routerRoot,
           msg.args.path,
           msg.args.relativeId,
           msg.args.params,

package/src/cli/serverRouteModules.ts

@@ -0,0 +1,33 @@
+import { getRouteExportsFromEntry } from '../server/routeExportsFromEntry'
+import { toAbsoluteUrl } from '../utils/toAbsolute'
+
+// entry evaluation is expensive and every page in a build shares it
+const serverEntries = new Map<string, Promise<any>>()
+
+function loadServerEntry(serverEntry: string) {
+  let loading = serverEntries.get(serverEntry)
+  if (!loading) {
+    loading = import(toAbsoluteUrl(serverEntry))
+    serverEntries.set(serverEntry, loading)
+  }
+  return loading
+}
+
+export async function getRouteExports(
+  serverEntry: string,
+  routerRoot: string,
+  routeFile: string
+): Promise<Record<string, any>> {
+  const entry = await loadServerEntry(serverEntry)
+  const exported = await getRouteExportsFromEntry(entry, routerRoot, routeFile)
+
+  if (!exported) {
+    const routes =
+      entry?.default?.options?.routes ?? entry?.default?.default?.options?.routes
+    throw new Error(
+      `[one] route ${routeFile} is missing from the built server entry route map (looked in: ${Object.keys(routes ?? {}).join(', ')})`
+    )
+  }
+
+  return exported
+}

package/src/cli/workerPool.ts

@@ -105,6 +105,7 @@ export class BuildWorkerPool {
 
   async buildPage(args: {
     serverEntry: string
+    routerRoot: string
     path: string
     relativeId: string
     params: any

package/src/createApp.tsx

@@ -7,7 +7,7 @@ import { render } from './render'
 import { initClientMatches } from './router/router'
 import { registerPreloadedRoute } from './router/useViteRoutes'
 import { setupSkewProtection } from './skewProtection'
-import { handleSkewError } from './utils/dynamicImport'
+import { handleSkewError, isChunkLoadError } from './utils/dynamicImport'
 import { findRootLayout } from './utils/findRootLayout'
 import type { RenderAppProps } from './types'
 import type { OneLinkingConfig } from './link/getLinking'
@@ -293,5 +293,9 @@ export function createApp(options: CreateAppProps) {
     })
     .catch((err) => {
       console.error(`Error during client initialization:`, err)
+      if (isChunkLoadError(err)) {
+        handleSkewError()
+      }
     })
 }
+

package/src/headless-server.ts

@@ -20,7 +20,6 @@
  *     oneOptions: { web: { defaultRenderMode: 'spa' } },
  *     routes: {
  *       api: { '/api/hello': () => import('./api/hello') },
- *       pages: { '/index': () => import('./index') },
  *       middlewares: {},
  *       serverEntry: () => import('./entry-server'),
  *     },

package/src/headless.tsx

@@ -4,6 +4,7 @@ import type { OneLinkingConfig } from './link/getLinking'
 import { Root } from './Root'
 import { resolveClientLoader } from './clientLoaderResolver'
 import { render } from './render'
+import { handleSkewError, isChunkLoadError } from './utils/dynamicImport'
 import { findRootLayout } from './utils/findRootLayout'
 import type { One } from './vite/types'
 
@@ -51,5 +52,9 @@ export function createApp(options: CreateHeadlessAppProps) {
     })
     .catch((err) => {
       console.error(`[one/headless] Error during initialization:`, err)
+      if (isChunkLoadError(err)) {
+        handleSkewError()
+      }
     })
 }
+