wrangler 3.68.0 → 3.69.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.68.0",
+  "version": "3.69.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -66,7 +66,8 @@
     "workerd": "1.20240725.0",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20240725.0"
+    "miniflare": "3.20240725.0",
+    "@cloudflare/workers-shared": "0.1.0"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
@@ -151,9 +152,9 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
+    "@cloudflare/pages-shared": "^0.11.50",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.11.50",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/templates/no-op-assets-worker.ts

@@ -0,0 +1,33 @@
+/**
+ * This Worker is used as a default entry-point for Assets-only
+ * Workers. It proxies the request directly on to the Asset Sever
+ * Worker service binding.
+ *
+ * In an Assets-only Workers world, we want to enable users
+ * to deploy a Worker with Assets without ever having to provide
+ * a User Worker.
+ *
+ * ```bash
+ * wrangler dev --experimental-assets dist
+ * wrangler deploy --experimental-assets dist
+ * ```
+ *
+ * ```toml
+ * name = "assets-only-worker"
+ * compatibility_date = "2024-01-01"
+ * ```
+ *
+ * Without a user-defined Worker, which usually serves as the entry
+ * point in the bundling process, wrangler needs to default to some
+ * other entry-point Worker for all intents and purposes. This is what
+ * this Worker is.
+ */
+type Env = {
+	ASSET_SERVER: Fetcher;
+};
+
+export default {
+	async fetch(request: Request, env: Env) {
+		return env.ASSET_SERVER.fetch(request);
+	},
+};

package/wrangler-dist/cli.d.ts

@@ -151,6 +151,8 @@ declare type Binding = {
     type: "logfwdr";
 } & Omit<CfLogfwdrBinding, "name">) | {
     type: `unsafe_${string}`;
+} | {
+    type: "assets";
 };
 
 declare type BindingOmit<T> = Omit<T, "binding" | "name">;
@@ -25923,6 +25925,9 @@ declare interface StartDevWorkerInput {
         enableServiceEnvironments?: boolean;
     };
     unsafe?: Omit<CfUnsafe, "bindings">;
+    experimental?: {
+        assets?: Omit<ExperimentalAssets, "bindings">;
+    };
 }
 
 declare type StartDevWorkerOptions = StartDevWorkerInput & {

package/wrangler-dist/cli.js

@@ -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");
@@ -152672,7 +152672,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.68.0";
+var version = "3.69.1";
 var package_default = {
   name: "wrangler",
   version,
@@ -152745,6 +152745,7 @@ var package_default = {
   },
   dependencies: {
     "@cloudflare/kv-asset-handler": "workspace:*",
+    "@cloudflare/workers-shared": "workspace:*",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -159390,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.`
@@ -162601,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 ?? []) {
@@ -162929,12 +162933,50 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
           proxy: true
         }))
       },
+      ...getAssetServerWorker(config),
       ...externalWorkers
     ]
   };
   return { options: options21, internalObjects, entrypointNames };
 }
 __name(buildMiniflareOptions, "buildMiniflareOptions");
+function getAssetServerWorker(config) {
+  if (!config.experimentalAssets) {
+    return [];
+  }
+  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}`
+    );
+  }
+  return [
+    {
+      name: assetServerConfig?.name,
+      compatibilityDate: assetServerConfig?.compatibility_date,
+      compatibilityFlags: assetServerConfig?.compatibility_flags,
+      modulesRoot: (0, import_node_path22.dirname)(assetServerModulePath),
+      modules: [
+        {
+          type: "ESModule",
+          path: assetServerModulePath
+        }
+      ],
+      unsafeDirectSockets: [
+        {
+          host: "127.0.0.1",
+          port: 0
+        }
+      ]
+    }
+  ];
+}
+__name(getAssetServerWorker, "getAssetServerWorker");
 var ReloadedEvent = class extends Event {
   url;
   internalDurableObjects;
@@ -163041,6 +163083,7 @@ async function localPropsToConfigBundle(props) {
     bindings: props.bindings,
     workerDefinitions: props.workerDefinitions,
     legacyAssetPaths: props.legacyAssetPaths,
+    experimentalAssets: props.experimentalAssets,
     initialPort: props.initialPort,
     initialIp: props.initialIp,
     rules: props.rules,
@@ -163397,11 +163440,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) {
@@ -201053,8 +201091,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(
@@ -201071,8 +201112,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) => {
@@ -206622,6 +206669,9 @@ function DevSession(props) {
       unsafe: {
         capnp: props.bindings.unsafe?.capnp,
         metadata: props.bindings.unsafe?.metadata
+      },
+      experimental: {
+        assets: props.experimentalAssets
       }
     };
   }, [
@@ -206637,6 +206687,7 @@ function DevSession(props) {
     props.isWorkersSite,
     props.local,
     props.legacyAssetsConfig,
+    props.experimentalAssets,
     props.processEntrypoint,
     props.additionalModules,
     props.env,
@@ -206790,6 +206841,7 @@ function DevSession(props) {
       bindings: props.bindings,
       workerDefinitions,
       legacyAssetPaths: props.legacyAssetPaths,
+      experimentalAssets: props.experimentalAssets,
       initialPort: void 0,
       initialIp: "127.0.0.1",
       rules: props.rules,
@@ -207391,6 +207443,7 @@ async function startDevServer(props) {
       compatibilityFlags: props.compatibilityFlags,
       bindings: props.bindings,
       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",
@@ -208175,6 +208228,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) {
@@ -208327,6 +208389,9 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           },
           legacyAssets: (configParam) => configParam.legacy_assets,
           enableServiceEnvironments: !(args.legacyEnv ?? true)
+        },
+        experimental: {
+          assets: experimentalAssets
         }
       });
       void sendMetricsEvent(
@@ -208355,10 +208420,6 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         }
       });
     }
-    const experimentalAssets = processExperimentalAssetsArg(args, config);
-    if (experimentalAssets) {
-      args.forceLocal = true;
-    }
     const {
       entry,
       upstreamProtocol,
@@ -208424,6 +208485,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
           accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
           legacyAssetPaths,
           legacyAssetsConfig: configParam.legacy_assets,
+          experimentalAssets,
           initialPort: args.port ?? configParam.dev.port ?? await getLocalPort2(),
           initialIp: args.ip || configParam.dev.ip,
           inspectorPort: args.inspectorPort ?? configParam.dev.inspector_port ?? await getInspectorPort2(),
@@ -208563,6 +208625,7 @@ async function startApiDev(args) {
       accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
       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,
@@ -208664,6 +208727,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,
@@ -208694,11 +208767,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(
@@ -208965,7 +209033,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
@@ -209490,7 +209558,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"
@@ -209536,6 +209608,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) {
@@ -209720,6 +209795,7 @@ async function convertToConfigBundle(event) {
       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: [],