wrangler 3.73.0 → 3.74.0

package/wrangler-dist/cli.js

@@ -80045,7 +80045,7 @@ var require_view = __commonJS({
     var debug = require_src2()("express:view");
     var path74 = require("path");
     var fs26 = require("fs");
-    var dirname17 = path74.dirname;
+    var dirname16 = path74.dirname;
     var basename5 = path74.basename;
     var extname5 = path74.extname;
     var join18 = path74.join;
@@ -80085,7 +80085,7 @@ var require_view = __commonJS({
       for (var i = 0; i < roots.length && !path75; i++) {
         var root = roots[i];
         var loc = resolve22(root, name);
-        var dir = dirname17(loc);
+        var dir = dirname16(loc);
         var file = basename5(loc);
         path75 = this.resolve(dir, file);
       }
@@ -97445,9 +97445,9 @@ var require_command_exists = __commonJS({
       cleanInput = /* @__PURE__ */ __name(function(s) {
         var isPathName = /[\\]/.test(s);
         if (isPathName) {
-          var dirname17 = '"' + path74.dirname(s) + '"';
+          var dirname16 = '"' + path74.dirname(s) + '"';
           var basename5 = '"' + path74.basename(s) + '"';
-          return dirname17 + ":" + basename5;
+          return dirname16 + ":" + basename5;
         }
         return '"' + s + '"';
       }, "cleanInput");
@@ -152693,7 +152693,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.73.0";
+var version = "3.74.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -159430,10 +159430,8 @@ async function getEntry(args, config, command2) {
         // site.entry-point could be a directory
         import_node_path16.default.resolve(config.site?.["entry-point"], "index.js")
       );
-    } else if (args.legacyAssets || config.legacy_assets) {
+    } else if (args.legacyAssets || config.legacy_assets || args.experimentalAssets || config.experimental_assets) {
       file = import_node_path16.default.resolve(getBasePath(), "templates/no-op-worker.js");
-    } else if (args.experimentalAssets || config.experimental_assets) {
-      file = import_node_path16.default.resolve(getBasePath(), "templates/no-op-assets-worker.ts");
     } else {
       throw new UserError(
         `Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler ${command2} path/to/script\`) or the \`main\` config field.`
@@ -159476,7 +159474,6 @@ ${migrateUrl}`
     directory,
     format: format10,
     moduleRoot: args.moduleRoot ?? config.base_dir ?? import_node_path16.default.dirname(file),
-    staticAssetsOnly: !!(args.experimentalAssets || config.experimental_assets) && !(args.script && config.main),
     name: config.name ?? "worker"
   };
 }
@@ -162639,8 +162636,7 @@ function buildMiniflareBindingOptions(config) {
     }
   }
   const serviceBindings = {
-    ...config.serviceBindings,
-    ...config.experimentalAssets ? { ASSET_WORKER: "asset-worker" } : {}
+    ...config.serviceBindings
   };
   const notFoundServices = /* @__PURE__ */ new Set();
   for (const service of config.services ?? []) {
@@ -162842,6 +162838,19 @@ function buildPersistOptions(localPersistencePath) {
   }
 }
 __name(buildPersistOptions, "buildPersistOptions");
+function buildAssetOptions(config) {
+  if (config.experimentalAssets) {
+    return {
+      assets: {
+        workerName: config.name,
+        path: config.experimentalAssets.directory,
+        bindingName: config.experimentalAssets.binding,
+        routingConfig: config.experimentalAssets.routingConfig
+      }
+    };
+  }
+}
+__name(buildAssetOptions, "buildAssetOptions");
 function buildSitesOptions({
   legacyAssetPaths
 }) {
@@ -162955,6 +162964,7 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
   const { bindingOptions, internalObjects, externalWorkers } = buildMiniflareBindingOptions(config);
   const sitesOptions = buildSitesOptions(config);
   const persistOptions = buildPersistOptions(config.localPersistencePath);
+  const assetOptions = buildAssetOptions(config);
   const options29 = {
     host: config.initialIp,
     port: config.initialPort,
@@ -162974,6 +162984,7 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
         ...sourceOptions,
         ...bindingOptions,
         ...sitesOptions,
+        ...assetOptions,
         // Allow each entrypoint to be accessed directly over `127.0.0.1:0`
         unsafeDirectSockets: entrypointNames.map((name) => ({
           host: "127.0.0.1",
@@ -162982,53 +162993,12 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
           proxy: true
         }))
       },
-      ...getAssetServerWorker(config),
       ...externalWorkers
     ]
   };
   return { options: options29, internalObjects, entrypointNames };
 }
 __name(buildMiniflareOptions, "buildMiniflareOptions");
-function getAssetServerWorker(config) {
-  if (!config.experimentalAssets) {
-    return [];
-  }
-  const assetServerModulePath = require.resolve("@cloudflare/workers-shared/dist/asset-worker.mjs");
-  const assetServerConfigPath = require.resolve("@cloudflare/workers-shared/dist/asset-worker.toml");
-  let assetServerConfig;
-  try {
-    assetServerConfig = readConfig(assetServerConfigPath, {});
-  } catch (err) {
-    throw new UserError(
-      `Failed to read the Asset Worker configuration file.
-${err}`
-    );
-  }
-  return [
-    {
-      name: assetServerConfig?.name,
-      compatibilityDate: assetServerConfig?.compatibility_date,
-      compatibilityFlags: assetServerConfig?.compatibility_flags,
-      modulesRoot: (0, import_node_path22.dirname)(assetServerModulePath),
-      modules: [
-        {
-          type: "ESModule",
-          path: assetServerModulePath
-        }
-      ],
-      unsafeDirectSockets: [
-        {
-          host: "127.0.0.1",
-          port: 0
-        }
-      ],
-      assetsPath: config.experimentalAssets.directory,
-      assetsKVBindingName: "ASSETS_KV_NAMESPACE",
-      assetsManifestBindingName: "ASSETS_MANIFEST"
-    }
-  ];
-}
-__name(getAssetServerWorker, "getAssetServerWorker");
 var ReloadedEvent = class extends Event {
   url;
   internalDurableObjects;
@@ -163620,12 +163590,12 @@ function createWorkerUploadForm(worker) {
     tail_consumers,
     limits,
     annotations,
-    experimental_assets_jwt
+    experimental_assets
   } = worker;
-  if (main2.name === "no-op-assets-worker.js" && experimental_assets_jwt) {
+  if (experimental_assets && !experimental_assets.routingConfig.hasUserWorker) {
     formData.set(
       "metadata",
-      JSON.stringify({ assets: experimental_assets_jwt })
+      JSON.stringify({ assets: experimental_assets.jwt })
     );
     return formData;
   }
@@ -163918,7 +163888,7 @@ function createWorkerUploadForm(worker) {
     ...tail_consumers && { tail_consumers },
     ...limits && { limits },
     ...annotations && { annotations },
-    ...experimental_assets_jwt && { assets: experimental_assets_jwt }
+    ...experimental_assets && { assets: experimental_assets.jwt }
   };
   if (bindings.unsafe?.metadata !== void 0) {
     for (const key of Object.keys(bindings.unsafe.metadata)) {
@@ -165236,6 +165206,7 @@ function getExperimentalAssetsBasePath(config, experimentalAssetsCommandLineArg)
 __name(getExperimentalAssetsBasePath, "getExperimentalAssetsBasePath");
 function processExperimentalAssetsArg(args, config) {
   const experimentalAssets = args.experimentalAssets ? { directory: args.experimentalAssets } : config.experimental_assets;
+  let experimentalAssetsOptions;
   if (experimentalAssets) {
     const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
       config,
@@ -165253,8 +165224,15 @@ ${resolvedExperimentalAssetsPath}`
       );
     }
     experimentalAssets.directory = resolvedExperimentalAssetsPath;
+    const routingConfig = {
+      hasUserWorker: Boolean(args.script || config.main)
+    };
+    experimentalAssetsOptions = {
+      ...experimentalAssets,
+      routingConfig
+    };
   }
-  return experimentalAssets;
+  return experimentalAssetsOptions;
 }
 __name(processExperimentalAssetsArg, "processExperimentalAssetsArg");
 var encodeFilePath = /* @__PURE__ */ __name((filePath) => {
@@ -166799,6 +166777,96 @@ ${dashLink}`);
 }
 __name(triggersDeploy, "triggersDeploy");
 
+// src/versions/api.ts
+init_import_meta_url();
+async function fetchVersion(accountId, workerName, versionId, versionCache) {
+  const cachedVersion = versionCache?.get(versionId);
+  if (cachedVersion) {
+    return cachedVersion;
+  }
+  const version3 = await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${workerName}/versions/${versionId}`
+  );
+  versionCache?.set(version3.id, version3);
+  return version3;
+}
+__name(fetchVersion, "fetchVersion");
+async function fetchVersions(accountId, workerName, versionCache, ...versionIds) {
+  return Promise.all(
+    versionIds.map(
+      (versionId) => fetchVersion(accountId, workerName, versionId, versionCache)
+    )
+  );
+}
+__name(fetchVersions, "fetchVersions");
+async function fetchLatestDeployments(accountId, workerName) {
+  const { deployments: deployments2 } = await fetchResult(`/accounts/${accountId}/workers/scripts/${workerName}/deployments`);
+  return deployments2;
+}
+__name(fetchLatestDeployments, "fetchLatestDeployments");
+async function fetchLatestDeployment(accountId, workerName) {
+  const deployments2 = await fetchLatestDeployments(accountId, workerName);
+  return deployments2.at(0);
+}
+__name(fetchLatestDeployment, "fetchLatestDeployment");
+async function fetchDeploymentVersions(accountId, workerName, deployment, versionCache) {
+  if (!deployment) {
+    return [[], /* @__PURE__ */ new Map()];
+  }
+  const versionTraffic = new Map(
+    deployment.versions.map((v2) => [v2.version_id, v2.percentage])
+  );
+  const versions = await fetchVersions(
+    accountId,
+    workerName,
+    versionCache,
+    ...versionTraffic.keys()
+  );
+  return [versions, versionTraffic];
+}
+__name(fetchDeploymentVersions, "fetchDeploymentVersions");
+async function fetchDeployableVersions(accountId, workerName, versionCache) {
+  const { items: versions } = await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${workerName}/versions?deployable=true`
+  );
+  for (const version3 of versions) {
+    versionCache.set(version3.id, version3);
+  }
+  return versions;
+}
+__name(fetchDeployableVersions, "fetchDeployableVersions");
+async function createDeployment(accountId, workerName, versionTraffic, message, force) {
+  return await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${workerName}/deployments${force ? "?force=true" : ""}`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        strategy: "percentage",
+        versions: Array.from(versionTraffic).map(
+          ([version_id, percentage]) => ({ version_id, percentage })
+        ),
+        annotations: {
+          "workers/message": message
+        }
+      })
+    }
+  );
+}
+__name(createDeployment, "createDeployment");
+async function patchNonVersionedScriptSettings(accountId, workerName, settings) {
+  const res = await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${workerName}/script-settings`,
+    {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(settings)
+    }
+  );
+  return res;
+}
+__name(patchNonVersionedScriptSettings, "patchNonVersionedScriptSettings");
+
 // src/versions/deploy.ts
 init_import_meta_url();
 var import_assert2 = __toESM(require("assert"));
@@ -168554,96 +168622,6 @@ function collapseWhiteSpaceLines(input) {
 }
 __name(collapseWhiteSpaceLines, "collapseWhiteSpaceLines");
 
-// src/versions/api.ts
-init_import_meta_url();
-async function fetchVersion(accountId, workerName, versionId, versionCache) {
-  const cachedVersion = versionCache?.get(versionId);
-  if (cachedVersion) {
-    return cachedVersion;
-  }
-  const version3 = await fetchResult(
-    `/accounts/${accountId}/workers/scripts/${workerName}/versions/${versionId}`
-  );
-  versionCache?.set(version3.id, version3);
-  return version3;
-}
-__name(fetchVersion, "fetchVersion");
-async function fetchVersions(accountId, workerName, versionCache, ...versionIds) {
-  return Promise.all(
-    versionIds.map(
-      (versionId) => fetchVersion(accountId, workerName, versionId, versionCache)
-    )
-  );
-}
-__name(fetchVersions, "fetchVersions");
-async function fetchLatestDeployments(accountId, workerName) {
-  const { deployments: deployments2 } = await fetchResult(`/accounts/${accountId}/workers/scripts/${workerName}/deployments`);
-  return deployments2;
-}
-__name(fetchLatestDeployments, "fetchLatestDeployments");
-async function fetchLatestDeployment(accountId, workerName) {
-  const deployments2 = await fetchLatestDeployments(accountId, workerName);
-  return deployments2.at(0);
-}
-__name(fetchLatestDeployment, "fetchLatestDeployment");
-async function fetchDeploymentVersions(accountId, workerName, deployment, versionCache) {
-  if (!deployment) {
-    return [[], /* @__PURE__ */ new Map()];
-  }
-  const versionTraffic = new Map(
-    deployment.versions.map((v2) => [v2.version_id, v2.percentage])
-  );
-  const versions = await fetchVersions(
-    accountId,
-    workerName,
-    versionCache,
-    ...versionTraffic.keys()
-  );
-  return [versions, versionTraffic];
-}
-__name(fetchDeploymentVersions, "fetchDeploymentVersions");
-async function fetchDeployableVersions(accountId, workerName, versionCache) {
-  const { items: versions } = await fetchResult(
-    `/accounts/${accountId}/workers/scripts/${workerName}/versions?deployable=true`
-  );
-  for (const version3 of versions) {
-    versionCache.set(version3.id, version3);
-  }
-  return versions;
-}
-__name(fetchDeployableVersions, "fetchDeployableVersions");
-async function createDeployment(accountId, workerName, versionTraffic, message, force) {
-  return await fetchResult(
-    `/accounts/${accountId}/workers/scripts/${workerName}/deployments${force ? "?force=true" : ""}`,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        strategy: "percentage",
-        versions: Array.from(versionTraffic).map(
-          ([version_id, percentage]) => ({ version_id, percentage })
-        ),
-        annotations: {
-          "workers/message": message
-        }
-      })
-    }
-  );
-}
-__name(createDeployment, "createDeployment");
-async function patchNonVersionedScriptSettings(accountId, workerName, settings) {
-  const res = await fetchResult(
-    `/accounts/${accountId}/workers/scripts/${workerName}/script-settings`,
-    {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(settings)
-    }
-  );
-  return res;
-}
-__name(patchNonVersionedScriptSettings, "patchNonVersionedScriptSettings");
-
 // src/versions/deploy.ts
 var EPSILON = 1e-3;
 var BLANK_INPUT = "-";
@@ -169478,11 +169456,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       legacyEnv: props.legacyEnv,
       env: props.env
     }) : void 0;
-    const experimentalAssetsJwt = props.experimentalAssets && !props.dryRun ? await syncExperimentalAssets(
-      accountId,
-      scriptName,
-      props.experimentalAssets.directory
-    ) : void 0;
+    const experimentalAssetsOptions = props.experimentalAssetsOptions && !props.dryRun ? {
+      routingConfig: props.experimentalAssetsOptions?.routingConfig,
+      jwt: await syncExperimentalAssets(
+        accountId,
+        scriptName,
+        props.experimentalAssetsOptions.directory
+      )
+    } : void 0;
     const legacyAssets = await syncLegacyAssets(
       accountId,
       // When we're using the newer service environments, we wouldn't
@@ -169564,7 +169545,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       placement,
       tail_consumers: config.tail_consumers,
       limits: config.limits,
-      experimental_assets_jwt: experimentalAssetsJwt
+      experimental_assets: experimentalAssetsOptions
     };
     sourceMapSize = worker.sourceMaps?.reduce(
       (acc, m2) => acc + m2.content.length,
@@ -169589,6 +169570,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     if (props.dryRun) {
       printBindings({ ...withoutStaticAssets, vars: maskedVars });
     } else {
+      (0, import_node_assert16.default)(accountId, "Missing accountId");
       await ensureQueuesExistByConfig(config);
       let bindingsPrinted = false;
       try {
@@ -169618,6 +169600,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
               headers: await getMetricsUsageHeaders(config.send_metrics)
             }
           );
+          await patchNonVersionedScriptSettings(accountId, scriptName, {
+            tail_consumers: worker.tail_consumers,
+            logpush: worker.logpush
+          });
           const { available_on_subdomain } = await fetchResult(`/accounts/${accountId}/workers/scripts/${scriptName}/subdomain`);
           result = {
             available_on_subdomain,
@@ -169714,7 +169700,6 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
     logger.log(`--dry-run: exiting now.`);
     return { versionId, workerTag };
   }
-  (0, import_node_assert16.default)(accountId, "Missing accountId");
   const uploadMs = Date.now() - start;
   logger.log("Uploaded", workerName, formatTime2(uploadMs));
   if (props.dispatchNamespace !== void 0) {
@@ -171117,7 +171102,7 @@ async function createRemoteWorkerInit(props) {
     // no tail consumers in dev - TODO revisit?
     limits: void 0,
     // no limits in preview - not supported yet but can be added
-    experimental_assets_jwt: void 0
+    experimental_assets: void 0
     // no remote mode for assets
   };
   return init3;
@@ -185080,7 +185065,7 @@ Please shift to the --legacy-assets command to preserve the current functionalit
       "The --assets argument is experimental and may change or break at any time"
     );
   }
-  const experimentalAssets = processExperimentalAssetsArg(args, config);
+  const experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
   if (args.latest) {
     logger.warn(
       "Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.\n"
@@ -185118,7 +185103,7 @@ Please shift to the --legacy-assets command to preserve the current functionalit
     jsxFragment: args.jsxFragment,
     tsconfig: args.tsconfig,
     routes: args.routes,
-    experimentalAssets,
+    experimentalAssetsOptions,
     legacyAssetPaths,
     legacyEnv: isLegacyEnv(config),
     minify: args.minify,
@@ -188435,7 +188420,7 @@ function createWorkerBundleFormData(workerBundle, config) {
     placement,
     tail_consumers: void 0,
     limits: config?.limits,
-    experimental_assets_jwt: void 0
+    experimental_assets: void 0
   };
   return createWorkerUploadForm(worker);
 }
@@ -195328,7 +195313,7 @@ async function createDraftWorker({
         placement: void 0,
         tail_consumers: void 0,
         limits: void 0,
-        experimental_assets_jwt: void 0
+        experimental_assets: void 0
       })
     }
   );
@@ -207007,7 +206992,7 @@ async function copyWorkerVersionWithNewSecrets({
       "workers/message": versionMessage,
       "workers/tag": versionTag
     },
-    experimental_assets_jwt: void 0
+    experimental_assets: void 0
   };
   const body = createWorkerUploadForm(worker);
   const result = await fetchResult(
@@ -207298,11 +207283,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       legacyEnv: props.legacyEnv,
       env: props.env
     }) : void 0;
-    const experimentalAssetsJwt = props.experimentalAssets && !props.dryRun ? await syncExperimentalAssets(
-      accountId,
-      scriptName,
-      props.experimentalAssets.directory
-    ) : void 0;
+    const experimentalAssetsOptions = props.experimentalAssetsOptions && !props.dryRun ? {
+      routingConfig: props.experimentalAssetsOptions?.routingConfig,
+      jwt: await syncExperimentalAssets(
+        accountId,
+        scriptName,
+        props.experimentalAssetsOptions.directory
+      )
+    } : void 0;
     const bindings = {
       kv_namespaces: config.kv_namespaces || [],
       send_email: config.send_email,
@@ -207362,7 +207350,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         "workers/message": props.message,
         "workers/tag": props.tag
       },
-      experimental_assets_jwt: experimentalAssetsJwt
+      experimental_assets: experimentalAssetsOptions
     };
     await printBundleSize(
       { name: import_node_path61.default.basename(resolvedEntryPointPath), content },
@@ -207830,7 +207818,7 @@ async function versionsUploadHandler(args) {
       "Legacy Assets does not support uploading versions through `wrangler versions upload`. You must use `wrangler deploy` instead."
     );
   }
-  const experimentalAssets = processExperimentalAssetsArg(args, config);
+  const experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
   if (args.latest) {
     logger.warn(
       "Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.\n"
@@ -207858,7 +207846,7 @@ async function versionsUploadHandler(args) {
     jsxFactory: args.jsxFactory,
     jsxFragment: args.jsxFragment,
     tsconfig: args.tsconfig,
-    experimentalAssets,
+    experimentalAssetsOptions,
     minify: args.minify,
     uploadSourceMaps: args.uploadSourceMaps,
     nodeCompat: args.nodeCompat,
@@ -209303,7 +209291,8 @@ Please shift to the --legacy-assets command to preserve the current functionalit
     throw new UserError("Cannot use both --assets and --legacy-assets.");
   }
   args.legacyAssets = args.legacyAssets ?? args.assets;
-  let watcher;
+  let configFileWatcher;
+  let assetsWatcher;
   try {
     const devInstance = await run(
       {
@@ -209318,12 +209307,16 @@ Please shift to the --legacy-assets command to preserve the current functionalit
       await import_node_events3.default.once(devInstance, "teardown");
     } else {
       (0, import_node_assert22.default)(!(devInstance instanceof DevEnv));
-      watcher = devInstance.watcher;
+      configFileWatcher = devInstance.configFileWatcher;
+      assetsWatcher = devInstance.assetsWatcher;
       const { waitUntilExit } = devInstance.devReactElement;
       await waitUntilExit();
     }
   } finally {
-    await watcher?.close();
+    await Promise.allSettled([
+      configFileWatcher?.close(),
+      assetsWatcher?.close()
+    ]);
   }
 }
 __name(devHandler, "devHandler");
@@ -209380,7 +209373,8 @@ async function getPagesAssetsFetcher(options29) {
 }
 __name(getPagesAssetsFetcher, "getPagesAssetsFetcher");
 async function startDev(args) {
-  let watcher;
+  let configFileWatcher;
+  let assetsWatcher;
   let rerender;
   try {
     const configPath = args.config || args.script && findWranglerToml(import_node_path63.default.dirname(args.script));
@@ -209415,11 +209409,11 @@ Move any existing data to .wrangler/state and use --persist, or
 use --persist-to=./wrangler-local-state to keep using the old path.`
       );
     }
