wrangler 4.39.0 → 4.40.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.39.0",
+  "version": "4.40.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -54,15 +54,15 @@
     "esbuild": "0.25.4",
     "path-to-regexp": "6.3.0",
     "unenv": "2.0.0-rc.21",
-    "workerd": "1.20250923.0",
+    "workerd": "1.20250924.0",
     "@cloudflare/kv-asset-handler": "0.4.0",
     "@cloudflare/unenv-preset": "2.7.4",
-    "miniflare": "4.20250923.0"
+    "miniflare": "4.20250924.0"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20250923.0",
+    "@cloudflare/workers-types": "^4.20250924.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@sentry/node": "^7.86.0",
@@ -138,15 +138,15 @@
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
-    "@cloudflare/cli": "1.1.2",
     "@cloudflare/containers-shared": "0.2.10",
+    "@cloudflare/cli": "1.1.2",
     "@cloudflare/eslint-config-shared": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.74",
     "@cloudflare/workers-shared": "0.18.8",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/pages-shared": "^0.13.75"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20250923.0"
+    "@cloudflare/workers-types": "^4.20250924.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.js

@@ -93842,7 +93842,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version = "4.39.0";
+    version = "4.40.0";
   }
 });
 
@@ -102805,7 +102805,6 @@ function findWranglerConfig(referencePath = process.cwd(), { useRedirectIfAvaila
   };
 }
 function findRedirectedWranglerConfig(cwd2, userConfigPath) {
-  const PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
   const deployConfigPath = findUpSync(PATH_TO_DEPLOY_CONFIG, { cwd: cwd2 });
   if (deployConfigPath === void 0) {
     return userConfigPath;
@@ -102861,7 +102860,7 @@ function findRedirectedWranglerConfig(cwd2, userConfigPath) {
 function isRedirectedRawConfig(rawConfig, configPath, userConfigPath) {
   return configPath !== void 0 && configPath !== userConfigPath;
 }
-var import_node_fs5, import_node_path7;
+var import_node_fs5, import_node_path7, PATH_TO_DEPLOY_CONFIG;
 var init_config_helpers = __esm({
   "src/config/config-helpers.ts"() {
     init_import_meta_url();
@@ -102872,6 +102871,7 @@ var init_config_helpers = __esm({
     init_errors();
     init_logger();
     init_parse();
+    PATH_TO_DEPLOY_CONFIG = ".wrangler/deploy/config.json";
     __name(resolveWranglerConfigPath, "resolveWranglerConfigPath");
     __name(findWranglerConfig, "findWranglerConfig");
     __name(findRedirectedWranglerConfig, "findRedirectedWranglerConfig");
@@ -104899,7 +104899,7 @@ Consider adding an environment configuration section to the ${configFileName(con
   const config = {
     configPath,
     userConfigPath,
-    topLevelName: rawConfig.name,
+    topLevelName: isRedirectedConfig ? rawConfig.topLevelName : rawConfig.name,
     definedEnvironments: isRedirectedConfig ? rawConfig.definedEnvironments : definedEnvironments,
     targetEnvironment: isRedirectedConfig ? rawConfig.targetEnvironment : envName,
     pages_build_output_dir: normalizeAndValidatePagesBuildOutputDir(
@@ -132484,55 +132484,35 @@ var init_durable = __esm({
 function hasDefinedEnvironments(config) {
   return isLegacyEnv(config) && Boolean(config.definedEnvironments?.length);
 }
-async function applyServiceAndEnvironmentTags(config, accountId, scriptName, tags) {
-  tags ??= [];
+function applyServiceAndEnvironmentTags(config, tags) {
   const env6 = config.targetEnvironment;
   const serviceName = config.topLevelName;
-  if (!serviceName) {
+  const shouldApplyTags = hasDefinedEnvironments(config);
+  if (shouldApplyTags && !serviceName) {
     logger.warn(
       "No top-level `name` has been defined in Wrangler configuration. Add a top-level `name` to group this Worker together with its sibling environments in the Cloudflare dashboard."
     );
-    if (tags.some((tag) => tag.startsWith(SERVICE_TAG_PREFIX))) {
-      try {
-        return await patchNonVersionedScriptSettings(
-          config,
-          accountId,
-          scriptName,
-          {
-            tags: tags.filter((tag) => !tag.startsWith(SERVICE_TAG_PREFIX))
-          }
-        );
-      } catch {
-      }
-    }
-    return;
   }
-  const serviceTag = `${SERVICE_TAG_PREFIX}${serviceName}`;
-  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."
-      );
-    }
+  const serviceTag = shouldApplyTags && serviceName ? `${SERVICE_TAG_PREFIX}${serviceName}` : null;
+  const environmentTag = serviceTag && env6 ? `${ENVIRONMENT_TAG_PREFIX}${env6}` : null;
+  tags = tags.filter(
+    (tag) => !tag.startsWith(SERVICE_TAG_PREFIX) && !tag.startsWith(ENVIRONMENT_TAG_PREFIX)
+  );
+  if (serviceTag) {
+    tags.push(serviceTag);
+  }
+  if (environmentTag) {
+    tags.push(environmentTag);
   }
+  return tags;
+}
+function warnOnErrorUpdatingServiceAndEnvironmentTags() {
+  logger.warn(
+    "Could not apply service and environment tags. This Worker will not appear grouped together with its sibling environments in the Cloudflare dashboard."
+  );
+}
+function tagsAreEqual(a6, b7) {
+  return a6.length === b7.length && a6.every((el, i6) => b7[i6] === el);
 }
 var SERVICE_TAG_PREFIX, ENVIRONMENT_TAG_PREFIX;
 var init_environments = __esm({
@@ -132540,11 +132520,12 @@ var init_environments = __esm({
     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");
+    __name(warnOnErrorUpdatingServiceAndEnvironmentTags, "warnOnErrorUpdatingServiceAndEnvironmentTags");
+    __name(tagsAreEqual, "tagsAreEqual");
   }
 });
 
@@ -144970,15 +144951,8 @@ function createHandler(def, commandName) {
           useRedirectIfAvailable: def.behaviour?.useConfigRedirectIfAvailable
         }) : defaultWranglerConfig;
         if (def.behaviour?.warnIfMultipleEnvsConfiguredButNoneSpecified) {
-          if (!("env" in args) && config.configPath) {
-            const { rawConfig } = experimental_readRawConfig(
-              {
-                config: config.configPath
-              },
-              { hideWarnings: true }
-            );
-            const availableEnvs = Object.keys(rawConfig.env ?? {});
-            if (availableEnvs.length > 0) {
+          if (!("env" in args)) {
+            if (hasDefinedEnvironments(config)) {
               logger.warn(
                 dedent2`
 										Multiple environments are defined in the Wrangler configuration file, but no target environment was specified for the ${commandName.replace(/^wrangler\s+/, "")} command.
@@ -145010,6 +144984,7 @@ var init_register_yargs_command = __esm({
     init_internal();
     init_config5();
     init_config4();
+    init_environments();
     init_errors();
     init_experimental_flags();
     init_logger();
@@ -192164,8 +192139,8 @@ function generateSampleValue(field) {
     case "int64":
       return "9223372036854775807";
     // Large numbers as strings to avoid JS precision issues
-    case "f32":
-    case "f64":
+    case "float32":
+    case "float64":
       return 3.14;
     case "json":
       return { example: "json_value" };
@@ -193040,6 +193015,72 @@ var init_list5 = __esm({
   }
 });
 
+// src/pipelines/defaults.ts
+function applyDefaultsToSink(sink) {
+  const withDefaults = {
+    ...sink,
+    format: { ...sink.format },
+    config: { ...sink.config }
+  };
+  if (withDefaults.format.type === "parquet") {
+    if (!withDefaults.format.compression) {
+      withDefaults.format.compression = SINK_DEFAULTS.format.compression;
+    }
+    if (!withDefaults.format.row_group_bytes) {
+      withDefaults.format.row_group_bytes = SINK_DEFAULTS.format.row_group_bytes;
+    }
+  }
+  if (!withDefaults.config.rolling_policy) {
+    withDefaults.config.rolling_policy = {
+      interval_seconds: SINK_DEFAULTS.rolling_policy.interval_seconds
+    };
+    if (SINK_DEFAULTS.rolling_policy.file_size_bytes !== void 0) {
+      withDefaults.config.rolling_policy.file_size_bytes = SINK_DEFAULTS.rolling_policy.file_size_bytes;
+    }
+  } else {
+    if (!withDefaults.config.rolling_policy.file_size_bytes && SINK_DEFAULTS.rolling_policy.file_size_bytes !== void 0) {
+      withDefaults.config.rolling_policy.file_size_bytes = SINK_DEFAULTS.rolling_policy.file_size_bytes;
+    }
+    if (!withDefaults.config.rolling_policy.interval_seconds) {
+      withDefaults.config.rolling_policy.interval_seconds = SINK_DEFAULTS.rolling_policy.interval_seconds;
+    }
+  }
+  if (withDefaults.type === "r2") {
+    if (!withDefaults.config.path) {
+      withDefaults.config.path = SINK_DEFAULTS.r2.path;
+    }
+    if (!withDefaults.config.partitioning) {
+      withDefaults.config.partitioning = SINK_DEFAULTS.r2.partitioning;
+    }
+  }
+  return withDefaults;
+}
+var SINK_DEFAULTS;
+var init_defaults = __esm({
+  "src/pipelines/defaults.ts"() {
+    init_import_meta_url();
+    SINK_DEFAULTS = {
+      format: {
+        type: "parquet",
+        compression: "zstd",
+        row_group_bytes: 1024 * 1024 * 1024
+      },
+      rolling_policy: {
+        file_size_bytes: void 0,
+        interval_seconds: 300
+      },
+      r2: {
+        path: "",
+        partitioning: {
+          time_pattern: "year=%Y/month=%m/day=%d"
+        }
+      },
+      r2_data_catalog: {}
+    };
+    __name(applyDefaultsToSink, "applyDefaultsToSink");
+  }
+});
+
 // src/pipelines/cli/setup.ts
 async function setupPipelineNaming(providedName) {
   const pipelineName = providedName || await prompt("What would you like to name your pipeline?");
@@ -193160,10 +193201,8 @@ async function buildField(fieldNumber, depth = 0) {
     { title: "string", value: "string" },
     { title: "int32", value: "int32" },
     { title: "int64", value: "int64" },
-    { title: "u_int32", value: "u_int32" },
-    { title: "u_int64", value: "u_int64" },
-    { title: "f32", value: "f32" },
-    { title: "f64", value: "f64" },
+    { title: "float32", value: "float32" },
+    { title: "float64", value: "float64" },
     { title: "bool", value: "bool" },
     { title: "timestamp", value: "timestamp" },
     { title: "json", value: "json" },
@@ -193311,13 +193350,16 @@ async function setupR2Sink(config, accountId, setupConfig) {
       fallbackOption: 3
     });
   }
-  const fileSizeMB = await prompt("Roll file when size reaches (MB):", {
-    defaultValue: "100"
-  });
+  const fileSizeMB = await prompt(
+    "Roll file when size reaches (MB, minimum 5):",
+    {
+      defaultValue: "100"
+    }
+  );
   const intervalSeconds = await prompt(
-    "Roll file when time reaches (seconds):",
+    "Roll file when time reaches (seconds, minimum 10):",
     {
-      defaultValue: "300"
+      defaultValue: String(SINK_DEFAULTS.rolling_policy.interval_seconds)
     }
   );
   const useOAuth = await confirm(
@@ -193396,16 +193438,19 @@ async function setupDataCatalogSink(setupConfig) {
       { title: "zstd", value: "zstd" },
       { title: "lz4", value: "lz4" }
     ],
-    defaultOption: 0,
-    fallbackOption: 0
-  });
-  const fileSizeMB = await prompt("Roll file when size reaches (MB):", {
-    defaultValue: "100"
+    defaultOption: 3,
+    fallbackOption: 3
   });
+  const fileSizeMB = await prompt(
+    "Roll file when size reaches (MB, minimum 5):",
+    {
+      defaultValue: "100"
+    }
+  );
   const intervalSeconds = await prompt(
-    "Roll file when time reaches (seconds):",
+    "Roll file when time reaches (seconds, minimum 10):",
     {
-      defaultValue: "300"
+      defaultValue: String(SINK_DEFAULTS.rolling_policy.interval_seconds)
     }
   );
   setupConfig.sinkConfig = {
@@ -193644,6 +193689,7 @@ var init_setup = __esm({
     init_helpers();
     init_user3();
     init_client7();
+    init_defaults();
     init_pipelines2();
     init_utils12();
     pipelinesSetupCommand = createCommand({
@@ -193713,70 +193759,6 @@ var init_sinks = __esm({
   }
 });
 
-// src/pipelines/defaults.ts
-function applyDefaultsToSink(sink) {
-  const withDefaults = {
-    ...sink,
-    format: { ...sink.format },
-    config: { ...sink.config }
-  };
-  if (withDefaults.format.type === "parquet") {
-    if (!withDefaults.format.compression) {
-      withDefaults.format.compression = SINK_DEFAULTS.format.compression;
-    }
-    if (!withDefaults.format.row_group_bytes) {
-      withDefaults.format.row_group_bytes = SINK_DEFAULTS.format.row_group_bytes;
-    }
-  }
-  if (!withDefaults.config.rolling_policy) {
-    withDefaults.config.rolling_policy = {
-      file_size_bytes: SINK_DEFAULTS.rolling_policy.file_size_bytes,
-      interval_seconds: SINK_DEFAULTS.rolling_policy.interval_seconds
-    };
-  } else {
-    if (!withDefaults.config.rolling_policy.file_size_bytes) {
-      withDefaults.config.rolling_policy.file_size_bytes = SINK_DEFAULTS.rolling_policy.file_size_bytes;
-    }
-    if (!withDefaults.config.rolling_policy.interval_seconds) {
-      withDefaults.config.rolling_policy.interval_seconds = SINK_DEFAULTS.rolling_policy.interval_seconds;
-    }
-  }
-  if (withDefaults.type === "r2") {
-    if (!withDefaults.config.path) {
-      withDefaults.config.path = SINK_DEFAULTS.r2.path;
-    }
-    if (!withDefaults.config.partitioning) {
-      withDefaults.config.partitioning = SINK_DEFAULTS.r2.partitioning;
-    }
-  }
-  return withDefaults;
-}
-var SINK_DEFAULTS;
-var init_defaults = __esm({
-  "src/pipelines/defaults.ts"() {
-    init_import_meta_url();
-    SINK_DEFAULTS = {
-      format: {
-        type: "parquet",
-        compression: "zstd",
-        row_group_bytes: 1024 * 1024 * 1024
-      },
-      rolling_policy: {
-        file_size_bytes: 0,
-        interval_seconds: 30
-      },
-      r2: {
-        path: "",
-        partitioning: {
-          time_pattern: "year=%Y/month=%m/day=%d"
-        }
-      },
-      r2_data_catalog: {}
-    };
-    __name(applyDefaultsToSink, "applyDefaultsToSink");
-  }
-});
-
 // src/pipelines/cli/sinks/utils.ts
 function displaySinkConfiguration(sink, title = "Configuration", options = {}) {
   const { includeTimestamps = true } = options;
@@ -193808,7 +193790,7 @@ ${title}:`);
   const fileSizeBytes = sink.config.rolling_policy?.file_size_bytes ?? SINK_DEFAULTS.rolling_policy.file_size_bytes;
   const intervalSeconds = sink.config.rolling_policy?.interval_seconds ?? SINK_DEFAULTS.rolling_policy.interval_seconds;
   const batching = {
-    "File Size": fileSizeBytes === 0 ? "none" : `${Math.round(fileSizeBytes / (1024 * 1024))}MB`,
+    "File Size": fileSizeBytes === void 0 || fileSizeBytes === 0 ? "none" : `${Math.round(fileSizeBytes / (1024 * 1024))}MB`,
     "Time Interval": `${intervalSeconds}s`
   };
   const format9 = {
@@ -193926,8 +193908,7 @@ var init_create6 = __esm({
         },
         "roll-size": {
           describe: "Roll file size in MB",
-          type: "number",
-          default: SINK_DEFAULTS.rolling_policy.file_size_bytes / (1024 * 1024)
+          type: "number"
         },
         "roll-interval": {
           describe: "Roll file interval in seconds",
@@ -194033,7 +194014,7 @@ var init_create6 = __esm({
             interval_seconds = args.rollInterval;
           }
           sinkConfig.config.rolling_policy = {
-            file_size_bytes,
+            ...file_size_bytes !== void 0 && { file_size_bytes },
             interval_seconds
           };
         }
@@ -197050,8 +197031,8 @@ For more details, refer to: https://developers.cloudflare.com/r2/api/s3/tokens/`
           type: "string",
           demandOption: true
         },
-        targetSizeMb: {
-          describe: "The target size for compacted files (allowed values: 64, 128, 256, 512)",
+        "target-size": {
+          describe: "The target size for compacted files in MB (allowed values: 64, 128, 256, 512)",
           type: "number",
           demandOption: false,
           default: 128
@@ -197074,7 +197055,7 @@ For more details, refer to: https://developers.cloudflare.com/r2/api/s3/tokens/`
           config,
           accountId,
           args.bucket,
-          args.targetSizeMb
+          args.targetSize
         );
         logger.log(
           `\u2728 Successfully enabled file compaction for the data catalog for bucket '${args.bucket}'.`
@@ -215440,7 +215421,7 @@ async function versionsUpload(props) {
   const { config, accountId, name: name2 } = props;
   let versionId = null;
   let workerTag = null;
-  let tags = null;
+  let tags = [];
   if (accountId && name2) {
     try {
       const {
@@ -215451,7 +215432,7 @@ async function versionsUpload(props) {
         // TODO(consider): should this be a /versions endpoint?
       );
       workerTag = script.tag;
-      tags = script.tags;
+      tags = script.tags ?? 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.
@@ -215757,13 +215738,15 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         }
         throw err;
       }
-      if (hasDefinedEnvironments(config)) {
-        await applyServiceAndEnvironmentTags(
-          config,
-          accountId,
-          scriptName,
-          tags
-        );
+      const nextTags = applyServiceAndEnvironmentTags(config, tags);
+      if (!tagsAreEqual(tags, nextTags)) {
+        try {
+          await patchNonVersionedScriptSettings(config, accountId, scriptName, {
+            tags: nextTags
+          });
+        } catch {
+          warnOnErrorUpdatingServiceAndEnvironmentTags();
+        }
       }
     }
     if (props.outFile) {
@@ -215923,6 +215906,7 @@ var init_upload5 = __esm({
     init_isLegacyEnv();
     init_print_bindings();
     init_retry();
+    init_api();
     versionsUploadCommand = createCommand({
       metadata: {
         description: "Uploads your Worker code and config as a new Version",
@@ -222702,7 +222686,7 @@ async function deploy(props) {
   const { config, accountId, name: name2, entry } = props;
   let workerTag = null;
   let versionId = null;
-  let tags = null;
+  let tags = [];
   let workerExists = true;
   const domainRoutes = (props.domains || []).map((domain2) => ({
     pattern: domain2,
@@ -222717,7 +222701,7 @@ async function deploy(props) {
         default_environment: { script }
       } = serviceMetaData;
       workerTag = script.tag;
-      tags = script.tags;
+      tags = script.tags ?? tags;
       if (script.last_deployed_from === "dash") {
         let configDiff;
         if (getFlag("DEPLOY_REMOTE_DIFF_CHECK")) {
@@ -223111,19 +223095,25 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
             versionMap,
             void 0
           );
-          await patchNonVersionedScriptSettings(
-            props.config,
-            accountId,
-            scriptName,
-            {
-              tail_consumers: worker.tail_consumers,
-              logpush: worker.logpush,
-              // If the user hasn't specified observability assume that they want it disabled if they have it on.
-              // This is a no-op in the event that they don't have observability enabled, but will remove observability
-              // if it has been removed from their Wrangler configuration file
-              observability: worker.observability ?? { enabled: false }
-            }
-          );
+          const nextTags = applyServiceAndEnvironmentTags(config, tags);
+          try {
+            await patchNonVersionedScriptSettings(
+              props.config,
+              accountId,
+              scriptName,
+              {
+                tail_consumers: worker.tail_consumers,
+                logpush: worker.logpush,
+                // If the user hasn't specified observability assume that they want it disabled if they have it on.
+                // This is a no-op in the event that they don't have observability enabled, but will remove observability
+                // if it has been removed from their Wrangler configuration file
+                observability: worker.observability ?? { enabled: false },
+                tags: nextTags
+              }
+            );
+          } catch {
+            warnOnErrorUpdatingServiceAndEnvironmentTags();
+          }
           result = {
             id: null,
             // fpw - ignore
@@ -223153,14 +223143,21 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
               })
             )
           );
-        }
-        if (hasDefinedEnvironments(config)) {
-          await applyServiceAndEnvironmentTags(
-            config,
-            accountId,
-            scriptName,
-            tags
-          );
+          const nextTags = applyServiceAndEnvironmentTags(config, tags);
+          if (!tagsAreEqual(tags, nextTags)) {
+            try {
+              await patchNonVersionedScriptSettings(
+                props.config,
+                accountId,
+                scriptName,
+                {
+                  tags: nextTags
+                }
+              );
+            } catch {
+              warnOnErrorUpdatingServiceAndEnvironmentTags();
+            }
+          }
         }
         if (result.startup_time_ms) {
           logger.log("Worker Startup Time:", result.startup_time_ms, "ms");