wrangler 3.71.0 → 3.72.0

package/wrangler-dist/cli.js

@@ -80778,7 +80778,7 @@ var require_send = __commonJS({
     var join18 = path74.join;
     var normalize4 = path74.normalize;
     var resolve22 = path74.resolve;
-    var sep3 = path74.sep;
+    var sep4 = path74.sep;
     var BYTES_RANGE_REGEXP = /^ *bytes=/;
     var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
     var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
@@ -80988,14 +80988,14 @@ var require_send = __commonJS({
       var parts;
       if (root !== null) {
         if (path75) {
-          path75 = normalize4("." + sep3 + path75);
+          path75 = normalize4("." + sep4 + path75);
         }
         if (UP_PATH_REGEXP.test(path75)) {
           debug('malicious path "%s"', path75);
           this.error(403);
           return res;
         }
-        parts = path75.split(sep3);
+        parts = path75.split(sep4);
         path75 = normalize4(join18(root, path75));
       } else {
         if (UP_PATH_REGEXP.test(path75)) {
@@ -81003,7 +81003,7 @@ var require_send = __commonJS({
           this.error(403);
           return res;
         }
-        parts = normalize4(path75).split(sep3);
+        parts = normalize4(path75).split(sep4);
         path75 = resolve22(path75);
       }
       if (containsDotFile(parts)) {
@@ -81102,7 +81102,7 @@ var require_send = __commonJS({
       var self2 = this;
       debug('stat "%s"', path75);
       fs26.stat(path75, /* @__PURE__ */ __name(function onstat(err, stat6) {
-        if (err && err.code === "ENOENT" && !extname5(path75) && path75[path75.length - 1] !== sep3) {
+        if (err && err.code === "ENOENT" && !extname5(path75) && path75[path75.length - 1] !== sep4) {
           return next(err);
         }
         if (err)
@@ -100662,9 +100662,9 @@ var require_prompts = __commonJS({
     $3.date = (args) => toPrompt("DatePrompt", args);
     $3.confirm = (args) => toPrompt("ConfirmPrompt", args);
     $3.list = (args) => {
-      const sep3 = args.separator || ",";
+      const sep4 = args.separator || ",";
       return toPrompt("TextPrompt", args, {
-        onSubmit: (str) => str.split(sep3).map((s) => s.trim())
+        onSubmit: (str) => str.split(sep4).map((s) => s.trim())
       });
     };
     $3.toggle = (args) => toPrompt("TogglePrompt", args);
@@ -103117,9 +103117,9 @@ var require_prompts2 = __commonJS({
     $3.date = (args) => toPrompt("DatePrompt", args);
     $3.confirm = (args) => toPrompt("ConfirmPrompt", args);
     $3.list = (args) => {
-      const sep3 = args.separator || ",";
+      const sep4 = args.separator || ",";
       return toPrompt("TextPrompt", args, {
-        onSubmit: (str) => str.split(sep3).map((s) => s.trim())
+        onSubmit: (str) => str.split(sep4).map((s) => s.trim())
       });
     };
     $3.toggle = (args) => toPrompt("TogglePrompt", args);
@@ -137868,13 +137868,13 @@ ${err.stack}`;
 });
 
 // ../pages-shared/asset-server/rulesEngine.ts
-var ESCAPE_REGEX_CHARACTERS, escapeRegex, HOST_PLACEHOLDER_REGEX, PLACEHOLDER_REGEX2, replacer, generateRulesMatcher;
+var ESCAPE_REGEX_CHARACTERS2, escapeRegex2, HOST_PLACEHOLDER_REGEX, PLACEHOLDER_REGEX2, replacer, generateRulesMatcher;
 var init_rulesEngine = __esm({
   "../pages-shared/asset-server/rulesEngine.ts"() {
     init_import_meta_url();
-    ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
-    escapeRegex = /* @__PURE__ */ __name((str) => {
-      return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
+    ESCAPE_REGEX_CHARACTERS2 = /[-/\\^$*+?.()|[\]{}]/g;
+    escapeRegex2 = /* @__PURE__ */ __name((str) => {
+      return str.replace(ESCAPE_REGEX_CHARACTERS2, "\\$&");
     }, "escapeRegex");
     HOST_PLACEHOLDER_REGEX = /(?<=^https:\\\/\\\/[^/]*?):([A-Za-z]\w*)(?=\\)/g;
     PLACEHOLDER_REGEX2 = /:([A-Za-z]\w*)/g;
@@ -137890,7 +137890,7 @@ var init_rulesEngine = __esm({
       }
       const compiledRules = Object.entries(rules).map(([rule, match]) => {
         const crossHost = rule.startsWith("https://");
-        rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
+        rule = rule.split("*").map(escapeRegex2).join("(?<splat>.*)");
         const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
         for (const host_match of host_matches) {
           rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
@@ -151359,6 +151359,10 @@ function convertCfWorkerInitBindingstoBindings(inputBindings) {
         }
         break;
       }
+      case "experimental_assets": {
+        output[info["binding"]] = { type: "assets" };
+        break;
+      }
       default: {
         assertNever(type);
       }
@@ -151389,7 +151393,8 @@ async function convertBindingsToCfWorkerInitBindings(inputBindings) {
     dispatch_namespaces: void 0,
     mtls_certificates: void 0,
     logfwdr: void 0,
-    unsafe: void 0
+    unsafe: void 0,
+    experimental_assets: void 0
   };
   const fetchers = {};
   for (const [name, binding] of Object.entries(inputBindings ?? {})) {
@@ -152688,7 +152693,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.71.0";
+var version = "3.72.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -158994,6 +158999,10 @@ async function writeAdditionalModules(modules, destination) {
 __name(writeAdditionalModules, "writeAdditionalModules");
 
 // src/deployment-bundle/bundle.ts
+var ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
+var escapeRegex = /* @__PURE__ */ __name((str) => {
+  return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
+}, "escapeRegex");
 var COMMON_ESBUILD_OPTIONS = {
   // Our workerd runtime uses the same V8 version as recent Chrome, which is highly ES2022 compliant: https://kangax.github.io/compat-table/es2016plus/
   target: "es2022",
@@ -159111,6 +159120,30 @@ async function bundleWorker(entry, destination, {
   if (watch9) {
     inject.push(path12.resolve(getBasePath(), "templates/modules-watch-stub.js"));
   }
+  const aliasPlugin = {
+    name: "alias",
+    setup(build5) {
+      if (!alias) {
+        return;
+      }
+      const filter = new RegExp(
+        Object.keys(alias).map((key) => escapeRegex(key)).join("|")
+      );
+      build5.onResolve({ filter }, (args) => {
+        const aliasPath = alias[args.path];
+        if (aliasPath) {
+          return {
+            // resolve with node resolution
+            path: require.resolve(aliasPath, {
+              // From the esbuild alias docs: "Note that when an import path is substituted using an alias, the resulting import path is resolved in the working directory instead of in the directory containing the source file with the import path."
+              // https://esbuild.github.io/api/#alias:~:text=Note%20that%20when%20an%20import%20path%20is%20substituted%20using%20an%20alias%2C%20the%20resulting%20import%20path%20is%20resolved%20in%20the%20working%20directory%20instead%20of%20in%20the%20directory%20containing%20the%20source%20file%20with%20the%20import%20path.
+              paths: [entry.directory]
+            })
+          };
+        }
+      });
+    }
+  };
   const buildOptions2 = {
     // Don't use entryFile here as the file may have been changed when applying the middleware
     entryPoints: [entry.file],
@@ -159144,12 +159177,12 @@ async function bundleWorker(entry, destination, {
         ...define2
       }
     },
-    alias,
     loader: {
       ...COMMON_ESBUILD_OPTIONS.loader,
       ...loader || {}
     },
     plugins: [
+      aliasPlugin,
       moduleCollector.plugin,
       ...nodejsCompatMode === "legacy" ? [
         (0, import_node_globals_polyfill.default)({ buffer: true }),
@@ -162997,7 +163030,10 @@ ${err}`
           host: "127.0.0.1",
           port: 0
         }
-      ]
+      ],
+      assetsPath: config.experimentalAssets.directory,
+      assetsKVBindingName: "ASSETS_KV_NAMESPACE",
+      assetsManifestBindingName: "ASSETS_MANIFEST"
     }
   ];
 }
@@ -163223,6 +163259,11 @@ function useLocalWorker(props) {
       });
       server.addEventListener("error", ({ error: error2 }) => {
         if (typeof error2 === "object" && error2 !== null && "code" in error2 && error2.code === "ERR_RUNTIME_FAILURE") {
+          if (process.platform === "win32") {
+            logger.error(
+              "Check that you have the latest Microsoft Visual C++ Redistributable library installed.\nSee https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist."
+            );
+          }
           logger.error(String(error2));
         } else {
           logger.error("Error reloading local server:", error2);
@@ -163302,6 +163343,8 @@ var shapes = {
   dash: "\u2500",
   radioInactive: "\u25CB",
   radioActive: "\u25CF",
+  backActive: "\u25C0",
+  backInactive: "\u25C1",
   bar: "\u2502",
   leftT: "\u251C",
   rigthT: "\u2524",
@@ -163591,12 +163634,12 @@ function createWorkerUploadForm(worker) {
     tail_consumers,
     limits,
     annotations,
-    experimental_assets
+    experimental_assets_jwt
   } = worker;
-  if (experimental_assets?.staticAssetsOnly) {
+  if (main2.name === "no-op-assets-worker.js" && experimental_assets_jwt) {
     formData.set(
       "metadata",
-      JSON.stringify({ assets: experimental_assets.jwt })
+      JSON.stringify({ assets: experimental_assets_jwt })
     );
     return formData;
   }
@@ -163761,6 +163804,12 @@ function createWorkerUploadForm(worker) {
       type: "version_metadata"
     });
   }
+  if (bindings.experimental_assets !== void 0) {
+    metadataBindings.push({
+      name: bindings.experimental_assets.binding,
+      type: "assets"
+    });
+  }
   for (const [name, filePath] of Object.entries(bindings.text_blobs || {})) {
     metadataBindings.push({
       name,
@@ -163880,7 +163929,8 @@ function createWorkerUploadForm(worker) {
     ...placement && { placement },
     ...tail_consumers && { tail_consumers },
     ...limits && { limits },
-    ...annotations && { annotations }
+    ...annotations && { annotations },
+    ...experimental_assets_jwt && { assets: experimental_assets_jwt }
   };
   if (bindings.unsafe?.metadata !== void 0) {
     for (const key of Object.keys(bindings.unsafe.metadata)) {
@@ -165046,13 +165096,13 @@ function usage(yargs, shim3) {
   };
   self2.stringifiedValues = /* @__PURE__ */ __name(function stringifiedValues(values, separator) {
     let string = "";
-    const sep3 = separator || ", ";
+    const sep4 = separator || ", ";
     const array = [].concat(values);
     if (!values || !array.length)
       return string;
     array.forEach((value) => {
       if (string.length)
-        string += sep3;
+        string += sep4;
       string += JSON.stringify(value);
     });
     return string;
@@ -168921,7 +168971,7 @@ var getSelectRenderers = /* @__PURE__ */ __name((config) => {
       const color = isInListOfValues || active2 ? blue : white;
       const text = active2 ? color.underline(optionLabel) : color(optionLabel);
       const sublabel = opt.sublabel ? color.grey(opt.sublabel) : "";
-      const indicator = isInListOfValues || active2 && !Array.isArray(value) ? color(shapes.radioActive) : color(shapes.radioInactive);
+      const indicator = isInListOfValues || active2 && !Array.isArray(value) ? color(opt.activeIcon ?? shapes.radioActive) : color(opt.inactiveIcon ?? shapes.radioInactive);
       return `${space(2)}${indicator} ${text} ${sublabel}`;
     }, "renderOption");
     const renderOptionCondition = /* @__PURE__ */ __name((_3, i) => {
@@ -170496,19 +170546,15 @@ init_import_meta_url();
 // ../cli/args.ts
 init_import_meta_url();
 var processArgument = /* @__PURE__ */ __name(async (args, name, promptConfig) => {
-  let value = args[name];
-  const renderSubmitted = getRenderers(promptConfig).submit;
-  if (value !== void 0) {
-    const error2 = promptConfig.validate?.(value);
-    if (error2) {
-      crash(error2);
-    }
-    const lines = renderSubmitted({ value });
-    logRaw(lines.join("\n"));
-    return value;
-  }
-  value = await inputPrompt(promptConfig);
-  return value;
+  const value = args[name];
+  const result = await inputPrompt({
+    ...promptConfig,
+    // Accept the default value if the arg is already set
+    acceptDefault: promptConfig.acceptDefault ?? value !== void 0,
+    defaultValue: value ?? promptConfig.defaultValue
+  });
+  args[name] = result;
+  return result;
 }, "processArgument");
 
 // src/cloudchamber/cli/index.ts
@@ -178010,10 +178056,10 @@ var import_node_path36 = __toESM(require("node:path"));
 
 // src/experimental-assets.ts
 init_import_meta_url();
-var import_node_assert16 = __toESM(require("node:assert"));
+var import_node_assert15 = __toESM(require("node:assert"));
 var import_node_fs20 = require("node:fs");
-var import_promises14 = require("node:fs/promises");
-var path40 = __toESM(require("node:path"));
+var import_promises13 = require("node:fs/promises");
+var path39 = __toESM(require("node:path"));
 var import_mime3 = __toESM(require_mime2());
 
 // ../../node_modules/.pnpm/p-queue@7.2.0/node_modules/p-queue/dist/index.js
@@ -178881,11 +178927,291 @@ function Progress({ done, total }) {
 }
 __name(Progress, "Progress");
 
+// src/experimental-assets.ts
+var BULK_UPLOAD_CONCURRENCY2 = 3;
+var MAX_ASSET_COUNT2 = 2e4;
+var MAX_ASSET_SIZE2 = 25 * 1024 * 1024;
+var MAX_UPLOAD_ATTEMPTS2 = 5;
+var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
+var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName, assetDirectory) => {
+  (0, import_node_assert15.default)(accountId, "Missing accountId");
+  logger.info("\u{1F300} Building list of assets...");
+  const manifest = await walk(assetDirectory, {});
+  logger.info("\u{1F300} Starting asset upload...");
+  const initializeAssetsResponse = await fetchResult(
+    `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
+    {
+      headers: { "Content-Type": "application/json" },
+      method: "POST",
+      body: JSON.stringify({ manifest })
+    }
+  );
+  if (initializeAssetsResponse.buckets.flat().length === 0) {
+    if (!initializeAssetsResponse.jwt) {
+      throw new FatalError(
+        "Could not find assets information to attach to deployment. Please try again.",
+        1
+      );
+    }
+    logger.info(`No files to upload. Proceeding with deployment...`);
+    return initializeAssetsResponse.jwt;
+  }
+  const numberFilesToUpload = initializeAssetsResponse.buckets.flat().length;
+  logger.info(
+    `\u{1F300} Found ${numberFilesToUpload} file${numberFilesToUpload > 1 ? "s" : ""} to upload. Proceeding with upload...`
+  );
+  const manifestLookup = Object.entries(manifest);
+  let assetLogCount = 0;
+  const assetBuckets = initializeAssetsResponse.buckets.map((bucket) => {
+    return bucket.map((fileHash) => {
+      const manifestEntry = manifestLookup.find(
+        (file) => file[1].hash === fileHash
+      );
+      if (manifestEntry === void 0) {
+        throw new FatalError(
+          `A file was requested that does not appear to exist.`,
+          1
+        );
+      }
+      assetLogCount = logAssetUpload(`+ ${manifestEntry[0]}`, assetLogCount);
+      return manifestEntry;
+    });
+  });
+  const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY2 });
+  let attempts = 0;
+  const start = Date.now();
+  let completionJwt = "";
+  for (const [bucketIndex, bucket] of assetBuckets.entries()) {
+    attempts = 0;
+    let gatewayErrors = 0;
+    const doUpload = /* @__PURE__ */ __name(async () => {
+      const payload = await Promise.all(
+        bucket.map(async (manifestEntry) => {
+          const absFilePath = path39.join(assetDirectory, manifestEntry[0]);
+          return {
+            base64: true,
+            key: manifestEntry[1].hash,
+            metadata: {
+              contentType: (0, import_mime3.getType)(absFilePath) || "application/octet-stream"
+            },
+            value: (await (0, import_promises13.readFile)(absFilePath)).toString("base64")
+          };
+        })
+      );
+      try {
+        const res = await fetchResult(
+          `/accounts/${accountId}/workers/assets/upload`,
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/jsonl",
+              Authorization: `Bearer ${initializeAssetsResponse.jwt}`
+            },
+            body: payload.map((x2) => JSON.stringify(x2)).join("\n")
+          }
+        );
+        logger.info(
+          `Uploaded bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length}`
+        );
+        return res;
+      } catch (e3) {
+        if (attempts < MAX_UPLOAD_ATTEMPTS2) {
+          logger.info(
+            source_default.dim(
+              `Bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length} upload failed. Retrying...
+`,
+              e3
+            )
+          );
+          await new Promise(
+            (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, attempts) * 1e3)
+          );
+          if (e3 instanceof APIError && e3.isGatewayError()) {
+            queue.concurrency = 1;
+            await new Promise(
+              (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, gatewayErrors) * 5e3)
+            );
+            gatewayErrors++;
+            if (gatewayErrors >= MAX_UPLOAD_GATEWAY_ERRORS2) {
+              attempts++;
+            }
+          } else {
+            attempts++;
+          }
+          return doUpload();
+        } else if (isJwtExpired(initializeAssetsResponse.jwt)) {
+          throw new FatalError(
+            `Upload took too long.
+Asset upload took too long on bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length}. Please try again.
+Assets already uploaded have been saved, so the next attempt will automatically resume from this point.`
+          );
+        } else {
+          throw e3;
+        }
+      }
+    }, "doUpload");
+    void queue.add(
+      () => doUpload().then((res) => {
+        completionJwt = res.jwt || completionJwt;
+      })
+    );
+  }
+  queue.on("error", (error2) => {
+    logger.error(error2.message);
+    throw error2;
+  });
+  await queue.onIdle();
+  if (!completionJwt) {
+    throw new FatalError(
+      "Failed to complete asset upload. Please try again.",
+      1
+    );
+  }
+  const uploadMs = Date.now() - start;
+  const skipped = Object.keys(manifest).length - numberFilesToUpload;
+  const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
+  logger.log(
+    `\u2728 Success! Uploaded ${numberFilesToUpload} file${numberFilesToUpload > 1 ? "s" : ""} ${skippedMessage}${formatTime2(uploadMs)}
+`
+  );
+  return completionJwt;
+}, "syncExperimentalAssets");
+var walk = /* @__PURE__ */ __name(async (dir, manifest, startingDir = dir) => {
+  const files = await (0, import_promises13.readdir)(dir);
+  let counter = 0;
+  await Promise.all(
+    files.map(async (file) => {
+      const filepath = path39.join(dir, file);
+      const relativeFilepath = path39.relative(startingDir, filepath);
+      const filestat = await (0, import_promises13.stat)(filepath);
+      if (filestat.isSymbolicLink()) {
+        return;
+      }
+      if (filestat.isDirectory()) {
+        manifest = await walk(filepath, manifest, startingDir);
+      } else {
+        if (counter >= MAX_ASSET_COUNT2) {
+          throw new UserError(
+            `Maximum number of assets exceeded.
+Cloudflare Workers supports up to ${MAX_ASSET_COUNT2.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${startingDir}".
+Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT2.toLocaleString()} files, and that you have specified your assets directory correctly.`
+          );
+        }
+        if (filestat.size > MAX_ASSET_SIZE2) {
+          throw new UserError(
+            `Asset too large.
+Cloudflare Workers supports assets with sizes of up to ${prettyBytes(
+              MAX_ASSET_SIZE2,
+              {
+                binary: true
+              }
+            )}. We found a file ${filepath} with a size of ${prettyBytes(
+              filestat.size,
+              {
+                binary: true
+              }
+            )}.
+Ensure all assets in your assets directory "${startingDir}" conform with the Workers maximum size requirement.`
+          );
+        }
+        manifest[encodeFilePath(relativeFilepath)] = {
+          hash: hashFile(filepath),
+          size: filestat.size
+        };
+        counter++;
+      }
+    })
+  );
+  return manifest;
+}, "walk");
+var MAX_DIFF_LINES = 100;
+function logAssetUpload(line, diffCount) {
+  const level = logger.loggerLevel;
+  if (LOGGER_LEVELS[level] >= LOGGER_LEVELS.debug) {
+    logger.debug(line);
+  } else if (diffCount < MAX_DIFF_LINES) {
+    logger.info(line);
+  } else if (diffCount === MAX_DIFF_LINES) {
+    const msg = "   (truncating changed assets log, set `WRANGLER_LOG=debug` environment variable to see full diff)";
+    logger.info(source_default.dim(msg));
+  }
+  return diffCount++;
+}
+__name(logAssetUpload, "logAssetUpload");
+function getExperimentalAssetsBasePath(config, experimentalAssetsCommandLineArg) {
+  return experimentalAssetsCommandLineArg ? process.cwd() : path39.resolve(path39.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 = path39.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");
+var encodeFilePath = /* @__PURE__ */ __name((filePath) => {
+  const encodedPath = filePath.split(path39.sep).map((segment) => encodeURIComponent(segment)).join("/");
+  return "/" + encodedPath;
+}, "encodeFilePath");
+
+// src/output.ts
+init_import_meta_url();
+var import_node_crypto6 = require("node:crypto");
+var import_node_fs21 = require("node:fs");
+var import_node_path35 = require("node:path");
+function writeOutput(entry) {
+  if (outputFilePath === void 0) {
+    outputFilePath = getOutputFilePath();
+  }
+  if (outputFilePath !== null) {
+    ensureDirectoryExistsSync(outputFilePath);
+    const entryJSON = JSON.stringify({
+      ...entry,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    (0, import_node_fs21.appendFileSync)(outputFilePath, entryJSON + "\n");
+  }
+}
+__name(writeOutput, "writeOutput");
+var outputFilePath = void 0;
+function getOutputFilePath() {
+  const outputFilePathFromEnv = getOutputFilePathFromEnv();
+  if (outputFilePathFromEnv) {
+    return outputFilePathFromEnv;
+  }
+  const outputFileDirectoryFromEnv = getOutputFileDirectoryFromEnv();
+  if (outputFileDirectoryFromEnv) {
+    const date = (/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-").replace(".", "_").replace("T", "_").replace("Z", "");
+    return (0, import_node_path35.resolve)(
+      outputFileDirectoryFromEnv,
+      `wrangler-output-${date}-${(0, import_node_crypto6.randomBytes)(3).toString("hex")}.json`
+    );
+  }
+  return null;
+}
+__name(getOutputFilePath, "getOutputFilePath");
+
 // src/sites.ts
 init_import_meta_url();
-var import_node_assert15 = __toESM(require("node:assert"));
-var import_promises13 = require("node:fs/promises");
-var path39 = __toESM(require("node:path"));
+var import_node_assert16 = __toESM(require("node:assert"));
+var import_promises14 = require("node:fs/promises");
+var path40 = __toESM(require("node:path"));
 var import_ignore = __toESM(require_ignore());
 
 // ../../node_modules/.pnpm/xxhash-wasm@1.0.1/node_modules/xxhash-wasm/esm/xxhash-wasm.js
@@ -178955,7 +179281,7 @@ var HIDDEN_FILES_TO_INCLUDE = /* @__PURE__ */ new Set([
   // See https://datatracker.ietf.org/doc/html/rfc8615
 ]);
 async function* getFilesInFolder(dirPath) {
-  const files = await (0, import_promises13.readdir)(dirPath, { withFileTypes: true });
+  const files = await (0, import_promises14.readdir)(dirPath, { withFileTypes: true });
   for (const file of files) {
     if (ALWAYS_IGNORE.has(file.name)) {
       continue;
@@ -178964,9 +179290,9 @@ async function* getFilesInFolder(dirPath) {
       continue;
     }
     if (file.isDirectory()) {
-      yield* await getFilesInFolder(path39.join(dirPath, file.name));
+      yield* await getFilesInFolder(path40.join(dirPath, file.name));
     } else {
-      yield path39.join(dirPath, file.name);
+      yield path40.join(dirPath, file.name);
     }
   }
 }
@@ -178976,11 +179302,11 @@ function hashFileContent(hasher, content) {
 }
 __name(hashFileContent, "hashFileContent");
 function hashAsset(hasher, filePath, content) {
-  const extName = path39.extname(filePath) || "";
-  const baseName = path39.basename(filePath, extName);
-  const directory = path39.dirname(filePath);
+  const extName = path40.extname(filePath) || "";
+  const baseName = path40.basename(filePath, extName);
+  const directory = path40.dirname(filePath);
   const hash = hashFileContent(hasher, content);
-  return urlSafe(path39.join(directory, `${baseName}.${hash}${extName}`));
+  return urlSafe(path40.join(directory, `${baseName}.${hash}${extName}`));
 }
 __name(hashAsset, "hashAsset");
 async function createKVNamespaceIfNotAlreadyExisting(title, accountId) {
@@ -178997,7 +179323,7 @@ async function createKVNamespaceIfNotAlreadyExisting(title, accountId) {
   };
 }
 __name(createKVNamespaceIfNotAlreadyExisting, "createKVNamespaceIfNotAlreadyExisting");
-var MAX_DIFF_LINES = 100;
+var MAX_DIFF_LINES2 = 100;
 var MAX_BUCKET_SIZE2 = 98 * 1e3 * 1e3;
 var MAX_BUCKET_KEYS = BATCH_KEY_MAX;
 var MAX_BATCH_OPERATIONS = 5;
@@ -179013,7 +179339,7 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
     logger.log("(Note: doing a dry run, not uploading or deleting anything.)");
     return { manifest: void 0, namespace: void 0 };
   }
-  (0, import_node_assert15.default)(accountId, "Missing accountId");
+  (0, import_node_assert16.default)(accountId, "Missing accountId");
   const title = `__${scriptName}-workers_sites_assets${preview ? "_preview" : ""}`;
   const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
     title,
@@ -179023,7 +179349,7 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
   const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
   const namespaceKeyInfoMap = new Map(namespaceKeysResponse.map((x2) => [x2.name, x2]));
   const namespaceKeys = new Set(namespaceKeysResponse.map((x2) => x2.name));
-  const assetDirectory = path39.join(
+  const assetDirectory = path40.join(
     siteAssets.baseDirectory,
     siteAssets.assetDirectory
   );
@@ -179041,9 +179367,9 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
     const level = logger.loggerLevel;
     if (LOGGER_LEVELS[level] >= LOGGER_LEVELS.debug) {
       logger.debug(line);
-    } else if (diffCount < MAX_DIFF_LINES) {
+    } else if (diffCount < MAX_DIFF_LINES2) {
       logger.info(line);
-    } else if (diffCount === MAX_DIFF_LINES) {
+    } else if (diffCount === MAX_DIFF_LINES2) {
       const msg = "   (truncating changed assets log, set `WRANGLER_LOG=debug` environment variable to see full diff)";
       logger.info(source_default.dim(msg));
     }
@@ -179052,11 +179378,11 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
   __name(logDiff, "logDiff");
   logger.info("Building list of assets to upload...");
   for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
-    const assetFile = path39.relative(assetDirectory, absAssetFile);
+    const assetFile = path40.relative(assetDirectory, absAssetFile);
     if (!include(assetFile) || exclude(assetFile)) {
       continue;
     }
-    const content = await (0, import_promises13.readFile)(absAssetFile, "base64");
+    const content = await (0, import_promises14.readFile)(absAssetFile, "base64");
     const assetSize = Buffer.byteLength(content);
     await validateAssetSize(absAssetFile, assetFile);
     const assetKey = hashAsset(hasher, assetFile, content);
@@ -179078,7 +179404,7 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
       skipCount++;
     }
     namespaceKeys.delete(assetKey);
-    const manifestKey = urlSafe(path39.relative(assetDirectory, absAssetFile));
+    const manifestKey = urlSafe(path40.relative(assetDirectory, absAssetFile));
     manifest[manifestKey] = assetKey;
   }
   if (uploadBucket.length > 0) {
@@ -179111,7 +179437,7 @@ async function syncLegacyAssets(accountId, scriptName, siteAssets, preview, dryR
       for (const [absAssetFile, assetKey] of nextBucket) {
         bucket.push({
           key: assetKey,
-          value: await (0, import_promises13.readFile)(absAssetFile, "base64"),
+          value: await (0, import_promises14.readFile)(absAssetFile, "base64"),
           base64: true
         });
         if (controller.signal.aborted) {
@@ -179199,7 +179525,7 @@ function createPatternMatcher(patterns, exclude) {
 }
 __name(createPatternMatcher, "createPatternMatcher");
 async function validateAssetSize(absFilePath, relativeFilePath) {
-  const { size } = await (0, import_promises13.stat)(absFilePath);
+  const { size } = await (0, import_promises14.stat)(absFilePath);
   if (size > 25 * 1024 * 1024) {
     throw new UserError(
       `File ${relativeFilePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
@@ -179220,7 +179546,7 @@ function urlSafe(filePath) {
 }
 __name(urlSafe, "urlSafe");
 function getLegacyAssetPaths(config, assetDirectory) {
-  const baseDirectory = assetDirectory ? process.cwd() : path39.resolve(path39.dirname(config.configPath ?? "wrangler.toml"));
+  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 || [];
   const excludePatterns = typeof config.legacy_assets !== "string" && config.legacy_assets?.exclude || [];
@@ -179233,7 +179559,7 @@ function getLegacyAssetPaths(config, assetDirectory) {
 }
 __name(getLegacyAssetPaths, "getLegacyAssetPaths");
 function getSiteAssetPaths(config, assetDirectory, includePatterns = config.site?.include ?? [], excludePatterns = config.site?.exclude ?? []) {
-  const baseDirectory = assetDirectory ? process.cwd() : path39.resolve(path39.dirname(config.configPath ?? "wrangler.toml"));
+  const baseDirectory = assetDirectory ? process.cwd() : path40.resolve(path40.dirname(config.configPath ?? "wrangler.toml"));
   assetDirectory ??= config.site?.bucket;
   if (assetDirectory) {
     return {
@@ -179248,283 +179574,6 @@ function getSiteAssetPaths(config, assetDirectory, includePatterns = config.site
 }
 __name(getSiteAssetPaths, "getSiteAssetPaths");
 
-// src/experimental-assets.ts
-var BULK_UPLOAD_CONCURRENCY2 = 3;
-var MAX_ASSET_COUNT2 = 2e4;
-var MAX_ASSET_SIZE2 = 25 * 1024 * 1024;
-var MAX_UPLOAD_ATTEMPTS2 = 5;
-var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
-var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName, assetDirectory) => {
-  (0, import_node_assert16.default)(accountId, "Missing accountId");
-  logger.info("\u{1F300} Building list of assets...");
-  const manifest = await walk(assetDirectory, {});
-  logger.info("\u{1F300} Starting asset upload...");
-  const initializeAssetsResponse = await fetchResult(
-    `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
-    {
-      headers: { "Content-Type": "application/json" },
-      method: "POST",
-      body: JSON.stringify({ manifest })
-    }
-  );
-  if (initializeAssetsResponse.buckets.flat().length === 0) {
-    if (!initializeAssetsResponse.jwt) {
-      throw new FatalError(
-        "Could not find assets information to attach to deployment. Please try again.",
-        1
-      );
-    }
-    logger.info(`No files to upload. Proceeding with deployment...`);
-    return initializeAssetsResponse.jwt;
-  }
-  const numberFilesToUpload = initializeAssetsResponse.buckets.flat().length;
-  logger.info(
-    `\u{1F300} Found ${numberFilesToUpload} file${numberFilesToUpload > 1 ? "s" : ""} to upload. Proceeding with upload...`
-  );
-  const manifestLookup = Object.entries(manifest);
-  let assetLogCount = 0;
-  const assetBuckets = initializeAssetsResponse.buckets.map((bucket) => {
-    return bucket.map((fileHash) => {
-      const manifestEntry = manifestLookup.find(
-        (file) => file[1].hash === fileHash
-      );
-      if (manifestEntry === void 0) {
-        throw new FatalError(
-          `A file was requested that does not appear to exist.`,
-          1
-        );
-      }
-      assetLogCount = logAssetUpload(`+ ${manifestEntry[0]}`, assetLogCount);
-      return manifestEntry;
-    });
-  });
-  const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY2 });
-  let attempts = 0;
-  const start = Date.now();
-  let completionJwt = "";
-  for (const [bucketIndex, bucket] of assetBuckets.entries()) {
-    attempts = 0;
-    let gatewayErrors = 0;
-    const doUpload = /* @__PURE__ */ __name(async () => {
-      const payload = await Promise.all(
-        bucket.map(async (manifestEntry) => {
-          const absFilePath = path40.join(assetDirectory, manifestEntry[0]);
-          return {
-            base64: true,
-            key: manifestEntry[1].hash,
-            metadata: {
-              contentType: (0, import_mime3.getType)(absFilePath) || "application/octet-stream"
-            },
-            value: (await (0, import_promises14.readFile)(absFilePath)).toString("base64")
-          };
-        })
-      );
-      try {
-        const res = await fetchResult(
-          `/accounts/${accountId}/workers/assets/upload`,
-          {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/x-ndjson",
-              Authorization: `Bearer ${initializeAssetsResponse.jwt}`
-            },
-            body: payload.map((x2) => JSON.stringify(x2)).join("\n")
-          }
-        );
-        logger.info(
-          `Uploaded bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length}`
-        );
-        return res;
-      } catch (e3) {
-        if (attempts < MAX_UPLOAD_ATTEMPTS2) {
-          logger.info(
-            source_default.dim(
-              `Bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length} upload failed. Retrying...
-`,
-              e3
-            )
-          );
-          await new Promise(
-            (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, attempts) * 1e3)
-          );
-          if (e3 instanceof APIError && e3.isGatewayError()) {
-            queue.concurrency = 1;
-            await new Promise(
-              (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, gatewayErrors) * 5e3)
-            );
-            gatewayErrors++;
-            if (gatewayErrors >= MAX_UPLOAD_GATEWAY_ERRORS2) {
-              attempts++;
-            }
-          } else {
-            attempts++;
-          }
-          return doUpload();
-        } else if (isJwtExpired(initializeAssetsResponse.jwt)) {
-          throw new FatalError(
-            `Upload took too long.
-Asset upload took too long on bucket ${bucketIndex + 1}/${initializeAssetsResponse.buckets.length}. Please try again.
-Assets already uploaded have been saved, so the next attempt will automatically resume from this point.`
-          );
-        } else {
-          throw e3;
-        }
-      }
-    }, "doUpload");
-    void queue.add(
-      () => doUpload().then((res) => {
-        completionJwt = res.jwt || completionJwt;
-      })
-    );
-  }
-  queue.on("error", (error2) => {
-    logger.error(error2.message);
-    throw error2;
-  });
-  await queue.onIdle();
-  if (!completionJwt) {
-    throw new FatalError(
-      "Failed to complete asset upload. Please try again.",
-      1
-    );
-  }
-  const uploadMs = Date.now() - start;
-  const skipped = Object.keys(manifest).length - numberFilesToUpload;
-  const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
-  logger.log(
-    `\u2728 Success! Uploaded ${numberFilesToUpload} file${numberFilesToUpload > 1 ? "s" : ""} ${skippedMessage}${formatTime2(uploadMs)}
-`
-  );
-  return completionJwt;
-}, "syncExperimentalAssets");
-var walk = /* @__PURE__ */ __name(async (dir, manifest, startingDir = dir) => {
-  const files = await (0, import_promises14.readdir)(dir);
-  let counter = 0;
-  await Promise.all(
-    files.map(async (file) => {
-      const filepath = path40.join(dir, file);
-      const relativeFilepath = path40.relative(startingDir, filepath);
-      const filestat = await (0, import_promises14.stat)(filepath);
-      if (filestat.isSymbolicLink()) {
-        return;
-      }
-      if (filestat.isDirectory()) {
-        manifest = await walk(filepath, manifest, startingDir);
-      } else {
-        if (counter >= MAX_ASSET_COUNT2) {
-          throw new UserError(
-            `Maximum number of assets exceeded.
-Cloudflare Workers supports up to ${MAX_ASSET_COUNT2.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${startingDir}".
-Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT2.toLocaleString()} files, and that you have specified your assets directory correctly.`
-          );
-        }
-        const name = urlSafe(relativeFilepath);
-        if (filestat.size > MAX_ASSET_SIZE2) {
-          throw new UserError(
-            `Asset too large.
-Cloudflare Workers supports assets with sizes of up to ${prettyBytes(
-              MAX_ASSET_SIZE2,
-              {
-                binary: true
-              }
-            )}. We found a file ${filepath} with a size of ${prettyBytes(
-              filestat.size,
-              {
-                binary: true
-              }
-            )}.
-Ensure all assets in your assets directory "${startingDir}" conform with the Workers maximum size requirement.`
-          );
-        }
-        manifest[urlSafe(path40.join("/", name))] = {
-          hash: hashFile(filepath),
-          size: filestat.size
-        };
-        counter++;
-      }
-    })
-  );
-  return manifest;
-}, "walk");
-var MAX_DIFF_LINES2 = 100;
-function logAssetUpload(line, diffCount) {
-  const level = logger.loggerLevel;
-  if (LOGGER_LEVELS[level] >= LOGGER_LEVELS.debug) {
-    logger.debug(line);
-  } else if (diffCount < MAX_DIFF_LINES2) {
-    logger.info(line);
-  } else if (diffCount === MAX_DIFF_LINES2) {
-    const msg = "   (truncating changed assets log, set `WRANGLER_LOG=debug` environment variable to see full diff)";
-    logger.info(source_default.dim(msg));
-  }
-  return diffCount++;
-}
-__name(logAssetUpload, "logAssetUpload");
-function getExperimentalAssetsBasePath(config, experimentalAssetsCommandLineArg) {
-  return experimentalAssetsCommandLineArg ? process.cwd() : path40.resolve(path40.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 = path40.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/output.ts
-init_import_meta_url();
-var import_node_crypto6 = require("node:crypto");
-var import_node_fs21 = require("node:fs");
-var import_node_path35 = require("node:path");
-function writeOutput(entry) {
-  if (outputFilePath === void 0) {
-    outputFilePath = getOutputFilePath();
-  }
-  if (outputFilePath !== null) {
-    ensureDirectoryExistsSync(outputFilePath);
-    const entryJSON = JSON.stringify({
-      ...entry,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    (0, import_node_fs21.appendFileSync)(outputFilePath, entryJSON + "\n");
-  }
-}
-__name(writeOutput, "writeOutput");
-var outputFilePath = void 0;
-function getOutputFilePath() {
-  const outputFilePathFromEnv = getOutputFilePathFromEnv();
-  if (outputFilePathFromEnv) {
-    return outputFilePathFromEnv;
-  }
-  const outputFileDirectoryFromEnv = getOutputFileDirectoryFromEnv();
-  if (outputFileDirectoryFromEnv) {
-    const date = (/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-").replace(".", "_").replace("T", "_").replace("Z", "");
-    return (0, import_node_path35.resolve)(
-      outputFileDirectoryFromEnv,
-      `wrangler-output-${date}-${(0, import_node_crypto6.randomBytes)(3).toString("hex")}.json`
-    );
-  }
-  return null;
-}
-__name(getOutputFilePath, "getOutputFilePath");
-
 // src/utils/collectKeyValues.ts
 init_import_meta_url();
 function collectKeyValues(array) {
@@ -179774,10 +179823,6 @@ Please shift to the --legacy-assets command to preserve the current functionalit
   if (!args.dryRun) {
     await standardPricingWarning(config);
   }
-  const experimentalAssetsOptions = experimentalAssets ? {
-    ...experimentalAssets,
-    staticAssetsOnly: !(args.script || config.main)
-  } : void 0;
   const beforeUpload = Date.now();
   const name = getScriptName(args, config);
   const { sourceMapSize, deploymentId, workerTag } = await deploy({
@@ -179797,7 +179842,7 @@ Please shift to the --legacy-assets command to preserve the current functionalit
     jsxFragment: args.jsxFragment,
     tsconfig: args.tsconfig,
     routes: args.routes,
-    experimentalAssets: experimentalAssetsOptions,
+    experimentalAssets,
     legacyAssetPaths,
     legacyEnv: isLegacyEnv(config),
     minify: args.minify,
@@ -181740,7 +181785,8 @@ function createWorkerBundleFormData(workerBundle, config) {
     data_blobs: void 0,
     dispatch_namespaces: void 0,
     logfwdr: void 0,
-    unsafe: void 0
+    unsafe: void 0,
+    experimental_assets: void 0
   };
   const placement = config?.placement?.mode === "smart" ? { mode: "smart" } : void 0;
   const worker = {
@@ -181759,7 +181805,7 @@ function createWorkerBundleFormData(workerBundle, config) {
     placement,
     tail_consumers: void 0,
     limits: config?.limits,
-    experimental_assets: void 0
+    experimental_assets_jwt: void 0
   };
   return createWorkerUploadForm(worker);
 }
@@ -188879,6 +188925,7 @@ async function createDraftWorker({
           dispatch_namespaces: [],
           mtls_certificates: [],
           logfwdr: { bindings: [] },
+          experimental_assets: void 0,
           unsafe: {
             bindings: void 0,
             metadata: void 0,
@@ -188898,7 +188945,7 @@ async function createDraftWorker({
         placement: void 0,
         tail_consumers: void 0,
         limits: void 0,
-        experimental_assets: void 0
+        experimental_assets_jwt: void 0
       })
     }
   );
@@ -201638,7 +201685,7 @@ async function copyWorkerVersionWithNewSecrets({
       "workers/message": versionMessage,
       "workers/tag": versionTag
     },
-    experimental_assets: void 0
+    experimental_assets_jwt: void 0
   };
   const body = createWorkerUploadForm(worker);
   const result = await fetchResult(
@@ -201999,14 +202046,11 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       legacyEnv: props.legacyEnv,
       env: props.env
     }) : void 0;
-    const experimentalAssetsWorkerInfo = props.experimentalAssets && !props.dryRun ? {
-      jwt: await syncExperimentalAssets(
-        accountId,
-        scriptName,
-        props.experimentalAssets.directory
-      ),
-      staticAssetsOnly: props.experimentalAssets.staticAssetsOnly
-    } : void 0;
+    const experimentalAssetsJwt = props.experimentalAssets && !props.dryRun ? await syncExperimentalAssets(
+      accountId,
+      scriptName,
+      props.experimentalAssets.directory
+    ) : void 0;
     const bindings = {
       kv_namespaces: config.kv_namespaces || [],
       send_email: config.send_email,
@@ -202030,6 +202074,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       dispatch_namespaces: config.dispatch_namespaces,
       mtls_certificates: config.mtls_certificates,
       logfwdr: config.logfwdr,
+      experimental_assets: config.experimental_assets?.binding ? { binding: config.experimental_assets?.binding } : void 0,
       unsafe: {
         bindings: config.unsafe.bindings,
         metadata: config.unsafe.metadata,
@@ -202065,7 +202110,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
         "workers/message": props.message,
         "workers/tag": props.tag
       },
-      experimental_assets: experimentalAssetsWorkerInfo
+      experimental_assets_jwt: experimentalAssetsJwt
     };
     await printBundleSize(
       { name: import_node_path56.default.basename(resolvedEntryPointPath), content },
@@ -202540,11 +202585,6 @@ async function versionsUploadHandler(args) {
       "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"
     );
   }
-  const experimentalAssetsOptions = experimentalAssets ? {
-    ...experimentalAssets,
-    // Flag use of assets without user worker
-    staticAssetsOnly: !(args.script || config.main)
-  } : void 0;
   const cliVars = collectKeyValues(args.var);
   const cliDefines = collectKeyValues(args.define);
   const cliAlias = collectKeyValues(args.alias);
@@ -202567,7 +202607,7 @@ async function versionsUploadHandler(args) {
     jsxFactory: args.jsxFactory,
     jsxFragment: args.jsxFragment,
     tsconfig: args.tsconfig,
-    experimentalAssets: experimentalAssetsOptions,
+    experimentalAssets,
     minify: args.minify,
     uploadSourceMaps: args.uploadSourceMaps,
     nodeCompat: args.nodeCompat,
@@ -205511,14 +205551,11 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       legacyEnv: props.legacyEnv,
       env: props.env
     }) : void 0;
-    const experimentalAssetsWorkerInfo = props.experimentalAssets && !props.dryRun ? {
-      jwt: await syncExperimentalAssets(
-        accountId,
-        scriptName,
-        props.experimentalAssets.directory
-      ),
-      staticAssetsOnly: props.experimentalAssets.staticAssetsOnly
-    } : void 0;
+    const experimentalAssetsJwt = props.experimentalAssets && !props.dryRun ? await syncExperimentalAssets(
+      accountId,
+      scriptName,
+      props.experimentalAssets.directory
+    ) : void 0;
     const legacyAssets = await syncLegacyAssets(
       accountId,
       // When we're using the newer service environments, we wouldn't
@@ -205561,6 +205598,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       dispatch_namespaces: config.dispatch_namespaces,
       mtls_certificates: config.mtls_certificates,
       logfwdr: config.logfwdr,
+      experimental_assets: config.experimental_assets?.binding ? { binding: config.experimental_assets.binding } : void 0,
       unsafe: {
         bindings: config.unsafe.bindings,
         metadata: config.unsafe.metadata,
@@ -205599,7 +205637,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
       placement,
       tail_consumers: config.tail_consumers,
       limits: config.limits,
-      experimental_assets: experimentalAssetsWorkerInfo
+      experimental_assets_jwt: experimentalAssetsJwt
     };
     sourceMapSize = worker.sourceMaps?.reduce(
       (acc, m2) => acc + m2.content.length,
@@ -206145,7 +206183,13 @@ var path63 = __toESM(require("node:path"));
 var import_miniflare15 = require("miniflare");
 var CERT_EXPIRY_DAYS = 30;
 var ONE_DAY_IN_MS = 864e5;
-function getHttpsOptions(customHttpsKeyPath, customHttpsCertPath) {
+var getHttpsKeyPathFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_HTTPS_KEY_PATH"
+});
+var getHttpsCertPathFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_HTTPS_CERT_PATH"
+});
+function getHttpsOptions(customHttpsKeyPath = getHttpsKeyPathFromEnv(), customHttpsCertPath = getHttpsCertPathFromEnv()) {
   if (customHttpsKeyPath !== void 0 || customHttpsCertPath !== void 0) {
     if (customHttpsKeyPath === void 0 || customHttpsCertPath === void 0) {
       throw new UserError(
@@ -207100,7 +207144,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: void 0
+    experimental_assets_jwt: void 0
     // no remote mode for assets
   };
   return init3;
@@ -209425,7 +209469,8 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
             dispatch_namespaces: void 0,
             mtls_certificates: void 0,
             logfwdr: void 0,
-            unsafe: void 0
+            unsafe: void 0,
+            experimental_assets: void 0
           })
         },
         dev: {
@@ -210040,7 +210085,8 @@ function getBindings(configParam, env7, local, args) {
       capnp: configParam.unsafe.capnp
     },
     mtls_certificates: configParam.mtls_certificates,
-    send_email: configParam.send_email
+    send_email: configParam.send_email,
+    experimental_assets: configParam.experimental_assets?.binding ? { binding: configParam.experimental_assets?.binding } : void 0
   };
   return bindings;
 }
@@ -212814,4 +212860,3 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
-//# sourceMappingURL=cli.js.map