wrangler 0.0.0-e95e5a0 → 0.0.0-e978986

package/src/__tests__/init.test.ts

@@ -2,12 +2,17 @@ import * as fs from "node:fs";
 import * as fsp from "node:fs/promises";
 import path from "node:path";
 import * as TOML from "@iarna/toml";
-import { execa } from "execa";
+import { execa, execaSync } from "execa";
 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 { PackageManager } from "../package-manager";
@@ -29,6 +34,7 @@ describe("init", () => {
 
   afterEach(() => {
     clearConfirmMocks();
+    clearSelectMocks();
   });
 
   const std = mockConsoleMethods();
@@ -46,11 +52,12 @@ describe("init", () => {
         "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ 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(`""`);
@@ -72,11 +79,12 @@ describe("init", () => {
         "✨ Created my-worker/wrangler.toml
         ✨ Initialized git repository at my-worker
         ✨ Created my-worker/package.json
-        ✨ Created my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created my-worker/tsconfig.json
         ✨ Created my-worker/src/index.ts
+        ✨ 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(`""`);
@@ -97,11 +105,12 @@ describe("init", () => {
           "out": "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ 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": "",
         }
       `);
@@ -284,13 +293,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\\""`
@@ -373,11 +383,12 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ 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": "",
         }
       `);
@@ -397,20 +408,48 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created path/to/worker/my-worker/wrangler.toml
         ✨ Created path/to/worker/my-worker/package.json
-        ✨ Created path/to/worker/my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/my-worker/tsconfig.json
         ✨ Created path/to/worker/my-worker/src/index.ts
+        ✨ 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": "",
         }
       `);
     });
 
+    // I... don't know how to test this lol
     it.todo(
       "should not offer to initialize a git repo if git is not installed"
     );
-    // I... don't know how to test this lol
+
+    it("should initialize git repo with `main` default branch", 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: false,
+        }
+      );
+      await runWrangler("init");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Initialized git repository",
+          "warn": "",
+        }
+      `);
+
+      expect(execaSync("git", ["symbolic-ref", "HEAD"]).stdout).toEqual(
+        "refs/heads/main"
+      );
+    });
   });
 
   describe("package.json", () => {
@@ -427,12 +466,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(
@@ -469,12 +508,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")
@@ -504,12 +543,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",
@@ -546,13 +585,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",
@@ -589,13 +629,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" }),
@@ -616,7 +657,7 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Installed wrangler",
+        ✨ Installed wrangler into devDependencies",
           "warn": "",
         }
       `);
@@ -635,13 +676,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",
@@ -664,7 +706,7 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created path/to/worker/my-worker/wrangler.toml
-        ✨ Installed wrangler",
+        ✨ Installed wrangler into devDependencies",
           "warn": "",
         }
       `);
@@ -683,13 +725,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" }),
@@ -737,13 +780,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" }),
@@ -780,13 +824,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" }),
@@ -801,8 +846,9 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npx wrangler dev\`
         To publish your Worker to the Internet, run \`npx wrangler publish\`",
@@ -828,12 +874,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);
@@ -845,17 +891,18 @@ 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(`
         "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ 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\`"
       `);
     });
 
@@ -872,18 +919,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",
           },
         })
       );
@@ -896,11 +943,12 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npx wrangler dev\`
         To publish your Worker to the Internet, run \`npx wrangler publish\`"
@@ -940,7 +988,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -981,7 +1030,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created my-worker/wrangler.toml
-        ✨ Created my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created my-worker/tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -1000,12 +1050,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 } =
@@ -1027,7 +1077,8 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -1052,16 +1103,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(
@@ -1102,16 +1152,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(
@@ -1145,12 +1194,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({
@@ -1179,8 +1228,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Installed @cloudflare/workers-types.
-        Please add \\"@cloudflare/workers-types\\" to compilerOptions.types in tsconfig.json",
+        ✨ Installed @cloudflare/workers-types into devDependencies
+        🚨 Please add \\"@cloudflare/workers-types\\" to compilerOptions.types in tsconfig.json",
           "warn": "",
         }
       `);
@@ -1205,16 +1254,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");
@@ -1261,12 +1309,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);
@@ -1278,7 +1326,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(`
@@ -1287,7 +1335,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\`"
       `);
     });
 
@@ -1304,18 +1352,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",
           },
         })
       );
@@ -1328,7 +1376,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
@@ -1445,11 +1493,12 @@ describe("init", () => {
           "out": "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ 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": "",
         }
       `);
@@ -1473,11 +1522,12 @@ describe("init", () => {
           "out": "✨ Created path/to/worker/wrangler.toml
         ✨ Initialized git repository at path/to/worker
         ✨ Created path/to/worker/package.json
-        ✨ Created path/to/worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/tsconfig.json
         ✨ Created path/to/worker/src/index.ts
+        ✨ 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": "",
         }
       `);
@@ -1503,11 +1553,12 @@ describe("init", () => {
           "out": "✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/wrangler.toml
         ✨ Initialized git repository at WEIRD_w0rkr_N4m3.js.tsx.tar.gz
         ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/package.json
-        ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/tsconfig.json
         ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/src/index.ts
+        ✨ 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": "",
         }
       `);