wrangler 4.88.0 → 4.89.1

package/config-schema.json

@@ -330,6 +330,11 @@
           "description": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability",
           "markdownDescription": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability"
         },
+        "cache": {
+          "$ref": "#/definitions/CacheOptions",
+          "description": "Specify the cache behavior of the Worker.",
+          "markdownDescription": "Specify the cache behavior of the Worker."
+        },
         "compliance_region": {
           "type": "string",
           "enum": [
@@ -1974,6 +1979,11 @@
           "description": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability",
           "markdownDescription": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability"
         },
+        "cache": {
+          "$ref": "#/definitions/CacheOptions",
+          "description": "Specify the cache behavior of the Worker.",
+          "markdownDescription": "Specify the cache behavior of the Worker."
+        },
         "compliance_region": {
           "type": "string",
           "enum": [
@@ -3530,18 +3540,35 @@
       },
       "additionalProperties": false
     },
+    "CacheOptions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "If cache is enabled for this Worker",
+          "markdownDescription": "If cache is enabled for this Worker"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "additionalProperties": false
+    },
     "PreviewsConfig": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "logpush": {
-          "$ref": "#/definitions/interface-769040647-8080-17962-769040647-0-476602004818536"
+          "$ref": "#/definitions/interface-769040647-8080-17950-769040647-0-476802004818536"
         },
         "observability": {
-          "$ref": "#/definitions/interface-769040647-8080-17962-769040647-0-476602004818536"
+          "$ref": "#/definitions/interface-769040647-8080-17950-769040647-0-476802004818536"
         },
         "limits": {
-          "$ref": "#/definitions/interface-769040647-8080-17962-769040647-0-476602004818536"
+          "$ref": "#/definitions/interface-769040647-8080-17950-769040647-0-476802004818536"
+        },
+        "cache": {
+          "$ref": "#/definitions/interface-769040647-8080-17950-769040647-0-476802004818536"
         },
         "define": {
           "type": "object",
@@ -4737,10 +4764,10 @@
           "default": []
         }
       },
-      "description": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments. Previews are branches of your Worker's main instance used to test features during feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`",
-      "markdownDescription": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments.\nPreviews are branches of your Worker's main instance used to test features\nduring feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`"
+      "description": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments. Previews are branches of your Worker's main instance used to test features during feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `cache`",
+      "markdownDescription": "Configuration for Worker Previews.\n\nThis defines the settings used when creating Preview deployments.\nPreviews are branches of your Worker's main instance used to test features\nduring feature development outside of production.\n\nThe `previews` block contains any intentionally divergent configuration intended solely for Previews, including:\n- All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)\n- Select inheritable properties: `logpush`, `observability`, `limits`, `cache`"
     },
