wrangler 2.0.7 → 2.0.11

package/src/__tests__/init.test.ts

@@ -7,9 +7,15 @@ import { parseConfigFileTextToJson } from "typescript";
 import { version as wranglerVersion } from "../../package.json";
 import { getPackageManager } from "../package-manager";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm, clearConfirmMocks } from "./helpers/mock-dialogs";
+import {
+  mockConfirm,
+  clearConfirmMocks,
+  mockSelect,
+  clearSelectMocks,
+} from "./helpers/mock-dialogs";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import type { RawConfig } from "../config";
 import type { PackageManager } from "../package-manager";
 
 describe("init", () => {
@@ -29,6 +35,7 @@ describe("init", () => {
 
   afterEach(() => {
     clearConfirmMocks();
+    clearSelectMocks();
   });
 
   const std = mockConsoleMethods();
@@ -51,7 +58,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`"
+        To publish your Worker to the Internet, run \`npm run deploy\`"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -78,7 +85,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd my-worker && npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`"
+        To publish your Worker to the Internet, run \`npm run deploy\`"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -104,7 +111,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);
@@ -287,13 +294,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
+
       await runWrangler("init");
       expect(fs.readFileSync("./wrangler.toml", "utf-8")).toMatchInlineSnapshot(
         `"compatibility_date=\\"something-else\\""`
@@ -335,6 +343,72 @@ describe("init", () => {
         }
       `);
     });
+
+    it("should not add a Cron Trigger to wrangler.toml when creating a Scheduled Worker if wrangler.toml already exists", async () => {
+      fs.writeFileSync(
+        "./wrangler.toml",
+        'compatibility_date="something-else"', // use a fake value to make sure the file is not overwritten
+        "utf-8"
+      );
+      mockConfirm(
+        {
+          text: "Would you like to use git to manage this Worker?",
+          result: true,
+        },
+        {
+          text: "Do you want to continue initializing this project?",
+          result: true,
+        },
+        {
+          text: "No package.json found. Would you like to create one?",
+          result: true,
+        },
+        {
+          text: "Would you like to use TypeScript?",
+          result: true,
+        }
+      );
+
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "scheduled",
+      });
+
+      await runWrangler("init");
+      expect(fs.readFileSync("./wrangler.toml", "utf-8")).toMatchInlineSnapshot(
+        `"compatibility_date=\\"something-else\\""`
+      );
+    });
+
+    it("should add a Cron Trigger to wrangler.toml when creating a Scheduled Worker, but only if wrangler.toml is being created during init", async () => {
+      mockConfirm(
+        {
+          text: "Would you like to use git to manage this Worker?",
+          result: true,
+        },
+        {
+          text: "No package.json found. Would you like to create one?",
+          result: true,
+        },
+        {
+          text: "Would you like to use TypeScript?",
+          result: true,
+        }
+      );
+
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "scheduled",
+      });
+
+      await runWrangler("init");
+      const parsed = TOML.parse(
+        await fsp.readFile("./wrangler.toml", "utf-8")
+      ) as RawConfig;
+      expect(typeof parsed.compatibility_date).toBe("string");
+      expect(parsed.name).toContain("wrangler-tests");
+      expect(parsed?.triggers?.crons[0]).toEqual("1 * * * *");
+    });
   });
 
   describe("git init", () => {
@@ -361,6 +435,9 @@ describe("init", () => {
       `);
       expect(fs.lstatSync(".git").isDirectory()).toBe(true);
       expect(fs.lstatSync(".gitignore").isFile()).toBe(true);
+      expect((await execa("git", ["branch", "--show-current"])).stdout).toEqual(
+        "main"
+      );
     });
 
     it("should not offer to initialize a git repo if it's already inside one", async () => {
@@ -381,7 +458,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);
@@ -406,7 +483,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd path/to/worker/my-worker && npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);
@@ -459,12 +536,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: false,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "none",
+      });
       await runWrangler("init");
       expect(fs.existsSync("./package.json")).toBe(true);
       const packageJson = JSON.parse(
@@ -501,12 +578,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at my-worker/src/index.js?",
-          result: false,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at my-worker/src/index.js?",
+        result: "none",
+      });
       await runWrangler("init my-worker");
       const packageJson = JSON.parse(
         fs.readFileSync("./my-worker/package.json", "utf-8")
@@ -536,12 +613,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: false,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "none",
+      });
 
       fs.writeFileSync(
         "./package.json",
@@ -578,13 +655,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.js?",
-          result: false,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.js?",
+        result: "none",
+      });
+
       fs.mkdirSync("path/to/worker", { recursive: true });
       fs.writeFileSync(
         "path/to/worker/package.json",
@@ -621,13 +699,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: false,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "none",
+      });
+
       fs.writeFileSync(
         "./package.json",
         JSON.stringify({ name: "test", version: "1.0.0" }),
@@ -667,13 +746,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.js?",
-          result: false,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.js?",
+        result: "none",
+      });
+
       fs.mkdirSync("path/to/worker", { recursive: true });
       fs.writeFileSync(
         "path/to/worker/package.json",
@@ -715,13 +795,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: false,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "none",
+      });
+
       fs.writeFileSync(
         "./package.json",
         JSON.stringify({ name: "test", version: "1.0.0" }),
@@ -769,13 +850,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: true,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "fetch",
+      });
+
       fs.writeFileSync(
         "./package.json",
         JSON.stringify({ name: "test", version: "1.0.0" }),
@@ -812,13 +894,14 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
         }
       );
 
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
+
       fs.writeFileSync(
         "./package.json",
         JSON.stringify({ name: "test", version: "1.0.0" }),
@@ -861,12 +944,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
       await runWrangler("init");
 
       expect(fs.existsSync("./package.json")).toBe(true);
@@ -878,7 +961,7 @@ describe("init", () => {
       expect(fs.existsSync("./src/index.ts")).toBe(true);
 
       expect(packageJson.scripts.start).toBe("wrangler dev");
-      expect(packageJson.scripts.publish).toBe("wrangler publish");
+      expect(packageJson.scripts.deploy).toBe("wrangler publish");
       expect(packageJson.name).toContain("wrangler-tests");
       expect(packageJson.version).toEqual("0.0.0");
       expect(std.out).toMatchInlineSnapshot(`
@@ -889,7 +972,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`"
+        To publish your Worker to the Internet, run \`npm run deploy\`"
       `);
     });
 
@@ -906,18 +989,18 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
       await fsp.writeFile(
         "./package.json",
         JSON.stringify({
           scripts: {
             start: "test-start",
-            publish: "test-publish",
+            deploy: "test-publish",
           },
         })
       );
@@ -930,7 +1013,7 @@ describe("init", () => {
       expect(fs.existsSync("./src/index.ts")).toBe(true);
 
       expect(packageJson.scripts.start).toBe("test-start");
-      expect(packageJson.scripts.publish).toBe("test-publish");
+      expect(packageJson.scripts.deploy).toBe("test-publish");
       expect(std.out).toMatchInlineSnapshot(`
         "✨ Created wrangler.toml
         ✨ Created tsconfig.json
@@ -1037,12 +1120,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: false,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "none",
+      });
       await runWrangler("init");
       expect(fs.existsSync("./tsconfig.json")).toBe(true);
       const { config: tsconfigJson, error: tsConfigParseError } =
@@ -1090,16 +1173,15 @@ describe("init", () => {
         "utf-8"
       );
 
-      mockConfirm(
-        {
-          text: "Would you like to use git to manage this Worker?",
-          result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
-        }
-      );
+      mockConfirm({
+        text: "Would you like to use git to manage this Worker?",
+        result: false,
+      });
+
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
 
       await runWrangler("init");
       const tsconfigJson = JSON.parse(
@@ -1140,16 +1222,15 @@ describe("init", () => {
         "utf-8"
       );
 
-      mockConfirm(
-        {
-          text: "Would you like to use git to manage this Worker?",
-          result: false,
-        },
-        {
-          text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.ts?",
-          result: true,
-        }
-      );
+      mockConfirm({
+        text: "Would you like to use git to manage this Worker?",
+        result: false,
+      });
+
+      mockSelect({
+        text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.ts?",
+        result: "fetch",
+      });
 
       await runWrangler("init path/to/worker/my-worker");
       const tsconfigJson = JSON.parse(
@@ -1183,12 +1264,12 @@ describe("init", () => {
         {
           text: "Would you like to install the type definitions for Workers into your package.json?",
           result: true,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: false,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "none",
+      });
       fs.writeFileSync(
         "./package.json",
         JSON.stringify({
@@ -1243,16 +1324,15 @@ describe("init", () => {
         "utf-8"
       );
 
-      mockConfirm(
-        {
-          text: "Would you like to use git to manage this Worker?",
-          result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.ts?",
-          result: true,
-        }
-      );
+      mockConfirm({
+        text: "Would you like to use git to manage this Worker?",
+        result: false,
+      });
+
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.ts?",
+        result: "fetch",
+      });
 
       fs.mkdirSync("./sub-1/sub-2", { recursive: true });
       process.chdir("./sub-1/sub-2");
@@ -1299,12 +1379,12 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: true,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "fetch",
+      });
       await runWrangler("init");
 
       expect(fs.existsSync("./package.json")).toBe(true);
@@ -1316,7 +1396,7 @@ describe("init", () => {
       expect(fs.existsSync("./src/index.ts")).toBe(false);
 
       expect(packageJson.scripts.start).toBe("wrangler dev");
-      expect(packageJson.scripts.publish).toBe("wrangler publish");
+      expect(packageJson.scripts.deploy).toBe("wrangler publish");
       expect(packageJson.name).toContain("wrangler-tests");
       expect(packageJson.version).toEqual("0.0.0");
       expect(std.out).toMatchInlineSnapshot(`
@@ -1325,7 +1405,7 @@ describe("init", () => {
         ✨ Created src/index.js
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`"
+        To publish your Worker to the Internet, run \`npm run deploy\`"
       `);
     });
 
@@ -1342,18 +1422,18 @@ describe("init", () => {
         {
           text: "Would you like to use TypeScript?",
           result: false,
-        },
-        {
-          text: "Would you like to create a Worker at src/index.js?",
-          result: true,
         }
       );
+      mockSelect({
+        text: "Would you like to create a Worker at src/index.js?",
+        result: "fetch",
+      });
       await fsp.writeFile(
         "./package.json",
         JSON.stringify({
           scripts: {
             start: "test-start",
-            publish: "test-publish",
+            deploy: "test-publish",
           },
         })
       );
@@ -1366,7 +1446,7 @@ describe("init", () => {
       expect(fs.existsSync("./src/index.ts")).toBe(false);
 
       expect(packageJson.scripts.start).toBe("test-start");
-      expect(packageJson.scripts.publish).toBe("test-publish");
+      expect(packageJson.scripts.deploy).toBe("test-publish");
       expect(std.out).toMatchInlineSnapshot(`
         "✨ Created wrangler.toml
         ✨ Created src/index.js
@@ -1488,7 +1568,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);
@@ -1517,7 +1597,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd path/to/worker && npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);
@@ -1548,7 +1628,7 @@ describe("init", () => {
         ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd WEIRD_w0rkr_N4m3.js.tsx.tar.gz && npm start\`
-        To publish your Worker to the Internet, run \`npm run publish\`",
+        To publish your Worker to the Internet, run \`npm run deploy\`",
           "warn": "",
         }
       `);

package/src/__tests__/kv.test.ts

@@ -663,7 +663,7 @@ describe("wrangler", () => {
 
         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] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -685,7 +685,7 @@ describe("wrangler", () => {
         );
         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] someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
@@ -856,7 +856,7 @@ describe("wrangler", () => {
         `);
         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"
         `);
       });
     });
@@ -1044,7 +1044,7 @@ describe("wrangler", () => {
         );
         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] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -1226,7 +1226,7 @@ describe("wrangler", () => {
               `);
         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.warn).toMatchInlineSnapshot(`""`);
       });
@@ -1288,7 +1288,7 @@ describe("wrangler", () => {
 
         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.warn).toMatchInlineSnapshot(`
           "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
@@ -1429,7 +1429,7 @@ describe("wrangler", () => {
               `);
         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.warn).toMatchInlineSnapshot(`""`);
       });
@@ -1454,7 +1454,7 @@ describe("wrangler", () => {
               `);
         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.warn).toMatchInlineSnapshot(`""`);
       });