wrangler 0.0.0-e95e5a0 → 0.0.0-e978986

package/src/__tests__/dev.test.tsx

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import getPort from "get-port";
 import patchConsole from "patch-console";
 import dedent from "ts-dedent";
 import Dev from "../dev/dev";
@@ -82,7 +83,7 @@ describe("wrangler dev", () => {
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler dev path/to/script\`) or the \`main\` config field.
@@ -224,6 +225,32 @@ describe("wrangler dev", () => {
       );
     });
 
+    it("should strip leading `*` from given host when deducing a zone id", async () => {
+      writeWranglerToml({
+        main: "index.js",
+        route: "*some-host.com/some/path/*",
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
+      await runWrangler("dev");
+      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
+        "some-host.com"
+      );
+    });
+
+    it("should strip leading `*.` from given host when deducing a zone id", async () => {
+      writeWranglerToml({
+        main: "index.js",
+        route: "*.some-host.com/some/path/*",
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      mockGetZones("some-host.com", [{ id: "some-zone-id" }]);
+      await runWrangler("dev");
+      expect((Dev as jest.Mock).mock.calls[0][0].zone.host).toEqual(
+        "some-host.com"
+      );
+    });
+
     it("should, when provided, use a configured zone_id", async () => {
       writeWranglerToml({
         main: "index.js",
@@ -432,18 +459,20 @@ describe("wrangler dev", () => {
         },
       });
 
-      await expect(
-        runWrangler("dev")
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\""`
-      );
+      await expect(runWrangler("dev")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+            `);
       expect(std.out).toMatchInlineSnapshot(`
         "Running custom build: node -e \\"console.log('custom build');\\"
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
-        "X [ERROR] Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\"
+        "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+
+          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 
         "
       `);
@@ -580,8 +609,73 @@ describe("wrangler dev", () => {
     });
   });
 
+  describe("port", () => {
+    it("should default port to 8787 if it is not in use", async () => {
+      writeWranglerToml({
+        main: "index.js",
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      await runWrangler("dev");
+      expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(8787);
+      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should use to `port` from `wrangler.toml`, if available", async () => {
+      writeWranglerToml({
+        main: "index.js",
+        dev: {
+          port: 8888,
+        },
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      // Mock `getPort()` to resolve to a completely different port.
+      (getPort as jest.Mock).mockResolvedValue(98765);
+
+      await runWrangler("dev");
+      expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(8888);
+      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should use --port command line arg, if provided", async () => {
+      writeWranglerToml({
+        main: "index.js",
+        dev: {
+          port: 8888,
+        },
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      // Mock `getPort()` to resolve to a completely different port.
+      (getPort as jest.Mock).mockResolvedValue(98765);
+
+      await runWrangler("dev --port=9999");
+      expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(9999);
+      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should use a different port to the default if it is in use", async () => {
+      writeWranglerToml({
+        main: "index.js",
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      // Mock `getPort()` to resolve to a completely different port.
+      (getPort as jest.Mock).mockResolvedValue(98765);
+
+      await runWrangler("dev");
+      expect((Dev as jest.Mock).mock.calls[0][0].port).toEqual(98765);
+      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+  });
+
   describe("durable_objects", () => {
-    it("should warn if there is one or more remote Durable Object", async () => {
+    it("should warn if there are remote Durable Objects, or missing migrations for local Durable Objects", async () => {
       writeWranglerToml({
         main: "index.js",
         durable_objects: {
@@ -604,9 +698,33 @@ describe("wrangler dev", () => {
       fs.writeFileSync("index.js", `export default {};`);
       await runWrangler("dev");
       expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
-      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.out).toMatchInlineSnapshot(`
+        "Your worker has access to the following bindings:
+        - Durable Objects:
+          - NAME_1: CLASS_1
+          - NAME_2: CLASS_2 (defined in SCRIPT_A)
+          - NAME_3: CLASS_3
+          - NAME_4: CLASS_4 (defined in SCRIPT_B)"
+      `);
       expect(std.warn).toMatchInlineSnapshot(`
-        "▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - In wrangler.toml, you have configured [durable_objects] exported by this Worker (CLASS_1,
+          CLASS_3), but no [migrations] for them. This may not work as expected until you add a [migrations]
+          section to your wrangler.toml. Add this configuration to your wrangler.toml:
+
+                \`\`\`
+                [[migrations]]
+                tag = \\"v1\\" # Should be unique for each entry
+                new_classes = [\\"CLASS_1\\", \\"CLASS_3\\"]
+                \`\`\`
+
+              Refer to
+          https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
+          for more details.
+
+
+        ▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
 
           Be aware that changes to the data stored in these Durable Objects will be permanent and affect the
           live instances.
@@ -661,9 +779,18 @@ describe("wrangler dev", () => {
         EMPTY: "",
         UNQUOTED: "unquoted value", // Note that whitespace is trimmed
       });
-      expect(std.out).toMatchInlineSnapshot(
-        `"Using vars defined in .dev.vars"`
-      );
+      expect(std.out).toMatchInlineSnapshot(`
+        "Using vars defined in .dev.vars
+        Your worker has access to the following bindings:
+        - Vars:
+          - VAR_1: \\"(hidden)\\"
+          - VAR_2: \\"original value 2\\"
+          - VAR_3: \\"(hidden)\\"
+          - VAR_MULTI_LINE_1: \\"(hidden)\\"
+          - VAR_MULTI_LINE_2: \\"(hidden)\\"
+          - EMPTY: \\"(hidden)\\"
+          - UNQUOTED: \\"(hidden)\\""
+      `);
       expect(std.warn).toMatchInlineSnapshot(`""`);
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
@@ -680,7 +807,11 @@ describe("wrangler dev", () => {
       expect(std).toMatchInlineSnapshot(`
         Object {
           "debug": "",
-          "err": "wrangler dev [script]
+          "err": "X [ERROR] Not enough arguments following: site
+
+        ",
+          "out": "
+        wrangler dev [script]
 
         👂 Start a local server for developing your worker
 
@@ -688,10 +819,9 @@ describe("wrangler dev", () => {
           script  The path to an entry point for your worker  [string]
 
         Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]
 
         Options:
               --name                                       Name of the worker  [string]
@@ -718,12 +848,7 @@ describe("wrangler dev", () => {
               --minify                                     Minify the script  [boolean]
               --node-compat                                Enable node.js compatibility  [boolean]
               --experimental-enable-local-persistence      Enable persistence for this session (only for local mode)  [boolean]
-              --inspect                                    Enable dev tools  [deprecated] [boolean]
-        X [ERROR] Not enough arguments following: site
-
-        ",
-          "out": "
-        ",
+              --inspect                                    Enable dev tools  [deprecated] [boolean]",
           "warn": "",
         }
       `);
@@ -746,6 +871,99 @@ describe("wrangler dev", () => {
       `);
     });
   });
