wrangler 4.36.0 → 4.37.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -56,8 +56,8 @@
     "unenv": "2.0.0-rc.21",
     "workerd": "1.20250906.0",
     "@cloudflare/kv-asset-handler": "0.4.0",
-    "miniflare": "4.20250906.1",
-    "@cloudflare/unenv-preset": "2.7.3"
+    "@cloudflare/unenv-preset": "2.7.3",
+    "miniflare": "4.20250906.2"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
@@ -141,7 +141,7 @@
     "@cloudflare/cli": "1.1.2",
     "@cloudflare/containers-shared": "0.2.10",
     "@cloudflare/eslint-config-shared": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.70",
+    "@cloudflare/pages-shared": "^0.13.71",
     "@cloudflare/workers-shared": "0.18.8",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },

package/wrangler-dist/cli.d.ts

@@ -1469,6 +1469,10 @@ interface ComputedFields {
      * It can be useful to know what the top-level name was before the flattening.
      */
     topLevelName: string | undefined;
+    /** A list of environment names declared in the raw configuration. */
+    definedEnvironments: string[] | undefined;
+    /** The name of the environment being targeted. */
+    targetEnvironment: string | undefined;
 }
 interface ConfigFields<Dev extends RawDevConfig> {
     /**

package/wrangler-dist/cli.js

@@ -93256,7 +93256,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.36.0";
+    version = "4.37.0";
   }
 });
 
@@ -102252,6 +102252,9 @@ function findRedirectedWranglerConfig(cwd2, userConfigPath) {
     return redirectedConfigPath;
   }
 }
+function isRedirectedRawConfig(rawConfig, configPath, userConfigPath) {
+  return configPath !== void 0 && configPath !== userConfigPath;
+}
 var import_node_fs5, import_node_path7;
 var init_config_helpers = __esm({
   "src/config/config-helpers.ts"() {
@@ -102266,6 +102269,7 @@ var init_config_helpers = __esm({
     __name(resolveWranglerConfigPath, "resolveWranglerConfigPath");
     __name(findWranglerConfig, "findWranglerConfig");
     __name(findRedirectedWranglerConfig, "findRedirectedWranglerConfig");
+    __name(isRedirectedRawConfig, "isRedirectedRawConfig");
   }
 });
 
@@ -103107,16 +103111,18 @@ async function disableR2Catalog(complianceConfig, accountId, bucketName) {
     }
   );
 }
-async function enableR2CatalogCompaction(complianceConfig, accountId, bucketName, namespace, tableName) {
+async function enableR2CatalogCompaction(complianceConfig, accountId, bucketName, targetSizeMb) {
+  const config = {
+    state: "enabled",
+    targetSizeMb
+  };
   return await fetchResult(
     complianceConfig,
-    `/accounts/${accountId}/r2-catalog/${bucketName}/namespaces/${namespace}/tables/${tableName}/maintenance-configs`,
+    `/accounts/${accountId}/r2-catalog/${bucketName}/maintenance-configs`,
     {
       method: "POST",
       body: JSON.stringify({
-        configuration_type: "compaction",
-        configuration: {},
-        state: "enabled"
+        compaction: config
       }),
       headers: {
         "Content-Type": "application/json"
@@ -103124,14 +103130,32 @@ async function enableR2CatalogCompaction(complianceConfig, accountId, bucketName
     }
   );
 }
-async function disableR2CatalogCompaction(complianceConfig, accountId, bucketName, namespace, tableName) {
+async function disableR2CatalogCompaction(complianceConfig, accountId, bucketName) {
+  const config = {
+    state: "disabled"
+  };
   return await fetchResult(
     complianceConfig,
-    `/accounts/${accountId}/r2-catalog/${bucketName}/namespaces/${namespace}/tables/${tableName}/maintenance-configs/compaction`,
+    `/accounts/${accountId}/r2-catalog/${bucketName}/maintenance-configs`,
     {
-      method: "PUT",
+      method: "POST",
       body: JSON.stringify({
-        state: "disabled"
+        compaction: config
+      }),
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }
+  );
+}
+async function upsertR2DataCatalogCredential(complianceConfig, accountId, bucketName, token) {
+  return await fetchResult(
+    complianceConfig,
+    `/accounts/${accountId}/r2-catalog/${bucketName}/credential`,
+    {
+      method: "POST",
+      body: JSON.stringify({
+        token
       }),
       headers: {
         "Content-Type": "application/json"
@@ -103675,6 +103699,7 @@ var init_helpers = __esm({
     __name(disableR2Catalog, "disableR2Catalog");
     __name(enableR2CatalogCompaction, "enableR2CatalogCompaction");
     __name(disableR2CatalogCompaction, "disableR2CatalogCompaction");
+    __name(upsertR2DataCatalogCredential, "upsertR2DataCatalogCredential");
     actionsForEventCategories = {
       "object-create": ["PutObject", "CompleteMultipartUpload", "CopyObject"],
       "object-delete": ["DeleteObject", "LifecycleDeletion"]
@@ -104186,7 +104211,11 @@ function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args,
     isDispatchNamespace,
     preserveOriginalMain
   );
-  const isRedirectedConfig = configPath && configPath !== userConfigPath;
+  const isRedirectedConfig = isRedirectedRawConfig(
+    rawConfig,
+    configPath,
+    userConfigPath
+  );
   const definedEnvironments = Object.keys(rawConfig.env ?? {});
   if (isRedirectedConfig && definedEnvironments.length > 0) {
     diagnostics.errors.push(
@@ -104265,6 +104294,8 @@ Consider adding an environment configuration section to the ${configFileName(con
     configPath,
     userConfigPath,
     topLevelName: rawConfig.name,
+    definedEnvironments: isRedirectedConfig ? rawConfig.definedEnvironments : definedEnvironments,
+    targetEnvironment: isRedirectedConfig ? rawConfig.targetEnvironment : envName,
     pages_build_output_dir: normalizeAndValidatePagesBuildOutputDir(
       configPath,
       rawConfig.pages_build_output_dir
@@ -105685,6 +105716,7 @@ var init_validation = __esm({
     init_experimental_flags();
     init_helpers();
     init_print_bindings();
+    init_config_helpers();
     init_diagnostics2();
     init_validation_helpers();
     init_config5();
@@ -107485,6 +107517,8 @@ var init_config4 = __esm({
       configPath: void 0,
       userConfigPath: void 0,
       topLevelName: void 0,
+      definedEnvironments: void 0,
+      targetEnvironment: void 0,
       /*====================================================*/
       /*      Fields supported by both Workers & Pages      */
       /*====================================================*/
@@ -107713,7 +107747,9 @@ var init_validation_pages = __esm({
       // normalizeAndValidateConfig() sets these values
       "configPath",
       "userConfigPath",
-      "topLevelName"
+      "topLevelName",
+      "definedEnvironments",
+      "targetEnvironment"
     ];
     __name(validatePagesConfig, "validatePagesConfig");
     __name(validateMainField, "validateMainField");
@@ -119815,6 +119851,21 @@ function buildMiniflareBindingOptions(config, remoteProxyConnectionString, remot
       };
     }
   }
