wrangler 0.0.0-e5a3814 → 0.0.0-e61fba8

package/kv-asset-handler.js

@@ -0,0 +1 @@
+export * from "@cloudflare/kv-asset-handler";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e5a3814",
+  "version": "0.0.0-e61fba8",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -114,6 +114,7 @@
     "templates",
     "vendor",
     "import_meta_url.js",
+    "kv-asset-handler.js",
     "Cloudflare_CA.pem"
   ],
   "scripts": {

package/src/__tests__/dev.test.tsx

@@ -856,6 +856,33 @@ describe("wrangler dev", () => {
         }
       `);
     });
+
+    it("should error if --experimental-public and --site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      await expect(
+        runWrangler("dev --experimental-public abc --site xyz")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
+
+    it("should error if --experimental-public and config.site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "xyz",
+        },
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      await expect(
+        runWrangler("dev --experimental-public abc")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
   });
 
   describe("--inspect", () => {

package/src/__tests__/kv.test.ts

@@ -448,10 +448,11 @@ describe("wrangler", () => {
       });
 
       it("should put a key with a value loaded from a given path", async () => {
-        writeFileSync("foo.txt", "file-contents", "utf-8");
+        const buf = Buffer.from("file-contents", "utf-8");
+        writeFileSync("foo.txt", buf);
         const requests = mockKeyPutRequest("some-namespace-id", {
           key: "my-key",
-          value: "file-contents",
+          value: buf,
         });
         await runWrangler(
           "kv:key put my-key --namespace-id some-namespace-id --path foo.txt"
@@ -463,6 +464,26 @@ describe("wrangler", () => {
         expect(requests.count).toEqual(1);
       });
 
+      it("should put a key with a binary value loaded from a given path", async () => {
+        const buf = Buffer.from(
+          "iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAiSURBVHgB7coxEQAACMPAgH/PgAM6dGwu49fA/deIBXrgAj2cAhIFT4QxAAAAAElFTkSuQmCC",
+          "base64"
+        );
+        writeFileSync("test.png", buf);
+        const requests = mockKeyPutRequest("another-namespace-id", {
+          key: "my-key",
+          value: buf,
+        });
+        await runWrangler(
+          "kv:key put my-key --namespace-id another-namespace-id --path test.png"
+        );
+        expect(std.out).toMatchInlineSnapshot(
+          `"Writing the contents of test.png to the key \\"my-key\\" on namespace another-namespace-id."`
+        );
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(requests.count).toEqual(1);
+      });
+
       it("should error if no key is provided", async () => {
         await expect(
           runWrangler("kv:key put")

package/src/__tests__/publish.test.ts

@@ -1404,6 +1404,69 @@ addEventListener('fetch', event => {});`
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should upload all the files in the directory specified by `--experimental-public`", async () => {
+      const assets = [
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
+      ];
+      const kvNamespace = {
+        title: "__test-name-workers_sites_assets",
+        id: "__test-name-workers_sites_assets-id",
+      };
+      writeWranglerToml({
+        main: "./index.js",
+      });
+      writeWorkerSource();
+      writeAssets(assets);
+      mockUploadWorkerRequest({
+        expectedMainModule: "stdin.js",
+      });
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+      await runWrangler("publish --experimental-public assets");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should error if --experimental-public and --site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+      });
+      writeWorkerSource();
+      await expect(
+        runWrangler("publish --experimental-public abc --site xyz")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
+
+    it("should error if --experimental-public and config.site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "xyz",
+        },
+      });
+      writeWorkerSource();
+      await expect(
+        runWrangler("publish --experimental-public abc")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
+
     it("should not contain backslash for assets with nested directories", async () => {
       const assets = [
         { filePath: "subdir/file-1.txt", content: "Content of file-1" },
@@ -2098,34 +2161,25 @@ addEventListener('fetch', event => {});`
       mockSubDomainRequest();
       mockListKVNamespacesRequest(kvNamespace);
       mockKeyListRequest(kvNamespace.id, []);
+      const requests = mockUploadAssetsToKVRequest(kvNamespace.id);
+
+      await runWrangler("publish");
 
       // We expect this to be uploaded in 3 batches
       // The first batch has 11 files (88mb)
+      expect(requests[0].uploads.length).toEqual(11);
       // The next batch has 5 files (93mb)
+      expect(requests[1].uploads.length).toEqual(5);
       // And the last one has 4 files (98mb)
+      expect(requests[2].uploads.length).toEqual(4);
 
-      // Since the bulk upload api endpoint stays the same
-      // We're going to have to clear the mock as soon as it's resolved
-      // And immediately add a mock for another one
-      // Welcome to a callback pyramid in 2022
-
-      const removeFirstBulkUploadMockFn = mockUploadAssetsToKVRequest(
-        kvNamespace.id,
-        assets.slice(0, 11),
-        () => {
-          removeFirstBulkUploadMockFn();
-          const removeSecondBulkUploadMockFn = mockUploadAssetsToKVRequest(
-            kvNamespace.id,
-            assets.slice(11, 16),
-            () => {
-              removeSecondBulkUploadMockFn();
-              mockUploadAssetsToKVRequest(kvNamespace.id, assets.slice(16, 20));
-            }
-          );
+      let assetIndex = 0;
+      for (const request of requests) {
+        for (const upload of request.uploads) {
+          checkAssetUpload(assets[assetIndex], upload);
+          assetIndex++;
         }
-      );
-
-      await runWrangler("publish");
+      }
 
       expect(std).toMatchInlineSnapshot(`
         Object {
@@ -5311,6 +5365,7 @@ function mockUploadWorkerRequest(
   options: {
     available_on_subdomain?: boolean;
     expectedEntry?: string;
+    expectedMainModule?: string;
     expectedType?: "esm" | "sw";
     expectedBindings?: unknown;
     expectedModules?: Record<string, string>;
@@ -5324,6 +5379,7 @@ function mockUploadWorkerRequest(
   const {
     available_on_subdomain = true,
     expectedEntry,
+    expectedMainModule = "index.js",
     expectedType = "esm",
     expectedBindings,
     expectedModules = {},
@@ -5347,6 +5403,7 @@ function mockUploadWorkerRequest(
         expect(envName).toEqual(env);
       }
       expect(queryParams.get("include_subdomain_availability")).toEqual("true");
+      expect(queryParams.get("excludeScript")).toEqual("true");
       const formBody = body as FormData;
       if (expectedEntry !== undefined) {
         expect(await (formBody.get("index.js") as File).text()).toMatch(
@@ -5357,7 +5414,7 @@ function mockUploadWorkerRequest(
         formBody.get("metadata") as string
       ) as WorkerMetadata;
       if (expectedType === "esm") {
-        expect(metadata.main_module).toEqual("index.js");
+        expect(metadata.main_module).toEqual(expectedMainModule);
       } else {
         expect(metadata.body_part).toEqual("index.js");
       }
@@ -5618,51 +5675,60 @@ function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
   );
 }
 
+interface ExpectedAsset {
+  filePath: string;
+  content: string;
+  expiration?: number;
+  expiration_ttl?: number;
+}
+interface StaticAssetUpload {
+  key: string;
+  base64: boolean;
+  value: string;
+  expiration: number | undefined;
+  expiration_ttl: number | undefined;
+}
+
 /** Create a mock handler for the request that tries to do a bulk upload of assets to a KV namespace. */
 function mockUploadAssetsToKVRequest(
   expectedNamespaceId: string,
-  assets: {
-    filePath: string;
-    content: string;
-    expiration?: number;
-    expiration_ttl?: number;
-  }[],
-  onUpload?: () => void
+  assets?: ExpectedAsset[]
 ) {
-  return setMockResponse(
+  const requests: {
+    uploads: StaticAssetUpload[];
+  }[] = [];
+  setMockResponse(
     "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
     "PUT",
     ([_url, accountId, namespaceId], { body }) => {
       expect(accountId).toEqual("some-account-id");
       expect(namespaceId).toEqual(expectedNamespaceId);
       const uploads = JSON.parse(body as string);
-      expect(assets.length).toEqual(uploads.length);
-      for (let i = 0; i < uploads.length; i++) {
-        const asset = assets[i];
-        const upload = uploads[i];
-        // The asset key consists of:
-        // - the basename of the filepath
-        // - some hash value
-        // - the extension
-        const keyMatcher = new RegExp(
-          "^" +
-            asset.filePath
-              .replace(/(\.[^.]+)$/, ".[a-z0-9]+$1")
-              .replace(/\./g, "\\.")
-        );
-        expect(upload.key).toMatch(keyMatcher);
-        // The asset value is base64 encoded.
-        expect(upload.base64).toBe(true);
-        expect(Buffer.from(upload.value, "base64").toString()).toEqual(
-          asset.content
-        );
-        expect(upload.expiration).toEqual(asset.expiration);
-        expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
+      if (assets) {
+        expect(assets.length).toEqual(uploads.length);
+        for (let i = 0; i < uploads.length; i++) {
+          checkAssetUpload(assets[i], uploads[i]);
+        }
+      } else {
+        requests.push({ uploads });
       }
-      onUpload?.();
-      return null;
     }
   );
+  return requests;
+}
+
+function checkAssetUpload(asset: ExpectedAsset, upload: StaticAssetUpload) {
+  // The asset key consists of: `<basename>.<hash>.<extension>`
+  const keyMatcher = new RegExp(
+    "^" +
+      asset.filePath.replace(/(\.[^.]+)$/, ".[a-z0-9]+$1").replace(/\./g, "\\.")
+  );
+  expect(upload.key).toMatch(keyMatcher);
+  // The asset value is base64 encoded.
+  expect(upload.base64).toBe(true);
+  expect(Buffer.from(upload.value, "base64").toString()).toEqual(asset.content);
+  expect(upload.expiration).toEqual(asset.expiration);
+  expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
 }
 
 /** Create a mock handler for thr request that does a bulk delete of unused assets */

package/src/bundle.ts

@@ -175,7 +175,14 @@ function getEntryPoint(
             path.join(__dirname, "../templates/static-asset-facade.js"),
             "utf8"
           )
-          .replace("__ENTRY_POINT__", entryFile),
+          // on windows, escape backslashes in the path (`\`)
+          .replace("__ENTRY_POINT__", entryFile.replaceAll("\\", "\\\\"))
+          .replace(
+            "__KV_ASSET_HANDLER__",
+            path
+              .join(__dirname, "../kv-asset-handler.js")
+              .replaceAll("\\", "\\\\")
+          ),
         sourcefile: "static-asset-facade.js",
         resolveDir: path.dirname(entryFile),
       },

package/src/config/environment.ts

@@ -175,7 +175,7 @@ interface EnvironmentInheritable {
     /** The directory in which the command is executed. */
     cwd?: string;
     /** The directory to watch for changes while using wrangler dev, defaults to the current working directory */
-    watch_dir?: string | string[] | undefined;
+    watch_dir?: string | string[];
     /**
      * Deprecated field previously used to configure the build and upload of the script.
      * @deprecated

package/src/config/validation.ts

@@ -227,8 +227,7 @@ function normalizeAndValidateBuild(
   rawBuild: Config["build"],
   configPath: string | undefined
 ): Config["build"] & { deprecatedUpload: DeprecatedUpload } {
-  const { command, cwd, watch_dir: _watch_dir, upload, ...rest } = rawBuild;
-  let { watch_dir } = rawBuild;
+  const { command, cwd, watch_dir = "./src", upload, ...rest } = rawBuild;
   const deprecatedUpload: DeprecatedUpload = { ...upload };
   validateAdditionalProperties(diagnostics, "build", Object.keys(rest), []);
 
@@ -285,9 +284,6 @@ function normalizeAndValidateBuild(
     );
   }
 
-  // default watch_dir to './src'
-  watch_dir ||= "./src";
-
   return {
     command,
     watch_dir:

package/src/dev/dev.tsx

@@ -20,7 +20,6 @@ import type { Config } from "../config";
 import type { Entry } from "../entry";
 import type { AssetPaths } from "../sites";
 import type { CfWorkerInit } from "../worker";
-import type { EsbuildBundle } from "./use-esbuild";
 
 export type DevProps = {
   name?: string;
@@ -54,10 +53,6 @@ export type DevProps = {
 };
 
 export function DevImplementation(props: DevProps): JSX.Element {
-  const directory = useTmpDir();
-
-  useCustomBuild(props.entry, props.build);
-
   if (props.public && props.entry.format === "service-worker") {
     throw new Error(
       "You cannot use the service-worker format with a `public` directory."
@@ -82,37 +77,16 @@ export function DevImplementation(props: DevProps): JSX.Element {
     );
   }
 
-  const bundle = useEsbuild({
-    entry: props.entry,
-    destination: directory,
-    staticRoot: props.public,
-    jsxFactory: props.jsxFactory,
-    rules: props.rules,
-    jsxFragment: props.jsxFragment,
-    serveAssetsFromWorker: !!props.public,
-    tsconfig: props.tsconfig,
-    minify: props.minify,
-    nodeCompat: props.nodeCompat,
-  });
-
   // only load the UI if we're running in a supported environment
   const { isRawModeSupported } = useStdin();
   return isRawModeSupported ? (
-    <InteractiveDevSession {...props} bundle={bundle} />
+    <InteractiveDevSession {...props} />
   ) : (
-    <DevSession
-      {...props}
-      bundle={bundle}
-      local={props.initialMode === "local"}
-    />
+    <DevSession {...props} local={props.initialMode === "local"} />
   );
 }
 
-type InteractiveDevSessionProps = DevProps & {
-  bundle: EsbuildBundle | undefined;
-};
-
-function InteractiveDevSession(props: InteractiveDevSessionProps) {
+function InteractiveDevSession(props: DevProps) {
   const toggles = useHotkeys(
     {
       local: props.initialMode === "local",
@@ -145,13 +119,33 @@ function InteractiveDevSession(props: InteractiveDevSessionProps) {
   );
 }
 
-type DevSessionProps = InteractiveDevSessionProps & { local: boolean };
+type DevSessionProps = DevProps & {
+  local: boolean;
+};
 
 function DevSession(props: DevSessionProps) {
+  useCustomBuild(props.entry, props.build);
+
+  const directory = useTmpDir();
+
+  const bundle = useEsbuild({
+    entry: props.entry,
+    destination: directory,
+    staticRoot: props.public,
+    jsxFactory: props.jsxFactory,
+    rules: props.rules,
+    jsxFragment: props.jsxFragment,
+    // In dev for remote mode, we serve --experimental-assets from the local proxy before we send the request to the worker.
+    serveAssetsFromWorker: !!props.public && !!props.local,
+    tsconfig: props.tsconfig,
+    minify: props.minify,
+    nodeCompat: props.nodeCompat,
+  });
+
   return props.local ? (
     <Local
       name={props.name}
-      bundle={props.bundle}
+      bundle={bundle}
       format={props.entry.format}
       compatibilityDate={props.compatibilityDate}
       localProtocol={props.localProtocol}
@@ -169,7 +163,7 @@ function DevSession(props: DevSessionProps) {
   ) : (
     <Remote
       name={props.name}
-      bundle={props.bundle}
+      bundle={bundle}
       format={props.entry.format}
       accountId={props.accountId}
       bindings={props.bindings}

package/src/dev/local.tsx

@@ -84,11 +84,6 @@ function useLocalWorker({
         abortSignal: abortController.signal,
       });
 
-      if (publicDirectory) {
-        throw new Error(
-          '⎔ A "public" folder is not yet supported in local mode.'
-        );
-      }
       if (bindings.services && bindings.services.length > 0) {
         throw new Error(
           "⎔ Service bindings are not yet supported in local mode."
@@ -254,12 +249,16 @@ function useLocalWorker({
         process.stdout.write(data);
       });
 
+      // parse the node inspector url (which may be received in chunks) from stderr
+      let stderrData = "";
       local.current.stderr?.on("data", (data: Buffer) => {
+        stderrData += data.toString();
         const matches =
-          /Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)/.exec(
-            data.toString()
+          /Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)[\r|\n]/.exec(
+            stderrData
           );
         if (matches) {
+          local.current?.stderr?.removeAllListeners("data");
           setInspectorUrl(matches[1]);
         }
       });

package/src/dev/remote.tsx

@@ -40,6 +40,7 @@ export function Remote(props: {
     accountId: props.accountId,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
+    public: props.public,
     port: props.port,
     compatibilityDate: props.compatibilityDate,
     compatibilityFlags: props.compatibilityFlags,
@@ -74,6 +75,7 @@ export function useWorker(props: {
   accountId: string | undefined;
   bindings: CfWorkerInit["bindings"];
   assetPaths: AssetPaths | undefined;
+  public: string | undefined;
   port: number;
   compatibilityDate: string | undefined;
   compatibilityFlags: string[] | undefined;
@@ -131,7 +133,7 @@ export function useWorker(props: {
         // include it in the kv namespace name regardless (since there's no
         // concept of service environments for kv namespaces yet).
         name + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
-        assetPaths,
+        props.public ? undefined : assetPaths,
         true,
         false
       ); // TODO: cancellable?
@@ -223,6 +225,7 @@ export function useWorker(props: {
     accountId,
     port,
     assetPaths,
+    props.public,
     compatibilityDate,
     compatibilityFlags,
     usageModel,

package/src/dev/use-esbuild.ts

@@ -14,7 +14,6 @@ export type EsbuildBundle = {
   entry: Entry;
   type: "esm" | "commonjs";
   modules: CfModule[];
-  serveAssetsFromWorker: boolean;
 };
 
 export function useEsbuild({
@@ -67,8 +66,7 @@ export function useEsbuild({
 
       const { resolvedEntryPointPath, bundleType, modules, stop } =
         await bundleWorker(entry, destination, {
-          // In dev, we serve assets from the local proxy before we send the request to the worker.
-          serveAssetsFromWorker: false,
+          serveAssetsFromWorker,
           jsxFactory,
           jsxFragment,
           rules,
@@ -87,7 +85,6 @@ export function useEsbuild({
         path: resolvedEntryPointPath,
         type: bundleType,
         modules,
-        serveAssetsFromWorker,
       });
     }
 

package/src/index.tsx

@@ -48,6 +48,7 @@ import {
   parsePackageJSON,
   parseTOML,
   readFileSync,
+  readFileSyncToBuffer,
 } from "./parse";
 import publish from "./publish";
 import { createR2Bucket, deleteR2Bucket, listR2Buckets } from "./r2";
@@ -1086,6 +1087,12 @@ function createCLIParser(argv: string[]) {
           );
         }
 
+        if (args["experimental-public"] && (args.site || config.site)) {
+          throw new Error(
+            "Cannot use --experimental-public and a Site configuration together."
+          );
+        }
+
         if (args.public) {
           throw new Error(
             "The --public field has been renamed to --experimental-public, and will change behaviour in the future."
@@ -1229,7 +1236,7 @@ function createCLIParser(argv: string[]) {
               accountId={config.account_id}
               assetPaths={getAssetPaths(
                 config,
-                args.site,
+                args["experimental-public"] || args.site,
                 args.siteInclude,
                 args.siteExclude
               )}
@@ -1384,23 +1391,29 @@ function createCLIParser(argv: string[]) {
     },
     async (args) => {
       await printWranglerBanner();
+
+      const configPath =
+        (args.config as ConfigPath) ||
+        (args.script && findWranglerToml(path.dirname(args.script)));
+      const config = readConfig(configPath, args);
+      const entry = await getEntry(args, config, "publish");
+
       if (args["experimental-public"]) {
         logger.warn(
           "The --experimental-public field is experimental and will change in the future."
         );
       }
+      if (args["experimental-public"] && (args.site || config.site)) {
+        throw new Error(
+          "Cannot use --experimental-public and a Site configuration together."
+        );
+      }
       if (args.public) {
         throw new Error(
           "The --public field has been renamed to --experimental-public, and will change behaviour in the future."
         );
       }
 
-      const configPath =
-        (args.config as ConfigPath) ||
-        (args.script && findWranglerToml(path.dirname(args.script)));
-      const config = readConfig(configPath, args);
-      const entry = await getEntry(args, config, "publish");
-
       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"
@@ -2260,7 +2273,7 @@ function createCLIParser(argv: string[]) {
             const namespaceId = getKVNamespaceId(args, config);
             // One of `args.path` and `args.value` must be defined
             const value = args.path
-              ? readFileSync(args.path)
+              ? readFileSyncToBuffer(args.path)
               : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 args.value!;
 

package/src/kv.ts

@@ -111,7 +111,7 @@ export async function deleteKVNamespace(
  */
 export interface KeyValue {
   key: string;
-  value: string;
+  value: string | Buffer;
   expiration?: number;
   expiration_ttl?: number;
   metadata?: object;

package/src/parse.ts

@@ -139,6 +139,25 @@ export function parseJSON<T>(input: string, file?: string): T {
   }
 }
 
+/**
+ * Reads a file into a node Buffer.
+ */
+export function readFileSyncToBuffer(file: string): Buffer {
+  try {
+    return fs.readFileSync(file);
+  } catch (err) {
+    const { message } = err as Error;
+    throw new ParseError({
+      text: `Could not read file: ${file}`,
+      notes: [
+        {
+          text: message.replace(file, resolve(file)),
+        },
+      ],
+    });
+  }
+}
+
 /**
  * Reads a file and parses it based on its type.
  */

package/src/publish.ts

@@ -430,7 +430,12 @@ export default async function publish(props: Props): Promise<void> {
             method: "PUT",
             body: createWorkerUploadForm(worker),
           },
-          new URLSearchParams({ include_subdomain_availability: "true" })
+          new URLSearchParams({
+            include_subdomain_availability: "true",
+            // pass excludeScript so the whole body of the
+            // script doesn't get included in the response
+            excludeScript: "true",
+          })
         )
       ).available_on_subdomain;
     }

package/templates/static-asset-facade.js

@@ -1,6 +1,6 @@
 // DO NOT IMPORT THIS DIRECTLY
 import worker from "__ENTRY_POINT__";
-import { getAssetFromKV } from "@cloudflare/kv-asset-handler";
+import { getAssetFromKV } from "__KV_ASSET_HANDLER__";
 import manifest from "__STATIC_CONTENT_MANIFEST";
 const ASSET_MANIFEST = JSON.parse(manifest);
 

package/wrangler-dist/cli.js

@@ -116943,7 +116943,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "0.0.0-e5a3814";
+var version = "0.0.0-e61fba8";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -117057,6 +117057,7 @@ var files = [
   "templates",
   "vendor",
   "import_meta_url.js",
+  "kv-asset-handler.js",
   "Cloudflare_CA.pem"
 ];
 var scripts = {
@@ -117242,6 +117243,21 @@ function parseJSON(input, file) {
     throw new ParseError({ text, location });
   }
 }
+function readFileSyncToBuffer(file) {
+  try {
+    return fs2.readFileSync(file);
+  } catch (err2) {
+    const { message } = err2;
+    throw new ParseError({
+      text: `Could not read file: ${file}`,
+      notes: [
+        {
+          text: message.replace(file, (0, import_node_path5.resolve)(file))
+        }
+      ]
+    });
+  }
+}
 function readFileSync5(file) {
   try {
     return fs2.readFileSync(file, { encoding: "utf-8" });
@@ -118398,8 +118414,7 @@ Consider adding an environment configuration section to the wrangler.toml file:
   return { config, diagnostics };
 }
 function normalizeAndValidateBuild(diagnostics, rawEnv, rawBuild, configPath) {
-  const { command: command2, cwd: cwd2, watch_dir: _watch_dir, upload: upload2, ...rest } = rawBuild;
-  let { watch_dir } = rawBuild;
+  const { command: command2, cwd: cwd2, watch_dir = "./src", upload: upload2, ...rest } = rawBuild;
   const deprecatedUpload = { ...upload2 };
   validateAdditionalProperties(diagnostics, "build", Object.keys(rest), []);
   validateOptionalProperty(diagnostics, "build", "command", command2, "string");
@@ -118422,7 +118437,6 @@ main = "${import_node_path7.default.join(rawBuild.upload?.dir ?? "./dist", rawBu
 \`\`\``, true);
     deprecated(diagnostics, rawEnv, "build.upload.dir", `Use the top level "main" field or a command-line argument to specify the entry-point for the Worker.`, true);
   }
-  watch_dir ||= "./src";
   return {
     command: command2,
     watch_dir: command2 && configPath ? Array.isArray(watch_dir) ? watch_dir.map((dir) => import_node_path7.default.relative(process.cwd(), import_node_path7.default.join(import_node_path7.default.dirname(configPath), `${dir}`))) : import_node_path7.default.relative(process.cwd(), import_node_path7.default.join(import_node_path7.default.dirname(configPath), `${watch_dir}`)) : watch_dir,
@@ -120513,9 +120527,6 @@ function useLocalWorker({
         timeout: 2e3,
         abortSignal: abortController.signal
       });
-      if (publicDirectory) {
-        throw new Error('\u2394 A "public" folder is not yet supported in local mode.');
-      }
       if (bindings.services && bindings.services.length > 0) {
         throw new Error("\u2394 Service bindings are not yet supported in local mode.");
       }
@@ -120605,9 +120616,12 @@ function useLocalWorker({
       local.current.stdout?.on("data", (data) => {
         process.stdout.write(data);
       });
+      let stderrData = "";
       local.current.stderr?.on("data", (data) => {
-        const matches = /Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)/.exec(data.toString());
+        stderrData += data.toString();
+        const matches = /Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)[\r|\n]/.exec(stderrData);
         if (matches) {
+          local.current?.stderr?.removeAllListeners("data");
           setInspectorUrl(matches[1]);
         }
       });
@@ -121114,6 +121128,7 @@ function Remote(props) {
     accountId: props.accountId,
     bindings: props.bindings,
     assetPaths: props.assetPaths,
+    public: props.public,
     port: props.port,
     compatibilityDate: props.compatibilityDate,
     compatibilityFlags: props.compatibilityFlags,
@@ -121168,7 +121183,7 @@ function useWorker(props) {
       accountIdRef.current = await requireAuth({
         account_id: accountIdRef.current
       });
-      const assets = await syncAssets(accountIdRef.current, name2 + (!props.legacyEnv && props.env ? `-${props.env}` : ""), assetPaths, true, false);
+      const assets = await syncAssets(accountIdRef.current, name2 + (!props.legacyEnv && props.env ? `-${props.env}` : ""), props.public ? void 0 : assetPaths, true, false);
       const content = await (0, import_promises4.readFile)(bundle.path, "utf-8");
       const init = {
         name: name2,
@@ -121231,6 +121246,7 @@ ${onboardingLink}`);
     accountId,
     port,
     assetPaths,
+    props.public,
     compatibilityDate,
     compatibilityFlags,
     usageModel,
@@ -121338,7 +121354,7 @@ function getEntryPoint(entryFile, serveAssetsFromWorker) {
   if (serveAssetsFromWorker) {
     return {
       stdin: {
-        contents: fs4.readFileSync(path15.join(__dirname, "../templates/static-asset-facade.js"), "utf8").replace("__ENTRY_POINT__", entryFile),
+        contents: fs4.readFileSync(path15.join(__dirname, "../templates/static-asset-facade.js"), "utf8").replace("__ENTRY_POINT__", entryFile.replaceAll("\\", "\\\\")).replace("__KV_ASSET_HANDLER__", path15.join(__dirname, "../kv-asset-handler.js").replaceAll("\\", "\\\\")),
         sourcefile: "static-asset-facade.js",
         resolveDir: path15.dirname(entryFile)
       }
@@ -121384,7 +121400,7 @@ function useEsbuild({
       if (!destination)
         return;
       const { resolvedEntryPointPath, bundleType, modules, stop } = await bundleWorker(entry, destination, {
-        serveAssetsFromWorker: false,
+        serveAssetsFromWorker,
         jsxFactory,
         jsxFragment,
         rules,
@@ -121399,8 +121415,7 @@ function useEsbuild({
         entry,
         path: resolvedEntryPointPath,
         type: bundleType,
-        modules,
-        serveAssetsFromWorker
+        modules
       });
     }
     build6().catch((err2) => {
@@ -121427,8 +121442,6 @@ function useEsbuild({
 
 // src/dev/dev.tsx
 function DevImplementation(props) {
-  const directory = useTmpDir();
-  useCustomBuild(props.entry, props.build);
   if (props.public && props.entry.format === "service-worker") {
     throw new Error("You cannot use the service-worker format with a `public` directory.");
   }
@@ -121441,25 +121454,11 @@ function DevImplementation(props) {
   if (props.bindings.data_blobs && props.entry.format === "modules") {
     throw new Error("You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml");
   }
-  const bundle = useEsbuild({
-    entry: props.entry,
-    destination: directory,
-    staticRoot: props.public,
-    jsxFactory: props.jsxFactory,
-    rules: props.rules,
-    jsxFragment: props.jsxFragment,
-    serveAssetsFromWorker: !!props.public,
-    tsconfig: props.tsconfig,
-    minify: props.minify,
-    nodeCompat: props.nodeCompat
-  });
   const { isRawModeSupported } = (0, import_ink3.useStdin)();
   return isRawModeSupported ? /* @__PURE__ */ import_react7.default.createElement(InteractiveDevSession, {
-    ...props,
-    bundle
+    ...props
   }) : /* @__PURE__ */ import_react7.default.createElement(DevSession, {
     ...props,
-    bundle,
     local: props.initialMode === "local"
   });
 }
@@ -121489,9 +121488,23 @@ function InteractiveDevSession(props) {
   }, "[x]"), /* @__PURE__ */ import_react7.default.createElement(import_ink3.Text, null, " to exit")));
 }
 function DevSession(props) {
+  useCustomBuild(props.entry, props.build);
+  const directory = useTmpDir();
+  const bundle = useEsbuild({
+    entry: props.entry,
+    destination: directory,
+    staticRoot: props.public,
+    jsxFactory: props.jsxFactory,
+    rules: props.rules,
+    jsxFragment: props.jsxFragment,
+    serveAssetsFromWorker: !!props.public && !!props.local,
+    tsconfig: props.tsconfig,
+    minify: props.minify,
+    nodeCompat: props.nodeCompat
+  });
   return props.local ? /* @__PURE__ */ import_react7.default.createElement(Local, {
     name: props.name,
-    bundle: props.bundle,
+    bundle,
     format: props.entry.format,
     compatibilityDate: props.compatibilityDate,
     localProtocol: props.localProtocol,
@@ -121507,7 +121520,7 @@ function DevSession(props) {
     crons: props.crons
   }) : /* @__PURE__ */ import_react7.default.createElement(Remote, {
     name: props.name,
-    bundle: props.bundle,
+    bundle,
     format: props.entry.format,
     accountId: props.accountId,
     bindings: props.bindings,
@@ -124606,7 +124619,10 @@ async function publish(props) {
       available_on_subdomain = (await fetchResult(workerUrl, {
         method: "PUT",
         body: createWorkerUploadForm(worker)
-      }, new import_node_url12.URLSearchParams({ include_subdomain_availability: "true" }))).available_on_subdomain;
+      }, new import_node_url12.URLSearchParams({
+        include_subdomain_availability: "true",
+        excludeScript: "true"
+      }))).available_on_subdomain;
     }
   } finally {
     if (typeof destination !== "string") {
@@ -125579,6 +125595,9 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
       if (args["experimental-public"]) {
         logger.warn("The --experimental-public field is experimental and will change in the future.");
       }
+      if (args["experimental-public"] && (args.site || config.site)) {
+        throw new Error("Cannot use --experimental-public and a Site configuration together.");
+      }
       if (args.public) {
         throw new Error("The --public field has been renamed to --experimental-public, and will change behaviour in the future.");
       }
@@ -125668,7 +125687,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           localProtocol: args["local-protocol"] || config.dev.local_protocol,
           enableLocalPersistence: args["experimental-enable-local-persistence"] || false,
           accountId: config.account_id,
-          assetPaths: getAssetPaths(config, args.site, args.siteInclude, args.siteExclude),
+          assetPaths: getAssetPaths(config, args["experimental-public"] || args.site, args.siteInclude, args.siteExclude),
           port: args.port || config.dev.port || await getLocalPort(),
           ip: args.ip || config.dev.ip,
           inspectorPort: args["inspector-port"] ?? await getInspectorPort(),
@@ -125780,15 +125799,18 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     });
   }, async (args) => {
     await printWranglerBanner();
+    const configPath = args.config || args.script && findWranglerToml(import_node_path21.default.dirname(args.script));
+    const config = readConfig(configPath, args);
+    const entry = await getEntry(args, config, "publish");
     if (args["experimental-public"]) {
       logger.warn("The --experimental-public field is experimental and will change in the future.");
     }
+    if (args["experimental-public"] && (args.site || config.site)) {
+      throw new Error("Cannot use --experimental-public and a Site configuration together.");
+    }
     if (args.public) {
       throw new Error("The --public field has been renamed to --experimental-public, and will change behaviour in the future.");
     }
-    const configPath = args.config || args.script && findWranglerToml(import_node_path21.default.dirname(args.script));
-    const config = readConfig(configPath, args);
-    const entry = await getEntry(args, config, "publish");
     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");
     }
@@ -126294,7 +126316,7 @@ ${shouldDo}`);
       await printWranglerBanner();
       const config = readConfig(args.config, args);
       const namespaceId = getKVNamespaceId(args, config);
-      const value = args.path ? readFileSync5(args.path) : args.value;
+      const value = args.path ? readFileSyncToBuffer(args.path) : args.value;
       if (args.path) {
         logger.log(`Writing the contents of ${args.path} to the key "${key2}" on namespace ${namespaceId}.`);
       } else {