one 1.17.11 → 1.18.0

package/dist/cjs/cli/build.cjs

@@ -46,6 +46,7 @@ var import_vite = require("vite");
 var import_vxrn = require("vxrn");
 var constants = __toESM(require("../constants.cjs"), 1);
 var import_setServerGlobals = require("../server/setServerGlobals.cjs");
+var import_environmentGuardPlugin = require("../vite/plugins/environmentGuardPlugin.cjs");
 var import_buildOutputPointer = require("../utils/buildOutputPointer.cjs");
 var import_getPathnameFromFilePath = require("../utils/getPathnameFromFilePath.cjs");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.cjs");
@@ -92,6 +93,10 @@ const GENERATED_CLOUDFLARE_WRANGLER_RULES = [{
   globs: ["./assets/**/*.js"],
   fallthrough: true
 }];
+const CLOUDFLARE_DEPLOY_WRANGLER_RULES = [{
+  type: "ESModule",
+  globs: ["assets/**/*.js", "assets/**/*.mjs"]
+}];
 function isPlainObject(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -220,6 +225,30 @@ function createCloudflareWranglerConfig(projectName, userConfig) {
   };
   return mergedConfig;
 }
+function omitEmptyJsonValues(value) {
+  if (Array.isArray(value)) {
+    const items = value.map(item => omitEmptyJsonValues(item)).filter(item => item !== void 0);
+    return items.length > 0 ? items : void 0;
+  }
+  if (isPlainObject(value)) {
+    const entries = Object.entries(value).map(([key, item]) => [key, omitEmptyJsonValues(item)]).filter(entry => entry[1] !== void 0);
+    return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+  }
+  return value;
+}
+async function finalizeCloudflareWranglerDeployConfig(configPath) {
+  const parsed = JSON.parse(await import_fs_extra.default.readFile(configPath, "utf-8"));
+  if (!isPlainObject(parsed)) {
+    throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain a JSON object`);
+  }
+  parsed.rules = CLOUDFLARE_DEPLOY_WRANGLER_RULES;
+  const config = omitEmptyJsonValues(parsed);
+  if (!isPlainObject(config)) {
+    throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain deploy config`);
+  }
+  await import_fs_extra.default.writeFile(configPath, `${JSON.stringify(config, null, 2)}
+`);
+}
 async function getCloudflareProjectName(root) {
   try {
     const pkg = JSON.parse(await import_fs_extra.default.readFile((0, import_node_path.join)(root, "package.json"), "utf-8"));
@@ -1092,7 +1121,16 @@ export default {
             "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr"),
             "process.env.ONE_CACHE_KEY": JSON.stringify(constants.CACHE_KEY)
           },
-          plugins: [cloudflare({
+          plugins: [
+          // the cloudflare worker IS a server, but this build runs with
+          // configFile:false so the user vite.config (where the user-level
+          // `one()` plugin registers environmentGuardPlugin via vite.config)
+          // doesn't apply. register the guard plugin directly here so
+          // `import 'server-only'` resolves to an empty module in the
+          // worker bundle instead of inlining the package's throwing
+          // index.js — which would crash the deployed worker on the first
+          // /api request that loads any server-only-importing module.
+          (0, import_environmentGuardPlugin.environmentGuardPlugin)(oneOptions.environmentGuards), cloudflare({
             configPath: wranglerInputPath,
             viteEnvironment: {
               name: "worker"
@@ -1133,11 +1171,12 @@ export default {
         await builder.build(workerEnv);
         await import_fs_extra.default.remove(workerSrcPath);
         await import_fs_extra.default.remove(wranglerInputPath);
+        await finalizeCloudflareWranglerDeployConfig((0, import_node_path.join)(options.root, outDir, "worker", "wrangler.json"));
         if (userWranglerConfig) {
           console.info(` [cloudflare] Merging ${(0, import_node_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/worker/wrangler.json`);
         }
         postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker/index.js`);
-        postBuildLogs.push(`To deploy: cd ${outDir}/worker && wrangler deploy`);
+        postBuildLogs.push(`To deploy: wrangler deploy`);
         break;
       }
   }

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

@@ -48,6 +48,7 @@ var import_vite = require("vite");
 var import_vxrn = require("vxrn");
 var constants = __toESM(require("../constants.native.js"), 1);
 var import_setServerGlobals = require("../server/setServerGlobals.native.js");
+var import_environmentGuardPlugin = require("../vite/plugins/environmentGuardPlugin.native.js");
 var import_buildOutputPointer = require("../utils/buildOutputPointer.native.js");
 var import_getPathnameFromFilePath = require("../utils/getPathnameFromFilePath.native.js");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.native.js");
@@ -99,6 +100,10 @@ var GENERATED_CLOUDFLARE_WRANGLER_RULES = [{
   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);
 }
@@ -270,6 +275,39 @@ function createCloudflareWranglerConfig(projectName, userConfig) {
   };
   return mergedConfig;
 }
+function omitEmptyJsonValues(value) {
+  if (Array.isArray(value)) {
+    var items = value.map(function (item) {
+      return omitEmptyJsonValues(item);
+    }).filter(function (item) {
+      return item !== void 0;
+    });
+    return items.length > 0 ? items : void 0;
+  }
+  if (isPlainObject(value)) {
+    var entries = Object.entries(value).map(function (param) {
+      var [key, item] = param;
+      return [key, omitEmptyJsonValues(item)];
+    }).filter(function (entry) {
+      return entry[1] !== void 0;
+    });
+    return entries.length > 0 ? Object.fromEntries(entries) : void 0;
+  }
+  return value;
+}
+async function finalizeCloudflareWranglerDeployConfig(configPath) {
+  var parsed = JSON.parse(await import_fs_extra.default.readFile(configPath, "utf-8"));
+  if (!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)) {
+    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"));
@@ -1538,7 +1576,16 @@ export default {
             "process.env.VITE_ENVIRONMENT": JSON.stringify("ssr"),
             "process.env.ONE_CACHE_KEY": JSON.stringify(constants.CACHE_KEY)
           },
-          plugins: [cloudflare({
+          plugins: [
+          // the cloudflare worker IS a server, but this build runs with
+          // configFile:false so the user vite.config (where the user-level
+          // `one()` plugin registers environmentGuardPlugin via vite.config)
+          // doesn't apply. register the guard plugin directly here so
+          // `import 'server-only'` resolves to an empty module in the
+          // worker bundle instead of inlining the package's throwing
+          // index.js — which would crash the deployed worker on the first
+          // /api request that loads any server-only-importing module.
+          (0, import_environmentGuardPlugin.environmentGuardPlugin)(oneOptions.environmentGuards), cloudflare({
             configPath: wranglerInputPath,
             viteEnvironment: {
               name: "worker"
@@ -1579,11 +1626,12 @@ export default {
         await builder.build(workerEnv);
         await import_fs_extra.default.remove(workerSrcPath);
         await import_fs_extra.default.remove(wranglerInputPath);
+        await finalizeCloudflareWranglerDeployConfig((0, import_path.join)(options.root, outDir, "worker", "wrangler.json"));
         if (userWranglerConfig) {
           console.info(` [cloudflare] Merging ${(0, import_path.relative)(options.root, userWranglerConfig.path)} into ${outDir}/worker/wrangler.json`);
         }
         postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker/index.js`);
-        postBuildLogs.push(`To deploy: cd ${outDir}/worker && wrangler deploy`);
+        postBuildLogs.push(`To deploy: wrangler deploy`);
         break;
       }
   }