wrangler 3.78.3 → 3.78.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.78.3",
+  "version": "3.78.5",
   "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",
     "@cloudflare/workers-shared": "0.5.3",
-    "miniflare": "3.20240909.2"
+    "miniflare": "3.20240909.3"
   },
   "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.59",
     "@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

@@ -152876,7 +152876,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.78.3";
+var version = "3.78.5";
 var package_default = {
   name: "wrangler",
   version,
@@ -152963,7 +152963,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"
   },
@@ -161421,7 +161421,9 @@ function createWorkerUploadForm(worker) {
         assets: {
           jwt: experimental_assets.jwt,
           config: assetConfig
-        }
+        },
+        ...compatibility_date && { compatibility_date },
+        ...compatibility_flags && { compatibility_flags }
       })
     );
     return formData;
@@ -166782,10 +166784,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) {
@@ -166981,6 +166983,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);
@@ -189516,16 +189536,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(
@@ -191729,7 +191745,6 @@ async function handler5(args) {
     args.host,
     args.port,
     args.scheme,
-    args.database,
     args.user,
     args.password
   );
@@ -191752,9 +191767,9 @@ async function handler5(args) {
     throw new UserError(
       "You must provide a port number - e.g. 'user:password@database.example.com:port/databasename"
     );
-  } else if (url4.pathname === "") {
+  } else if (args.connectionString && url4.pathname === "" || args.database === "") {
     throw new UserError(
-      "You must provide a database name as the path component - e.g. /postgres"
+      "You must provide a database name as the path component - e.g. example.com:port/postgres"
     );
   } else if (url4.username === "") {
     throw new UserError(
@@ -191767,9 +191782,9 @@ async function handler5(args) {
   } else {
     logger.log(`\u{1F6A7} Creating '${args.name}'`);
     const origin = args.accessClientId && args.accessClientSecret ? {
-      host: url4.hostname,
+      host: url4.hostname + url4.pathname,
       scheme: url4.protocol.replace(":", ""),
-      database: decodeURIComponent(url4.pathname.replace("/", "")),
+      database: args.database,
       user: decodeURIComponent(url4.username),
       password: decodeURIComponent(url4.password),
       access_client_id: args.accessClientId,
@@ -191778,7 +191793,8 @@ async function handler5(args) {
       host: url4.hostname,
       port: parseInt(url4.port),
       scheme: url4.protocol.replace(":", ""),
-      database: decodeURIComponent(url4.pathname.replace("/", "")),
+      // database will either be the value passed in the relevant yargs flag or is URL-decoded value from the url pathname
+      database: args.connectionString !== "" ? decodeURIComponent(url4.pathname.replace("/", "")) : args.database,
       user: decodeURIComponent(url4.username),
       password: decodeURIComponent(url4.password)
     };
@@ -191799,8 +191815,8 @@ async function handler5(args) {
   }
 }
 __name(handler5, "handler");
-function buildURLFromParts(host, port2, scheme, database, user, password) {
-  const url4 = new URL(database ? `/${database}` : "", `${scheme}://${host}`);
+function buildURLFromParts(host, port2, scheme, user, password) {
+  const url4 = new URL(`${scheme}://${host}`);
   if (port2) {
     url4.port = port2.toString();
   }
@@ -191884,11 +191900,13 @@ function options8(yargs) {
     name: { type: "string", describe: "Give your config a new name" },
     "origin-host": {
       type: "string",
-      describe: "The host of the origin database"
+      describe: "The host of the origin database",
+      implies: ["database", "origin-user", "origin-password"]
     },
     "origin-port": {
       type: "number",
-      describe: "The port number of the origin database"
+      describe: "The port number of the origin database",
+      implies: ["origin-host", "database", "origin-user", "origin-password"]
     },
     "origin-scheme": {
       type: "string",
@@ -191896,27 +191914,42 @@ function options8(yargs) {
     },
     database: {
       type: "string",
-      describe: "The name of the database within the origin database"
+      describe: "The name of the database within the origin database",
+      implies: ["origin-host", "origin-user", "origin-password"]
     },
     "origin-user": {
       type: "string",
-      describe: "The username used to connect to the origin database"
+      describe: "The username used to connect to the origin database",
+      implies: ["origin-host", "database", "origin-password"]
     },
     "origin-password": {
       type: "string",
-      describe: "The password used to connect to the origin database"
+      describe: "The password used to connect to the origin database",
+      implies: ["origin-host", "database", "origin-user"]
     },
     "access-client-id": {
       type: "string",
       describe: "The Client ID of the Access token to use when connecting to the origin database",
       conflicts: ["origin-port"],
-      implies: ["access-client-secret"]
+      implies: [
+        "access-client-secret",
+        "origin-host",
+        "database",
+        "origin-user",
+        "origin-password"
+      ]
     },
     "access-client-secret": {
       type: "string",
       describe: "The Client Secret of the Access token to use when connecting to the origin database",
       conflicts: ["origin-port"],
-      implies: ["access-client-id"]
+      implies: [
+        "access-client-id",
+        "origin-host",
+        "database",
+        "origin-user",
+        "origin-password"
+      ]
     },
     "caching-disabled": {
       type: "boolean",
@@ -191934,33 +191967,21 @@ function options8(yargs) {
   });
 }
 __name(options8, "options");
-var requiredOriginOptions = [
+var coreOriginOptions = [
   "originHost",
   "database",
   "originUser",
   "originPassword"
 ];
-function camelToKebab(str) {
-  return str.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
-}
-__name(camelToKebab, "camelToKebab");
 function isOptionSet(args, key) {
   return key in args && args[key] !== void 0;
 }
 __name(isOptionSet, "isOptionSet");
 async function handler9(args) {
-  const allOriginFieldsSet = requiredOriginOptions.every(
+  const coreOriginFieldsSet = coreOriginOptions.every(
     (field) => isOptionSet(args, field)
   );
-  const noOriginFieldSet = requiredOriginOptions.every(
-    (field) => !isOptionSet(args, field)
-  );
-  if (!allOriginFieldsSet && !noOriginFieldSet) {
-    throw new UserError(
-      `When updating the origin, all of the following must be set: ${requiredOriginOptions.map((option) => camelToKebab(option)).join(", ")}`
-    );
-  }
-  if (allOriginFieldsSet && args.originPort === void 0 && args.accessClientId === void 0 && args.accessClientSecret === void 0) {
+  if (coreOriginFieldsSet && args.originPort === void 0 && args.accessClientId === void 0 && args.accessClientSecret === void 0) {
     throw new UserError(
       `When updating the origin, either the port or the Access Client ID and Secret must be set`
     );
@@ -191971,7 +191992,7 @@ async function handler9(args) {
   if (args.name !== void 0) {
     database.name = args.name;
   }
-  if (allOriginFieldsSet) {
+  if (coreOriginFieldsSet) {
     if (args.accessClientId && args.accessClientSecret) {
       database.origin = {
         scheme: args.originScheme ?? "postgresql",
@@ -199231,8 +199252,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(",")
       });
     }
@@ -199246,9 +199267,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 }
@@ -199281,7 +199302,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);
@@ -199309,16 +199330,24 @@ __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}...`
-  );
-  const body = ruleId !== void 0 ? {
-    ruleIds: [ruleId]
-  } : {};
-  return await fetchResult(
-    `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
-    { method: "DELETE", body: JSON.stringify(body), headers }
-  );
+  if (ruleId !== void 0) {
+    logger.log(`Deleting event notifications rule "${ruleId}"...`);
+    const body = ruleId !== void 0 ? {
+      ruleIds: [ruleId]
+    } : {};
+    return await fetchResult(
+      `/accounts/${accountId}/event_notifications/r2/${bucketName}/configuration/queues/${queue.queue_id}`,
+      { 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 }
+    );
+  }
 }
 __name(deleteEventNotificationConfig, "deleteEventNotificationConfig");
 function isValidR2BucketName(name) {
@@ -199328,20 +199357,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}`
@@ -199349,28 +199383,28 @@ 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", {
-    describe: "Specify the kinds of object events to emit notifications for. ex. '--event-types object-create object-delete'",
+    describe: "The type of event(s) that will emit event notifications",
     alias: "event-type",
     choices: Object.keys(actionsForEventCategories),
     demandOption: true,
     requiresArg: true,
     type: "array"
   }).option("prefix", {
-    describe: "only actions on objects with this prefix will emit notifications",
+    describe: "The prefix that an object must match to emit event notifications (note: regular expressions not supported)",
     requiresArg: false,
     type: "string"
   }).option("suffix", {
-    describe: "only actions on objects with this suffix will emit notifications",
+    describe: "The suffix that an object must match to emit event notifications (note: regular expressions not supported)",
     type: "string"
   }).option("queue", {
-    describe: "The name of the queue to which event notifications will be sent. ex '--queue my-queue'",
+    describe: "The name of the queue that will receive event notification messages",
     demandOption: true,
     requiresArg: true,
     type: "string"
@@ -199393,21 +199427,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 is configured to receive notifications. ex '--queue my-queue'",
+    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"
   });
@@ -199427,7 +199461,7 @@ async function DeleteHandler2(args) {
     queue,
     rule
   );
-  logger.log("Configuration deleted successfully!");
+  logger.log("Event notification rule deleted successfully!");
 }
 __name(DeleteHandler2, "DeleteHandler");
 
@@ -199625,7 +199659,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",
@@ -199637,8 +199671,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 {
@@ -199656,7 +199690,7 @@ async function GetHandler2(args) {
     }
   }
 }
-__name(GetHandler2, "GetHandler");
+__name(GetHandler, "GetHandler");
 function DisableOptions(yargs) {
   return yargs.positional("name", {
     describe: "The name of the bucket",
@@ -200196,28 +200230,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
         );
@@ -212827,6 +212861,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(
@@ -214431,15 +214476,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) {
@@ -214988,16 +215034,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,