-    const experimentalAssets = processExperimentalAssetsArg(args, config);
-    if (experimentalAssets) {
+    let experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
+    if (experimentalAssetsOptions) {
       args.forceLocal = true;
     }
-    if ((args.legacyAssets || config.legacy_assets) && experimentalAssets) {
+    if ((args.legacyAssets || config.legacy_assets) && experimentalAssetsOptions) {
       throw new UserError(
         "Cannot use Legacy Assets and Experimental Assets in the same Worker."
       );
@@ -209581,7 +209575,10 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           enableServiceEnvironments: !(args.legacyEnv ?? true)
         },
         experimental: {
-          assets: experimentalAssets
+          // only pass `experimentalAssetsOptions` if it came from args not from config
+          // otherwise config at startup ends up overriding future config changes in the
+          // ConfigController
+          assets: args.experimentalAssets ? experimentalAssetsOptions : void 0
         }
       });
       void sendMetricsEvent(
@@ -209600,13 +209597,35 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
       return devEnv;
     }
     if (config.configPath && !args.experimentalDevEnv) {
-      watcher = (0, import_chokidar6.watch)(config.configPath, {
+      configFileWatcher = (0, import_chokidar6.watch)(config.configPath, {
         persistent: true
       }).on("change", async (_event) => {
-        config = readConfig(configPath, args);
-        if (config.configPath) {
+        try {
+          config = readConfig(configPath, args);
+          if (!config.configPath) {
+            return;
+          }
           logger.log(`${import_node_path63.default.basename(config.configPath)} changed...`);
+          if (experimentalAssetsOptions && !args.experimentalAssets) {
+            await assetsWatcher?.close();
+            experimentalAssetsOptions = processExperimentalAssetsArg(
+              args,
+              config
+            );
+            if (experimentalAssetsOptions) {
+              assetsWatcher = (0, import_chokidar6.watch)(experimentalAssetsOptions.directory, {
+                persistent: true,
+                ignoreInitial: true
+              }).on("all", async (eventName, changedPath) => {
+                const message = getAssetChangeMessage(eventName, changedPath);
+                logger.log(`\u{1F300} ${message}...`);
+                rerender(await getDevReactElement(config));
+              });
+            }
+          }
           rerender(await getDevReactElement(config));
+        } catch (err) {
+          logger.error(err);
         }
       });
     }
@@ -209677,7 +209696,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
           legacyAssetPaths,
           legacyAssetsConfig: configParam.legacy_assets,
-          experimentalAssets,
+          experimentalAssets: experimentalAssetsOptions,
           initialPort: args.port ?? configParam.dev.port ?? await getLocalPort2(),
           initialIp: args.ip || configParam.dev.ip,
           inspectorPort: args.inspectorPort ?? configParam.dev.inspector_port ?? await getInspectorPort2(),
@@ -209710,16 +209729,33 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
     __name(getDevReactElement, "getDevReactElement");
     const devReactElement = (0, import_ink13.render)(await getDevReactElement(config));
     rerender = devReactElement.rerender;
+    if (experimentalAssetsOptions && !args.experimentalDevEnv) {
+      assetsWatcher = (0, import_chokidar6.watch)(experimentalAssetsOptions.directory, {
+        persistent: true,
+        ignoreInitial: true
+      }).on("all", async (eventName, filePath) => {
+        const message = getAssetChangeMessage(eventName, filePath);
+        logger.log(`\u{1F300} ${message}...`);
+        rerender(await getDevReactElement(config));
+      });
+    }
     return {
       devReactElement,
-      watcher,
+      configFileWatcher,
+      assetsWatcher,
       stop: async () => {
         devReactElement.unmount();
-        await watcher?.close();
+        await Promise.allSettled([
+          configFileWatcher?.close(),
+          assetsWatcher?.close()
+        ]);
       }
     };
   } catch (e3) {
-    await watcher?.close();
+    await Promise.allSettled([
+      configFileWatcher?.close(),
+      assetsWatcher?.close()
+    ]);
     throw e3;
   }
 }
@@ -210150,6 +210186,25 @@ function getBindings(configParam, env7, local, args) {
   return bindings;
 }
 __name(getBindings, "getBindings");
+function getAssetChangeMessage(eventName, assetPath) {
+  let message = `${assetPath} changed`;
+  switch (eventName) {
+    case "add":
+      message = `File ${assetPath} was added`;
+      break;
+    case "addDir":
+      message = `Directory ${assetPath} was added`;
+      break;
+    case "unlink":
+      message = `File ${assetPath} was removed`;
+      break;
+    case "unlinkDir":
+      message = `Directory ${assetPath} was removed`;
+      break;
+  }
+  return message;
+}
+__name(getAssetChangeMessage, "getAssetChangeMessage");
 
 // src/api/dev.ts
 async function unstable_dev(script, options29, apiOptions) {
@@ -210764,6 +210819,13 @@ async function resolveConfig(config, input) {
   );
   const nodejsCompatMode = unwrapHook(input.build?.nodejsCompatMode, config);
   const { bindings, unsafe } = await resolveBindings(config, input);
+  const experimentalAssetsOptions = processExperimentalAssetsArg(
+    {
+      experimentalAssets: input?.experimental?.assets?.directory,
+      script: input.entrypoint
+    },
+    config
+  );
   const resolved = {
     name: getScriptName({ name: input.name, env: input.env }, config),
     compatibilityDate: getDevCompatibilityDate(config, input.compatibilityDate),
@@ -210805,7 +210867,7 @@ async function resolveConfig(config, input) {
       metadata: input.unsafe?.metadata ?? unsafe?.metadata
     },
     experimental: {
-      assets: input?.experimental?.assets
+      assets: experimentalAssetsOptions
     }
   };
   if (resolved.legacy.legacyAssets && resolved.legacy.site) {
@@ -210839,12 +210901,14 @@ var ConfigController = class extends Controller {
   latestInput;
   latestConfig;
   #configWatcher;
+  #assetsWatcher;
   #abortController;
   async #ensureWatchingConfig(configPath) {
     await this.#configWatcher?.close();
     if (configPath) {
       this.#configWatcher = (0, import_chokidar8.watch)(configPath, {
-        persistent: true
+        persistent: true,
+        ignoreInitial: true
       }).on("change", async (_event) => {
         logger.log(`${import_node_path64.default.basename(configPath)} changed...`);
         (0, import_node_assert23.default)(
@@ -210855,6 +210919,23 @@ var ConfigController = class extends Controller {
       });
     }
   }
+  async #ensureWatchingAssets(assetsPath) {
+    await this.#assetsWatcher?.close();
+    if (assetsPath) {
+      this.#assetsWatcher = (0, import_chokidar8.watch)(assetsPath, {
+        persistent: true,
+        ignoreInitial: true
+      }).on("all", async (eventName, filePath) => {
+        const message = getAssetChangeMessage(eventName, filePath);
+        logger.log(`\u{1F300} ${message}...`);
+        (0, import_node_assert23.default)(
+          this.latestInput,
+          "Cannot be watching config without having first set an input"
+        );
+        void this.#updateConfig(this.latestInput);
+      });
+    }
+  }
   set(input) {
     return this.#updateConfig(input);
   }
