one 1.25.13 → 1.25.16

package/dist/cjs/cli/build.cjs

@@ -62,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");
@@ -401,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();
@@ -491,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;
@@ -530,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 [];
@@ -626,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
       });
     }
@@ -663,6 +676,7 @@ async function build(args) {
         console.info(`  \u21A6 route ${path}`);
         return workerPool.buildPage({
           serverEntry: vxrnOutput.serverEntry,
+          routerRoot,
           path,
           relativeId,
           params,
@@ -689,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,
@@ -859,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);
@@ -894,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")}
   },