+  const additionalUnboundDurableObjects = [];
+  for (const [className, useSQLite] of classNameToUseSQLite) {
+    if (!durableObjects.find((d7) => d7.class_name === className)) {
+      additionalUnboundDurableObjects.push({
+        className,
+        scriptName: void 0,
+        useSQLite,
+        container: config.containerDOClassNames?.size && config.enableContainers ? getImageNameFromDOClassName({
+          doClassName: className,
+          containerDOClassNames: config.containerDOClassNames,
+          containerBuildId: config.containerBuildId
+        }) : void 0
+      });
+    }
+  }
   const bindingOptions = {
     bindings: {
       ...bindings.vars,
@@ -119944,6 +119995,7 @@ function buildMiniflareBindingOptions(config, remoteProxyConnectionString, remot
         }
       )
     ),
+    additionalUnboundDurableObjects,
     ratelimits: Object.fromEntries([
       ...bindings.unsafe?.bindings?.filter((b7) => b7.type == "ratelimit").map(ratelimitEntry) ?? [],
       ...bindings.ratelimits?.map((r8) => [
@@ -132191,6 +132243,54 @@ var init_durable = __esm({
   }
 });
 
+// src/environments/index.ts
+function hasDefinedEnvironments(config) {
+  return isLegacyEnv(config) && Boolean(config.definedEnvironments?.length);
+}
+async function applyServiceAndEnvironmentTags(config, accountId, scriptName, tags) {
+  tags ??= [];
+  const env6 = config.targetEnvironment;
+  const serviceTag = `${SERVICE_TAG_PREFIX}${config.topLevelName}`;
+  const environmentTag = env6 ? `${ENVIRONMENT_TAG_PREFIX}${env6}` : null;
+  const hasMissingServiceTag = !tags.includes(serviceTag);
+  const hasMissingOrStaleEnvironmentTag = environmentTag ? !tags.includes(environmentTag) : tags.some((tag) => tag.startsWith(ENVIRONMENT_TAG_PREFIX));
+  if (hasMissingServiceTag || hasMissingOrStaleEnvironmentTag) {
+    const nextTags = tags.filter(
+      (tag) => !tag.startsWith(SERVICE_TAG_PREFIX) && !tag.startsWith(ENVIRONMENT_TAG_PREFIX)
+    ).concat([serviceTag]);
+    if (environmentTag) {
+      nextTags.push(environmentTag);
+    }
+    try {
+      return await patchNonVersionedScriptSettings(
+        config,
+        accountId,
+        scriptName,
+        {
+          tags: nextTags
+        }
+      );
+    } catch {
+      logger.warn(
+        "Could not apply service and environment tags. This Worker will not appear grouped together with its sibling environments in the Cloudflare dashboard."
+      );
+    }
+  }
+}
+var SERVICE_TAG_PREFIX, ENVIRONMENT_TAG_PREFIX;
+var init_environments = __esm({
+  "src/environments/index.ts"() {
+    init_import_meta_url();
+    init_logger();
+    init_isLegacyEnv();
+    init_api();
+    SERVICE_TAG_PREFIX = "cf:service=";
+    ENVIRONMENT_TAG_PREFIX = "cf:environment=";
+    __name(hasDefinedEnvironments, "hasDefinedEnvironments");
+    __name(applyServiceAndEnvironmentTags, "applyServiceAndEnvironmentTags");
+  }
+});
+
 // ../../node_modules/.pnpm/xxhash-wasm@1.0.1/node_modules/xxhash-wasm/esm/xxhash-wasm.js
 async function e2() {
   const { instance: { exports: { mem: e8, xxh32: n7, xxh64: r8, init32: i6, update32: o6, digest32: h7, init64: s6, update64: u6, digest64: g7 } } } = await WebAssembly.instantiate(t2);
@@ -194620,69 +194720,65 @@ For more details, refer to: https://developers.cloudflare.com/r2/api/s3/tokens/`
     });
     r2BucketCatalogCompactionNamespace = createNamespace({
       metadata: {
-        description: "Manage compaction maintenance for tables in your R2 data catalog",
-        status: "private-beta",
+        description: "Control settings for automatic file compaction maintenance jobs for your R2 data catalog",
+        status: "open-beta",
         owner: "Product: R2 Data Catalog"
       }
     });
     r2BucketCatalogCompactionEnableCommand = createCommand({
       metadata: {
-        description: "Enable compaction maintenance for a table in the R2 data catalog",
-        status: "private-beta",
+        description: "Enable automatic file compaction for your R2 data catalog",
+        status: "open-beta",
         owner: "Product: R2 Data Catalog"
       },
       positionalArgs: ["bucket"],
       args: {
         bucket: {
-          describe: "The name of the bucket",
+          describe: "The name of the bucket which contains the catalog",
           type: "string",
           demandOption: true
         },
-        table: {
-          describe: "The name of the table to enable compaction for",
-          type: "string",
-          demandOption: true
+        targetSizeMb: {
+          describe: "The target size for compacted files (allowed values: 64, 128, 256, 512)",
+          type: "number",
+          demandOption: false,
+          default: 128
         },
-        namespace: {
-          describe: "The namespace containing the table",
-          type: "string",
-          demandOption: true
+        token: {
+          describe: "A cloudflare api token with access to R2 and R2 Data Catalog which will be used to read/write files for compaction.",
+          demandOption: true,
+          type: "string"
         }
       },
       async handler(args, { config }) {
         const accountId = await requireAuth(config);
+        await upsertR2DataCatalogCredential(
+          config,
+          accountId,
+          args.bucket,
+          args.token
+        );
         await enableR2CatalogCompaction(
           config,
           accountId,
           args.bucket,
-          args.namespace,
-          args.table
+          args.targetSizeMb
         );
         logger.log(
-          `\u2728 Successfully enabled compaction maintenance for table '${args.table}' in namespace '${args.namespace}' of bucket '${args.bucket}'.`
+          `\u2728 Successfully enabled file compaction for the data catalog for bucket '${args.bucket}'.`
         );
       }
     });
     r2BucketCatalogCompactionDisableCommand = createCommand({
       metadata: {
-        description: "Disable compaction maintenance for a table in the R2 data catalog",
-        status: "private-beta",
+        description: "Disable automatic file compaction for your R2 data catalog",
+        status: "open-beta",
         owner: "Product: R2 Data Catalog"
       },
       positionalArgs: ["bucket"],
       args: {
         bucket: {
-          describe: "The name of the bucket",
-          type: "string",
-          demandOption: true
-        },
-        table: {
-          describe: "The name of the table to disable compaction for",
-          type: "string",
-          demandOption: true
-        },
-        namespace: {
-          describe: "The namespace containing the table",
+          describe: "The name of the bucket which contains the catalog",
           type: "string",
           demandOption: true
         }
@@ -194690,21 +194786,15 @@ For more details, refer to: https://developers.cloudflare.com/r2/api/s3/tokens/`
       async handler(args, { config }) {
         const accountId = await requireAuth(config);
         const confirmedDisable = await confirm(
-          `Are you sure you want to disable compaction maintenance for table '${args.table}' in namespace '${args.namespace}' of bucket '${args.bucket}'?`
+          `Are you sure you want to disable file compaction for the data catalog for bucket '${args.bucket}'?`
         );
         if (!confirmedDisable) {
           logger.log("Disable cancelled.");
           return;
         }
-        await disableR2CatalogCompaction(
-          config,
-          accountId,
-          args.bucket,
-          args.namespace,
-          args.table
-        );
+        await disableR2CatalogCompaction(config, accountId, args.bucket);
         logger.log(
-          `Successfully disabled compaction maintenance for table '${args.table}' in namespace '${args.namespace}' of bucket '${args.bucket}'.`
+          `Successfully disabled file compaction for the data catalog for bucket '${args.bucket}'.`
         );
       }
     });
@@ -213003,6 +213093,7 @@ async function versionsUpload(props) {
   const { config, accountId, name: name2 } = props;
   let versionId = null;
   let workerTag = null;
+  let tags = null;
   if (accountId && name2) {
     try {
       const {
@@ -213013,6 +213104,7 @@ async function versionsUpload(props) {
         // TODO(consider): should this be a /versions endpoint?
       );
       workerTag = script.tag;
+      tags = script.tags;
       if (script.last_deployed_from === "dash") {
         logger.warn(
           `You are about to upload a Worker Version that was last published via the Cloudflare Dashboard.
@@ -213318,6 +213410,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         }
         throw err;
       }
+      if (hasDefinedEnvironments(config)) {
+        await applyServiceAndEnvironmentTags(
+          config,
+          accountId,
+          scriptName,
+          tags
+        );
+      }
     }
     if (props.outFile) {
       (0, import_node_fs33.mkdirSync)(import_node_path55.default.dirname(props.outFile), { recursive: true });
@@ -213453,6 +213553,7 @@ var init_upload5 = __esm({
     init_dialogs();
     init_durable();
     init_misc_variables();
+    init_environments();
     init_errors();
     init_experimental_flags();
     init_logger();
@@ -220255,6 +220356,7 @@ async function deploy(props) {
   const { config, accountId, name: name2, entry } = props;
   let workerTag = null;
   let versionId = null;
+  let tags = null;
   let workerExists = true;
   const domainRoutes = (props.domains || []).map((domain2) => ({
     pattern: domain2,
@@ -220269,6 +220371,7 @@ async function deploy(props) {
         default_environment: { script }
       } = serviceMetaData;
       workerTag = script.tag;
+      tags = script.tags;
       if (script.last_deployed_from === "dash") {
         let configDiff;
         if (getFlag("DEPLOY_REMOTE_DIFF_CHECK")) {
@@ -220705,6 +220808,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
             )
           );
         }
+        if (hasDefinedEnvironments(config)) {
+          await applyServiceAndEnvironmentTags(
+            config,
+            accountId,
+            scriptName,
+            tags
+          );
+        }
         if (result.startup_time_ms) {
           logger.log("Worker Startup Time:", result.startup_time_ms, "ms");
         }
@@ -221061,6 +221172,7 @@ var init_deploy8 = __esm({
     init_dialogs();
     init_durable();
     init_misc_variables();
+    init_environments();
     init_errors();
     init_experimental_flags();
     init_logger();