wrangler 3.63.1 → 3.63.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.63.1",
+  "version": "3.63.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -151,8 +151,8 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/cli": "1.1.1",
     "@cloudflare/pages-shared": "^0.11.46",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },

package/wrangler-dist/cli.js

@@ -152612,7 +152612,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.63.1";
+var version = "3.63.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -185593,24 +185593,40 @@ init_import_meta_url();
 var import_fs9 = require("fs");
 var import_promises20 = require("node:fs/promises");
 var import_toml4 = __toESM(require_toml());
-async function toEnvironment(project, accountId) {
+var import_miniflare11 = require("miniflare");
+async function toEnvironment(deploymentConfig, accountId) {
   const configObj = {};
-  configObj.compatibility_date = project.compatibility_date ?? (/* @__PURE__ */ new Date()).toISOString().substring(0, 10);
-  if (project.compatibility_flags?.length) {
-    configObj.compatibility_flags = project.compatibility_flags;
+  configObj.compatibility_date = deploymentConfig.compatibility_date ?? (/* @__PURE__ */ new Date()).toISOString().substring(0, 10);
+  if (deploymentConfig.always_use_latest_compatibility_date) {
+    configObj.compatibility_date = import_miniflare11.supportedCompatibilityDate;
+  }
+  if (deploymentConfig.compatibility_flags?.length) {
+    configObj.compatibility_flags = deploymentConfig.compatibility_flags;
+  }
+  if (deploymentConfig.placement) {
+    configObj.placement = deploymentConfig.placement;
+  } else {
+    configObj.placement = { mode: "off" };
   }
-  for (const [name, envVar] of Object.entries(project.env_vars ?? {})) {
+  if (deploymentConfig.limits) {
+    configObj.limits = deploymentConfig.limits;
+  }
+  for (const [name, envVar] of Object.entries(
+    deploymentConfig.env_vars ?? {}
+  )) {
     if (envVar?.value && envVar?.type == "plain_text") {
       configObj.vars ??= {};
       configObj.vars[name] = envVar?.value;
     }
   }
-  for (const [name, namespace] of Object.entries(project.kv_namespaces ?? {})) {
+  for (const [name, namespace] of Object.entries(
+    deploymentConfig.kv_namespaces ?? {}
+  )) {
     configObj.kv_namespaces ??= [];
     configObj.kv_namespaces.push({ id: namespace.namespace_id, binding: name });
   }
   for (const [name, ns] of Object.entries(
-    project.durable_object_namespaces ?? {}
+    deploymentConfig.durable_object_namespaces ?? {}
   )) {
     configObj.durable_objects ??= { bindings: [] };
     if (ns.class_name && ns.class_name !== "") {
@@ -185632,7 +185648,9 @@ async function toEnvironment(project, accountId) {
       });
     }
   }
-  for (const [name, namespace] of Object.entries(project.d1_databases ?? {})) {
+  for (const [name, namespace] of Object.entries(
+    deploymentConfig.d1_databases ?? {}
+  )) {
     configObj.d1_databases ??= [];
     configObj.d1_databases.push({
       database_id: namespace.id,
@@ -185640,7 +185658,9 @@ async function toEnvironment(project, accountId) {
       database_name: name
     });
   }
-  for (const [name, bucket] of Object.entries(project.r2_buckets ?? {})) {
+  for (const [name, bucket] of Object.entries(
+    deploymentConfig.r2_buckets ?? {}
+  )) {
     configObj.r2_buckets ??= [];
     configObj.r2_buckets.push({
       bucket_name: bucket.name,
@@ -185648,7 +185668,7 @@ async function toEnvironment(project, accountId) {
     });
   }
   for (const [name, { service, environment }] of Object.entries(
-    project.services ?? {}
+    deploymentConfig.services ?? {}
   )) {
     configObj.services ??= [];
     configObj.services.push({
@@ -185657,7 +185677,9 @@ async function toEnvironment(project, accountId) {
       environment
     });
   }
-  for (const [name, queue] of Object.entries(project.queue_producers ?? {})) {
+  for (const [name, queue] of Object.entries(
+    deploymentConfig.queue_producers ?? {}
+  )) {
     configObj.queues ??= { producers: [] };
     configObj.queues?.producers?.push({
       binding: name,
@@ -185665,7 +185687,7 @@ async function toEnvironment(project, accountId) {
     });
   }
   for (const [name, { dataset }] of Object.entries(
-    project.analytics_engine_datasets ?? {}
+    deploymentConfig.analytics_engine_datasets ?? {}
   )) {
     configObj.analytics_engine_datasets ??= [];
     configObj.analytics_engine_datasets.push({
@@ -185673,36 +185695,70 @@ async function toEnvironment(project, accountId) {
       dataset
     });
   }
-  for (const [name] of Object.entries(project.ai_bindings ?? {})) {
+  for (const [name] of Object.entries(deploymentConfig.ai_bindings ?? {})) {
     configObj.ai = { binding: name };
   }
   return configObj;
 }
 __name(toEnvironment, "toEnvironment");
 async function writeWranglerToml(toml) {
+  let tomlString = import_toml4.default.stringify(toml);
+  tomlString = tomlString.split("\n").map((line) => line.trimStart()).join("\n");
   await (0, import_promises20.writeFile)(
     "wrangler.toml",
-    [
-      `# Generated by Wrangler on ${/* @__PURE__ */ new Date()}`,
-      import_toml4.default.stringify(toml)
-    ].join("\n")
+    `# Generated by Wrangler on ${/* @__PURE__ */ new Date()}
+${tomlString}`
   );
 }
 __name(writeWranglerToml, "writeWranglerToml");
+function simplifyEnvironments(preview, production) {
+  const topLevel = { ...preview };
+  if (preview.compatibility_date === production.compatibility_date) {
+    delete production.compatibility_date;
+    delete preview.compatibility_date;
+  }
+  if (JSON.stringify(preview.compatibility_flags) === JSON.stringify(production.compatibility_flags)) {
+    delete production.compatibility_flags;
+    delete preview.compatibility_date;
+  }
+  if (JSON.stringify(preview.placement) === JSON.stringify(production.placement)) {
+    delete production.placement;
+    delete preview.placement;
+    if (topLevel.placement?.mode === "off") {
+      delete topLevel.placement;
+    }
+  }
+  if (JSON.stringify(preview.limits) === JSON.stringify(production.limits)) {
+    delete production.limits;
+    delete preview.limits;
+    return { topLevel, production };
+  } else if (preview.limits && !production.limits) {
+    delete topLevel.limits;
+    return { topLevel, production, preview };
+  }
+  return { topLevel, production };
+}
+__name(simplifyEnvironments, "simplifyEnvironments");
 async function downloadProject(accountId, projectName) {
   const project = await fetchResult(
     `/accounts/${accountId}/pages/projects/${projectName}`
   );
   logger.debug(JSON.stringify(project, null, 2));
+  const { topLevel, preview, production } = simplifyEnvironments(
+    await toEnvironment(project.deployment_configs.preview, accountId),
+    await toEnvironment(project.deployment_configs.production, accountId)
+  );
   return {
     name: project.name,
     pages_build_output_dir: project.build_config.destination_dir,
-    ...await toEnvironment(project.deployment_configs.preview, accountId),
-    env: {
-      production: await toEnvironment(
-        project.deployment_configs.production,
-        accountId
-      )
+    ...topLevel,
+    ...{
+      env: preview ? {
+        preview,
+        production
+      } : {
+        production
+      }
     }
   };
 }
@@ -187467,7 +187523,7 @@ var MAX_UPLOAD_SIZE = 300 * 1024 * 1024;
 
 // src/r2/helpers.ts
 init_import_meta_url();
-var import_miniflare11 = require("miniflare");
+var import_miniflare12 = require("miniflare");
 async function listR2Buckets(accountId, jurisdiction) {
   const headers = {};
   if (jurisdiction !== void 0) {
@@ -187594,7 +187650,7 @@ __name(deleteR2Object, "deleteR2Object");
 async function usingLocalBucket(persistTo, configPath, bucketName, closure) {
   const persist = getLocalPersistencePath(persistTo, configPath);
   const persistOptions = buildPersistOptions(persist);
-  const mf = new import_miniflare11.Miniflare({
+  const mf = new import_miniflare12.Miniflare({
     modules: true,
     // TODO(soon): import `reduceError()` from `miniflare:shared`
     script: `
@@ -204720,7 +204776,7 @@ var import_node_http3 = require("node:http");
 var import_node_http22 = require("node:http2");
 var import_node_https = __toESM(require("node:https"));
 var import_http_terminator2 = __toESM(require_src5());
-var import_miniflare14 = require("miniflare");
+var import_miniflare15 = require("miniflare");
 var import_react2 = __toESM(require_react());
 var import_serve_static = __toESM(require_serve_static());
 
@@ -204728,7 +204784,7 @@ var import_serve_static = __toESM(require_serve_static());
 init_import_meta_url();
 var fs25 = __toESM(require("node:fs"));
 var path61 = __toESM(require("node:path"));
-var import_miniflare13 = require("miniflare");
+var import_miniflare14 = require("miniflare");
 var CERT_EXPIRY_DAYS = 30;
 var ONE_DAY_IN_MS = 864e5;
 function getHttpsOptions(customHttpsKeyPath, customHttpsCertPath) {
@@ -204822,7 +204878,7 @@ function generateCertificate() {
         name: "subjectAltName",
         altNames: [
           { type: 2, value: "localhost" },
-          ...(0, import_miniflare13.getAccessibleHosts)(false).map((ip2) => ({ type: 7, ip: ip2 }))
+          ...(0, import_miniflare14.getAccessibleHosts)(false).map((ip2) => ({ type: 7, ip: ip2 }))
         ]
       }
     ]
@@ -204933,7 +204989,7 @@ async function startPreviewServer({
       logger.log(`\u2B23 Listening at ${localProtocol}://${ip2}:${usedPort}`);
       const accessibleHosts = [];
       if (ip2 === "::" || ip2 === "*" || ip2 === "0.0.0.0") {
-        accessibleHosts.push(...(0, import_miniflare14.getAccessibleHosts)(true));
+        accessibleHosts.push(...(0, import_miniflare15.getAccessibleHosts)(true));
         if (ip2 !== "0.0.0.0") {
           accessibleHosts.push("localhost");
           accessibleHosts.push("[::1]");
@@ -206760,7 +206816,7 @@ init_import_meta_url();
 // src/cli-hotkeys.ts
 init_import_meta_url();
 var import_readline2 = __toESM(require("readline"));
-var import_miniflare15 = require("miniflare");
+var import_miniflare16 = require("miniflare");
 
 // src/utils/onKeyPress.ts
 init_import_meta_url();
@@ -206840,16 +206896,16 @@ function cli_hotkeys_default(options29) {
   __name(printInstructions, "printInstructions");
   Logger.registerBeforeLogHook(clearPreviousInstructions);
   Logger.registerAfterLogHook(printInstructions);
-  import_miniflare15.Log.unstable_registerBeforeLogHook(clearPreviousInstructions);
-  import_miniflare15.Log.unstable_registerAfterLogHook(printInstructions);
+  import_miniflare16.Log.unstable_registerBeforeLogHook(clearPreviousInstructions);
+  import_miniflare16.Log.unstable_registerAfterLogHook(printInstructions);
   printInstructions();
   return () => {
     unregisterKeyPress();
     clearPreviousInstructions();
     Logger.registerBeforeLogHook(void 0);
     Logger.registerAfterLogHook(void 0);
-    import_miniflare15.Log.unstable_registerBeforeLogHook(void 0);
-    import_miniflare15.Log.unstable_registerAfterLogHook(void 0);
+    import_miniflare16.Log.unstable_registerBeforeLogHook(void 0);
+    import_miniflare16.Log.unstable_registerAfterLogHook(void 0);
   };
 }
 __name(cli_hotkeys_default, "default");
@@ -209258,7 +209314,7 @@ __name(ConfigController, "ConfigController");
 init_import_meta_url();
 var import_node_crypto8 = require("node:crypto");
 var import_promises24 = require("node:fs/promises");
-var import_miniflare17 = require("miniflare");
+var import_miniflare18 = require("miniflare");
 async function getBinaryFileContents2(file) {
   if ("contents" in file) {
     if (file.contents instanceof Buffer) {
@@ -209368,7 +209424,7 @@ var LocalRuntimeController = class extends RuntimeController {
   // `buildMiniflareOptions()` is asynchronous, meaning if multiple bundle
   // updates were submitted, the second may apply before the first. Therefore,
   // wrap updates in a mutex, so they're always applied in invocation order.
-  #mutex = new import_miniflare17.Mutex();
+  #mutex = new import_miniflare18.Mutex();
   #mf;
   onBundleStart(_3) {
   }
@@ -209381,7 +209437,7 @@ var LocalRuntimeController = class extends RuntimeController {
       );
       if (this.#mf === void 0) {
         logger.log(source_default.dim("\u2394 Starting local server..."));
-        this.#mf = new import_miniflare17.Miniflare(options29);
+        this.#mf = new import_miniflare18.Miniflare(options29);
       } else {
         logger.log(source_default.dim("\u2394 Reloading local server..."));
         await this.#mf.setOptions(options29);
@@ -209482,7 +209538,7 @@ var import_node_assert23 = __toESM(require("node:assert"));
 var import_node_crypto9 = require("node:crypto");
 var import_node_events4 = __toESM(require("node:events"));
 var import_node_path65 = __toESM(require("node:path"));
-var import_miniflare18 = require("miniflare");
+var import_miniflare19 = require("miniflare");
 
 // embed-worker:/home/runner/work/workers-sdk/workers-sdk/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts
 init_import_meta_url();
@@ -209537,7 +209593,7 @@ var ProxyController = class extends Controller {
             PROXY_CONTROLLER: async (req) => {
               const message = await req.json();
               this.onProxyWorkerMessage(message);
-              return new import_miniflare18.Response(null, { status: 204 });
+              return new import_miniflare19.Response(null, { status: 204 });
             }
           },
           bindings: {
@@ -209594,7 +209650,7 @@ var ProxyController = class extends Controller {
       proxyWorkerOptions
     );
     const willInstantiateMiniflareInstance = !this.proxyWorker || proxyWorkerOptionsChanged;
-    this.proxyWorker ??= new import_miniflare18.Miniflare(proxyWorkerOptions);
+    this.proxyWorker ??= new import_miniflare19.Miniflare(proxyWorkerOptions);
     this.proxyWorkerOptions = proxyWorkerOptions;
     if (proxyWorkerOptionsChanged) {
       logger.debug("ProxyWorker miniflare options changed, reinstantiating...");
@@ -209667,7 +209723,7 @@ var ProxyController = class extends Controller {
     this.inspectorProxyWorkerWebSocket?.resolve(webSocket);
     return webSocket;
   }
-  runtimeMessageMutex = new import_miniflare18.Mutex();
+  runtimeMessageMutex = new import_miniflare19.Mutex();
   async sendMessageToProxyWorker(message, retries = 3) {
     if (this._torndown) {
       return;
@@ -209822,15 +209878,15 @@ var ProxyController = class extends Controller {
           );
         }
         if (maybeContents === void 0) {
-          return new import_miniflare18.Response(null, { status: 404 });
+          return new import_miniflare19.Response(null, { status: 404 });
         }
-        return new import_miniflare18.Response(maybeContents);
+        return new import_miniflare19.Response(maybeContents);
       }
       default:
         assertNever(message);
-        return new import_miniflare18.Response(null, { status: 404 });
+        return new import_miniflare19.Response(null, { status: 404 });
     }
-    return new import_miniflare18.Response(null, { status: 204 });
+    return new import_miniflare19.Response(null, { status: 204 });
   }
   _torndown = false;
   async teardown() {
@@ -209883,7 +209939,7 @@ var ProxyController = class extends Controller {
 __name(ProxyController, "ProxyController");
 var ProxyControllerLogger = class extends WranglerLog {
   log(message) {
-    if (message.includes("/cdn-cgi/") && this.level < import_miniflare18.LogLevel.DEBUG) {
+    if (message.includes("/cdn-cgi/") && this.level < import_miniflare19.LogLevel.DEBUG) {
       return;
     }
     super.log(message);
@@ -209904,7 +209960,7 @@ __name(didMiniflareOptionsChange, "didMiniflareOptionsChange");
 
 // src/api/startDevWorker/RemoteRuntimeController.ts
 init_import_meta_url();
-var import_miniflare20 = require("miniflare");
+var import_miniflare21 = require("miniflare");
 
 // src/api/startDevWorker/NotImplementedError.ts
 init_import_meta_url();
@@ -209930,7 +209986,7 @@ __name(notImplemented, "notImplemented");
 var RemoteRuntimeController = class extends RuntimeController {
   #abortController = new AbortController();
   #currentBundleId = 0;
-  #mutex = new import_miniflare20.Mutex();
+  #mutex = new import_miniflare21.Mutex();
   #session;
   async #previewSession(props) {
     try {
@@ -210311,7 +210367,7 @@ init_import_meta_url();
 
 // src/api/integrations/platform/index.ts
 init_import_meta_url();
-var import_miniflare22 = require("miniflare");
+var import_miniflare23 = require("miniflare");
 
 // src/api/integrations/platform/caches.ts
 init_import_meta_url();
@@ -210358,15 +210414,21 @@ init_import_meta_url();
 var ExecutionContext = class {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, unused-imports/no-unused-vars
   waitUntil(promise) {
+    if (!(this instanceof ExecutionContext)) {
+      throw new Error("Illegal invocation");
+    }
   }
   passThroughOnException() {
+    if (!(this instanceof ExecutionContext)) {
+      throw new Error("Illegal invocation");
+    }
   }
 };
 __name(ExecutionContext, "ExecutionContext");
 
 // src/api/integrations/platform/services.ts
 init_import_meta_url();
-var import_miniflare21 = require("miniflare");
+var import_miniflare22 = require("miniflare");
 var import_undici27 = __toESM(require_undici());
 async function getServiceBindings(services = []) {
   if (services.length === 0) {
@@ -210418,9 +210480,9 @@ function getServiceBindingProxyFetch({
     try {
       const resp = await (0, import_undici27.fetch)(newUrl, request3);
       const respBody = await resp.arrayBuffer();
-      return new import_miniflare21.Response(respBody, resp);
+      return new import_miniflare22.Response(respBody, resp);
     } catch {
-      return new import_miniflare21.Response(
+      return new import_miniflare22.Response(
         `Error: Unable to fetch from external service (${serviceName} bound with ${bindingName} binding), please make sure that the service is still running with \`wrangler dev\``,
         { status: 500 }
       );
@@ -210452,7 +210514,7 @@ async function getPlatformProxy(options29 = {}) {
     },
     () => getMiniflareOptionsFromConfig(rawConfig, env7, options29)
   );
-  const mf = new import_miniflare22.Miniflare({
+  const mf = new import_miniflare23.Miniflare({
     script: "",
     modules: true,
     ...miniflareOptions
@@ -210558,7 +210620,7 @@ function unstable_getMiniflareWorkerOptions(configPath, env7) {
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
-        const name = binding.service === config.name ? import_miniflare22.kCurrentWorker : binding.service;
+        const name = binding.service === config.name ? import_miniflare23.kCurrentWorker : binding.service;
         return [binding.binding, { name, entrypoint: binding.entrypoint }];
       })
     );
@@ -211254,3 +211316,4 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
+//# sourceMappingURL=cli.js.map