one 1.25.12 → 1.25.13

package/dist/cjs/cli/build.cjs

@@ -53,6 +53,7 @@ var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneO
 var import_isRolldown = require("../utils/isRolldown.cjs");
 var import_toAbsolute = require("../utils/toAbsolute.cjs");
 var import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory.cjs");
+var import_cloudflareWranglerConfig = require("../vite/cloudflareWranglerConfig.cjs");
 var import_getManifest = require("../vite/getManifest.cjs");
 var import_loadConfig = require("../vite/loadConfig.cjs");
 var import_one_server_only = require("../vite/one-server-only.cjs");
@@ -76,161 +77,16 @@ function normalizeDeploy(deploy) {
   };
   return deploy;
 }
-const 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
-}];
 const CLOUDFLARE_DEPLOY_WRANGLER_RULES = [{
   type: "ESModule",
   globs: ["assets/**/*.js", "assets/**/*.mjs"]
 }];
-function isPlainObject(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function mergeJsonObjects(base, overrides) {
-  const merged = {
-    ...base
-  };
-  for (const [key, value] of Object.entries(overrides)) {
-    const baseValue = merged[key];
-    if (isPlainObject(baseValue) && isPlainObject(value)) {
-      merged[key] = mergeJsonObjects(baseValue, value);
-    } else {
-      merged[key] = value;
-    }
-  }
-  return merged;
-}
-function dedupeJsonValues(values) {
-  const seen = /* @__PURE__ */new Set();
-  return values.filter(value => {
-    const key = JSON.stringify(value);
-    if (seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-}
-function mergeCloudflareCompatibilityFlags(flags) {
-  const userFlags = Array.isArray(flags) ? flags.filter(flag => typeof flag === "string") : [];
-  return dedupeJsonValues(["nodejs_compat", ...userFlags]);
-}
-function mergeCloudflareRules(rules) {
-  const userRules = Array.isArray(rules) ? rules.filter(rule => isPlainObject(rule)) : [];
-  return dedupeJsonValues([...GENERATED_CLOUDFLARE_WRANGLER_RULES, ...userRules]);
-}
-function parseJsonc(text) {
-  let out = "";
-  let i = 0;
-  let inString = false;
-  let quote = "";
-  while (i < text.length) {
-    const ch = text[i];
-    const next = text[i + 1];
-    if (inString) {
-      if (ch === "\\") {
-        out += ch + (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) {
-  const candidateRoots = [... /* @__PURE__ */new Set([root, process.cwd()])];
-  for (const candidateRoot of candidateRoots) {
-    for (const fileName of ["wrangler.jsonc", "wrangler.json"]) {
-      const configPath = (0, import_node_path.join)(candidateRoot, fileName);
-      if (!(await import_fs_extra.default.pathExists(configPath))) {
-        continue;
-      }
-      const contents = await import_fs_extra.default.readFile(configPath, "utf-8");
-      let parsed;
-      try {
-        parsed = parseJsonc(contents);
-      } catch (err) {
-        throw new Error(`Failed to parse ${(0, import_node_path.relative)(process.cwd(), configPath)}: ${err.message}`);
-      }
-      if (!isPlainObject(parsed)) {
-        throw new Error(`Expected ${(0, import_node_path.relative)(process.cwd(), configPath)} to contain a top-level JSON object`);
-      }
-      return {
-        path: configPath,
-        config: parsed
-      };
-    }
-  }
-  return null;
-}
-function createCloudflareWranglerConfig(projectName, userConfig) {
-  const 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
-    }
-  };
-  const 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)) {
     const items = value.map(item => omitEmptyJsonValues(item)).filter(item => item !== void 0);
     return items.length > 0 ? items : void 0;
   }
-  if (isPlainObject(value)) {
+  if ((0, import_cloudflareWranglerConfig.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;
   }
@@ -238,26 +94,17 @@ function omitEmptyJsonValues(value) {
 }
 async function finalizeCloudflareWranglerDeployConfig(configPath) {
   const 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_node_path.relative)(process.cwd(), configPath)} to contain a JSON object`);
   }
   parsed.rules = CLOUDFLARE_DEPLOY_WRANGLER_RULES;
   const config = omitEmptyJsonValues(parsed);
-  if (!isPlainObject(config)) {
+  if (!(0, import_cloudflareWranglerConfig.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"));
-    if (pkg.name) {
-      return pkg.name.replace(/^@[^/]+\//, "");
-    }
-  } catch {}
-  return "one-app";
-}
 process.env.ONE_CACHE_KEY = constants.CACHE_KEY;
 function shouldUseWorkers(oneOptions) {
   if (process.env.ONE_BUILD_WORKERS === "0") return false;
@@ -335,7 +182,7 @@ async function build(args) {
   }
   const deployConfig = normalizeDeploy(oneOptions.web?.deploy);
   if (!process.env.ONE_SERVER_URL && deployConfig) {
-    const url = deployConfig.url ?? (deployConfig.target === "cloudflare" ? `https://${await getCloudflareProjectName(process.cwd())}.workers.dev` : void 0);
+    const url = 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(`
@@ -1110,9 +957,9 @@ 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);
+        const projectName = await (0, import_cloudflareWranglerConfig.getCloudflareProjectName)(options.root);
+        const userWranglerConfig = await (0, import_cloudflareWranglerConfig.loadUserWranglerConfig)(options.root);
+        const wranglerInputConfig = (0, import_cloudflareWranglerConfig.createCloudflareWranglerConfig)(projectName, userWranglerConfig?.config);
         wranglerInputConfig.main = (0, import_vite.normalizePath)((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)}

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");
@@ -83,198 +84,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 +97,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 +110,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 +221,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(`
@@ -1566,9 +1370,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)}