@@ -210874,29 +210955,43 @@ var ConfigController = class extends Controller {
     this.#abortController = new AbortController();
     const signal = this.#abortController.signal;
     this.latestInput = input;
-    const fileConfig = readConfig(input.config, {
-      env: input.env,
-      "dispatch-namespace": void 0,
-      "legacy-env": !input.legacy?.enableServiceEnvironments,
-      remote: input.dev?.remote,
-      upstreamProtocol: input.dev?.origin?.secure === void 0 ? void 0 : input.dev?.origin?.secure ? "https" : "http",
-      localProtocol: input.dev?.server?.secure === void 0 ? void 0 : input.dev?.server?.secure ? "https" : "http"
-    });
-    void this.#ensureWatchingConfig(fileConfig.configPath);
-    const resolvedConfig = await resolveConfig(fileConfig, input);
-    if (signal.aborted) {
-      return;
+    try {
+      const fileConfig = readConfig(input.config, {
+        env: input.env,
+        "dispatch-namespace": void 0,
+        "legacy-env": !input.legacy?.enableServiceEnvironments,
+        remote: input.dev?.remote,
+        upstreamProtocol: input.dev?.origin?.secure === void 0 ? void 0 : input.dev?.origin?.secure ? "https" : "http",
+        localProtocol: input.dev?.server?.secure === void 0 ? void 0 : input.dev?.server?.secure ? "https" : "http"
+      });
+      void this.#ensureWatchingConfig(fileConfig.configPath);
+      const experimentalAssets = processExperimentalAssetsArg(
+        { experimentalAssets: input.experimental?.assets?.directory },
+        fileConfig
+      );
+      if (experimentalAssets) {
+        void this.#ensureWatchingAssets(experimentalAssets.directory);
+      }
+      const resolvedConfig = await resolveConfig(fileConfig, input);
+      if (signal.aborted) {
+        return;
+      }
+      this.latestConfig = resolvedConfig;
+      this.emitConfigUpdateEvent(resolvedConfig);
+      return this.latestConfig;
+    } catch (err) {
+      logger.error(err);
     }
-    this.latestConfig = resolvedConfig;
-    this.emitConfigUpdateEvent(resolvedConfig);
-    return this.latestConfig;
   }
   // ******************
   //   Event Handlers
   // ******************
   async teardown() {
     logger.debug("ConfigController teardown beginning...");
-    await this.#configWatcher?.close();
+    await Promise.allSettled([
+      this.#configWatcher?.close(),
+      this.#assetsWatcher?.close()
+    ]);
     logger.debug("ConfigController teardown complete");
   }
   // *********************
@@ -212921,4 +213016,3 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
-//# sourceMappingURL=cli.js.map