wrangler 3.63.1 → 3.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.63.1",
+  "version": "3.64.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -153,8 +153,8 @@
     "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/pages-shared": "^0.11.46",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/pages-shared": "^0.11.46"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20240620.0"

package/templates/tsconfig.init.json

@@ -1,105 +1,22 @@
 {
 	"compilerOptions": {
-		/* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-		/* Projects */
-		// "incremental": true,                              /* Enable incremental compilation */
-		// "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-		// "tsBuildInfoFile": "./",                          /* Specify the folder for .tsbuildinfo incremental compilation files. */
-		// "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
-		// "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-		// "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-		/* Language and Environment */
 		"target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
 		"lib": [
 			"es2021"
 		] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
 		"jsx": "react-jsx" /* Specify what JSX code is generated. */,
-		// "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
-		// "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-		// "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
-		// "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-		// "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
-		// "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
-		// "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-		// "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-
-		/* Modules */
-		"module": "es2022" /* Specify what module code is generated. */,
-		// "rootDir": "./",                                  /* Specify the root folder within your source files. */
-		"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
-		// "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-		// "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-		// "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
+		"module": "ESNext" /* Specify what module code is generated. */,
+		"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
 		"types": [
 			"@cloudflare/workers-types"
 		] /* Specify type package names to be included without being referenced in a source file. */,
-		// "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
 		"resolveJsonModule": true /* Enable importing .json files */,
-		// "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
-
-		/* JavaScript Support */
 		"allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
-		"checkJs": false /* Enable error reporting in type-checked JavaScript files. */,
-		// "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
-
-		/* Emit */
-		// "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-		// "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-		// "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-		// "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
-		// "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
-		// "outDir": "./",                                   /* Specify an output folder for all emitted files. */
-		// "removeComments": true,                           /* Disable emitting comments. */
 		"noEmit": true /* Disable emitting files from a compilation. */,
-		// "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-		// "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
-		// "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-		// "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-		// "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-		// "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-		// "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-		// "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-		// "newLine": "crlf",                                /* Set the newline character for emitting files. */
-		// "stripInternal": true,                            /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
-		// "noEmitHelpers": true,                            /* Disable generating custom helper functions like `__extends` in compiled output. */
-		// "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-		// "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
-		// "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-		// "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-		/* Interop Constraints */
 		"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
 		"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
-		// "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
-		// "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-		"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
-
-		/* Type Checking */
 		"strict": true /* Enable all strict type-checking options. */,
-		// "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied `any` type.. */
-		// "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
-		// "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-		// "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
-		// "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-		// "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
-		// "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
-		// "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-		// "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
-		// "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
-		// "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-		// "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-		// "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-		// "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
-		// "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-		// "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
-		// "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-		// "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-		/* Completeness */
-		// "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+		"noUncheckedIndexedAccess": true,
 		"skipLibCheck": true /* Skip type checking all .d.ts files. */
 	}
 }

package/wrangler-dist/cli.js

