wrangler 3.114.10 → 3.114.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.114.10",
+  "version": "3.114.11",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",

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.11";
 
 // 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`,
@@ -123475,20 +123476,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 +127198,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);
@@ -147455,9 +147468,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 +147480,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,7 +147509,7 @@ 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(
@@ -147541,18 +147560,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");
@@ -154799,6 +154845,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 +154869,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}`,
       {
@@ -158248,8 +158297,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 +158319,8 @@ async function getMiniflareOptionsFromConfig(rawConfig, env6, options32) {
         serviceBindings: {
           ...serviceBindings,
           ...bindingOptions.serviceBindings
-        }
+        },
+        ...assetOptions
       },
       ...externalWorkers
     ],