wrangler 3.78.4 → 3.78.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.78.4",
+  "version": "3.78.6",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -62,12 +62,12 @@
     "resolve.exports": "^2.0.2",
     "selfsigned": "^2.0.1",
     "source-map": "^0.6.1",
-    "unenv": "npm:unenv-nightly@2.0.0-1724863496.70db6f1",
+    "unenv": "npm:unenv-nightly@2.0.0-1726478054.1e87097",
     "workerd": "1.20240909.0",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20240909.2",
-    "@cloudflare/workers-shared": "0.5.3"
+    "@cloudflare/workers-shared": "0.5.3",
+    "miniflare": "3.20240909.4"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
@@ -154,7 +154,7 @@
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.11.58",
+    "@cloudflare/pages-shared": "^0.11.60",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.d.ts

@@ -192,7 +192,7 @@ declare type BodyInit =
 | ArrayBuffer
 | AsyncIterable<Uint8Array>
 | Blob_2
-| FormData
+| FormData_2
 | Iterable<Uint8Array>
 | NodeJS.ArrayBufferView
 | URLSearchParams_2
@@ -205,7 +205,7 @@ declare interface BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 }
@@ -1245,7 +1245,7 @@ declare namespace Dispatcher {
         path: string;
         method: HttpMethod;
         /** Default: `null` */
-        body?: string | Buffer | Uint8Array | Readable | null | FormData;
+        body?: string | Buffer | Uint8Array | Readable | null | FormData_2;
         /** Default: `null` */
         headers?: IncomingHttpHeaders | string[] | null;
         /** Query string params to be embedded in the request URL. Default: `null` */
@@ -2413,7 +2413,7 @@ declare class FileReader {
 /**
  * Provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using fetch().
  */
-declare class FormData {
+declare class FormData_2 {
     /**
      * Appends a new value onto an existing key inside a FormData object,
      * or adds the key if it does not already exist.
@@ -2478,7 +2478,7 @@ declare class FormData {
      * Executes given callback function for each field of the FormData instance
      */
     forEach: (
-    callbackfn: (value: FormDataEntryValue, key: string, iterable: FormData) => void,
+    callbackfn: (value: FormDataEntryValue, key: string, iterable: FormData_2) => void,
     thisArg?: unknown
     ) => void
 
@@ -25594,7 +25594,7 @@ declare class Request implements BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 
@@ -25678,7 +25678,7 @@ declare class Response implements BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 
@@ -26113,7 +26113,7 @@ declare namespace Undici {
     var Headers: Headers;
     var Response: Response;
     var Request: Request;
-    var FormData: FormData;
+    var FormData: FormData_2;
     var File: File;
     var FileReader: FileReader;
     var caches: caches;
@@ -26181,7 +26181,7 @@ declare namespace undici {
         ProgressEventInit,
         ProgressEvent,
         FormDataEntryValue,
-        FormData,
+        FormData_2 as FormData,
         DiagnosticsChannel,
         BinaryType,
         WebSocketEventMap,

package/wrangler-dist/cli.js

@@ -152543,9 +152543,9 @@ function getEnvironmentVariableFactory({
 }) {
   let hasWarned = false;
   return () => {
-    if (process.env[variableName]) {
+    if (variableName in process.env) {
       return process.env[variableName];
-    } else if (deprecatedName && process.env[deprecatedName]) {
+    } else if (deprecatedName && deprecatedName in process.env) {
       if (!hasWarned) {
         hasWarned = true;
         console.warn(
@@ -152595,6 +152595,12 @@ var getOutputFilePathFromEnv = getEnvironmentVariableFactory({
 var getCIMatchTag = getEnvironmentVariableFactory({
   variableName: "WRANGLER_CI_MATCH_TAG"
 });
+var getBuildConditionsFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_BUILD_CONDITIONS"
+});
+var getBuildPlatformFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_BUILD_PLATFORM"
+});
 
 // src/utils/log-file.ts
 init_import_meta_url();
@@ -152876,7 +152882,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.78.4";
+var version = "3.78.6";
 var package_default = {
   name: "wrangler",
   version,
@@ -152963,7 +152969,7 @@ var package_default = {
     "resolve.exports": "^2.0.2",
     selfsigned: "^2.0.1",
     "source-map": "^0.6.1",
-    unenv: "npm:unenv-nightly@2.0.0-1724863496.70db6f1",
+    unenv: "npm:unenv-nightly@2.0.0-1726478054.1e87097",
     workerd: "1.20240909.0",
     "xxhash-wasm": "^1.0.1"
   },
@@ -160608,7 +160614,7 @@ function createModuleCollector(props) {
                       packageJson,
                       args.path.replace(`${packageName}/`, ""),
                       {
-                        conditions: BUILD_CONDITIONS
+                        conditions: getBuildConditions()
                       }
                     );
                     if (testResolved) {
@@ -160993,7 +160999,25 @@ var COMMON_ESBUILD_OPTIONS = {
   target: "es2022",
   loader: { ".js": "jsx", ".mjs": "jsx", ".cjs": "jsx" }
 };
-var BUILD_CONDITIONS = ["workerd", "worker", "browser"];
+function getBuildConditions() {
+  const envVar = getBuildConditionsFromEnv();
+  if (envVar !== void 0) {
+    return envVar.split(",");
+  } else {
+    return ["workerd", "worker", "browser"];
+  }
+}
+__name(getBuildConditions, "getBuildConditions");
+function getBuildPlatform() {
+  const platform2 = getBuildPlatformFromEnv();
+  if (platform2 !== void 0 && !["browser", "node", "neutral"].includes(platform2)) {
+    throw new UserError(
+      "Invalid esbuild platform configuration defined in the WRANGLER_BUILD_PLATFORM environment variable.\nValid platform values are: 'browser', 'node' and 'neutral'."
+    );
+  }
+  return platform2;
+}
+__name(getBuildPlatform, "getBuildPlatform");
 async function bundleWorker(entry, destination, {
   bundle,
   moduleCollector = noopModuleCollector,
@@ -161162,7 +161186,8 @@ async function bundleWorker(entry, destination, {
     sourceRoot: destination,
     minify,
     metafile: true,
-    conditions: BUILD_CONDITIONS,
+    conditions: getBuildConditions(),
+    platform: getBuildPlatform(),
     ...{
       define: {
         ...defineNavigatorUserAgent ? { "navigator.userAgent": `"Cloudflare-Workers"` } : {},
@@ -166736,7 +166761,7 @@ var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
 var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName, assetDirectory) => {
   (0, import_node_assert9.default)(accountId, "Missing accountId");
   logger.info("\u{1F300} Building list of assets...");
-  const manifest = await buildAssetsManifest(assetDirectory);
+  const manifest = await buildAssetManifest(assetDirectory);
   logger.info("\u{1F300} Starting asset upload...");
   const initializeAssetsResponse = await fetchResult(
     `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
@@ -166784,10 +166809,10 @@ var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName
   let attempts = 0;
   const start = Date.now();
   let completionJwt = "";
+  let assetUploadCount = 0;
   for (const [bucketIndex, bucket] of assetBuckets.entries()) {
     attempts = 0;
     let gatewayErrors = 0;
-    let assetUploadCount = 0;
     const doUpload = /* @__PURE__ */ __name(async () => {
       const payload = new import_undici5.FormData();
       for (const manifestEntry of bucket) {
@@ -166878,7 +166903,7 @@ Assets already uploaded have been saved, so the next attempt will automatically
   );
   return completionJwt;
 }, "syncExperimentalAssets");
-var buildAssetsManifest = /* @__PURE__ */ __name(async (dir) => {
+var buildAssetManifest = /* @__PURE__ */ __name(async (dir) => {
   const files = await (0, import_promises8.readdir)(dir, { recursive: true });
   const manifest = {};
   let counter = 0;
@@ -166928,7 +166953,7 @@ Ensure all assets in your assets directory "${dir}" conform with the Workers max
     })
   );
   return manifest;
-}, "buildAssetsManifest");
+}, "buildAssetManifest");
 var MAX_DIFF_LINES = 100;
 function logAssetUpload(line, diffCount) {
   const level = logger.loggerLevel;
@@ -166983,6 +167008,24 @@ ${resolvedExperimentalAssetsPath}`
   return experimentalAssetsOptions;
 }
 __name(processExperimentalAssetsArg, "processExperimentalAssetsArg");
+function verifyMutuallyExclusiveAssetsArgsOrConfig(args, config) {
+  if ((args.experimentalAssets || config.experimental_assets) && (args.legacyAssets || config.legacy_assets)) {
+    throw new UserError(
+      "Cannot use Experimental Assets and Legacy Assets in the same Worker."
+    );
+  }
+  if ((args.experimentalAssets || config.experimental_assets) && (args.site || config.site)) {
+    throw new UserError(
+      "Cannot use Experimental Assets and Workers Sites in the same Worker."
+    );
+  }
+  if ((args.experimentalAssets || config.experimental_assets) && config.tail_consumers?.length) {
+    throw new UserError(
+      "Cannot use Experimental Assets and tail consumers in the same Worker. Tail Workers are not yet supported for Workers with assets."
+    );
+  }
+}
+__name(verifyMutuallyExclusiveAssetsArgsOrConfig, "verifyMutuallyExclusiveAssetsArgsOrConfig");
 async function createAssetIgnoreFunction(dir) {
   const CF_ASSETS_IGNORE_FILENAME = ".assetsignore";
   const cfAssetIgnorePath = path16.resolve(dir, CF_ASSETS_IGNORE_FILENAME);
@@ -172569,7 +172612,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           await patchNonVersionedScriptSettings(accountId, scriptName, {
             tail_consumers: worker.tail_consumers,
             logpush: worker.logpush,
-            observability: worker.observability
+            // 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.toml
+            observability: worker.observability ?? { enabled: false }
           });
           const { available_on_subdomain } = await fetchResult(`/accounts/${accountId}/workers/scripts/${scriptName}/subdomain`);
           result = {
@@ -189518,16 +189564,12 @@ Please shift to the --legacy-assets command to preserve the current functionalit
       "The --experimental-public field has been deprecated, try --legacy-assets instead."
     );
   }
-  if ((args.legacyAssets || config.legacy_assets || args.experimentalAssets || config.experimental_assets) && (args.site || config.site)) {
+  if ((args.legacyAssets || config.legacy_assets) && (args.site || config.site)) {
     throw new UserError(
-      "Cannot use Assets and Workers Sites in the same Worker."
-    );
-  }
-  if (args.assets) {
-    logger.warn(
-      "The --assets argument is experimental and may change or break at any time"
+      "Cannot use Legacy Assets and Workers Sites in the same Worker."
     );
   }
+  verifyMutuallyExclusiveAssetsArgsOrConfig(args, config);
   const experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
   if (args.latest) {
     logger.warn(
@@ -199238,8 +199280,8 @@ async function tableFromNotificationGetResponse(config, response) {
         rule_id: ruleId,
         created_at: createdAt,
         queue_name: entry.queueName,
-        prefix,
-        suffix,
+        prefix: prefix || "(all prefixes)",
+        suffix: suffix || "(all suffixes)",
         event_type: actions.join(",")
       });
     }
@@ -199253,9 +199295,9 @@ async function tableFromNotificationGetResponse(config, response) {
   return tableOutput;
 }
 __name(tableFromNotificationGetResponse, "tableFromNotificationGetResponse");
-async function getEventNotificationConfig(apiCredentials, accountId, bucketName) {
+async function listEventNotificationConfig(apiCredentials, accountId, bucketName) {
   const headers = eventNotificationHeaders(apiCredentials);
-  logger.log(`Fetching notification configuration for bucket ${bucketName}...`);
+  logger.log(`Fetching notification rules for bucket ${bucketName}...`);
   const res = await fetchResult(
     `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration`,
     { method: "GET", headers }
@@ -199288,7 +199330,7 @@ async function getEventNotificationConfig(apiCredentials, accountId, bucketName)
   };
   return newResult;
 }
-__name(getEventNotificationConfig, "getEventNotificationConfig");
+__name(listEventNotificationConfig, "listEventNotificationConfig");
 async function putEventNotificationConfig(config, apiCredentials, accountId, bucketName, queueName, eventTypes, prefix, suffix) {
   const queue = await getQueue(config, queueName);
   const headers = eventNotificationHeaders(apiCredentials);
@@ -199316,10 +199358,8 @@ __name(putEventNotificationConfig, "putEventNotificationConfig");
 async function deleteEventNotificationConfig(config, apiCredentials, accountId, bucketName, queueName, ruleId) {
   const queue = await getQueue(config, queueName);
   const headers = eventNotificationHeaders(apiCredentials);
-  logger.log(
-    `Disabling event notifications for "${bucketName}" to queue ${queueName}...`
-  );
   if (ruleId !== void 0) {
+    logger.log(`Deleting event notifications rule "${ruleId}"...`);
     const body = ruleId !== void 0 ? {
       ruleIds: [ruleId]
     } : {};
@@ -199328,6 +199368,9 @@ async function deleteEventNotificationConfig(config, apiCredentials, accountId,
       { method: "DELETE", body: JSON.stringify(body), headers }
     );
   } else {
+    logger.log(
+      `Deleting event notification rules associated with queue ${queueName}...`
+    );
     return await fetchResult(
       `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
       { method: "DELETE", headers }
@@ -199342,20 +199385,25 @@ __name(isValidR2BucketName, "isValidR2BucketName");
 
 // src/r2/notification.ts
 init_import_meta_url();
-function GetOptions(yargs) {
+function ListOptions5(yargs) {
   return yargs.positional("bucket", {
-    describe: "The name of the bucket for which notifications will be emitted",
+    describe: "The name of the R2 bucket to get event notification rules for",
     type: "string",
     demandOption: true
   });
 }
-__name(GetOptions, "GetOptions");
-async function GetHandler(args) {
+__name(ListOptions5, "ListOptions");
+async function ListHandler5(args) {
   await printWranglerBanner();
+  if (args._[3] === "get") {
+    logger.warn(
+      "`wrangler r2 bucket notification get` is deprecated and will be removed in an upcoming release.\nPlease use `wrangler r2 bucket notification list` instead."
+    );
+  }
   const config = readConfig(args.config, args);
   const accountId = await requireAuth(config);
   const apiCreds = requireApiToken();
-  const resp = await getEventNotificationConfig(
+  const resp = await listEventNotificationConfig(
     apiCreds,
     accountId,
     `${args.bucket}`
@@ -199363,10 +199411,10 @@ async function GetHandler(args) {
   const tableOutput = await tableFromNotificationGetResponse(config, resp);
   logger.log(tableOutput.map((x2) => formatLabelledValues(x2)).join("\n\n"));
 }
-__name(GetHandler, "GetHandler");
+__name(ListHandler5, "ListHandler");
 function CreateOptions4(yargs) {
   return yargs.positional("bucket", {
-    describe: "The name of the bucket for which notifications will be emitted",
+    describe: "The name of the R2 bucket to create an event notification rule for",
     type: "string",
     demandOption: true
   }).option("event-types", {
@@ -199407,21 +199455,21 @@ async function CreateHandler4(args) {
     prefix,
     suffix
   );
-  logger.log("Configuration created successfully!");
+  logger.log("Event notification rule created successfully!");
 }
 __name(CreateHandler4, "CreateHandler");
 function DeleteOptions2(yargs) {
   return yargs.positional("bucket", {
-    describe: "The name of the bucket for which notifications will be emitted",
+    describe: "The name of the R2 bucket to delete an event notification rule for",
     type: "string",
     demandOption: true
   }).option("queue", {
-    describe: "The name of the queue that will receive event notification messages",
+    describe: "The name of the queue that corresponds to the event notification rule. If no rule is provided, all event notification rules associated with the bucket and queue will be deleted",
     demandOption: true,
     requiresArg: true,
     type: "string"
   }).option("rule", {
-    describe: "The id of the rule to delete. If no rule is specified, all rules for the bucket/queue configuration will be deleted",
+    describe: "The ID of the event notification rule to delete",
     requiresArg: false,
     type: "string"
   });
@@ -199441,7 +199489,7 @@ async function DeleteHandler2(args) {
     queue,
     rule
   );
-  logger.log("Configuration deleted successfully!");
+  logger.log("Event notification rule deleted successfully!");
 }
 __name(DeleteHandler2, "DeleteHandler");
 
@@ -199639,7 +199687,7 @@ async function EnableHandler(args) {
   logger.log(`\u2728 Successfully enabled Sippy on the '${args.name}' bucket.`);
 }
 __name(EnableHandler, "EnableHandler");
-function GetOptions2(yargs) {
+function GetOptions(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
     type: "string",
@@ -199651,8 +199699,8 @@ function GetOptions2(yargs) {
     type: "string"
   });
 }
-__name(GetOptions2, "GetOptions");
-async function GetHandler2(args) {
+__name(GetOptions, "GetOptions");
+async function GetHandler(args) {
   const config = readConfig(args.config, args);
   const accountId = await requireAuth(config);
   try {
@@ -199670,7 +199718,7 @@ async function GetHandler2(args) {
     }
   }
 }
-__name(GetHandler2, "GetHandler");
+__name(GetHandler, "GetHandler");
 function DisableOptions(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
@@ -200210,28 +200258,28 @@ ${key} is ${prettyBytes(objectSize, {
         ).command(
           "get <name>",
           "Check the status of Sippy on an R2 bucket",
-          GetOptions2,
-          GetHandler2
+          GetOptions,
+          GetHandler
         );
       }
     );
     r2BucketYargs.command(
       "notification",
-      `Manage event notifications for an R2 bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
+      `Manage event notification rules for an R2 bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
       (r2EvNotifyYargs) => {
         return r2EvNotifyYargs.command(
-          "get <bucket>",
-          `Get event notification configuration for a bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
-          GetOptions,
-          GetHandler
+          ["list <bucket>", "get <bucket>"],
+          `List event notification rules for a bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
+          ListOptions5,
+          ListHandler5
         ).command(
           "create <bucket>",
-          `Create new event notification configuration for an R2 bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
+          `Create an event notification rule for an R2 bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
           CreateOptions4,
           CreateHandler4
         ).command(
           "delete <bucket>",
-          `Delete event notification configuration for an R2 bucket and queue ${source_default.hex(betaCmdColor)("[open beta]")}`,
+          `Delete an event notification rule from an R2 bucket ${source_default.hex(betaCmdColor)("[open beta]")}`,
           DeleteOptions2,
           DeleteHandler2
         );
@@ -212841,6 +212889,17 @@ async function versionsUploadHandler(args) {
       "Legacy Assets does not support uploading versions through `wrangler versions upload`. You must use `wrangler deploy` instead."
     );
   }
+  verifyMutuallyExclusiveAssetsArgsOrConfig(
+    {
+      // given that legacyAssets and sites are not supported by
+      // `wrangler versions upload` pass them as undefined to
+      // skip the corresponding mutual exclusivity validation
+      legacyAssets: void 0,
+      site: void 0,
+      experimentalAssets: args.experimentalAssets
+    },
+    config
+  );
   const experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
   if (args.latest) {
     logger.warn(
@@ -214445,15 +214504,16 @@ Move any existing data to .wrangler/state and use --persist, or
 use --persist-to=./wrangler-local-state to keep using the old path.`
       );
     }
+    if ((args.legacyAssets || config.legacy_assets) && (args.site || config.site)) {
+      throw new UserError(
+        "Cannot use Legacy Assets and Workers Sites in the same Worker."
+      );
+    }
+    verifyMutuallyExclusiveAssetsArgsOrConfig(args, config);
     let experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
     if (experimentalAssetsOptions) {
       args.forceLocal = true;
     }
-    if ((args.legacyAssets || config.legacy_assets) && experimentalAssetsOptions) {
-      throw new UserError(
-        "Cannot use Legacy Assets and Experimental Assets in the same Worker."
-      );
-    }
     const projectRoot = configPath && import_node_path63.default.dirname(configPath);
     const devEnv = new DevEnv();
     if (args.experimentalDevEnv) {
@@ -215002,16 +215062,6 @@ You can explicitly set the \`dev.host\` configuration in your wrangler.toml file
 }
 __name(getInferredHost, "getInferredHost");
 async function validateDevServerSettings(args, config) {
-  if ((args.legacyAssets || config.legacy_assets) && (args.site || config.site)) {
-    throw new UserError(
-      "Cannot use Legacy Assets and Workers Sites in the same Worker."
-    );
-  }
-  if ((args.experimentalAssets || config.experimental_assets) && (args.site || config.site)) {
-    throw new UserError(
-      "Cannot use Experimental Assets and Workers Sites in the same Worker."
-    );
-  }
   const entry = await getEntry(
     {
       legacyAssets: args.legacyAssets,