wrangler 2.0.11 → 2.0.12

package/kv-asset-handler.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -36,6 +36,7 @@
     "cli"
   ],
   "dependencies": {
+    "@cloudflare/kv-asset-handler": "^0.2.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "blake3-wasm": "^2.1.5",
@@ -113,6 +114,7 @@
     "templates",
     "vendor",
     "import_meta_url.js",
+    "kv-asset-handler.js",
     "Cloudflare_CA.pem"
   ],
   "scripts": {

package/src/__tests__/configuration.test.ts

@@ -19,7 +19,7 @@ describe("normalizeAndValidateConfig()", () => {
       build: {
         command: undefined,
         cwd: undefined,
-        watch_dir: undefined,
+        watch_dir: "./src",
       },
       compatibility_date: undefined,
       compatibility_flags: [],
@@ -879,171 +879,250 @@ describe("normalizeAndValidateConfig()", () => {
       `);
     });
 
-    it("should error on invalid `name` value with spaces", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "NCC 1701 D",
-      } as unknown as RawEnvironment;
+    describe("name", () => {
+      it("should error on invalid `name` value with spaces", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "NCC 1701 D",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"NCC 1701 D\\"."
-      `);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"NCC 1701 D\\"."
+        `);
+      });
 
-    it("should be valid `name` with underscores", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "enterprise_nx_01",
-      } as unknown as RawEnvironment;
+      it("should be valid `name` with underscores", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "enterprise_nx_01",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.hasErrors()).toBe(false);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(false);
+      });
 
-    it("should error on invalid `name` value with special characters", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "Thy'lek-Shran",
-      } as unknown as RawEnvironment;
+      it("should error on invalid `name` value with special characters", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "Thy'lek-Shran",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"Thy'lek-Shran\\"."
-      `);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"Thy'lek-Shran\\"."
+        `);
+      });
 
-    it("should error on invalid `name` value with only special characters", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "!@#$%^&*(()",
-      } as unknown as RawEnvironment;
+      it("should error on invalid `name` value with only special characters", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "!@#$%^&*(()",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"!@#$%^&*(()\\"."
-      `);
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"!@#$%^&*(()\\"."
+        `);
+      });
     });
 
-    it("should override build.upload config defaults with provided values and warn about deprecations", () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          upload: {
-            dir: "src",
-            format: "modules",
-            main: "index.ts",
-            rules: [{ type: "Text", globs: ["GLOB"], fallthrough: true }],
+    describe("build", () => {
+      it("should override build.upload config defaults with provided values and warn about deprecations", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            upload: {
+              dir: "src",
+              format: "modules",
+              main: "index.ts",
+              rules: [{ type: "Text", globs: ["GLOB"], fallthrough: true }],
+            },
           },
-        },
-      };
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        path.resolve("project/wrangler.toml"),
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          path.resolve("project/wrangler.toml"),
+          { env: undefined }
+        );
 
-      expect(config.main).toEqual(path.resolve("project/src/index.ts"));
-      expect(config.build.upload).toBeUndefined();
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(true);
-      expect(normalizePath(diagnostics.renderWarnings()))
-        .toMatchInlineSnapshot(`
-        "Processing project/wrangler.toml configuration:
-          - Deprecation: \\"build.upload.format\\":
-            The format is inferred automatically from the code.
-          - Deprecation: \\"build.upload.main\\":
-            Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-            Then add the top level \`main\` field to your configuration file:
-            \`\`\`
-            main = \\"src/index.ts\\"
-            \`\`\`
-          - Deprecation: \\"build.upload.dir\\":
-            Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
-          - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
-            \`\`\`
-            [[rules]]
-            type = \\"Text\\"
-            globs = [ \\"GLOB\\" ]
-            fallthrough = true
-            \`\`\`"
-      `);
-    });
+        expect(config.main).toEqual(path.resolve("project/src/index.ts"));
+        expect(config.build.upload).toBeUndefined();
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(normalizePath(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
+          "Processing project/wrangler.toml configuration:
+            - Deprecation: \\"build.upload.format\\":
+              The format is inferred automatically from the code.
+            - Deprecation: \\"build.upload.main\\":
+              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+              Then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"src/index.ts\\"
+              \`\`\`
+            - Deprecation: \\"build.upload.dir\\":
+              Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
+            - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
+              \`\`\`
+              [[rules]]
+              type = \\"Text\\"
+              globs = [ \\"GLOB\\" ]
+              fallthrough = true
+              \`\`\`"
+        `);
+      });
 
-    it("should default custom build watch directories to src", () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          command: "execute some --build",
-        },
-      };
+      it("should default custom build watch directories to src", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config.build).toEqual(
-        expect.objectContaining({
-          command: "execute some --build",
-          watch_dir: "./src",
-        })
-      );
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: "./src",
+          })
+        );
 
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(false);
-    });
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
 
-    it("should resolve custom build watch directories relative to wrangler.toml", async () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          command: "execute some --build",
-          watch_dir: "some/path",
-        },
-      };
+      it("should resolve custom build watch directories relative to wrangler.toml", async () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: "some/path",
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        "project/wrangler.toml",
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
 
-      expect(config.build).toEqual(
-        expect.objectContaining({
-          command: "execute some --build",
-          watch_dir: path.normalize("project/some/path"),
-        })
-      );
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: path.normalize("project/some/path"),
+          })
+        );
 
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
+
+      it("should allow watch_dir to be an array of paths", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: ["some/path/a", "some/path/b", "some/path/c"],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
+
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: [
+              path.normalize("project/some/path/a"),
+              path.normalize("project/some/path/b"),
+              path.normalize("project/some/path/c"),
+            ],
+          })
+        );
+
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
+
+      it("should error when the watch_dir array isn't an array of strings", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: [
+              "some/path/a",
+              "some/path/b",
+              // @ts-expect-error intentionally bad "paths"
+              123,
+              "some/path/c",
+              // @ts-expect-error intentionally bad "paths"
+              false,
+            ],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
+
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: [
+              path.normalize("project/some/path/a"),
+              path.normalize("project/some/path/b"),
+              path.normalize("project/123"),
+              path.normalize("project/some/path/c"),
+              path.normalize("project/false"),
+            ],
+          })
+        );
+
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(true);
+
+        expect(normalizePath(diagnostics.renderErrors()))
+          .toMatchInlineSnapshot(`
+          "Processing project/wrangler.toml configuration:
+            - Expected \\"build.watch_dir.[2]\\" to be of type string but got 123.
+            - Expected \\"build.watch_dir.[4]\\" to be of type string but got false."
+        `);
+      });
     });
 
     describe("durable_objects field", () => {

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__/index.test.ts

@@ -242,7 +242,8 @@ describe("wrangler", () => {
     expect(std.out).toMatchInlineSnapshot(`
       "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
 
-        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build for more information.
+        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
+        for more information.
         Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
 
 

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")