-    "interface-769040647-8080-17962-769040647-0-476602004818536": {
+    "interface-769040647-8080-17950-769040647-0-476802004818536": {
       "type": "object",
       "properties": {
         "name": {
@@ -5055,6 +5082,11 @@
           "description": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability",
           "markdownDescription": "Specify the observability behavior of the Worker.\n\nFor reference, see https://developers.cloudflare.com/workers/wrangler/configuration/#observability"
         },
+        "cache": {
+          "$ref": "#/definitions/CacheOptions",
+          "description": "Specify the cache behavior of the Worker.",
+          "markdownDescription": "Specify the cache behavior of the Worker."
+        },
         "compliance_region": {
           "type": "string",
           "enum": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.88.0",
+  "version": "4.89.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "assembly",
@@ -54,16 +54,16 @@
     "esbuild": "0.27.3",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.24",
-    "workerd": "1.20260504.1",
+    "workerd": "1.20260507.1",
     "@cloudflare/kv-asset-handler": "0.5.0",
-    "miniflare": "4.20260504.0",
-    "@cloudflare/unenv-preset": "2.16.1"
+    "@cloudflare/unenv-preset": "2.16.1",
+    "miniflare": "4.20260507.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@bomb.sh/tab": "^0.0.12",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20260504.1",
+    "@cloudflare/workers-types": "^4.20260507.1",
     "@cspotcode/source-map-support": "0.8.1",
     "@netlify/build-info": "^10.5.1",
     "@sentry/node": "^7.86.0",
@@ -144,17 +144,17 @@
     "xxhash-wasm": "^1.0.1",
     "yaml": "^2.8.1",
     "yargs": "^17.7.2",
-    "@cloudflare/cli-shared-helpers": "0.1.1",
+    "@cloudflare/cli-shared-helpers": "0.1.2",
     "@cloudflare/codemod": "1.1.0",
+    "@cloudflare/pages-shared": "^0.13.133",
     "@cloudflare/containers-shared": "0.14.1",
     "@cloudflare/workers-shared": "0.19.5",
+    "@cloudflare/workers-utils": "0.20.0",
     "@cloudflare/workflows-shared": "0.10.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/pages-shared": "^0.13.131",
-    "@cloudflare/workers-utils": "0.19.0"
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20260504.1"
+    "@cloudflare/workers-types": "^4.20260507.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.d.ts

@@ -1461,7 +1461,6 @@ interface EnvironmentInheritable {
      * Specify the cache behavior of the Worker.
      *
      * @inheritable
-     * @hidden
      */
     cache: CacheOptions | undefined;
     /**
@@ -2355,11 +2354,11 @@ type ContainerEngine = {
  *
  * The `previews` block contains any intentionally divergent configuration intended solely for Previews, including:
  * - All non-inheritable properties (environment variables and bindings like KV, D1, R2, etc.)
- * - Select inheritable properties: `logpush`, `observability`, `limits`
+ * - Select inheritable properties: `logpush`, `observability`, `limits`, `cache`
  *
  * @inheritable
  */
-interface PreviewsConfig extends Partial<EnvironmentNonInheritable>, Partial<Pick<EnvironmentInheritable, "logpush" | "observability" | "limits">> {
+interface PreviewsConfig extends Partial<EnvironmentNonInheritable>, Partial<Pick<EnvironmentInheritable, "logpush" | "observability" | "limits" | "cache">> {
 }
 
 /**

package/wrangler-dist/cli.js

@@ -39785,7 +39785,8 @@ ${resolution}`);
         "version_metadata",
         "logpush",
         "observability",
-        "limits"
+        "limits",
+        "cache"
       ]) && isValid22;
       isValid22 = validateVars(envName)(
         diagnostics,
@@ -40014,6 +40015,7 @@ ${resolution}`);
           "number"
         ) && isValid22;
       }
+      isValid22 = validateCache(diagnostics, `${field}.cache`, previews.cache, void 0) && isValid22;
       return isValid22;
     }, "validatePreviewsConfig");
     validateMigrations = /* @__PURE__ */ __name2((diagnostics, field, value) => {
@@ -55811,7 +55813,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.88.0";
+    version = "4.89.1";
   }
 });
 function getWranglerVersion() {
@@ -133134,34 +133136,57 @@ var init_cfetch = __esm({
 });
 
 // src/user/fetch-accounts.ts
-async function fetchAllAccounts(complianceConfig) {
-  try {
-    const response = await fetchPagedListResult(complianceConfig, `/memberships`);
-    const accounts = response.map((r9) => r9.account);
-    if (accounts.length === 0) {
-      throw new UserError(
-        `Failed to automatically retrieve account IDs for the logged in user.
-In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your ${configFileName(void 0)} file.`,
-        { telemetryMessage: "user account fetch empty" }
-      );
-    }
-    return accounts;
-  } catch (err) {
-    if (err.code === 9109) {
+function isMembershipsInaccessible(err) {
+  const code = err?.code;
+  return code !== void 0 && MEMBERSHIPS_INACCESSIBLE_CODES.includes(code);
+}
+async function fetchAllAccounts(complianceConfig, options = {}) {
+  const { throwOnEmpty = true } = options;
+  const [accountsRes, membershipsRes] = await Promise.allSettled([
+    fetchPagedListResult(complianceConfig, `/accounts`),
+    fetchPagedListResult(
+      complianceConfig,
+      `/memberships`
+    )
+  ]);
+  if (accountsRes.status === "rejected") {
+    throw accountsRes.reason;
+  }
+  if (membershipsRes.status === "rejected") {
+    if (isMembershipsInaccessible(membershipsRes.reason)) {
+      if (accountsRes.status === "fulfilled" && accountsRes.value.length > 0) {
+        return accountsRes.value;
+      }
       throw new UserError(
         `Failed to automatically retrieve account IDs for the logged in user.
-You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your ${configFileName(void 0)} file, or by setting the value of CLOUDFLARE_ACCOUNT_ID"`,
+You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your ${configFileName(void 0)} file, or by setting the value of CLOUDFLARE_ACCOUNT_ID`,
         { telemetryMessage: "user account fetch permission denied" }
       );
+    } else {
+      throw membershipsRes.reason;
     }
-    throw err;
   }
+  const membershipIds = new Set(membershipsRes.value.map((m6) => m6.account.id));
+  const usableAccounts = accountsRes.value.filter(
+    (a7) => membershipIds.has(a7.id)
+  );
+  if (usableAccounts.length === 0 && throwOnEmpty) {
+    throw new UserError(
+      `Failed to automatically retrieve account IDs for the logged in user.
+In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your ${configFileName(void 0)} file.`,
+      { telemetryMessage: "user account fetch empty" }
+    );
+  }
+  return usableAccounts;
 }
+var MEMBERSHIPS_INACCESSIBLE_CODES;
 var init_fetch_accounts = __esm({
   "src/user/fetch-accounts.ts"() {
     init_import_meta_url();
     init_dist();
     init_cfetch();
+    MEMBERSHIPS_INACCESSIBLE_CODES = [9109, 1e4];
+    __name(isMembershipsInaccessible, "isMembershipsInaccessible");
     __name(fetchAllAccounts, "fetchAllAccounts");
   }
 });
@@ -152063,8 +152088,7 @@ var init_ssh = __esm({
       metadata: {
         description: "SSH into a container",
         status: "stable",
-        owner: "Product: Cloudchamber",
-        hidden: true
+        owner: "Product: Cloudchamber"
       },
       args: sshArgDefs,
       positionalArgs: ["ID"],
@@ -244464,8 +244488,12 @@ async function deploy2({
     logger.log(`\u2728 Uploading Worker bundle`);
     if (_routesCustom) {
       try {
-        const routesCustomJSON = JSON.parse(_routesCustom);
-        validateRoutes2(routesCustomJSON, path3.join(directory, "_routes.json"));
+        const routesPath = path3.join(directory, "_routes.json");
+        const routesCustomJSON = parseJSON(
+          _routesCustom,
+          routesPath
+        );
+        validateRoutes2(routesCustomJSON, routesPath);
         formData.append(
           "_routes.json",
           new File([_routesCustom], "_routes.json")
@@ -244475,6 +244503,13 @@ async function deploy2({
         if (err instanceof FatalError) {
           throw err;
         }
+        if (err instanceof ParseError) {
+          throw new FatalError(
+            `Invalid _routes.json file at ${path3.join(directory, "_routes.json")}: ${err.text}`,
+            { code: 1, telemetryMessage: "pages deploy invalid routes json" }
+          );
+        }
+        throw err;
       }
     }
   }
@@ -244490,8 +244525,12 @@ async function deploy2({
     logger.log(`\u2728 Uploading Functions bundle`);
     if (_routesCustom) {
       try {
-        const routesCustomJSON = JSON.parse(_routesCustom);
-        validateRoutes2(routesCustomJSON, path3.join(directory, "_routes.json"));
+        const routesPath = path3.join(directory, "_routes.json");
+        const routesCustomJSON = parseJSON(
+          _routesCustom,
+          routesPath
+        );
+        validateRoutes2(routesCustomJSON, routesPath);
         formData.append(
           "_routes.json",
           new File([_routesCustom], "_routes.json")
@@ -244501,6 +244540,13 @@ async function deploy2({
         if (err instanceof FatalError) {
           throw err;
         }
+        if (err instanceof ParseError) {
+          throw new FatalError(
+            `Invalid _routes.json file at ${path3.join(directory, "_routes.json")}: ${err.text}`,
+            { code: 1, telemetryMessage: "pages deploy invalid routes json" }
+          );
+        }
+        throw err;
       }
     } else if (routesOutputPath) {
       try {
@@ -285644,6 +285690,9 @@ function extractConfigBindings(config) {
   if (previews?.version_metadata) {
     env6[previews.version_metadata.binding] = { type: "version_metadata" };
   }
+  if (config.assets?.binding) {
+    env6[config.assets.binding] = { type: "assets" };
+  }
   return env6;
 }
 function assemblePreviewScriptSettings(config) {
@@ -285676,6 +285725,9 @@ function assemblePreviewDefaults(config) {
   if (previews?.limits || config.limits) {
     previewDefaults.limits = previews?.limits ?? config.limits;
   }
+  if (previews?.cache !== void 0 || config.cache !== void 0) {
+    previewDefaults.cache = previews?.cache ?? config.cache;
+  }
   if (config.placement) {
     previewDefaults.placement = parseConfigPlacement(config);
   }
@@ -285915,6 +285967,11 @@ async function assemblePreviewDeploymentSettings(config, scriptPath4, accountId,
   } else if (config.limits !== void 0) {
     request4.limits = config.limits;
   }
+  if (previews?.cache !== void 0) {
+    request4.cache = previews.cache;
+  } else if (config.cache !== void 0) {
+    request4.cache = config.cache;
+  }
   if (config.placement) {
     request4.placement = parseConfigPlacement(config);
   }
@@ -285984,6 +286041,12 @@ function buildMergedVersionLevel(config, deployment) {
       fromConfig: !!config.placement?.mode
     };
   }
+  if (deployment.cache !== void 0) {
+    result.cache = {
+      value: deployment.cache,
+      fromConfig: previews?.cache !== void 0 || config.cache !== void 0
+    };
+  }
   if (config.assets) {
     result.assets = {
       value: {
@@ -286131,6 +286194,13 @@ function formatDeploymentResource(deployment, versionLevel, configName) {
       versionLevel.placement.fromConfig
     ]);
   }
+  if (versionLevel.cache !== void 0) {
+    settingsRows.push([
+      "cache",
+      versionLevel.cache.value?.enabled ? "enabled" : "disabled",
+      versionLevel.cache.fromConfig
+    ]);
+  }
   if (settingsRows.length > 0) {
     lines.push("");
     lines.push(...formatAlignedRows(settingsRows));
@@ -286170,9 +286240,6 @@ function formatDeploymentResource(deployment, versionLevel, configName) {
   const footerLines = hasConfigValues ? ["", source_default.hex("#FFA500")(`\u25C6 from ${configName}`)] : void 0;
   return drawConnectedChildBox(lines, { footerLines, indent: "  " });
 }
-function isInheritableBinding(binding) {
-  return binding.type === "assets";
-}
 function logMissingPreviewsBindingsWarning(topLevelBindings, remotePreviewDefaultBindings, localPreviewBindings) {
   const availableBindingNames = /* @__PURE__ */ new Set([
     ...Object.keys(remotePreviewDefaultBindings ?? {}),
@@ -286180,7 +286247,7 @@ function logMissingPreviewsBindingsWarning(topLevelBindings, remotePreviewDefaul
   ]);
   const missingBindings = Object.fromEntries(
     Object.entries(topLevelBindings ?? {}).filter(
-      ([name2, binding]) => !availableBindingNames.has(name2) && !isInheritableBinding(binding)
+      ([name2]) => !availableBindingNames.has(name2)
     )
   );
   if (Object.keys(missingBindings).length === 0) {
@@ -286368,7 +286435,6 @@ var init_preview2 = __esm({
     __name(formatBindings, "formatBindings");
     __name(formatPreviewResource, "formatPreviewResource");
     __name(formatDeploymentResource, "formatDeploymentResource");
-    __name(isInheritableBinding, "isInheritableBinding");
     __name(logMissingPreviewsBindingsWarning, "logMissingPreviewsBindingsWarning");
     __name(handlePreviewCommand, "handlePreviewCommand");
     __name(handlePreviewDeleteCommand, "handlePreviewDeleteCommand");
@@ -289028,6 +289094,12 @@ function formatPreviewsSettings(workerName, previewDefaults) {
   if (typeof previewDefaults.placement?.mode === "string") {
     settingsRows.push(["placement", previewDefaults.placement.mode]);
   }
+  if (previewDefaults.cache !== void 0) {
+    settingsRows.push([
+      "cache",
+      previewDefaults.cache.enabled ? "enabled" : "disabled"
+    ]);
+  }
   if (settingsRows.length > 0) {
     const labelWidth = Math.max(...settingsRows.map(([label]) => label.length));
     for (const [label, value] of settingsRows) {
@@ -297642,7 +297714,7 @@ var init_helpers7 = __esm({
         telemetryMessage: false
       });
     }, "unsafeParseBooleanString");
-    checkTypesUpToDate = /* @__PURE__ */ __name(async (primaryConfig, envInterface, typesPath = DEFAULT_WORKERS_TYPES_FILE_PATH, serviceEntries = /* @__PURE__ */ new Map()) => {
+    checkTypesUpToDate = /* @__PURE__ */ __name(async (primaryConfig, envInterface, typesPath = DEFAULT_WORKERS_TYPES_FILE_PATH, serviceEntries = /* @__PURE__ */ new Map(), cliEnvFile, cliEnv) => {
       let typesFileLines = new Array();
       try {
         typesFileLines = fs29.readFileSync(typesPath, "utf-8").split("\n");
@@ -297669,11 +297741,16 @@ var init_helpers7 = __esm({
         /\/\/ Generated by Wrangler by running `(?<command>.*)` \(hash: (?<hash>[a-zA-Z0-9]+)\)/
       )?.groups ?? {};
       const rawArgs = yargs_default(wranglerCommand).parseSync();
+      const rawEnvFile = rawArgs.envFile;
+      const envFile = cliEnvFile ?? (typeof rawEnvFile === "string" ? [rawEnvFile] : Array.isArray(rawEnvFile) ? rawEnvFile : void 0);
+      const env6 = cliEnv ?? rawArgs.env;
       const args = {
         includeEnv: existingEnvHeader ? unsafeParseBooleanString(rawArgs.includeEnv ?? "true") : false,
         includeRuntime: existingRuntimeHeader ? unsafeParseBooleanString(rawArgs.includeRuntime ?? "true") : false,
         envInterface: envInterface ?? (rawArgs.envInterface ?? "Env"),
-        strictVars: unsafeParseBooleanString(rawArgs.strictVars ?? "true")
+        strictVars: unsafeParseBooleanString(rawArgs.strictVars ?? "true"),
+        envFile,
+        env: env6
       };
       const configContainsEntrypoint = primaryConfig.main !== void 0 || !!primaryConfig.site?.["entry-point"];
       const entrypoint = configContainsEntrypoint ? await getEntry({}, primaryConfig, "types").catch(() => void 0) : void 0;
@@ -297683,7 +297760,7 @@ var init_helpers7 = __esm({
         try {
           const { envHeader } = await generateEnvTypes(
             primaryConfig,
-            { strictVars: args.strictVars },
+            { strictVars: args.strictVars, envFile: args.envFile, env: args.env },
             args.envInterface,
             typesPath,
             entrypoint,
@@ -300572,7 +300649,9 @@ var init_type_generation = __esm({
             config,
             envInterface,
             outputPath,
-            secondaryEntries
+            secondaryEntries,
+            args.envFile,
+            args.env
           );
           if (outOfDate) {
             throw new FatalError(
@@ -300915,7 +300994,10 @@ async function getEmail(complianceConfig) {
   }
 }
 async function getAccounts(complianceConfig) {
-  return await fetchPagedListResult(complianceConfig, "/accounts");
+  return await fetchAllAccounts(complianceConfig, {
+    // `whoami` is informational and should render an empty list rather than fail when the intersection is empty.
+    throwOnEmpty: false
+  });
 }
 async function getTokenPermissions() {
   return getScopes();
@@ -300929,6 +301011,7 @@ var init_whoami = __esm({
     init_handle_errors();
     init_logger();
     init_format_message();
+    init_fetch_accounts();
     init_membership();
     init_user3();
     __name(whoami, "whoami");
@@ -313878,10 +313961,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   }
   const uploadMs = Date.now() - start;
   logger.log("Uploaded", workerName, formatTime2(uploadMs));
-  if (props.dispatchNamespace !== void 0) {
-    deployWfpUserWorker(props.dispatchNamespace, versionId);
-    return { versionId, workerTag };
-  }
   if (normalisedContainerConfig.length) {
     assert56__default.default(versionId && accountId);
     await deployContainers(config, normalisedContainerConfig, {
@@ -313890,6 +313969,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       scriptName
     });
   }
+  if (props.dispatchNamespace !== void 0) {
+    deployWfpUserWorker(props.dispatchNamespace, versionId);
+    return { versionId, workerTag };
+  }
   const targets = await triggersDeploy({
     ...props,
     firstDeploy: !workerExists,