+
+  describe("service bindings", () => {
+    it("should warn when using service bindings", async () => {
+      writeWranglerToml({
+        services: [
+          { binding: "WorkerA", service: "A" },
+          { binding: "WorkerB", service: "B", environment: "staging" },
+        ],
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      await runWrangler("dev index.js");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Your worker has access to the following bindings:
+        - Services:
+          - WorkerA: A
+          - WorkerB: B - staging",
+          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"services\\" fields are experimental and may change or break at any time.
+
+
+        ▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
+
+        ",
+        }
+      `);
+    });
+  });
+
+  describe("print bindings", () => {
+    it("should print bindings", async () => {
+      writeWranglerToml({
+        services: [
+          { binding: "WorkerA", service: "A" },
+          { binding: "WorkerB", service: "B", environment: "staging" },
+        ],
+      });
+      fs.writeFileSync("index.js", `export default {};`);
+      await runWrangler("dev index.js");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Your worker has access to the following bindings:
+        - Services:
+          - WorkerA: A
+          - WorkerB: B - staging",
+          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"services\\" fields are experimental and may change or break at any time.
+
+
+        ▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
+
+        ",
+        }
+      `);
+    });
+
+    it("should mask vars that were overriden in .dev.vars", async () => {
+      writeWranglerToml({
+        vars: {
+          variable: 123,
+          overriden: "original values",
+        },
+      });
+      fs.writeFileSync(
+        ".dev.vars",
+        `
+        SECRET = "A secret"
+        overriden = "overriden value"
+      `
+      );
+      fs.writeFileSync("index.js", `export default {};`);
+      await runWrangler("dev index.js");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Using vars defined in .dev.vars
+        Your worker has access to the following bindings:
+        - Vars:
+          - variable: \\"123\\"
+          - overriden: \\"(hidden)\\"
+          - SECRET: \\"(hidden)\\"",
+          "warn": "",
+        }
+      `);
+    });
+  });
 });
 
 function mockGetZones(domain: string, zones: { id: string }[] = []) {

package/src/__tests__/helpers/mock-dialogs.ts

@@ -1,4 +1,4 @@
-import { confirm, prompt } from "../../dialogs";
+import { confirm, prompt, select } from "../../dialogs";
 import { normalizeSlashes } from "./mock-console";
 
 /**
@@ -88,3 +88,43 @@ export function clearPromptMocks() {
     );
   });
 }
+
+/**
+ * The expected values for a select request.
+ */
+export interface SelectExpectation {
+  /** The text expected to be seen in the select dialog. */
+  text: string;
+  /** The mock response send back from the select dialog. */
+  result: string;
+}
+
+/**
+ * Mock the implementation of `select()` that will respond with configured results
+ * for configured select text messages.
+ *
+ * If there is a call to `select()` that does not match any of the expectations
+ * then an error is thrown.
+ */
+export function mockSelect(...expectations: SelectExpectation[]) {
+  (select as jest.Mock).mockImplementation((text: string) => {
+    for (const { text: expectedText, result } of expectations) {
+      if (normalizeSlashes(text) === normalizeSlashes(expectedText)) {
+        return Promise.resolve(result);
+      }
+    }
+    throw new Error(`Unexpected select message: ${text}`);
+  });
+}
+
+export function clearSelectMocks() {
+  (select as jest.Mock).mockReset();
+  // Because select was originally a spy, calling mockReset will simply reset
+  // it as a function with no return value (!), so we need to additionally reset
+  // the mock implementation to the one that throws (from jest.setup.js).
+  (select as jest.Mock).mockImplementation((text: string) => {
+    throw new Error(
+      `Unexpected call to \`select("${text}")\`.\nYou should use \`mockSelect()\` to mock calls to \`select()\` with expectations. Search the codebase for \`mockSelect\` to learn more.`
+    );
+  });
+}