@@ -100903,21 +100903,89 @@ var require_has_property_descriptors = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/define-properties@1.2.0/node_modules/define-properties/index.js
+// ../../node_modules/.pnpm/gopd@1.0.1/node_modules/gopd/index.js
+var require_gopd = __commonJS({
+  "../../node_modules/.pnpm/gopd@1.0.1/node_modules/gopd/index.js"(exports2, module3) {
+    "use strict";
+    init_import_meta_url();
+    var GetIntrinsic = require_get_intrinsic();
+    var $gOPD = GetIntrinsic("%Object.getOwnPropertyDescriptor%", true);
+    if ($gOPD) {
+      try {
+        $gOPD([], "length");
+      } catch (e3) {
+        $gOPD = null;
+      }
+    }
+    module3.exports = $gOPD;
+  }
+});
+
+// ../../node_modules/.pnpm/define-data-property@1.1.0/node_modules/define-data-property/index.js
+var require_define_data_property = __commonJS({
+  "../../node_modules/.pnpm/define-data-property@1.1.0/node_modules/define-data-property/index.js"(exports2, module3) {
+    "use strict";
+    init_import_meta_url();
+    var hasPropertyDescriptors = require_has_property_descriptors()();
+    var GetIntrinsic = require_get_intrinsic();
+    var $defineProperty = hasPropertyDescriptors && GetIntrinsic("%Object.defineProperty%", true);
+    var $SyntaxError = GetIntrinsic("%SyntaxError%");
+    var $TypeError = GetIntrinsic("%TypeError%");
+    var gopd = require_gopd();
+    module3.exports = /* @__PURE__ */ __name(function defineDataProperty(obj, property, value) {
+      if (!obj || typeof obj !== "object" && typeof obj !== "function") {
+        throw new $TypeError("`obj` must be an object or a function`");
+      }
+      if (typeof property !== "string" && typeof property !== "symbol") {
+        throw new $TypeError("`property` must be a string or a symbol`");
+      }
+      if (arguments.length > 3 && typeof arguments[3] !== "boolean" && arguments[3] !== null) {
+        throw new $TypeError("`nonEnumerable`, if provided, must be a boolean or null");
+      }
+      if (arguments.length > 4 && typeof arguments[4] !== "boolean" && arguments[4] !== null) {
+        throw new $TypeError("`nonWritable`, if provided, must be a boolean or null");
+      }
+      if (arguments.length > 5 && typeof arguments[5] !== "boolean" && arguments[5] !== null) {
+        throw new $TypeError("`nonConfigurable`, if provided, must be a boolean or null");
+      }
+      if (arguments.length > 6 && typeof arguments[6] !== "boolean") {
+        throw new $TypeError("`loose`, if provided, must be a boolean");
+      }
+      var nonEnumerable = arguments.length > 3 ? arguments[3] : null;
+      var nonWritable = arguments.length > 4 ? arguments[4] : null;
+      var nonConfigurable = arguments.length > 5 ? arguments[5] : null;
+      var loose = arguments.length > 6 ? arguments[6] : false;
+      var desc = !!gopd && gopd(obj, property);
+      if ($defineProperty) {
+        $defineProperty(obj, property, {
+          configurable: nonConfigurable === null && desc ? desc.configurable : !nonConfigurable,
+          enumerable: nonEnumerable === null && desc ? desc.enumerable : !nonEnumerable,
+          value,
+          writable: nonWritable === null && desc ? desc.writable : !nonWritable
+        });
+      } else if (loose || !nonEnumerable && !nonWritable && !nonConfigurable) {
+        obj[property] = value;
+      } else {
+        throw new $SyntaxError("This environment does not support defining a property as non-configurable, non-writable, or non-enumerable.");
+      }
+    }, "defineDataProperty");
+  }
+});
+
+// ../../node_modules/.pnpm/define-properties@1.2.1/node_modules/define-properties/index.js
 var require_define_properties = __commonJS({
-  "../../node_modules/.pnpm/define-properties@1.2.0/node_modules/define-properties/index.js"(exports2, module3) {
+  "../../node_modules/.pnpm/define-properties@1.2.1/node_modules/define-properties/index.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
     var keys = require_object_keys();
     var hasSymbols = typeof Symbol === "function" && typeof Symbol("foo") === "symbol";
     var toStr = Object.prototype.toString;
     var concat = Array.prototype.concat;
-    var origDefineProperty = Object.defineProperty;
+    var defineDataProperty = require_define_data_property();
     var isFunction2 = /* @__PURE__ */ __name(function(fn2) {
       return typeof fn2 === "function" && toStr.call(fn2) === "[object Function]";
     }, "isFunction");
-    var hasPropertyDescriptors = require_has_property_descriptors()();
-    var supportsDescriptors = origDefineProperty && hasPropertyDescriptors;
+    var supportsDescriptors = require_has_property_descriptors()();
     var defineProperty2 = /* @__PURE__ */ __name(function(object, name, value, predicate) {
       if (name in object) {
         if (predicate === true) {
@@ -100929,14 +100997,9 @@ var require_define_properties = __commonJS({
         }
       }
       if (supportsDescriptors) {
-        origDefineProperty(object, name, {
-          configurable: true,
-          enumerable: false,
-          value,
-          writable: true
-        });
+        defineDataProperty(object, name, value, true);
       } else {
-        object[name] = value;
+        defineDataProperty(object, name, value);
       }
     }, "defineProperty");
     var defineProperties = /* @__PURE__ */ __name(function(object, map) {
@@ -152612,7 +152675,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.63.1";
+var version = "3.64.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -155032,6 +155095,13 @@ async function loginOrRefreshIfRequired(props) {
 }
 __name(loginOrRefreshIfRequired, "loginOrRefreshIfRequired");
 async function login(props = { browser: true }) {
+  const authFromEnv = getAuthFromEnv();
+  if (authFromEnv) {
+    logger.error(
+      "You are logged in with an API Token. Unset the CLOUDFLARE_API_TOKEN in the environment to log in via OAuth."
+    );
+    return false;
+  }
   logger.log("Attempting to login via OAuth...");
   const urlToOpen = await getAuthURL(props?.scopes);
   let server;
@@ -155149,6 +155219,13 @@ async function refreshToken() {
 }
 __name(refreshToken, "refreshToken");
 async function logout() {
+  const authFromEnv = getAuthFromEnv();
+  if (authFromEnv) {
+    logger.log(
+      "You are logged in with an API Token. Unset the CLOUDFLARE_API_TOKEN in the environment to log out."
+    );
+    return;
+  }
   if (!LocalState.accessToken) {
     if (!LocalState.refreshToken) {
       logger.log("Not logged in, exiting...");
@@ -185593,24 +185670,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;
   }
-  for (const [name, envVar] of Object.entries(project.env_vars ?? {})) {
+  if (deploymentConfig.compatibility_flags?.length) {
+    configObj.compatibility_flags = deploymentConfig.compatibility_flags;
+  }
+  if (deploymentConfig.placement) {
+    configObj.placement = deploymentConfig.placement;
+  } else {
+    configObj.placement = { mode: "off" };
+  }
+  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 +185725,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 +185735,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 +185745,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 +185754,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 +185764,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 +185772,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 +187600,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 +187727,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: `
@@ -187766,6 +187899,10 @@ async function deleteEventNotificationConfig(config, apiCredentials, accountId,
   );
 }
 __name(deleteEventNotificationConfig, "deleteEventNotificationConfig");
+function isValidR2BucketName(name) {
+  return typeof name === "string" && /^[a-zA-Z][a-zA-Z0-9-]*$/.test(name);
+}
+__name(isValidR2BucketName, "isValidR2BucketName");
 
 // src/r2/notification.ts
 init_import_meta_url();
@@ -188484,6 +188621,11 @@ ${key} is ${prettyBytes(objectSize, {
       },
       async (args) => {
         await printWranglerBanner();
+        if (!isValidR2BucketName(args.name)) {
+          throw new CommandLineArgsError(
+            `The bucket name "${args.name}" is invalid. Bucket names can only have alphanumeric and - characters.`
+          );
+        }
         const config = readConfig(args.config, args);
         const accountId = await requireAuth(config);
         let fullBucketName = `${args.name}`;
@@ -201947,6 +202089,11 @@ async function whoami() {
       `\u{1F44B} You are logged in with an ${user.authType}. Unable to retrieve email for this user. Are you missing the \`User->User Details->Read\` permission?`
     );
   }
+  if (user.authType === "API Token") {
+    logger.log(
+      "\u2139\uFE0F  The API Token is read from the CLOUDFLARE_API_TOKEN in your environment."
+    );
+  }
   logger.table(
     user.accounts.map((account) => ({
       "Account Name": account.name,
@@ -204720,7 +204867,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 +204875,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 +204969,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 +205080,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 +206907,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 +206987,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 +209405,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 +209515,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 +209528,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 +209629,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 +209684,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 +209741,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 +209814,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 +209969,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 +210030,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 +210051,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 +210077,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 +210458,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 +210505,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 +210571,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 +210605,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 +210711,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 }];
       })
     );