one 1.15.10 → 1.16.1

package/dist/cjs/cli/build.cjs

@@ -322,10 +322,30 @@ async function build(args) {
     rolldownOptions: _rolldownOptions,
     ...optimizeDepsNoRolldown
   } = optimizeDeps;
-  const clonedWebBuildConfig = clonePluginHooks(vxrnOutput.webBuildConfig);
-  const apiBuildConfig = (0, import_vite.mergeConfig)(
-  // feels like this should build off the *server* build config not web
-  clonedWebBuildConfig, {
+  const serverOpts = oneOptions.build?.server;
+  const isUnified = typeof serverOpts === "object" && serverOpts !== null && serverOpts.unified === true;
+  let baseForApi = isUnified ? clonePluginHooks(vxrnOutput.serverBuildConfig ?? vxrnOutput.webBuildConfig) : clonePluginHooks(vxrnOutput.webBuildConfig);
+  if (isUnified) {
+    const clone = {
+      ...baseForApi,
+      build: baseForApi.build ? {
+        ...baseForApi.build
+      } : void 0,
+      plugins: baseForApi.plugins ? baseForApi.plugins.filter(p => p && typeof p === "object" && p.name !== "omit-api-routes") : void 0
+    };
+    if (clone.build && clone.build.rolldownOptions) {
+      const ro = {
+        ...clone.build.rolldownOptions
+      };
+      delete ro.input;
+      clone.build.rolldownOptions = ro;
+    }
+    if (clone.build) {
+      delete clone.build.outDir;
+    }
+    baseForApi = clone;
+  }
+  const apiBuildConfig = (0, import_vite.mergeConfig)(baseForApi, {
     configFile: false,
     appType: "custom",
     optimizeDeps: optimizeDepsNoRolldown,
@@ -350,13 +370,13 @@ async function build(args) {
     const mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
       appType: "custom",
       configFile: false,
-      // plugins: [
-      //   nodeExternals({
-      //     exclude: optimizeDeps.include,
-      //   }) as any,
-      // ],
       define: vxrnOutput.processEnvDefines,
-      ssr: {
+      ssr: isUnified ? {
+        // in unified mode let the base (serverBuildConfig) set ssr.noExternal
+        // — default is now ['react', 'react-dom'] instead of `true`, so
+        // rolldown can externalize the rest.
+        optimizeDeps: optimizeDepsNoRolldown
+      } : {
         noExternal: true,
         external: ["react", "react-dom"],
         optimizeDeps: optimizeDepsNoRolldown
@@ -388,7 +408,12 @@ async function build(args) {
           // prevents it from shaking out the exports
           preserveEntrySignatures: "strict",
           input,
-          external: [],
+          // in unified mode, inherit externals from serverBuildConfig (user
+          // ssr.external / rolldownOptions.external). the legacy path resets
+          // them to [] so per-route files bundle everything.
+          ...(isUnified ? {} : {
+            external: []
+          }),
           output: {
             entryFileNames: "[name]",
             exports: "auto",
@@ -437,14 +462,14 @@ async function build(args) {
   if (middlewareBuildInfo) {
     for (const middleware of manifest.middlewareRoutes) {
       const absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root);
-      const fullPath = (0, import_node_path.join)(absoluteRoot, routerRoot, middleware.file);
+      const fullPath = (0, import_vite.normalizePath)((0, import_node_path.join)(absoluteRoot, routerRoot, middleware.file));
       const outChunks = middlewareBuildInfo.output.filter(x => x.type === "chunk");
       const chunk = outChunks.find(x => x.facadeModuleId === fullPath);
       if (!chunk) throw new Error(`internal err finding middleware`);
       builtMiddlewares[middleware.file] = (0, import_node_path.join)(outDir, "middlewares", chunk.fileName);
     }
   }
-  globalThis["require"] = (0, import_node_module.createRequire)((0, import_node_path.join)(import_meta.url, ".."));
+  globalThis["require"] = (0, import_node_module.createRequire)(import_meta.dirname + "/");
   const assets = [];
   const builtRoutes = [];
   const sitemapData = [];
@@ -487,7 +512,7 @@ async function build(args) {
     const id = output.facadeModuleId || "";
     const file = import_node_path.default.basename(id);
     if (file.startsWith("_layout") && id.includes(`/${routerRoot}/`)) {
-      const relativePath = (0, import_node_path.relative)(process.cwd(), id).replace(`${routerRoot}/`, "");
+      const relativePath = (0, import_vite.normalizePath)((0, import_node_path.relative)(process.cwd(), id)).replace(`${routerRoot}/`, "");
       const contextKey = `./${relativePath}`;
       layoutServerPaths.set(contextKey, output.fileName);
     }
@@ -538,7 +563,7 @@ async function build(args) {
     if (!foundRoute.file) {
       continue;
     }
-    const routeModulePath = (0, import_node_path.join)((0, import_node_path.resolve)(process.cwd(), options.root), routerRoot, foundRoute.file.slice(2));
+    const routeModulePath = (0, import_vite.normalizePath)((0, import_node_path.join)((0, import_node_path.resolve)(process.cwd(), options.root), routerRoot, foundRoute.file.slice(2)));
     const serverFileName = moduleIdToServerChunk.get(routeModulePath);
     if (!serverFileName) {
       if (foundRoute.type === "spa") {
@@ -680,7 +705,7 @@ async function build(args) {
     const serverJsPath = (0, import_node_path.join)(`${outDir}/server`, serverFileName);
     let exported;
     try {
-      exported = await import((0, import_toAbsolute.toAbsolute)(serverJsPath));
+      exported = await import((0, import_toAbsolute.toAbsoluteUrl)(serverJsPath));
     } catch (err) {
       console.error(`Error importing page (original error)`, err);
       throw new Error(`Error importing page: ${serverJsPath}`, {
@@ -822,9 +847,17 @@ async function build(args) {
       }));
     }
     const buildInfo = builtRoutes.find(x => x.routeFile === route.file);
-    if (built.middlewares && buildInfo?.middlewares) {
+    if (built.middlewares) {
       for (const [index, mw] of built.middlewares.entries()) {
-        mw.contextKey = buildInfo.middlewares[index];
+        const viaBuildInfo = buildInfo?.middlewares?.[index];
+        if (viaBuildInfo) {
+          mw.contextKey = viaBuildInfo;
+          continue;
+        }
+        const viaMiddlewareMap = builtMiddlewares[mw.contextKey];
+        if (viaMiddlewareMap) {
+          mw.contextKey = viaMiddlewareMap;
+        }
       }
     }
     if (buildInfo) {
@@ -900,6 +933,11 @@ async function build(args) {
       }
     case "cloudflare":
       {
+        const workerSrcDir = (0, import_node_path.join)(options.root, outDir);
+        const getWorkerSourceImportPath = routeFile => {
+          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 = [];
@@ -911,13 +949,12 @@ async function build(args) {
         }
         for (const route of buildInfoForWriting.manifest.apiRoutes) {
           if (route.file) {
-            const apiFileName = route.page.slice(1).replace(/\[/g, "_").replace(/\]/g, "_");
-            const importPath = `./api/${apiFileName}.js`;
+            const importPath = getWorkerSourceImportPath(route.file);
             apiRouteMap.push(`  '${route.page}': () => import('${importPath}')`);
           }
         }
-        for (const [, builtPath] of Object.entries(builtMiddlewares)) {
-          const importPath = "./" + builtPath.replace(new RegExp(`^${outDir}/`), "");
+        for (const [sourceFile, builtPath] of Object.entries(builtMiddlewares)) {
+          const importPath = getWorkerSourceImportPath(sourceFile);
           middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath}')`);
         }
         const workerSrcPath = (0, import_node_path.join)(options.root, outDir, "_worker-src.js");
@@ -975,7 +1012,7 @@ export default {
     }
 
     try {
-      const response = await server.fetch(request)
+      const response = await server.fetch(request, env, ctx)
 
       // no route matched or 404 \u2192 try static assets
       if (!response || response.status === 404) {
@@ -999,38 +1036,34 @@ 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);
+        wranglerInputConfig.main = (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)}
+`);
         console.info("\n [cloudflare] Bundling worker...");
-        await (0, import_vite.build)({
+        const {
+          cloudflare
+        } = await import("@cloudflare/vite-plugin");
+        const builder = await (0, import_vite.createBuilder)({
           root: options.root,
           mode: "production",
           logLevel: "warn",
-          build: {
-            outDir,
-            emptyOutDir: false,
-            // Use SSR mode with node target for proper Node.js module resolution
-            ssr: workerSrcPath,
-            rolldownOptions: {
-              external: [
-              // React Native dev tools - not needed in production
-              "@react-native/dev-middleware", "@react-native/debugger-shell", "metro", "metro-core", "metro-runtime",
-              // Native modules that can't run in workers
-              /\.node$/],
-              output: {
-                entryFileNames: "worker.js",
-                format: "es",
-                // Keep dynamic imports separate for lazy loading
-                inlineDynamicImports: false
-              }
-            },
-            minify: true,
-            target: "esnext"
-          },
+          configFile: false,
           define: {
             "process.env.NODE_ENV": JSON.stringify("production"),
-            "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr")
+            "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr"),
+            "process.env.ONE_CACHE_KEY": JSON.stringify(constants.CACHE_KEY)
           },
+          plugins: [cloudflare({
+            configPath: wranglerInputPath,
+            viteEnvironment: {
+              name: "worker"
+            }
+          })],
           resolve: {
-            conditions: ["workerd", "worker", "node", "module", "default"],
             alias: [
             // rolldown can't parse react-native's Flow syntax; alias to react-native-web for ssr
             {
@@ -1047,22 +1080,29 @@ export default {
               replacement: (0, import_resolve.resolvePath)("@vxrn/safe-area", options.root)
             }]
           },
-          ssr: {
-            target: "node",
-            noExternal: true
+          build: {
+            outDir,
+            emptyOutDir: false,
+            rolldownOptions: {
+              // Match the main web build behavior so RN packages that import
+              // native-only symbols from react-native can still bundle against
+              // the react-native-web alias in the worker graph.
+              shimMissingExports: true
+            }
           }
         });
+        const workerEnv = builder.environments.worker;
+        if (!workerEnv) {
+          throw new Error('[one] plugin did not register "worker" environment');
+        }
+        await builder.build(workerEnv);
         await import_fs_extra.default.remove(workerSrcPath);
-        const projectName = await getCloudflareProjectName(options.root);
-        const userWranglerConfig = await loadUserWranglerConfig(options.root);
-        const wranglerConfig = createCloudflareWranglerConfig(projectName, userWranglerConfig?.config);
+        await import_fs_extra.default.remove(wranglerInputPath);
         if (userWranglerConfig) {
-          console.info(` [cloudflare] Merging ${(0, import_node_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/wrangler.jsonc`);
+          console.info(` [cloudflare] Merging ${(0, import_node_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/worker/wrangler.json`);
         }
-        await import_fs_extra.default.writeFile((0, import_node_path.join)(options.root, outDir, "wrangler.jsonc"), `${JSON.stringify(wranglerConfig, null, 2)}
-`);
-        postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker.js`);
-        postBuildLogs.push(`To deploy: cd ${outDir} && wrangler deploy`);
+        postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker/index.js`);
+        postBuildLogs.push(`To deploy: cd ${outDir}/worker && wrangler deploy`);
         break;
       }
   }

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

@@ -329,8 +329,8 @@ function clonePluginHooks(config) {
   };
 }
 async function build(args) {
-  var _ref, _ref1, _args_skipEnv, _securityScanOption_level;
-  var _oneOptions_web, _oneOptions_web1, _viteLoadedConfig_config_build, _viteLoadedConfig_config, _oneOptions_router, _oneOptions_build, _oneOptions_build_server, _oneOptions_build1, _oneOptions_build2, _oneOptions_web2, _oneOptions_build3;
+  var _ref, _ref1, _args_skipEnv, _vxrnOutput_serverBuildConfig, _securityScanOption_level;
+  var _oneOptions_web, _oneOptions_web1, _viteLoadedConfig_config_build, _viteLoadedConfig_config, _oneOptions_router, _oneOptions_build, _oneOptions_build_server, _oneOptions_build1, _oneOptions_build2, _oneOptions_build3, _oneOptions_web2, _oneOptions_build4;
   process.env.IS_VXRN_CLI = "true";
   if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = "production";
@@ -395,10 +395,32 @@ async function build(args) {
     rolldownOptions: _rolldownOptions,
     ...optimizeDepsNoRolldown
   } = optimizeDeps;
-  var clonedWebBuildConfig = clonePluginHooks(vxrnOutput.webBuildConfig);
-  var apiBuildConfig = (0, import_vite.mergeConfig)(
-  // feels like this should build off the *server* build config not web
-  clonedWebBuildConfig, {
+  var serverOpts = (_oneOptions_build3 = oneOptions.build) === null || _oneOptions_build3 === void 0 ? void 0 : _oneOptions_build3.server;
+  var isUnified = (typeof serverOpts === "undefined" ? "undefined" : _type_of(serverOpts)) === "object" && serverOpts !== null && serverOpts.unified === true;
+  var baseForApi = isUnified ? clonePluginHooks((_vxrnOutput_serverBuildConfig = vxrnOutput.serverBuildConfig) !== null && _vxrnOutput_serverBuildConfig !== void 0 ? _vxrnOutput_serverBuildConfig : vxrnOutput.webBuildConfig) : clonePluginHooks(vxrnOutput.webBuildConfig);
+  if (isUnified) {
+    var clone = {
+      ...baseForApi,
+      build: baseForApi.build ? {
+        ...baseForApi.build
+      } : void 0,
+      plugins: baseForApi.plugins ? baseForApi.plugins.filter(function (p2) {
+        return p2 && (typeof p2 === "undefined" ? "undefined" : _type_of(p2)) === "object" && p2.name !== "omit-api-routes";
+      }) : void 0
+    };
+    if (clone.build && clone.build.rolldownOptions) {
+      var ro = {
+        ...clone.build.rolldownOptions
+      };
+      delete ro.input;
+      clone.build.rolldownOptions = ro;
+    }
+    if (clone.build) {
+      delete clone.build.outDir;
+    }
+    baseForApi = clone;
+  }
+  var apiBuildConfig = (0, import_vite.mergeConfig)(baseForApi, {
     configFile: false,
     appType: "custom",
     optimizeDeps: optimizeDepsNoRolldown,
@@ -412,7 +434,7 @@ async function build(args) {
   });
   async function buildCustomRoutes(subFolder, routes) {
     var _ref2;
-    var _oneOptions_build_api, _oneOptions_build4, _oneOptions_build_api1, _oneOptions_build12, _oneOptions_build_api2, _oneOptions_build22;
+    var _oneOptions_build_api, _oneOptions_build5, _oneOptions_build_api1, _oneOptions_build12, _oneOptions_build_api2, _oneOptions_build22;
     var input = routes.reduce(function (entries, param) {
       var {
         page,
@@ -421,18 +443,18 @@ async function build(args) {
       entries[page.slice(1) + ".js"] = (0, import_path.join)(routerRoot, file2);
       return entries;
     }, {});
-    var outputFormat = (_ref2 = oneOptions === null || oneOptions === void 0 ? void 0 : (_oneOptions_build4 = oneOptions.build) === null || _oneOptions_build4 === void 0 ? void 0 : (_oneOptions_build_api = _oneOptions_build4.api) === null || _oneOptions_build_api === void 0 ? void 0 : _oneOptions_build_api.outputFormat) !== null && _ref2 !== void 0 ? _ref2 : serverOutputFormat;
+    var outputFormat = (_ref2 = oneOptions === null || oneOptions === void 0 ? void 0 : (_oneOptions_build5 = oneOptions.build) === null || _oneOptions_build5 === void 0 ? void 0 : (_oneOptions_build_api = _oneOptions_build5.api) === null || _oneOptions_build_api === void 0 ? void 0 : _oneOptions_build_api.outputFormat) !== null && _ref2 !== void 0 ? _ref2 : serverOutputFormat;
     var treeshake = oneOptions === null || oneOptions === void 0 ? void 0 : (_oneOptions_build12 = oneOptions.build) === null || _oneOptions_build12 === void 0 ? void 0 : (_oneOptions_build_api1 = _oneOptions_build12.api) === null || _oneOptions_build_api1 === void 0 ? void 0 : _oneOptions_build_api1.treeshake;
     var mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
       appType: "custom",
       configFile: false,
-      // plugins: [
-      //   nodeExternals({
-      //     exclude: optimizeDeps.include,
-      //   }) as any,
-      // ],
       define: vxrnOutput.processEnvDefines,
-      ssr: {
+      ssr: isUnified ? {
+        // in unified mode let the base (serverBuildConfig) set ssr.noExternal
+        // — default is now ['react', 'react-dom'] instead of `true`, so
+        // rolldown can externalize the rest.
+        optimizeDeps: optimizeDepsNoRolldown
+      } : {
         noExternal: true,
         external: ["react", "react-dom"],
         optimizeDeps: optimizeDepsNoRolldown
@@ -464,7 +486,12 @@ async function build(args) {
           // prevents it from shaking out the exports
           preserveEntrySignatures: "strict",
           input,
-          external: [],
+          // in unified mode, inherit externals from serverBuildConfig (user
+          // ssr.external / rolldownOptions.external). the legacy path resets
+          // them to [] so per-route files bundle everything.
+          ...(isUnified ? {} : {
+            external: []
+          }),
           output: {
             entryFileNames: "[name]",
             exports: "auto",
@@ -519,7 +546,7 @@ async function build(args) {
       var _loop = function () {
         var middleware = _step.value;
         var absoluteRoot = (0, import_path.resolve)(process.cwd(), options.root);
-        var fullPath = (0, import_path.join)(absoluteRoot, routerRoot, middleware.file);
+        var fullPath = (0, import_vite.normalizePath)((0, import_path.join)(absoluteRoot, routerRoot, middleware.file));
         var outChunks = middlewareBuildInfo.output.filter(function (x) {
           return x.type === "chunk";
         });
@@ -545,7 +572,7 @@ async function build(args) {
       }
     }
   }
-  globalThis["require"] = (0, import_module.createRequire)((0, import_path.join)(import_meta.url, ".."));
+  globalThis["require"] = (0, import_module.createRequire)(import_meta.dirname + "/");
   var assets = [];
   var builtRoutes = [];
   var sitemapData = [];
@@ -614,7 +641,7 @@ async function build(args) {
       var id = output.facadeModuleId || "";
       var file = import_path.default.basename(id);
       if (file.startsWith("_layout") && id.includes(`/${routerRoot}/`)) {
-        var relativePath = (0, import_path.relative)(process.cwd(), id).replace(`${routerRoot}/`, "");
+        var relativePath = (0, import_vite.normalizePath)((0, import_path.relative)(process.cwd(), id)).replace(`${routerRoot}/`, "");
         var contextKey = `./${relativePath}`;
         layoutServerPaths.set(contextKey, output.fileName);
       }
@@ -740,7 +767,7 @@ async function build(args) {
       if (!foundRoute.file) {
         return "continue";
       }
-      var routeModulePath = (0, import_path.join)((0, import_path.resolve)(process.cwd(), options.root), routerRoot, foundRoute.file.slice(2));
+      var routeModulePath = (0, import_vite.normalizePath)((0, import_path.join)((0, import_path.resolve)(process.cwd(), options.root), routerRoot, foundRoute.file.slice(2)));
       var serverFileName = moduleIdToServerChunk.get(routeModulePath);
       if (!serverFileName) {
         if (foundRoute.type === "spa") {
@@ -971,7 +998,7 @@ async function build(args) {
       var serverJsPath = (0, import_path.join)(`${outDir}/server`, serverFileName);
       var exported = void 0;
       try {
-        exported = await import((0, import_toAbsolute.toAbsolute)(serverJsPath));
+        exported = await import((0, import_toAbsolute.toAbsoluteUrl)(serverJsPath));
       } catch (err) {
         console.error(`Error importing page (original error)`, err);
         throw new Error(`Error importing page: ${serverJsPath}`, {
@@ -1191,14 +1218,23 @@ async function build(args) {
     var buildInfo = builtRoutes.find(function (x) {
       return x.routeFile === route3.file;
     });
-    if (built.middlewares && (buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.middlewares)) {
+    if (built.middlewares) {
       var _iteratorNormalCompletion13 = true,
         _didIteratorError13 = false,
         _iteratorError13 = void 0;
       try {
         for (var _iterator13 = built.middlewares.entries()[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
           var [index, mw] = _step13.value;
-          mw.contextKey = buildInfo.middlewares[index];
+          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) {
+            mw.contextKey = viaBuildInfo;
+            continue;
+          }
+          var viaMiddlewareMap = builtMiddlewares[mw.contextKey];
+          if (viaMiddlewareMap) {
+            mw.contextKey = viaMiddlewareMap;
+          }
         }
       } catch (err) {
         _didIteratorError13 = true;
@@ -1288,6 +1324,11 @@ 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 pageRouteMap = [];
         var apiRouteMap = [];
         var middlewareRouteMap = [];
@@ -1323,8 +1364,7 @@ async function build(args) {
           for (var _iterator11 = buildInfoForWriting.manifest.apiRoutes[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
             var route2 = _step11.value;
             if (route2.file) {
-              var apiFileName = route2.page.slice(1).replace(/\[/g, "_").replace(/\]/g, "_");
-              var importPath1 = `./api/${apiFileName}.js`;
+              var importPath1 = getWorkerSourceImportPath(route2.file);
               apiRouteMap.push(`  '${route2.page}': () => import('${importPath1}')`);
             }
           }
@@ -1347,8 +1387,8 @@ async function build(args) {
           _iteratorError12 = void 0;
         try {
           for (var _iterator12 = Object.entries(builtMiddlewares)[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-            var [, builtPath] = _step12.value;
-            var importPath2 = "./" + builtPath.replace(new RegExp(`^${outDir}/`), "");
+            var [sourceFile, builtPath] = _step12.value;
+            var importPath2 = getWorkerSourceImportPath(sourceFile);
             middlewareRouteMap.push(`  '${builtPath}': () => import('${importPath2}')`);
           }
         } catch (err) {
@@ -1420,7 +1460,7 @@ export default {
     }
 
     try {
-      const response = await server.fetch(request)
+      const response = await server.fetch(request, env, ctx)
 
       // no route matched or 404 \u2192 try static assets
       if (!response || response.status === 404) {
@@ -1444,38 +1484,34 @@ 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);
+        wranglerInputConfig.main = (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)}
+`);
         console.info("\n [cloudflare] Bundling worker...");
-        await (0, import_vite.build)({
+        var {
+          cloudflare
+        } = await import("@cloudflare/vite-plugin");
+        var builder = await (0, import_vite.createBuilder)({
           root: options.root,
           mode: "production",
           logLevel: "warn",
-          build: {
-            outDir,
-            emptyOutDir: false,
-            // Use SSR mode with node target for proper Node.js module resolution
-            ssr: workerSrcPath,
-            rolldownOptions: {
-              external: [
-              // React Native dev tools - not needed in production
-              "@react-native/dev-middleware", "@react-native/debugger-shell", "metro", "metro-core", "metro-runtime",
-              // Native modules that can't run in workers
-              /\.node$/],
-              output: {
-                entryFileNames: "worker.js",
-                format: "es",
-                // Keep dynamic imports separate for lazy loading
-                inlineDynamicImports: false
-              }
-            },
-            minify: true,
-            target: "esnext"
-          },
+          configFile: false,
           define: {
             "process.env.NODE_ENV": JSON.stringify("production"),
-            "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr")
+            "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr"),
+            "process.env.ONE_CACHE_KEY": JSON.stringify(constants.CACHE_KEY)
           },
+          plugins: [cloudflare({
+            configPath: wranglerInputPath,
+            viteEnvironment: {
+              name: "worker"
+            }
+          })],
           resolve: {
-            conditions: ["workerd", "worker", "node", "module", "default"],
             alias: [
             // rolldown can't parse react-native's Flow syntax; alias to react-native-web for ssr
             {
@@ -1492,26 +1528,33 @@ export default {
               replacement: (0, import_resolve.resolvePath)("@vxrn/safe-area", options.root)
             }]
           },
-          ssr: {
-            target: "node",
-            noExternal: true
+          build: {
+            outDir,
+            emptyOutDir: false,
+            rolldownOptions: {
+              // Match the main web build behavior so RN packages that import
+              // native-only symbols from react-native can still bundle against
+              // the react-native-web alias in the worker graph.
+              shimMissingExports: true
+            }
           }
         });
+        var workerEnv = builder.environments.worker;
+        if (!workerEnv) {
+          throw new Error('[one] plugin did not register "worker" environment');
+        }
+        await builder.build(workerEnv);
         await import_fs_extra.default.remove(workerSrcPath);
-        var projectName = await getCloudflareProjectName(options.root);
-        var userWranglerConfig = await loadUserWranglerConfig(options.root);
-        var wranglerConfig = createCloudflareWranglerConfig(projectName, userWranglerConfig === null || userWranglerConfig === void 0 ? void 0 : userWranglerConfig.config);
+        await import_fs_extra.default.remove(wranglerInputPath);
         if (userWranglerConfig) {
-          console.info(` [cloudflare] Merging ${(0, import_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/wrangler.jsonc`);
+          console.info(` [cloudflare] Merging ${(0, import_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/worker/wrangler.json`);
         }
-        await import_fs_extra.default.writeFile((0, import_path.join)(options.root, outDir, "wrangler.jsonc"), `${JSON.stringify(wranglerConfig, null, 2)}
-`);
-        postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker.js`);
-        postBuildLogs.push(`To deploy: cd ${outDir} && wrangler deploy`);
+        postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker/index.js`);
+        postBuildLogs.push(`To deploy: cd ${outDir}/worker && wrangler deploy`);
         break;
       }
   }
-  var securityScanOption = (_oneOptions_build3 = oneOptions.build) === null || _oneOptions_build3 === void 0 ? void 0 : _oneOptions_build3.securityScan;
+  var securityScanOption = (_oneOptions_build4 = oneOptions.build) === null || _oneOptions_build4 === void 0 ? void 0 : _oneOptions_build4.securityScan;
   var securityScanLevel = securityScanOption === false ? null : securityScanOption === true || securityScanOption === void 0 ? "warn" : typeof securityScanOption === "string" ? securityScanOption : (_securityScanOption_level = securityScanOption.level) !== null && _securityScanOption_level !== void 0 ? _securityScanOption_level : "warn";
   var securitySafePatterns = (typeof securityScanOption === "undefined" ? "undefined" : _type_of(securityScanOption)) === "object" && securityScanOption !== null ? securityScanOption.safePatterns : void 0;
   if (securityScanLevel) {