package/src/__tests__/index.test.ts

@@ -2,6 +2,8 @@ import { getPackageManager } from "../package-manager";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import { writeWorkerSource } from "./helpers/write-worker-source";
+import writeWranglerToml from "./helpers/write-wrangler-toml";
 import type { PackageManager } from "../package-manager";
 
 describe("wrangler", () => {
@@ -44,10 +46,9 @@ describe("wrangler", () => {
           wrangler whoami            🕵️  Retrieve your user info and test your auth config
 
         Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]"
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
       `);
 
       expect(std.err).toMatchInlineSnapshot(`""`);
@@ -64,10 +65,7 @@ describe("wrangler", () => {
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        "
-      `);
-      expect(std.err).toMatchInlineSnapshot(`
-        "wrangler
+        wrangler
 
         Commands:
           wrangler init [name]       📥 Create a wrangler.toml configuration file
@@ -85,11 +83,12 @@ describe("wrangler", () => {
           wrangler whoami            🕵️  Retrieve your user info and test your auth config
 
         Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]
-        X [ERROR] Unknown argument: invalid-command
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] Unknown argument: invalid-command
 
         "
       `);
@@ -116,9 +115,6 @@ describe("wrangler", () => {
   });
 
   describe("subcommand implicit help ran on incomplete command execution", () => {
-    function endEventLoop() {
-      return new Promise((resolve) => setImmediate(resolve));
-    }
     it("no subcommand for 'secret' should display a list of available subcommands", async () => {
       await runWrangler("secret");
       await endEventLoop();
@@ -133,10 +129,9 @@ describe("wrangler", () => {
           wrangler secret list          List all secrets for a script
 
         Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]"
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
       `);
     });
 
@@ -144,20 +139,19 @@ describe("wrangler", () => {
       await runWrangler("kv:namespace");
       await endEventLoop();
       expect(std.out).toMatchInlineSnapshot(`
-         "wrangler kv:namespace
+        "wrangler kv:namespace
 
-         🗂️  Interact with your Workers KV Namespaces
+        🗂️  Interact with your Workers KV Namespaces
 
-         Commands:
-           wrangler kv:namespace create <namespace>  Create a new namespace
-           wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
-           wrangler kv:namespace delete              Deletes a given namespace.
+        Commands:
+          wrangler kv:namespace create <namespace>  Create a new namespace
+          wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
+          wrangler kv:namespace delete              Deletes a given namespace.
 
-         Flags:
-           -c, --config      Path to .toml configuration file  [string]
-           -h, --help        Show help  [boolean]
-           -v, --version     Show version number  [boolean]
-               --legacy-env  Use legacy environments  [boolean]"
+        Flags:
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
       `);
     });
 
@@ -165,62 +159,61 @@ describe("wrangler", () => {
       await runWrangler("kv:key");
       await endEventLoop();
       expect(std.out).toMatchInlineSnapshot(`
-               "wrangler kv:key
+        "wrangler kv:key
 
-               🔑 Individually manage Workers KV key-value pairs
+        🔑 Individually manage Workers KV key-value pairs
 
-               Commands:
-                 wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
-                 wrangler kv:key list               Outputs a list of all keys in a given namespace.
-                 wrangler kv:key get <key>          Reads a single value by key from the given namespace.
-                 wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
+        Commands:
+          wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
+          wrangler kv:key list               Outputs a list of all keys in a given namespace.
+          wrangler kv:key get <key>          Reads a single value by key from the given namespace.
+          wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
 
-               Flags:
-                 -c, --config      Path to .toml configuration file  [string]
-                 -h, --help        Show help  [boolean]
-                 -v, --version     Show version number  [boolean]
-                     --legacy-env  Use legacy environments  [boolean]"
-            `);
+        Flags:
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
+      `);
     });
 
     it("no subcommand 'kv:bulk' should display a list of available subcommands", async () => {
       await runWrangler("kv:bulk");
       await endEventLoop();
       expect(std.out).toMatchInlineSnapshot(`
-               "wrangler kv:bulk
+        "wrangler kv:bulk
 
-               💪 Interact with multiple Workers KV key-value pairs at once
+        💪 Interact with multiple Workers KV key-value pairs at once
 
-               Commands:
-                 wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
-                 wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
+        Commands:
+          wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
+          wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
 
-               Flags:
-                 -c, --config      Path to .toml configuration file  [string]
-                 -h, --help        Show help  [boolean]
-                 -v, --version     Show version number  [boolean]
-                     --legacy-env  Use legacy environments  [boolean]"
-            `);
+        Flags:
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
+      `);
     });
+
     it("no subcommand 'r2' should display a list of available subcommands", async () => {
       await runWrangler("r2");
       await endEventLoop();
       expect(std.out).toMatchInlineSnapshot(`
-               "wrangler r2
+        "wrangler r2
 
-               📦 Interact with an R2 store
+        📦 Interact with an R2 store
 
-               Commands:
-                 wrangler r2 bucket  Manage R2 buckets
+        Commands:
+          wrangler r2 bucket  Manage R2 buckets
 
-               Flags:
-                 -c, --config      Path to .toml configuration file  [string]
-                 -h, --help        Show help  [boolean]
-                 -v, --version     Show version number  [boolean]
-                     --legacy-env  Use legacy environments  [boolean]"
-            `);
+        Flags:
+          -c, --config   Path to .toml configuration file  [string]
+          -h, --help     Show help  [boolean]
+          -v, --version  Show version number  [boolean]"
+      `);
     });
   });
+
   describe("Deprecated commands", () => {
     it("should print a deprecation message for 'generate'", async () => {
       await runWrangler("generate").catch((err) => {
@@ -237,13 +230,27 @@ describe("wrangler", () => {
         `);
       });
     });
-    it("should print a deprecation message for 'build'", async () => {
-      await runWrangler("build").catch((err) => {
-        expect(err.message).toMatchInlineSnapshot(`
-          "Deprecation:
-          \`wrangler build\` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#build for alternatives"
-        `);
-      });
+  });
+
+  it("should print a deprecation message for 'build' and then try to run `publish --dry-run --outdir`", async () => {
+    writeWranglerToml({
+      main: "index.js",
     });
+    writeWorkerSource();
+    await runWrangler("build");
+    await endEventLoop();
+    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.
+        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
+
+
+      --dry-run: exiting now."
+    `);
   });
 });
+
+function endEventLoop() {
+  return new Promise((resolve) => setImmediate(resolve));
+}