wrangler 3.114.10 → 3.114.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.114.10",
+  "version": "3.114.12",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -57,9 +57,9 @@
     "esbuild": "0.17.19",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.14",
-    "workerd": "1.20250408.0",
-    "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20250408.2"
+    "workerd": "1.20250718.0",
+    "miniflare": "3.20250718.0",
+    "@cloudflare/kv-asset-handler": "0.3.4"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
@@ -137,9 +137,9 @@
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "0.13.18",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "0.13.19",
     "@cloudflare/workers-shared": "0.15.1",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },

package/wrangler-dist/cli.js

@@ -81450,7 +81450,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.114.10";
+var version = "3.114.12";
 
 // src/environment-variables/misc-variables.ts
 init_import_meta_url();
@@ -101185,6 +101185,7 @@ var import_miniflare14 = require("miniflare");
 var import_undici4 = __toESM(require_undici());
 var API_MAX = 1e4;
 var BATCH_KEY_MAX = API_MAX / 10;
+var BATCH_MAX_ERRORS_WARNINGS = 12;
 async function createKVNamespace(accountId, title) {
   const response = await fetchResult(
     `/accounts/${accountId}/storage/kv/namespaces`,
@@ -102546,7 +102547,10 @@ async function getPackageManager(cwd2) {
     return { ...PnpmPackageManager, cwd: cwd2 };
   } else {
     throw new UserError(
-      "Unable to find a package manager. Supported managers are: npm, yarn, and pnpm."
+      "Unable to find a package manager. Supported managers are: npm, yarn, and pnpm.",
+      {
+        telemetryMessage: true
+      }
     );
   }
 }
@@ -120162,7 +120166,8 @@ async function getEntry(args, config, command2) {
   } else {
     if (config.pages_build_output_dir && command2 === "dev") {
       throw new UserError(
-        "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages dev` instead."
+        "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages dev` instead.",
+        { telemetryMessage: true }
       );
     }
     const compatibilityDateStr = [
@@ -120225,7 +120230,8 @@ async function getEntry(args, config, command2) {
 ${addScriptName}
 ${addScriptNameExamples}
 ${migrateText}
-${migrateUrl}`
+${migrateUrl}`,
+      { telemetryMessage: "tried to use DO with service worker" }
     );
   }
   return {
@@ -123475,20 +123481,32 @@ var kvBulkPutCommand = createCommand({
 Expected an array of key-value objects but got type "${typeof content}".`
       );
     }
+    let maxNumberOfErrorsReached = false;
     const errors = [];
+    let maxNumberOfWarningsReached = false;
     const warnings = [];
     for (let i5 = 0; i5 < content.length; i5++) {
       const keyValue = content[i5];
-      if (!isKVKeyValue(keyValue)) {
-        errors.push(`The item at index ${i5} is ${JSON.stringify(keyValue)}`);
+      if (!isKVKeyValue(keyValue) && !maxNumberOfErrorsReached) {
+        if (errors.length === BATCH_MAX_ERRORS_WARNINGS) {
+          maxNumberOfErrorsReached = true;
+          errors.push("...");
+        } else {
+          errors.push(`The item at index ${i5} is ${JSON.stringify(keyValue)}`);
+        }
       } else {
         const props = unexpectedKVKeyValueProps(keyValue);
-        if (props.length > 0) {
-          warnings.push(
-            `The item at index ${i5} contains unexpected properties: ${JSON.stringify(
-              props
-            )}.`
-          );
+        if (props.length > 0 && !maxNumberOfWarningsReached) {
+          if (warnings.length === BATCH_MAX_ERRORS_WARNINGS) {
+            maxNumberOfWarningsReached = true;
+            warnings.push("...");
+          } else {
+            warnings.push(
+              `The item at index ${i5} contains unexpected properties: ${JSON.stringify(
+                props
+              )}.`
+            );
+          }
         }
       }
     }
@@ -127185,7 +127203,7 @@ async function Handler13({
     new URLSearchParams({ env: environment })
   );
   const envDeployments = deployments.filter(
-    (d6) => d6.environment === environment
+    (d6) => d6.environment === environment && d6.latest_stage.name === "deploy" && d6.latest_stage.status === "success"
   );
   if (isUrl(deployment)) {
     const { hostname: deploymentHostname } = new URL(deployment);
@@ -136689,6 +136707,11 @@ var r2ObjectGetCommand = createCommand({
       type: "string"
     }
   },
+  behaviour: {
+    printBanner({ pipe }) {
+      return !pipe;
+    }
+  },
   positionalArgs: ["objectPath"],
   async handler(objectGetYargs, { config }) {
     const { objectPath, pipe, jurisdiction } = objectGetYargs;
@@ -147455,9 +147478,9 @@ async function whoami(accountFilter) {
       "You are not authenticated. Please run `wrangler login`."
     );
   }
-  if (user.authType === "API Token") {
+  if (user.authType === "User API Token" || user.authType === "Account API Token") {
     logger.log(
-      "\u2139\uFE0F  The API Token is read from the CLOUDFLARE_API_TOKEN in your environment."
+      "\u2139\uFE0F  The API Token is read from the CLOUDFLARE_API_TOKEN environment variable."
     );
   }
   await printUserEmail(user);
@@ -147467,6 +147490,12 @@ async function whoami(accountFilter) {
 }
 __name(whoami, "whoami");
 function printUserEmail(user) {
+  if (user.authType === "Account API Token") {
+    const accountName = user.accounts[0].name;
+    return void logger.log(
+      `\u{1F44B} You are logged in with an ${user.authType}, associated with the account ${source_default.blue(accountName)}.`
+    );
+  }
   if (!user.email) {
     return void logger.log(
       `\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?`
@@ -147490,16 +147519,26 @@ function printTokenPermissions(user) {
   const permissions = user.tokenPermissions?.map((scope) => scope.split(":")) ?? [];
   if (user.authType !== "OAuth Token") {
     return void logger.log(
-      `\u{1F513} To see token permissions visit https://dash.cloudflare.com/profile/api-tokens.`
+      `\u{1F513} To see token permissions visit https://dash.cloudflare.com/${user.authType === "User API Token" ? "profile" : user.accounts[0].id}/api-tokens.`
     );
   }
-  logger.log(
-    `\u{1F513} Token Permissions: If scopes are missing, you may need to logout and re-login.`
-  );
+  logger.log(`\u{1F513} Token Permissions:`);
   logger.log(`Scope (Access)`);
+  const expectedScopes = new Set(DefaultScopeKeys);
   for (const [scope, access4] of permissions) {
+    expectedScopes.delete(`${scope}:${access4}`);
     logger.log(`- ${scope} ${access4 ? `(${access4})` : ``}`);
   }
+  if (expectedScopes.size > 0) {
+    logger.log("");
+    logger.log(
+      formatMessage({
+        text: "Wrangler is missing some expected Oauth scopes. To fix this, run `wrangler login` to refresh your token. The missing scopes are:",
+        kind: "warning",
+        notes: [...expectedScopes.values()].map((s5) => ({ text: `- ${s5}` }))
+      })
+    );
+  }
 }
 __name(printTokenPermissions, "printTokenPermissions");
 async function printMembershipInfo(user, accountFilter) {
@@ -147541,18 +147580,45 @@ async function getUserInfo() {
   if (!apiToken) {
     return;
   }
+  const authType = await getAuthType(apiToken);
   const tokenPermissions = await getTokenPermissions();
-  const usingEnvAuth = !!getAuthFromEnv();
-  const usingGlobalAuthKey = "authKey" in apiToken;
   return {
-    apiToken: usingGlobalAuthKey ? apiToken.authKey : apiToken.apiToken,
-    authType: usingGlobalAuthKey ? "Global API Key" : usingEnvAuth ? "API Token" : "OAuth Token",
+    apiToken: "authKey" in apiToken ? apiToken.authKey : apiToken.apiToken,
+    authType,
     email: "authEmail" in apiToken ? apiToken.authEmail : await getEmail(),
     accounts: await getAccounts(),
     tokenPermissions
   };
 }
 __name(getUserInfo, "getUserInfo");
+async function getAuthType(credentials) {
+  if ("authKey" in credentials) {
+    return "Global API Key";
+  }
+  const usingEnvAuth = !!getAuthFromEnv();
+  if (!usingEnvAuth) {
+    return "OAuth Token";
+  }
+  const tokenType = await getTokenType();
+  if (tokenType === "account") {
+    return "Account API Token";
+  } else {
+    return "User API Token";
+  }
+}
+__name(getAuthType, "getAuthType");
+async function getTokenType() {
+  try {
+    await fetchResult("/user/tokens/verify");
+    return "user";
+  } catch (e7) {
+    if (e7.code === 1e3) {
+      return "account";
+    }
+    throw e7;
+  }
+}
+__name(getTokenType, "getTokenType");
 async function getEmail() {
   try {
     const { email } = await fetchResult("/user");
@@ -153912,12 +153978,15 @@ Edits that have been made via the script API will be overridden by your local co
   }
   if (!(props.compatibilityDate || config.compatibility_date)) {
     const compatibilityDateStr = `${(/* @__PURE__ */ new Date()).getFullYear()}-${((/* @__PURE__ */ new Date()).getMonth() + 1 + "").padStart(2, "0")}-${((/* @__PURE__ */ new Date()).getDate() + "").padStart(2, "0")}`;
-    throw new UserError(`A compatibility_date is required when publishing. Add the following to your ${configFileName(config.configPath)} file:
+    throw new UserError(
+      `A compatibility_date is required when publishing. Add the following to your ${configFileName(config.configPath)} file:
     \`\`\`
     ${formatConfigSnippet({ compatibility_date: compatibilityDateStr }, config.configPath, false)}
     \`\`\`
     Or you could pass it in your terminal as \`--compatibility-date ${compatibilityDateStr}\`
-See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.`);
+See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.`,
+      { telemetryMessage: "missing compatibiltiy date when deploying" }
+    );
   }
   const routes = props.routes ?? config.routes ?? (config.route ? [config.route] : []) ?? [];
   validateRoutes3(routes, props.assetsOptions);
@@ -153970,22 +154039,26 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   }
   if (!props.isWorkersSite && Boolean(props.legacyAssetPaths) && format11 === "service-worker") {
     throw new UserError(
-      "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
+      "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/",
+      { telemetryMessage: true }
     );
   }
   if (config.wasm_modules && format11 === "modules") {
     throw new UserError(
-      "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
+      "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code",
+      { telemetryMessage: true }
     );
   }
   if (config.text_blobs && format11 === "modules") {
     throw new UserError(
-      `You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your ${configFileName(config.configPath)} file`
+      `You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your ${configFileName(config.configPath)} file`,
+      { telemetryMessage: "[text_blobs] with an ES module worker" }
     );
   }
   if (config.data_blobs && format11 === "modules") {
     throw new UserError(
-      `You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your ${configFileName(config.configPath)} file`
+      `You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your ${configFileName(config.configPath)} file`,
+      { telemetryMessage: "[data_blobs] with an ES module worker" }
     );
   }
   let sourceMapSize;
@@ -154277,7 +154350,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           err.preventReport();
           if (err.notes[0].text === "binding DB of type d1 must have a valid `id` specified [code: 10021]") {
             throw new UserError(
-              "You must use a real database in the database_id configuration. You can find your databases using 'wrangler d1 list', or read how to develop locally with D1 here: https://developers.cloudflare.com/d1/configuration/local-development"
+              "You must use a real database in the database_id configuration. You can find your databases using 'wrangler d1 list', or read how to develop locally with D1 here: https://developers.cloudflare.com/d1/configuration/local-development",
+              { telemetryMessage: true }
             );
           }
           const maybeNameToFilePath = /* @__PURE__ */ __name((moduleName) => {
@@ -154380,7 +154454,8 @@ async function publishRoutesFallback(routes, {
 }) {
   if (notProd) {
     throw new UserError(
-      "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.\nEither turn off service environments by setting `legacy_env = true`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
+      "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.\nEither turn off service environments by setting `legacy_env = true`, creating an API token with 'All Zones' permissions, or logging in via OAuth",
+      { telemetryMessage: true }
     );
   }
   logger.warn(
@@ -154439,7 +154514,8 @@ async function publishRoutesFallback(routes, {
         continue;
       } else {
         throw new UserError(
-          `The route with pattern "${routePattern}" is already associated with another worker called "${knownScript}".`
+          `The route with pattern "${routePattern}" is already associated with another worker called "${knownScript}".`,
+          { telemetryMessage: "route already associated with another worker" }
         );
       }
     }
@@ -154526,7 +154602,8 @@ async function updateQueueConsumers(scriptName, config) {
     } else {
       if (scriptName === void 0) {
         throw new UserError(
-          "Script name is required to update queue consumers"
+          "Script name is required to update queue consumers",
+          { telemetryMessage: true }
         );
       }
       const body = {
@@ -154799,6 +154876,9 @@ function getAssetsBasePath(config, assetsCommandLineArg) {
   return assetsCommandLineArg ? process.cwd() : path65.resolve(path65.dirname(config.configPath ?? "wrangler.toml"));
 }
 __name(getAssetsBasePath, "getAssetsBasePath");
+var NonExistentAssetsDirError = class extends UserError {
+};
+__name(NonExistentAssetsDirError, "NonExistentAssetsDirError");
 function getAssetsOptions(args, config) {
   const assets = args.assets ? { directory: args.assets } : config.assets;
   if (!assets) {
@@ -154820,7 +154900,7 @@ function getAssetsOptions(args, config) {
   const resolvedAssetsPath = path65.resolve(assetsBasePath, directory);
   if (!(0, import_node_fs33.existsSync)(resolvedAssetsPath)) {
     const sourceOfTruthMessage = args.assets ? '"--assets" command line argument' : '"assets.directory" field in your configuration file';
-    throw new UserError(
+    throw new NonExistentAssetsDirError(
       `The directory specified by the ${sourceOfTruthMessage} does not exist:
 ${resolvedAssetsPath}`,
       {
@@ -154887,7 +154967,8 @@ function validateAssetsArgsAndConfig(args, config) {
   }
   if ("legacy" in args ? args.assets && args.legacy.site : (args.assets || config?.assets) && (args.site || config?.site)) {
     throw new UserError(
-      "Cannot use assets and Workers Sites in the same Worker.\nPlease remove either the `site` or `assets` field from your configuration file."
+      "Cannot use assets and Workers Sites in the same Worker.\nPlease remove either the `site` or `assets` field from your configuration file.",
+      { telemetryMessage: true }
     );
   }
   const noOpEntrypoint = path65.resolve(
@@ -156061,7 +156142,10 @@ function getBindings2(configParam, env6, local, args) {
     ({ binding, preview_bucket_name, bucket_name, jurisdiction }) => {
       if (!preview_bucket_name && !local) {
         throw new UserError(
-          `In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your ${configFileName(configParam.configPath)} file`
+          `In development, you should use a separate r2 bucket than the one you'd use in production. Please create a new r2 bucket with "wrangler r2 bucket create <name>" and add its name as preview_bucket_name to the r2_buckets "${binding}" in your ${configFileName(configParam.configPath)} file`,
+          {
+            telemetryMessage: "no preview r2 bucket configured in remote dev"
+          }
         );
       }
       return {
@@ -156084,7 +156168,8 @@ function getBindings2(configParam, env6, local, args) {
     const connectionStringFromEnv = process.env[`WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}`];
     if (local && connectionStringFromEnv === void 0 && hyperdrive2.localConnectionString === void 0) {
       throw new UserError(
-        `When developing locally, you should use a local Postgres connection string to emulate Hyperdrive functionality. Please setup Postgres locally and set the value of the 'WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}' variable or "${hyperdrive2.binding}"'s "localConnectionString" to the Postgres connection string.`
+        `When developing locally, you should use a local Postgres connection string to emulate Hyperdrive functionality. Please setup Postgres locally and set the value of the 'WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}' variable or "${hyperdrive2.binding}"'s "localConnectionString" to the Postgres connection string.`,
+        { telemetryMessage: "no local hyperdrive connection string" }
       );
     }
     if (connectionStringFromEnv) {
@@ -158248,8 +158333,18 @@ async function getMiniflareOptionsFromConfig(rawConfig, env6, options32) {
     migrations: rawConfig.migrations,
     imagesLocalMode: false
   });
-  const persistOptions = getMiniflarePersistOptions(options32.persist);
+  let processedAssetOptions;
+  try {
+    processedAssetOptions = getAssetsOptions({ assets: void 0 }, rawConfig);
+  } catch (e7) {
+    const isNonExistentError = e7 instanceof NonExistentAssetsDirError;
+    if (!isNonExistentError) {
+      throw e7;
+    }
+  }
+  const assetOptions = processedAssetOptions ? buildAssetOptions({ assets: processedAssetOptions }) : {};
   const serviceBindings = await getServiceBindings(bindings.services);
+  const persistOptions = getMiniflarePersistOptions(options32.persist);
   const miniflareOptions = {
     workers: [
       {
@@ -158260,7 +158355,8 @@ async function getMiniflareOptionsFromConfig(rawConfig, env6, options32) {
         serviceBindings: {
           ...serviceBindings,
           ...bindingOptions.serviceBindings
-        }
+        },
+        ...assetOptions
       },
       ...externalWorkers
     ],