wrangler 3.67.1 → 3.69.0

package/wrangler-dist/cli.js

@@ -22039,10 +22039,10 @@ var require_lodash = __commonJS({
           };
         }
         __name(negate, "negate");
-        function once(func) {
+        function once2(func) {
           return before(2, func);
         }
-        __name(once, "once");
+        __name(once2, "once");
         var overArgs = castRest(function(func, transforms) {
           transforms = transforms.length == 1 && isArray(transforms[0]) ? arrayMap(transforms[0], baseUnary(getIteratee())) : arrayMap(baseFlatten(transforms, 1), baseUnary(getIteratee()));
           var funcsLength = transforms.length;
@@ -23291,7 +23291,7 @@ var require_lodash = __commonJS({
         lodash.nthArg = nthArg;
         lodash.omit = omit;
         lodash.omitBy = omitBy;
-        lodash.once = once;
+        lodash.once = once2;
         lodash.orderBy = orderBy;
         lodash.over = over;
         lodash.overArgs = overArgs;
@@ -80042,7 +80042,7 @@ var require_view = __commonJS({
     var debug = require_src2()("express:view");
     var path74 = require("path");
     var fs26 = require("fs");
-    var dirname15 = path74.dirname;
+    var dirname16 = path74.dirname;
     var basename5 = path74.basename;
     var extname5 = path74.extname;
     var join17 = path74.join;
@@ -80082,7 +80082,7 @@ var require_view = __commonJS({
       for (var i = 0; i < roots.length && !path75; i++) {
         var root = roots[i];
         var loc = resolve20(root, name);
-        var dir = dirname15(loc);
+        var dir = dirname16(loc);
         var file = basename5(loc);
         path75 = this.resolve(dir, file);
       }
@@ -97442,9 +97442,9 @@ var require_command_exists = __commonJS({
       cleanInput = /* @__PURE__ */ __name(function(s) {
         var isPathName = /[\\]/.test(s);
         if (isPathName) {
-          var dirname15 = '"' + path74.dirname(s) + '"';
+          var dirname16 = '"' + path74.dirname(s) + '"';
           var basename5 = '"' + path74.basename(s) + '"';
-          return dirname15 + ":" + basename5;
+          return dirname16 + ":" + basename5;
         }
         return '"' + s + '"';
       }, "cleanInput");
@@ -125409,12 +125409,12 @@ var require_set_cookie = __commonJS({
       map: false,
       silent: false
     };
-    function isNonEmptyString(str) {
+    function isNonEmptyString2(str) {
       return typeof str === "string" && !!str.trim();
     }
-    __name(isNonEmptyString, "isNonEmptyString");
+    __name(isNonEmptyString2, "isNonEmptyString");
     function parseString(setCookieValue, options21) {
-      var parts = setCookieValue.split(";").filter(isNonEmptyString);
+      var parts = setCookieValue.split(";").filter(isNonEmptyString2);
       var nameValuePairStr = parts.shift();
       var parsed = parseNameValuePair(nameValuePairStr);
       var name = parsed.name;
@@ -125497,12 +125497,12 @@ var require_set_cookie = __commonJS({
       }
       options21 = options21 ? Object.assign({}, defaultParseOptions, options21) : defaultParseOptions;
       if (!options21.map) {
-        return input.filter(isNonEmptyString).map(function(str) {
+        return input.filter(isNonEmptyString2).map(function(str) {
           return parseString(str, options21);
         });
       } else {
         var cookies = {};
-        return input.filter(isNonEmptyString).reduce(function(cookies2, str) {
+        return input.filter(isNonEmptyString2).reduce(function(cookies2, str) {
           var cookie = parseString(str, options21);
           cookies2[cookie.name] = cookie;
           return cookies2;
@@ -135302,21 +135302,21 @@ Make sure "${service}" is mounted so Miniflare knows where to find it.`);
       getEventListeners: () => getEventListeners,
       listenerCount: () => listenerCount,
       on: () => on,
-      once: () => once,
+      once: () => once2,
       setMaxListeners: () => setMaxListeners
     });
-    var import_node_events6 = __toModule(require("node:events"));
-    var events_default = import_node_events6.default;
-    var EventEmitter5 = import_node_events6.default.EventEmitter;
-    var EventEmitterAsyncResource = import_node_events6.default.EventEmitterAsyncResource;
-    var captureRejectionSymbol = import_node_events6.default.captureRejectionSymbol;
-    var defaultMaxListeners = import_node_events6.default.defaultMaxListeners;
-    var errorMonitor = import_node_events6.default.errorMonitor;
-    var getEventListeners = import_node_events6.default.getEventListeners;
-    var listenerCount = import_node_events6.default.listenerCount;
-    var on = import_node_events6.default.on;
-    var once = import_node_events6.default.once;
-    var setMaxListeners = import_node_events6.default.setMaxListeners;
+    var import_node_events7 = __toModule(require("node:events"));
+    var events_default = import_node_events7.default;
+    var EventEmitter5 = import_node_events7.default.EventEmitter;
+    var EventEmitterAsyncResource = import_node_events7.default.EventEmitterAsyncResource;
+    var captureRejectionSymbol = import_node_events7.default.captureRejectionSymbol;
+    var defaultMaxListeners = import_node_events7.default.defaultMaxListeners;
+    var errorMonitor = import_node_events7.default.errorMonitor;
+    var getEventListeners = import_node_events7.default.getEventListeners;
+    var listenerCount = import_node_events7.default.listenerCount;
+    var on = import_node_events7.default.on;
+    var once2 = import_node_events7.default.once;
+    var setMaxListeners = import_node_events7.default.setMaxListeners;
     var util_exports = {};
     __export2(util_exports, {
       _extend: () => import_node_util4._extend,
@@ -142444,17 +142444,17 @@ var require_eventemitter3 = __commonJS({
       if (!new Events().__proto__)
         prefix = false;
     }
-    function EE(fn2, context2, once) {
+    function EE(fn2, context2, once2) {
       this.fn = fn2;
       this.context = context2;
-      this.once = once || false;
+      this.once = once2 || false;
     }
     __name(EE, "EE");
-    function addListener(emitter, event, fn2, context2, once) {
+    function addListener(emitter, event, fn2, context2, once2) {
       if (typeof fn2 !== "function") {
         throw new TypeError("The listener must be a function");
       }
-      var listener = new EE(fn2, context2 || emitter, once), evt = prefix ? prefix + event : event;
+      var listener = new EE(fn2, context2 || emitter, once2), evt = prefix ? prefix + event : event;
       if (!emitter._events[evt])
         emitter._events[evt] = listener, emitter._eventsCount++;
       else if (!emitter._events[evt].fn)
@@ -142566,10 +142566,10 @@ var require_eventemitter3 = __commonJS({
     EventEmitter5.prototype.on = /* @__PURE__ */ __name(function on(event, fn2, context2) {
       return addListener(this, event, fn2, context2, false);
     }, "on");
-    EventEmitter5.prototype.once = /* @__PURE__ */ __name(function once(event, fn2, context2) {
+    EventEmitter5.prototype.once = /* @__PURE__ */ __name(function once2(event, fn2, context2) {
       return addListener(this, event, fn2, context2, true);
     }, "once");
-    EventEmitter5.prototype.removeListener = /* @__PURE__ */ __name(function removeListener(event, fn2, context2, once) {
+    EventEmitter5.prototype.removeListener = /* @__PURE__ */ __name(function removeListener(event, fn2, context2, once2) {
       var evt = prefix ? prefix + event : event;
       if (!this._events[evt])
         return this;
@@ -142579,12 +142579,12 @@ var require_eventemitter3 = __commonJS({
       }
       var listeners = this._events[evt];
       if (listeners.fn) {
-        if (listeners.fn === fn2 && (!once || listeners.once) && (!context2 || listeners.context === context2)) {
+        if (listeners.fn === fn2 && (!once2 || listeners.once) && (!context2 || listeners.context === context2)) {
           clearEvent(this, evt);
         }
       } else {
         for (var i = 0, events4 = [], length = listeners.length; i < length; i++) {
-          if (listeners[i].fn !== fn2 || once && !listeners[i].once || context2 && listeners[i].context !== context2) {
+          if (listeners[i].fn !== fn2 || once2 && !listeners[i].once || context2 && listeners[i].context !== context2) {
             events4.push(listeners[i]);
           }
         }
@@ -151168,8 +151168,7 @@ var import_undici25 = __toESM(require_undici());
 // src/dev.tsx
 init_import_meta_url();
 var import_node_assert21 = __toESM(require("node:assert"));
-var import_node_events2 = __toESM(require("node:events"));
-var import_node_fs35 = require("node:fs");
+var import_node_events3 = __toESM(require("node:events"));
 var import_node_path63 = __toESM(require("node:path"));
 var import_node_util3 = __toESM(require("node:util"));
 var import_env2 = __toESM(require_dist());
@@ -151351,8 +151350,8 @@ function convertCfWorkerInitBindingstoBindings(inputBindings) {
         break;
       }
       case "unsafe": {
-        for (const { type: unsafeType, name } of info.bindings ?? []) {
-          output[name] = { type: `unsafe_${unsafeType}` };
+        for (const { type: unsafeType, name, ...data } of info.bindings ?? []) {
+          output[name] = { type: `unsafe_${unsafeType}`, ...data };
         }
         break;
       }
@@ -151464,9 +151463,11 @@ async function convertBindingsToCfWorkerInitBindings(inputBindings) {
         metadata: void 0,
         capnp: void 0
       };
+      const { type, ...data } = binding;
       bindings.unsafe.bindings?.push({
-        type: binding.type.slice("unsafe_".length),
-        name
+        type: type.slice("unsafe_".length),
+        name,
+        ...data
       });
     }
   }
@@ -152671,7 +152672,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.67.1";
+var version = "3.69.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -152758,7 +152759,7 @@ var package_default = {
     selfsigned: "^2.0.1",
     "source-map": "^0.6.1",
     unenv: "npm:unenv-nightly@1.10.0-1717606461.a117952",
-    workerd: "1.20240718.0",
+    workerd: "1.20240725.0",
     "xxhash-wasm": "^1.0.1"
   },
   devDependencies: {
@@ -152766,8 +152767,9 @@ var package_default = {
     "@cloudflare/eslint-config-worker": "workspace:*",
     "@cloudflare/pages-shared": "workspace:^",
     "@cloudflare/types": "^6.18.4",
+    "@cloudflare/workers-shared": "workspace:*",
     "@cloudflare/workers-tsconfig": "workspace:*",
-    "@cloudflare/workers-types": "^4.20240718.0",
+    "@cloudflare/workers-types": "^4.20240725.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -152838,7 +152840,6 @@ var package_default = {
     "strip-ansi": "^7.1.0",
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
-    "tree-kill": "^1.2.2",
     "ts-dedent": "^2.2.0",
     "ts-json-schema-generator": "^1.5.0",
     undici: "^5.28.4",
@@ -152851,7 +152852,7 @@ var package_default = {
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz"
   },
   peerDependencies: {
-    "@cloudflare/workers-types": "^4.20240718.0"
+    "@cloudflare/workers-types": "^4.20240725.0"
   },
   peerDependenciesMeta: {
     "@cloudflare/workers-types": {
@@ -154379,6 +154380,16 @@ var isString = /* @__PURE__ */ __name((diagnostics, field, value) => {
   }
   return true;
 }, "isString");
+var isNonEmptyString = /* @__PURE__ */ __name((diagnostics, field, value, topLevelEnv) => {
+  if (!isString(diagnostics, field, value, topLevelEnv)) {
+    return false;
+  }
+  if (value?.trim() === "") {
+    diagnostics.errors.push(`Expected "${field}" to be a non-empty string.`);
+    return false;
+  }
+  return true;
+}, "isNonEmptyString");
 var isValidName = /* @__PURE__ */ __name((diagnostics, field, value) => {
   if (typeof value === "string" && /^$|^[a-z0-9_ ][a-z0-9-_ ]*$/.test(value) || value === void 0) {
     return true;
@@ -156151,6 +156162,12 @@ var validateAssetsConfig = /* @__PURE__ */ __name((diagnostics, field, value) =>
     value.directory,
     "string"
   ) && isValid;
+  isValid = isNonEmptyString(
+    diagnostics,
+    `${field}.directory`,
+    value.directory,
+    void 0
+  ) && isValid;
   isValid = validateOptionalProperty(
     diagnostics,
     field,
@@ -158970,7 +158987,7 @@ async function bundleWorker(entry, destination, {
   bundle,
   moduleCollector = noopModuleCollector,
   additionalModules = [],
-  serveAssetsFromWorker,
+  serveLegacyAssetsFromWorker,
   doBindings,
   jsxFactory,
   jsxFragment,
@@ -159021,7 +159038,7 @@ async function bundleWorker(entry, destination, {
       supports: ["modules", "service-worker"]
     });
   }
-  if (serveAssetsFromWorker) {
+  if (serveLegacyAssetsFromWorker) {
     middlewareToLoad.push({
       name: "serve-static-assets",
       path: "templates/middleware/middleware-serve-static-assets.ts",
@@ -159374,8 +159391,10 @@ 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 || args.experimentalAssets || config.experimental_assets) {
+    } else if (args.legacyAssets || config.legacy_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.`
@@ -162585,7 +162604,8 @@ function buildMiniflareBindingOptions(config) {
     }
   }
   const serviceBindings = {
-    ...config.serviceBindings
+    ...config.serviceBindings,
+    ...config.experimentalAssets ? { ASSET_SERVER: "asset-server" } : {}
   };
   const notFoundServices = /* @__PURE__ */ new Set();
   for (const service of config.services ?? []) {
@@ -162788,10 +162808,10 @@ function buildPersistOptions(localPersistencePath) {
 }
 __name(buildPersistOptions, "buildPersistOptions");
 function buildSitesOptions({
-  assetPaths
+  legacyAssetPaths
 }) {
-  if (assetPaths !== void 0) {
-    const { baseDirectory, assetDirectory, includePatterns, excludePatterns } = assetPaths;
+  if (legacyAssetPaths !== void 0) {
+    const { baseDirectory, assetDirectory, includePatterns, excludePatterns } = legacyAssetPaths;
     return {
       sitePath: import_node_path22.default.join(baseDirectory, assetDirectory),
       siteInclude: includePatterns.length > 0 ? includePatterns : void 0,
@@ -162881,6 +162901,35 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
       );
     }
   }
+  const assetServerModulePath = require.resolve("@cloudflare/workers-shared/dist/asset-server-worker.mjs");
+  const assetServerConfigPath = require.resolve("@cloudflare/workers-shared/asset-server-worker/wrangler.toml");
+  let assetServerConfig;
+  try {
+    assetServerConfig = readConfig(assetServerConfigPath, {});
+  } catch (err) {
+    throw new UserError(
+      `Failed to read the Asset Server Worker configuration file.
+${err}`
+    );
+  }
+  const assetServerWorker = config.experimentalAssets ? {
+    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
+      }
+    ]
+  } : void 0;
   const upstream = typeof config.localUpstream === "string" ? `${config.upstreamProtocol}://${config.localUpstream}` : void 0;
   const { sourceOptions, entrypointNames } = await buildSourceOptions(config);
   const { bindingOptions, internalObjects, externalWorkers } = buildMiniflareBindingOptions(config);
@@ -162913,6 +162962,7 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
           proxy: true
         }))
       },
+      ...config.experimentalAssets ? [assetServerWorker] : [],
       ...externalWorkers
     ]
   };
@@ -163024,7 +163074,8 @@ async function localPropsToConfigBundle(props) {
     inspectorPort: props.runtimeInspectorPort,
     bindings: props.bindings,
     workerDefinitions: props.workerDefinitions,
-    assetPaths: props.assetPaths,
+    legacyAssetPaths: props.legacyAssetPaths,
+    experimentalAssets: props.experimentalAssets,
     initialPort: props.initialPort,
     initialIp: props.initialIp,
     rules: props.rules,
@@ -163381,11 +163432,6 @@ async function printBundleSize(main2, modules) {
   const percentage = gzipSize / ALLOWED_INITIAL_MAX * 100;
   const colorizedReport = percentage > 90 ? source_default.red(bundleReport) : percentage > 70 ? source_default.yellow(bundleReport) : source_default.green(bundleReport);
   logger.log(`Total Upload: ${colorizedReport}`);
-  if (gzipSize > ALLOWED_INITIAL_MAX && !process.env.NO_SCRIPT_SIZE_WARNING) {
-    logger.warn(
-      "We recommend keeping your script less than 1MiB (1024 KiB) after gzip. Exceeding this can affect cold start time. Consider using Wrangler's `--minify` option to reduce your bundle size."
-    );
-  }
 }
 __name(printBundleSize, "printBundleSize");
 function printOffendingDependencies(dependencies) {
@@ -177879,16 +177925,39 @@ __name(checkAndConfirmForceDeleteIfNecessary, "checkAndConfirmForceDeleteIfNeces
 
 // src/deploy/index.ts
 init_import_meta_url();
-var import_node_fs20 = require("node:fs");
 var import_node_path34 = __toESM(require("node:path"));
 
 // src/experimental-assets.ts
 init_import_meta_url();
+var import_node_fs20 = require("node:fs");
 var import_node_path33 = __toESM(require("node:path"));
-function getExperimentalAssetsBasePath(config, experimentalAssetsDirectory) {
-  return experimentalAssetsDirectory ? process.cwd() : import_node_path33.default.resolve(import_node_path33.default.dirname(config.configPath ?? "wrangler.toml"));
+function getExperimentalAssetsBasePath(config, experimentalAssetsCommandLineArg) {
+  return experimentalAssetsCommandLineArg ? process.cwd() : import_node_path33.default.resolve(import_node_path33.default.dirname(config.configPath ?? "wrangler.toml"));
 }
 __name(getExperimentalAssetsBasePath, "getExperimentalAssetsBasePath");
+function processExperimentalAssetsArg(args, config) {
+  const experimentalAssets = args.experimentalAssets ? { directory: args.experimentalAssets } : config.experimental_assets;
+  if (experimentalAssets) {
+    const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
+      config,
+      args.experimentalAssets
+    );
+    const resolvedExperimentalAssetsPath = import_node_path33.default.resolve(
+      experimentalAssetsBasePath,
+      experimentalAssets.directory
+    );
+    if (!(0, import_node_fs20.existsSync)(resolvedExperimentalAssetsPath)) {
+      const sourceOfTruthMessage = args.experimentalAssets ? '"--experimental-assets" command line argument' : '"experimental_assets.directory" field in your configuration file';
+      throw new UserError(
+        `The directory specified by the ${sourceOfTruthMessage} does not exist:
+${resolvedExperimentalAssetsPath}`
+      );
+    }
+    experimentalAssets.directory = resolvedExperimentalAssetsPath;
+  }
+  return experimentalAssets;
+}
+__name(processExperimentalAssetsArg, "processExperimentalAssetsArg");
 
 // src/sites.ts
 init_import_meta_url();
@@ -178228,7 +178297,7 @@ function urlSafe(filePath) {
   return filePath.replace(/\\/g, "/");
 }
 __name(urlSafe, "urlSafe");
-function getAssetPaths(config, assetDirectory) {
+function getLegacyAssetPaths(config, assetDirectory) {
   const baseDirectory = assetDirectory ? process.cwd() : path40.resolve(path40.dirname(config.configPath ?? "wrangler.toml"));
   assetDirectory ??= typeof config.legacy_assets === "string" ? config.legacy_assets : config.legacy_assets !== void 0 ? config.legacy_assets.bucket : void 0;
   const includePatterns = typeof config.legacy_assets !== "string" && config.legacy_assets?.include || [];
@@ -178240,7 +178309,7 @@ function getAssetPaths(config, assetDirectory) {
     excludePatterns
   } : void 0;
 }
-__name(getAssetPaths, "getAssetPaths");
+__name(getLegacyAssetPaths, "getLegacyAssetPaths");
 function getSiteAssetPaths(config, assetDirectory, includePatterns = config.site?.include ?? [], excludePatterns = config.site?.exclude ?? []) {
   const baseDirectory = assetDirectory ? process.cwd() : path40.resolve(path40.dirname(config.configPath ?? "wrangler.toml"));
   assetDirectory ??= config.site?.bucket;
@@ -178482,30 +178551,12 @@ Please shift to the --legacy-assets command to preserve the current functionalit
       "Cannot use Assets and Workers Sites in the same Worker."
     );
   }
-  const experimentalAssets = args.experimentalAssets ? { directory: args.experimentalAssets } : config.experimental_assets;
-  if (experimentalAssets) {
-    const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
-      config,
-      args.experimentalAssets
-    );
-    const resolvedExperimentalAssetsPath = import_node_path34.default.resolve(
-      experimentalAssetsBasePath,
-      experimentalAssets.directory
-    );
-    if (!(0, import_node_fs20.existsSync)(resolvedExperimentalAssetsPath)) {
-      const sourceOfTruthMessage = args.experimentalAssets ? '"--experimental-assets" command line argument' : '"experimental_assets.directory" field in your configuration file';
-      throw new UserError(
-        `The directory specified by the ${sourceOfTruthMessage} does not exist:
-${resolvedExperimentalAssetsPath}`
-      );
-    }
-    experimentalAssets.directory = resolvedExperimentalAssetsPath;
-  }
   if (args.assets) {
     logger.warn(
       "The --assets argument is experimental and may change or break at any time"
     );
   }
+  const experimentalAssets = 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"
@@ -178515,7 +178566,7 @@ ${resolvedExperimentalAssetsPath}`
   const cliDefines = collectKeyValues(args.define);
   const cliAlias = collectKeyValues(args.alias);
   const accountId = args.dryRun ? void 0 : await requireAuth(config);
-  const assetPaths = args.legacyAssets || config.legacy_assets ? getAssetPaths(config, args.legacyAssets) : getSiteAssetPaths(
+  const legacyAssetPaths = args.legacyAssets || config.legacy_assets ? getLegacyAssetPaths(config, args.legacyAssets) : getSiteAssetPaths(
     config,
     args.site,
     args.siteInclude,
@@ -178543,7 +178594,7 @@ ${resolvedExperimentalAssetsPath}`
     tsconfig: args.tsconfig,
     routes: args.routes,
     experimentalAssets: experimentalAssets?.directory,
-    assetPaths,
+    legacyAssetPaths,
     legacyEnv: isLegacyEnv(config),
     minify: args.minify,
     nodeCompat: args.nodeCompat,
@@ -180720,7 +180771,7 @@ function buildWorkerFromFunctions({
       }
     ],
     isOutfile: !outdir,
-    serveAssetsFromWorker: false,
+    serveLegacyAssetsFromWorker: false,
     checkFetch: local,
     targetConsumer: local ? "dev" : "deploy",
     forPages: true,
@@ -180790,7 +180841,7 @@ function buildRawWorker({
       ] : []
     ],
     isOutfile: !outdir,
-    serveAssetsFromWorker: false,
+    serveLegacyAssetsFromWorker: false,
     checkFetch: local,
     targetConsumer: local ? "dev" : "deploy",
     forPages: true,
@@ -181008,7 +181059,7 @@ function buildPluginFromFunctions({
         }
       }
     ],
-    serveAssetsFromWorker: false,
+    serveLegacyAssetsFromWorker: false,
     checkFetch: local,
     targetConsumer: local ? "dev" : "deploy",
     forPages: true,
@@ -184614,6 +184665,12 @@ function Options14(yargs) {
       describe: "Show interactive dev session (defaults to true if the terminal supports interactivity)",
       type: "boolean"
     },
+    "experimental-dev-env": {
+      alias: ["x-dev-env"],
+      type: "boolean",
+      describe: "Use the experimental DevEnv instantiation (unified across wrangler dev and unstable_dev)",
+      default: false
+    },
     "experimental-registry": {
       alias: ["x-registry"],
       type: "boolean",
@@ -185017,7 +185074,8 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
       showInteractiveDevSession: args.showInteractiveDevSession,
       testMode: false,
       watch: true,
-      fileBasedRegistry: args.experimentalRegistry
+      fileBasedRegistry: args.experimentalRegistry,
+      devEnv: args.experimentalDevEnv
     }
   });
   await sendMetricsEvent("run pages dev");
@@ -200627,7 +200685,7 @@ async function parseModules(accountId, scriptName, versionId) {
     const formData = await contentRes.formData();
     if (formData.get("__STATIC_CONTENT_MANIFEST") !== null) {
       throw new UserError(
-        "Workers Sites is not supported for `versions secret put` today."
+        "Workers Sites and Legacy Assets do not support updating secrets through `wrangler versions secret put`. You must use `wrangler secret put` instead."
       );
     }
     const entrypoint = contentRes.headers.get("cf-entrypoint");
@@ -200641,7 +200699,7 @@ async function parseModules(accountId, scriptName, versionId) {
     const mainModule = {
       name: entrypointPart.name,
       filePath: "",
-      content: await entrypointPart.text(),
+      content: Buffer.from(await entrypointPart.arrayBuffer()),
       type: fromMimeType(entrypointPart.type)
     };
     const modules = await Promise.all(
@@ -200651,7 +200709,7 @@ async function parseModules(accountId, scriptName, versionId) {
         async ([name, file]) => ({
           name,
           filePath: "",
-          content: await file.text(),
+          content: Buffer.from(await file.arrayBuffer()),
           type: fromMimeType(file.type)
         })
       )
@@ -200911,7 +200969,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         bundle: true,
         additionalModules: [],
         moduleCollector,
-        serveAssetsFromWorker: false,
+        serveLegacyAssetsFromWorker: false,
         doBindings: config.durable_objects.bindings,
         jsxFactory,
         jsxFragment,
@@ -201025,8 +201083,11 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       }
     }
     printBindings({ ...withoutStaticAssets, vars: maskedVars });
-    if (!props.dryRun) {
+    if (props.dryRun) {
+      printBindings({ ...withoutStaticAssets, vars: maskedVars });
+    } else {
       await ensureQueuesExistByConfig(config);
+      let bindingsPrinted = false;
       try {
         const body = createWorkerUploadForm(worker);
         const result = await fetchResult(
@@ -201043,8 +201104,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
             excludeScript: "true"
           })
         );
+        logger.log("Worker Startup Time:", result.startup_time_ms, "ms");
+        bindingsPrinted = true;
+        printBindings({ ...withoutStaticAssets, vars: maskedVars });
         logger.log("Worker Version ID:", result.id);
       } catch (err) {
+        if (!bindingsPrinted) {
+          printBindings({ ...withoutStaticAssets, vars: maskedVars });
+        }
         helpIfErrorIsSizeOrScriptStartup(err, dependencies);
         if (err instanceof ParseError && "code" in err && err.code === 10021 && err.notes.length > 0) {
           const maybeNameToFilePath = /* @__PURE__ */ __name((moduleName) => {
@@ -201356,20 +201423,39 @@ function versionsUploadOptions(yargs) {
     describe: "Use the latest version of the worker runtime",
     type: "boolean",
     default: false
+  }).option("legacy-assets", {
+    describe: "(Experimental) Static assets to be served",
+    type: "string",
+    requiresArg: true,
+    hidden: true
+  }).option("assets", {
+    describe: "(Experimental) Static assets to be served",
+    type: "string",
+    requiresArg: true,
+    hidden: true
+  }).option("experimental-assets", {
+    describe: "Static assets to be served",
+    type: "string",
+    alias: "x-assets",
+    requiresArg: true,
+    hidden: true
   }).option("site", {
     describe: "Root folder of static assets for Workers Sites",
     type: "string",
-    requiresArg: true
+    requiresArg: true,
+    hidden: true
   }).option("site-include", {
     describe: "Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.",
     type: "string",
     requiresArg: true,
-    array: true
+    array: true,
+    hidden: true
   }).option("site-exclude", {
     describe: "Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.",
     type: "string",
     requiresArg: true,
-    array: true
+    array: true,
+    hidden: true
   }).option("var", {
     describe: "A key-value pair to be injected into the script as a variable",
     type: "string",
@@ -201425,7 +201511,7 @@ async function versionsUploadHandler(args) {
   const configPath = args.config || args.script && findWranglerToml(import_node_path57.default.dirname(args.script));
   const projectRoot = configPath && import_node_path57.default.dirname(configPath);
   const config = readConfig(configPath, args);
-  const entry = await getEntry(args, config, "deploy");
+  const entry = await getEntry(args, config, "versions upload");
   await sendMetricsEvent(
     "upload worker version",
     {
@@ -201435,6 +201521,18 @@ async function versionsUploadHandler(args) {
       sendMetrics: config.send_metrics
     }
   );
+  args.legacyAssets = args.legacyAssets ?? args.assets;
+  if (args.site || config.site) {
+    throw new UserError(
+      "Workers Sites does not support uploading versions through `wrangler versions upload`. You must use `wrangler deploy` instead."
+    );
+  }
+  if (args.legacyAssets || config.legacy_assets) {
+    throw new UserError(
+      "Legacy Assets does not support uploading versions through `wrangler versions upload`. You must use `wrangler deploy` instead."
+    );
+  }
+  const experimentalAssets = 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"
@@ -201461,6 +201559,7 @@ async function versionsUploadHandler(args) {
     jsxFactory: args.jsxFactory,
     jsxFragment: args.jsxFragment,
     tsconfig: args.tsconfig,
+    experimentalAssets: experimentalAssets?.directory,
     minify: args.minify,
     uploadSourceMaps: args.uploadSourceMaps,
     nodeCompat: args.nodeCompat,
@@ -204224,7 +204323,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       return {};
     }
   }
-  if (!props.isWorkersSite && Boolean(props.assetPaths) && format10 === "service-worker") {
+  if (!props.isWorkersSite && Boolean(props.legacyAssetPaths) && format10 === "service-worker") {
     throw new UserError(
       "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
     );
@@ -204281,7 +204380,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         bundle: true,
         additionalModules: [],
         moduleCollector,
-        serveAssetsFromWorker: !props.isWorkersSite && Boolean(props.assetPaths),
+        serveLegacyAssetsFromWorker: !props.isWorkersSite && Boolean(props.legacyAssetPaths),
         doBindings: config.durable_objects.bindings,
         jsxFactory,
         jsxFragment,
@@ -204332,7 +204431,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       // include it in the kv namespace name regardless (since there's no
       // concept of service environments for kv namespaces yet).
       scriptName + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
-      props.assetPaths,
+      props.legacyAssetPaths,
       false,
       props.dryRun,
       props.oldAssetTtl
@@ -204425,9 +204524,11 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         maskedVars[key] = "(hidden)";
       }
     }
-    printBindings({ ...withoutStaticAssets, vars: maskedVars });
-    if (!props.dryRun) {
+    if (props.dryRun) {
+      printBindings({ ...withoutStaticAssets, vars: maskedVars });
+    } else {
       await ensureQueuesExistByConfig(config);
+      let bindingsPrinted = false;
       try {
         const result = await fetchResult(
           workerUrl,
@@ -204443,6 +204544,9 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
             excludeScript: "true"
           })
         );
+        logger.log("Worker Startup Time:", result.startup_time_ms, "ms");
+        bindingsPrinted = true;
+        printBindings({ ...withoutStaticAssets, vars: maskedVars });
         deploymentId = addHyphens(result.deployment_id) ?? result.deployment_id;
         if (config.first_party_worker) {
           if (result.id) {
@@ -204462,6 +204566,9 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           }
         }
       } catch (err) {
+        if (!bindingsPrinted) {
+          printBindings({ ...withoutStaticAssets, vars: maskedVars });
+        }
         helpIfErrorIsSizeOrScriptStartup2(err, dependencies);
         if (err instanceof APIError && "code" in err && err.code === 10021 && err.notes.length > 0) {
           err.preventReport();
@@ -205475,7 +205582,7 @@ function Remote(props) {
     modules: props.bundle ? props.bundle.modules : [],
     accountId: props.accountId,
     bindings: props.bindings,
-    assetPaths: props.assetPaths,
+    legacyAssetPaths: props.legacyAssetPaths,
     isWorkersSite: props.isWorkersSite,
     compatibilityDate: props.compatibilityDate,
     compatibilityFlags: props.compatibilityFlags,
@@ -205597,7 +205704,7 @@ function useWorker(props) {
         legacyEnv: props.legacyEnv,
         env: props.env,
         isWorkersSite: props.isWorkersSite,
-        assetPaths: props.assetPaths,
+        legacyAssetPaths: props.legacyAssetPaths,
         format: props.format,
         bindings: props.bindings,
         compatibilityDate: props.compatibilityDate,
@@ -205672,7 +205779,7 @@ function useWorker(props) {
     props.bundle,
     props.format,
     props.accountId,
-    props.assetPaths,
+    props.legacyAssetPaths,
     props.isWorkersSite,
     props.compatibilityDate,
     props.compatibilityFlags,
@@ -205720,7 +205827,7 @@ async function startRemoteServer(props) {
   }
   const previewServer = await startPreviewServer({
     previewToken,
-    assetDirectory: props.isWorkersSite ? void 0 : props.assetPaths?.assetDirectory,
+    assetDirectory: props.isWorkersSite ? void 0 : props.legacyAssetPaths?.assetDirectory,
     localProtocol: props.localProtocol,
     customHttpsKeyPath: props.httpsKeyPath,
     customHttpsCertPath: props.httpsCertPath,
@@ -205801,7 +205908,7 @@ async function getRemotePreviewToken(props) {
       legacyEnv: props.legacyEnv,
       env: props.env,
       isWorkersSite: props.isWorkersSite,
-      assetPaths: props.assetPaths,
+      legacyAssetPaths: props.legacyAssetPaths,
       format: props.format,
       bindings: props.bindings,
       compatibilityDate: props.compatibilityDate,
@@ -205849,7 +205956,7 @@ async function createRemoteWorkerInit(props) {
     // include it in the kv namespace name regardless (since there's no
     // concept of service environments for kv namespaces yet).
     props.name + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
-    props.isWorkersSite ? props.assetPaths : void 0,
+    props.isWorkersSite ? props.legacyAssetPaths : void 0,
     true,
     false,
     void 0
@@ -205991,7 +206098,7 @@ function runBuild({
   additionalModules,
   rules,
   legacyAssets,
-  serveAssetsFromWorker,
+  serveLegacyAssetsFromWorker,
   tsconfig,
   minify,
   nodejsCompatMode,
@@ -206081,7 +206188,7 @@ function runBuild({
       bundle: !noBundle,
       moduleCollector,
       additionalModules: newAdditionalModules,
-      serveAssetsFromWorker,
+      serveLegacyAssetsFromWorker,
       jsxFactory,
       jsxFragment,
       watch: true,
@@ -206148,7 +206255,7 @@ function useEsbuild({
   additionalModules,
   rules,
   legacyAssets,
-  serveAssetsFromWorker,
+  serveLegacyAssetsFromWorker,
   tsconfig,
   minify,
   nodejsCompatMode,
@@ -206178,7 +206285,7 @@ function useEsbuild({
         additionalModules,
         rules,
         legacyAssets,
-        serveAssetsFromWorker,
+        serveLegacyAssetsFromWorker,
         tsconfig,
         minify,
         nodejsCompatMode,
@@ -206205,7 +206312,7 @@ function useEsbuild({
     destination,
     jsxFactory,
     jsxFragment,
-    serveAssetsFromWorker,
+    serveLegacyAssetsFromWorker,
     processEntrypoint,
     additionalModules,
     rules,
@@ -206238,7 +206345,7 @@ __name(useEsbuild, "useEsbuild");
 // src/dev/validate-dev-props.ts
 init_import_meta_url();
 function validateDevProps(props) {
-  if (!props.isWorkersSite && props.assetPaths && props.entry.format === "service-worker") {
+  if (!props.isWorkersSite && props.legacyAssetPaths && props.entry.format === "service-worker") {
     throw new UserError(
       "You cannot use the service-worker format with an `assets` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
     );
@@ -206540,20 +206647,23 @@ function DevSession(props) {
         persist: ""
       },
       legacy: {
-        site: props.isWorkersSite && props.assetPaths ? {
+        site: props.isWorkersSite && props.legacyAssetPaths ? {
           bucket: path66.join(
-            props.assetPaths.baseDirectory,
-            props.assetPaths?.assetDirectory
+            props.legacyAssetPaths.baseDirectory,
+            props.legacyAssetPaths?.assetDirectory
           ),
-          include: props.assetPaths.includePatterns,
-          exclude: props.assetPaths.excludePatterns
+          include: props.legacyAssetPaths.includePatterns,
+          exclude: props.legacyAssetPaths.excludePatterns
         } : void 0,
-        legacyAssets: props.assetsConfig,
+        legacyAssets: props.legacyAssetsConfig,
         enableServiceEnvironments: !props.legacyEnv
       },
       unsafe: {
         capnp: props.bindings.unsafe?.capnp,
         metadata: props.bindings.unsafe?.metadata
+      },
+      experimental: {
+        assets: props.experimentalAssets
       }
     };
   }, [
@@ -206565,10 +206675,11 @@ function DevSession(props) {
     props.compatibilityFlags,
     props.bindings,
     props.entry,
-    props.assetPaths,
+    props.legacyAssetPaths,
     props.isWorkersSite,
     props.local,
-    props.assetsConfig,
+    props.legacyAssetsConfig,
+    props.experimentalAssets,
     props.processEntrypoint,
     props.additionalModules,
     props.env,
@@ -206646,8 +206757,8 @@ function DevSession(props) {
     additionalModules: props.additionalModules,
     rules: props.rules,
     jsxFragment: props.jsxFragment,
-    serveAssetsFromWorker: Boolean(
-      props.assetPaths && !props.isWorkersSite && props.local
+    serveLegacyAssetsFromWorker: Boolean(
+      props.legacyAssetPaths && !props.isWorkersSite && props.local
     ),
     tsconfig: props.tsconfig,
     minify: props.minify,
@@ -206656,7 +206767,7 @@ function DevSession(props) {
     alias: props.alias,
     noBundle: props.noBundle,
     findAdditionalModules: props.findAdditionalModules,
-    legacyAssets: props.assetsConfig,
+    legacyAssets: props.legacyAssetsConfig,
     durableObjects: props.bindings.durable_objects || { bindings: [] },
     local: props.local,
     // Enable the bundling to know whether we are using dev or deploy
@@ -206721,7 +206832,8 @@ function DevSession(props) {
       usageModel: props.usageModel,
       bindings: props.bindings,
       workerDefinitions,
-      assetPaths: props.assetPaths,
+      legacyAssetPaths: props.legacyAssetPaths,
+      experimentalAssets: props.experimentalAssets,
       initialPort: void 0,
       initialIp: "127.0.0.1",
       rules: props.rules,
@@ -206749,7 +206861,7 @@ function DevSession(props) {
       bundle,
       format: props.entry.format,
       bindings: props.bindings,
-      assetPaths: props.assetPaths,
+      legacyAssetPaths: props.legacyAssetPaths,
       isWorkersSite: props.isWorkersSite,
       port: props.initialPort,
       ip: props.initialIp,
@@ -207132,6 +207244,7 @@ __name(registerDevHotKeys, "registerDevHotKeys");
 
 // src/dev/start-server.ts
 init_import_meta_url();
+var import_node_events2 = require("node:events");
 var import_promises25 = require("node:fs/promises");
 var path67 = __toESM(require("node:path"));
 var util3 = __toESM(require("node:util"));
@@ -207172,7 +207285,15 @@ async function startDevServer(props) {
   const devEnv = props.devEnv;
   const startDevWorkerOptions = {
     name: props.name ?? "worker",
+    config: props.rawConfig.configPath,
     entrypoint: props.entry.file,
+    compatibilityDate: props.compatibilityDate,
+    compatibilityFlags: props.compatibilityFlags,
+    triggers: props.routes?.map((r3) => ({
+      type: "route",
+      ...typeof r3 === "string" ? { pattern: r3 } : r3
+    })),
+    bindings: convertCfWorkerInitBindingstoBindings(props.bindings),
     dev: {
       server: {
         hostname: props.initialIp,
@@ -207186,10 +207307,10 @@ async function startDevServer(props) {
       },
       origin: {
         secure: props.upstreamProtocol === "https",
-        hostname: props.localUpstream
+        hostname: props.host ?? props.localUpstream
       },
       liveReload: props.liveReload,
-      remote: !props.local,
+      remote: !props.forceLocal && !props.local,
       auth: async () => {
         let accountId = props.accountId;
         if (accountId === void 0) {
@@ -207207,24 +207328,71 @@ async function startDevServer(props) {
           }
         }
         return { accountId, apiToken: requireApiToken() };
-      }
+      },
+      persist: props.localPersistencePath ?? void 0,
+      testScheduled: props.testScheduled,
+      registry: workerDefinitions
     },
     build: {
-      // format: props.entry.format,
+      bundle: !props.noBundle,
+      define: props.define,
+      jsxFactory: props.jsxFactory,
+      jsxFragment: props.jsxFragment,
+      tsconfig: props.tsconfig,
+      minify: props.minify,
+      processEntrypoint: props.processEntrypoint,
+      additionalModules: props.additionalModules,
       moduleRoot: props.entry.moduleRoot,
-      nodejsCompatMode: null
+      moduleRules: props.rules,
+      nodejsCompatMode: props.nodejsCompatMode
     }
   };
-  if (!props.experimentalDevEnv) {
-    devEnv.proxy.onConfigUpdate({
-      type: "configUpdate",
-      config: fakeResolvedInput(startDevWorkerOptions)
-    });
-    devEnv.proxy.onBundleStart({
-      type: "bundleStart",
-      config: fakeResolvedInput(startDevWorkerOptions)
+  if (props.experimentalDevEnv) {
+    devEnv.runtimes.forEach((runtime) => {
+      runtime.on("reloadComplete", async (ev) => {
+        const { proxyWorker } = await devEnv.proxy.ready.promise;
+        const url4 = await proxyWorker.ready;
+        props.onReady?.(url4.hostname, parseInt(url4.port), ev.proxyData);
+      });
     });
+    await devEnv.config.set(startDevWorkerOptions);
+    const stop = /* @__PURE__ */ __name(async () => {
+      await Promise.allSettled([stopWorkerRegistry(), devEnv.teardown()]);
+    }, "stop");
+    try {
+      await Promise.all([
+        // adhere to unstable_dev contract:
+        //   - only resolve when UserWorker is ready
+        //   - reject if UserWorker fails to start
+        Promise.race(
+          devEnv.runtimes.flatMap((runtime) => [
+            (0, import_node_events2.once)(runtime, "reloadComplete"),
+            (0, import_node_events2.once)(runtime, "error").then((err) => Promise.reject(err))
+          ])
+        ),
+        // adhere to unstable_dev contract:
+        //   - only resolve when _perceived_ UserWorker is ready
+        //   - throw if _perceived_ UserWorker fails to start
+        // to the eyeball, the ProxyWorker is the _perceived_ UserWorker
+        Promise.race([
+          devEnv.proxy.ready.promise,
+          (0, import_node_events2.once)(devEnv.proxy, "error").then((err) => Promise.reject(err))
+        ])
+      ]);
+    } catch (err) {
+      await stop();
+      throw err;
+    }
+    return { stop };
   }
+  devEnv.proxy.onConfigUpdate({
+    type: "configUpdate",
+    config: fakeResolvedInput(startDevWorkerOptions)
+  });
+  devEnv.proxy.onBundleStart({
+    type: "bundleStart",
+    config: fakeResolvedInput(startDevWorkerOptions)
+  });
   const bundle = await runEsbuild({
     entry: props.entry,
     destination: directory,
@@ -207233,8 +207401,8 @@ async function startDevServer(props) {
     additionalModules: props.additionalModules,
     rules: props.rules,
     jsxFragment: props.jsxFragment,
-    serveAssetsFromWorker: Boolean(
-      props.assetPaths && !props.isWorkersSite && props.local
+    serveLegacyAssetsFromWorker: Boolean(
+      props.legacyAssetPaths && !props.isWorkersSite && props.local
     ),
     tsconfig: props.tsconfig,
     minify: props.minify,
@@ -207243,7 +207411,7 @@ async function startDevServer(props) {
     noBundle: props.noBundle,
     findAdditionalModules: props.findAdditionalModules,
     alias: props.alias,
-    legacyAssets: props.assetsConfig,
+    legacyAssets: props.legacyAssetsConfig,
     testScheduled: props.testScheduled,
     local: props.local,
     doBindings: props.bindings.durable_objects?.bindings ?? [],
@@ -207253,15 +207421,6 @@ async function startDevServer(props) {
       props.compatibilityFlags
     )
   });
-  if (props.experimentalDevEnv) {
-    devEnv.runtimes.forEach((runtime) => {
-      runtime.on("reloadComplete", async (ev) => {
-        const { proxyWorker } = await devEnv.proxy.ready.promise;
-        const url4 = await proxyWorker.ready;
-        props.onReady?.(url4.hostname, parseInt(url4.port), ev.proxyData);
-      });
-    });
-  }
   if (props.local) {
     devEnv.proxy.onReloadStart({
       type: "reloadStart",
@@ -207275,7 +207434,8 @@ async function startDevServer(props) {
       compatibilityDate: props.compatibilityDate,
       compatibilityFlags: props.compatibilityFlags,
       bindings: props.bindings,
-      assetPaths: props.assetPaths,
+      legacyAssetPaths: props.legacyAssetPaths,
+      experimentalAssets: props.experimentalAssets,
       initialPort: void 0,
       // hard-code for userworker, DevEnv-ProxyWorker now uses this prop value
       initialIp: "127.0.0.1",
@@ -207337,7 +207497,7 @@ async function startDevServer(props) {
       format: props.entry.format,
       accountId: props.accountId,
       bindings: props.bindings,
-      assetPaths: props.assetPaths,
+      legacyAssetPaths: props.legacyAssetPaths,
       isWorkersSite: props.isWorkersSite,
       port: props.initialPort,
       ip: props.initialIp,
@@ -207408,7 +207568,7 @@ async function runEsbuild({
   rules,
   alias,
   legacyAssets,
-  serveAssetsFromWorker,
+  serveLegacyAssetsFromWorker,
   tsconfig,
   minify,
   nodejsCompatMode,
@@ -207441,7 +207601,7 @@ async function runEsbuild({
     bundle: !noBundle,
     additionalModules,
     moduleCollector,
-    serveAssetsFromWorker,
+    serveLegacyAssetsFromWorker,
     jsxFactory,
     jsxFragment,
     tsconfig,
@@ -207955,7 +208115,7 @@ Please shift to the --legacy-assets command to preserve the current functionalit
     );
     if (args.experimentalDevEnv) {
       (0, import_node_assert21.default)(devInstance instanceof DevEnv);
-      await import_node_events2.default.once(devInstance, "teardown");
+      await import_node_events3.default.once(devInstance, "teardown");
     } else {
       (0, import_node_assert21.default)(!(devInstance instanceof DevEnv));
       watcher = devInstance.watcher;
@@ -207988,7 +208148,7 @@ async function updateDevEnvRegistry(devEnv, registry) {
     boundWorkers = void 0;
   }
   if (!devEnv.config.latestConfig) {
-    await import_node_events2.default.once(devEnv, "configUpdate");
+    await import_node_events3.default.once(devEnv, "configUpdate");
   }
   if (import_node_util3.default.isDeepStrictEqual(
     boundWorkers,
@@ -208004,6 +208164,21 @@ async function updateDevEnvRegistry(devEnv, registry) {
   });
 }
 __name(updateDevEnvRegistry, "updateDevEnvRegistry");
+async function getPagesAssetsFetcher(options21) {
+  if (options21 !== void 0) {
+    const generateASSETSBinding3 = (init_assets(), __toCommonJS(assets_exports)).default;
+    return {
+      ASSETS: {
+        type: "fetcher",
+        fetcher: await generateASSETSBinding3({
+          log: logger,
+          ...options21
+        })
+      }
+    };
+  }
+}
+__name(getPagesAssetsFetcher, "getPagesAssetsFetcher");
 async function startDev(args) {
   let watcher;
   let rerender;
@@ -208045,6 +208220,15 @@ 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) {
+      args.forceLocal = true;
+    }
+    if ((args.legacyAssets || config.legacy_assets) && experimentalAssets) {
+      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) {
@@ -208118,6 +208302,9 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           })
         },
         bindings: {
+          ...await getPagesAssetsFetcher(
+            args.enablePagesAssetsServiceBinding
+          ),
           ...collectPlainTextVars(args.var),
           ...convertCfWorkerInitBindingstoBindings({
             kv_namespaces: args.kv,
@@ -208179,18 +208366,24 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         },
         legacy: {
           site: (configParam) => {
-            const assetPaths = getResolvedAssetPaths(args, configParam);
-            return Boolean(args.site || configParam.site) && assetPaths ? {
+            const legacyAssetPaths = getResolvedLegacyAssetPaths(
+              args,
+              configParam
+            );
+            return Boolean(args.site || configParam.site) && legacyAssetPaths ? {
               bucket: import_node_path63.default.join(
-                assetPaths.baseDirectory,
-                assetPaths?.assetDirectory
+                legacyAssetPaths.baseDirectory,
+                legacyAssetPaths?.assetDirectory
               ),
-              include: assetPaths.includePatterns,
-              exclude: assetPaths.excludePatterns
+              include: legacyAssetPaths.includePatterns,
+              exclude: legacyAssetPaths.excludePatterns
             } : void 0;
           },
           legacyAssets: (configParam) => configParam.legacy_assets,
           enableServiceEnvironments: !(args.legacyEnv ?? true)
+        },
+        experimental: {
+          assets: experimentalAssets
         }
       });
       void sendMetricsEvent(
@@ -208219,26 +208412,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         }
       });
     }
-    const experimentalAssets = args.experimentalAssets ? { directory: args.experimentalAssets } : config.experimental_assets;
-    if (experimentalAssets) {
-      const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
-        config,
-        args.experimentalAssets
-      );
-      const resolvedExperimentalAssetsPath = import_node_path63.default.resolve(
-        experimentalAssetsBasePath,
-        experimentalAssets.directory
-      );
-      if (!(0, import_node_fs35.existsSync)(resolvedExperimentalAssetsPath)) {
-        const sourceOfTruthMessage = args.experimentalAssets ? '"--experimental-assets" command line argument' : '"experimental_assets.directory" field in your configuration file';
-        throw new UserError(
-          `The directory specified by the ${sourceOfTruthMessage} does not exist:
-${resolvedExperimentalAssetsPath}`
-        );
-      }
-      experimentalAssets.directory = resolvedExperimentalAssetsPath;
-      args.forceLocal = true;
-    }
     const {
       entry,
       upstreamProtocol,
@@ -208267,7 +208440,7 @@ ${resolvedExperimentalAssetsPath}`
       { sendMetrics: config.send_metrics, offline: !args.remote }
     );
     async function getDevReactElement(configParam) {
-      const { assetPaths, bindings } = getBindingsAndAssetPaths(
+      const { legacyAssetPaths, bindings } = getBindingsAndLegacyAssetPaths(
         args,
         configParam
       );
@@ -208302,8 +208475,9 @@ ${resolvedExperimentalAssetsPath}`
           localPersistencePath,
           liveReload: args.liveReload || false,
           accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
-          assetPaths,
-          assetsConfig: configParam.legacy_assets,
+          legacyAssetPaths,
+          legacyAssetsConfig: configParam.legacy_assets,
+          experimentalAssets,
           initialPort: args.port ?? configParam.dev.port ?? await getLocalPort2(),
           initialIp: args.ip || configParam.dev.ip,
           inspectorPort: args.inspectorPort ?? configParam.dev.inspector_port ?? await getInspectorPort2(),
@@ -208406,7 +208580,7 @@ async function startApiDev(args) {
     });
   }
   async function getDevServer(configParam) {
-    const { assetPaths, bindings } = getBindingsAndAssetPaths(
+    const { legacyAssetPaths, bindings } = getBindingsAndLegacyAssetPaths(
       args,
       configParam
     );
@@ -208441,8 +208615,9 @@ async function startApiDev(args) {
       localPersistencePath,
       liveReload: args.liveReload ?? false,
       accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
-      assetPaths,
-      assetsConfig: configParam.legacy_assets,
+      legacyAssetPaths,
+      legacyAssetsConfig: configParam.legacy_assets,
+      experimentalAssets: void 0,
       //port can be 0, which means to use a random port
       initialPort: args.port ?? configParam.dev.port ?? await getLocalPort2(),
       initialIp: args.ip ?? configParam.dev.ip,
@@ -208544,6 +208719,16 @@ 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,
@@ -208574,11 +208759,6 @@ async function validateDevServerSettings(args, config) {
       ).join(", ")}`
     );
   }
-  if ((args.legacyAssets || config.legacy_assets || args.experimentalAssets || config.experimental_assets) && (args.site || config.site)) {
-    throw new UserError(
-      "Cannot use Assets and Workers Sites in the same Worker."
-    );
-  }
   const upstreamProtocol = args.upstreamProtocol ?? config.dev.upstream_protocol;
   if (upstreamProtocol === "http" && args.remote) {
     logger.warn(
@@ -208627,23 +208807,23 @@ function getResolvedBindings(args, configParam) {
   return bindings;
 }
 __name(getResolvedBindings, "getResolvedBindings");
-function getResolvedAssetPaths(args, configParam) {
-  const assetPaths = args.legacyAssets || configParam.legacy_assets ? getAssetPaths(configParam, args.legacyAssets) : getSiteAssetPaths(
+function getResolvedLegacyAssetPaths(args, configParam) {
+  const legacyAssetPaths = args.legacyAssets || configParam.legacy_assets ? getLegacyAssetPaths(configParam, args.legacyAssets) : getSiteAssetPaths(
     configParam,
     args.site,
     args.siteInclude,
     args.siteExclude
   );
-  return assetPaths;
+  return legacyAssetPaths;
 }
-__name(getResolvedAssetPaths, "getResolvedAssetPaths");
-function getBindingsAndAssetPaths(args, configParam) {
+__name(getResolvedLegacyAssetPaths, "getResolvedLegacyAssetPaths");
+function getBindingsAndLegacyAssetPaths(args, configParam) {
   return {
     bindings: getResolvedBindings(args, configParam),
-    assetPaths: getResolvedAssetPaths(args, configParam)
+    legacyAssetPaths: getResolvedLegacyAssetPaths(args, configParam)
   };
 }
-__name(getBindingsAndAssetPaths, "getBindingsAndAssetPaths");
+__name(getBindingsAndLegacyAssetPaths, "getBindingsAndLegacyAssetPaths");
 function getBindings(configParam, env7, local, args) {
   const kvConfig = (configParam.kv_namespaces || []).map(
     ({ binding, preview_id, id }) => {
@@ -208845,7 +209025,7 @@ unstable_dev()'s behaviour will likely change in future releases`
     localProtocol: options21?.localProtocol,
     httpsKeyPath: options21?.httpsKeyPath,
     httpsCertPath: options21?.httpsCertPath,
-    experimentalAssets: options21?.experimentalAssets,
+    experimentalAssets: void 0,
     legacyAssets: options21?.legacyAssets,
     site: options21?.site,
     // Root folder of static assets for Workers Sites
@@ -208971,7 +209151,7 @@ init_import_meta_url();
 // src/api/startDevWorker/DevEnv.ts
 init_import_meta_url();
 var import_node_assert24 = __toESM(require("node:assert"));
-var import_node_events5 = require("node:events");
+var import_node_events6 = require("node:events");
 
 // src/api/startDevWorker/BundlerController.ts
 init_import_meta_url();
@@ -208982,8 +209162,8 @@ var import_chokidar7 = require("chokidar");
 
 // src/api/startDevWorker/BaseController.ts
 init_import_meta_url();
-var import_node_events3 = require("node:events");
-var TypedEventEmitterImpl = import_node_events3.EventEmitter;
+var import_node_events4 = require("node:events");
+var TypedEventEmitterImpl = import_node_events4.EventEmitter;
 var Controller = class extends TypedEventEmitterImpl {
   emitErrorEvent(data) {
     this.emit("error", data);
@@ -209068,7 +209248,7 @@ var BundlerController = class extends Controller {
         bundle: true,
         additionalModules: [],
         moduleCollector,
-        serveAssetsFromWorker: Boolean(
+        serveLegacyAssetsFromWorker: Boolean(
           config.legacy?.legacyAssets && !config.dev?.remote
         ),
         doBindings: bindings?.durable_objects?.bindings ?? [],
@@ -209168,7 +209348,7 @@ var BundlerController = class extends Controller {
         additionalModules: config.build?.additionalModules ?? [],
         rules: config.build.moduleRules,
         legacyAssets: config.legacy?.legacyAssets,
-        serveAssetsFromWorker: Boolean(
+        serveLegacyAssetsFromWorker: Boolean(
           config.legacy?.legacyAssets && !config.dev?.remote
         ),
         tsconfig: config.build?.tsconfig,
@@ -209370,7 +209550,11 @@ async function resolveConfig(config, input) {
     {
       legacyAssets: Boolean(legacyAssets),
       script: input.entrypoint,
-      moduleRoot: input.build?.moduleRoot
+      moduleRoot: input.build?.moduleRoot,
+      // getEntry only needs to know if experimental_assets was specified.
+      // The actualy value is not relevant here, which is why not passing
+      // the entire ExperimentalAssets object is fine.
+      experimentalAssets: input?.experimental?.assets?.directory
     },
     config,
     "dev"
@@ -209416,6 +209600,9 @@ async function resolveConfig(config, input) {
     unsafe: {
       capnp: input.unsafe?.capnp ?? unsafe?.capnp,
       metadata: input.unsafe?.metadata ?? unsafe?.metadata
+    },
+    experimental: {
+      assets: input?.experimental?.assets
     }
   };
   if (resolved.legacy.legacyAssets && resolved.legacy.site) {
@@ -209594,12 +209781,13 @@ async function convertToConfigBundle(event) {
     compatibilityFlags: event.config.compatibilityFlags,
     bindings,
     workerDefinitions: event.config.dev?.registry,
-    assetPaths: event.config.legacy?.site?.bucket ? {
+    legacyAssetPaths: event.config.legacy?.site?.bucket ? {
       baseDirectory: event.config.legacy?.site?.bucket,
       assetDirectory: "",
       excludePatterns: event.config.legacy?.site?.exclude ?? [],
       includePatterns: event.config.legacy?.site?.include ?? []
     } : void 0,
+    experimentalAssets: event.config.experimental?.assets,
     initialPort: void 0,
     initialIp: "127.0.0.1",
     rules: [],
@@ -209679,7 +209867,8 @@ var LocalRuntimeController = class extends RuntimeController {
           },
           userWorkerInnerUrlOverrides: {
             protocol: data.config?.dev?.origin?.secure ? "https:" : "http:",
-            hostname: data.config?.dev?.origin?.hostname
+            hostname: data.config?.dev?.origin?.hostname,
+            port: data.config?.dev?.origin?.hostname ? "" : void 0
           },
           headers: {
             // Passing this signature from Proxy Worker allows the User Worker to trust the request.
@@ -209744,7 +209933,7 @@ __name(LocalRuntimeController, "LocalRuntimeController");
 init_import_meta_url();
 var import_node_assert23 = __toESM(require("node:assert"));
 var import_node_crypto9 = require("node:crypto");
-var import_node_events4 = __toESM(require("node:events"));
+var import_node_events5 = __toESM(require("node:events"));
 var import_node_path67 = __toESM(require("node:path"));
 var import_miniflare20 = require("miniflare");
 
@@ -209927,7 +210116,7 @@ var ProxyController = class extends Controller {
       }
       void this.reconnectInspectorProxyWorker();
     });
-    await import_node_events4.default.once(webSocket, "open");
+    await import_node_events5.default.once(webSocket, "open");
     this.inspectorProxyWorkerWebSocket?.resolve(webSocket);
     return webSocket;
   }
@@ -209938,12 +210127,12 @@ var ProxyController = class extends Controller {
     }
     try {
       await this.runtimeMessageMutex.runWith(async () => {
-        (0, import_node_assert23.default)(this.proxyWorker, "proxyWorker should already be instantiated");
-        const ready = await this.proxyWorker.ready.catch(() => void 0);
+        const { proxyWorker } = await this.ready.promise;
+        const ready = await proxyWorker.ready.catch(() => void 0);
         if (!ready) {
           return;
         }
-        return this.proxyWorker.dispatchFetch(
+        return proxyWorker.dispatchFetch(
           `http://dummy/cdn-cgi/ProxyWorker/${message.type}`,
           {
             headers: { Authorization: this.secret },
@@ -210221,7 +210410,7 @@ var RemoteRuntimeController = class extends RuntimeController {
         legacyEnv: props.legacyEnv,
         env: props.env,
         isWorkersSite: props.isWorkersSite,
-        assetPaths: props.assetPaths,
+        legacyAssetPaths: props.legacyAssetPaths,
         format: props.format,
         bindings: props.bindings,
         compatibilityDate: props.compatibilityDate,
@@ -210299,7 +210488,7 @@ var RemoteRuntimeController = class extends RuntimeController {
         legacyEnv: !config.legacy?.enableServiceEnvironments,
         env: config.env,
         isWorkersSite: config.legacy?.site !== void 0,
-        assetPaths: config.legacy?.site?.bucket ? {
+        legacyAssetPaths: config.legacy?.site?.bucket ? {
           baseDirectory: config.legacy?.site?.bucket,
           assetDirectory: "",
           excludePatterns: config.legacy?.site?.exclude ?? [],
@@ -210400,7 +210589,7 @@ var RemoteRuntimeController = class extends RuntimeController {
 __name(RemoteRuntimeController, "RemoteRuntimeController");
 
 // src/api/startDevWorker/DevEnv.ts
-var DevEnv = class extends import_node_events5.EventEmitter {
+var DevEnv = class extends import_node_events6.EventEmitter {
   config;
   bundler;
   runtimes;
@@ -210841,8 +211030,8 @@ function unstable_getMiniflareWorkerOptions(configPath, env7) {
       ])
     );
   }
-  const assetPaths = config.legacy_assets ? getAssetPaths(config, void 0) : getSiteAssetPaths(config);
-  const sitesOptions = buildSitesOptions({ assetPaths });
+  const legacyAssetPaths = config.legacy_assets ? getLegacyAssetPaths(config, void 0) : getSiteAssetPaths(config);
+  const sitesOptions = buildSitesOptions({ legacyAssetPaths });
   const workerOptions = {
     compatibilityDate: config.compatibility_date,
     compatibilityFlags: config.compatibility_flags,