wrangler 0.0.0-e2f9bb2 → 0.0.0-e3278fa

package/src/__tests__/init.test.ts

@@ -2,14 +2,20 @@ 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 { RawConfig } from "../config";
 import type { PackageManager } from "../package-manager";
 
 describe("init", () => {
@@ -29,6 +35,7 @@ describe("init", () => {
 
   afterEach(() => {
     clearConfirmMocks();
+    clearSelectMocks();
   });
 
   const std = mockConsoleMethods();
@@ -43,14 +50,15 @@ describe("init", () => {
       expect(fs.existsSync("./package.json")).toBe(true);
       expect(fs.existsSync("./wrangler.toml")).toBe(true);
       expect(std.out).toMatchInlineSnapshot(`
-        "✨ Successfully created wrangler.toml
+        "✨ 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(`""`);
@@ -69,14 +77,15 @@ describe("init", () => {
       );
       expect(parsedWranglerToml.main).toEqual("src/index.ts");
       expect(std.out).toMatchInlineSnapshot(`
-        "✨ Successfully created wrangler.toml
-        ✨ Initialized git repository
-        ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
-        ✨ Created src/index.ts
+        "✨ Created my-worker/wrangler.toml
+        ✨ Initialized git repository at my-worker
+        ✨ Created my-worker/package.json
+        ✨ 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(`""`);
@@ -94,14 +103,15 @@ describe("init", () => {
         Object {
           "debug": "",
           "err": "",
-          "out": "✨ Successfully created wrangler.toml
+          "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": "",
         }
       `);
@@ -166,6 +176,14 @@ describe("init", () => {
       expect(parsed.name).toContain("wrangler-tests");
       expect(fs.existsSync("./package.json")).toBe(false);
       expect(fs.existsSync("./tsconfig.json")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
 
     it("should create a wrangler.toml and a directory for a named Worker ", async () => {
@@ -187,6 +205,15 @@ describe("init", () => {
       expect(parsed.name).toBe("my-worker");
       expect(fs.existsSync("./my-worker/package.json")).toBe(false);
       expect(fs.existsSync("./my-worker/tsconfig.json")).toBe(false);
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created my-worker/wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
 
     it("should display warning when wrangler.toml already exists, and exit if user does not want to carry on", async () => {
@@ -200,9 +227,49 @@ describe("init", () => {
         result: false,
       });
       await runWrangler("init");
-      expect(std.warn).toContain("wrangler.toml file already exists!");
+      expect(std.warn).toContain("wrangler.toml already exists!");
       const parsed = TOML.parse(await fsp.readFile("./wrangler.toml", "utf-8"));
       expect(parsed.compatibility_date).toBe("something-else");
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "",
+          "warn": "▲ [WARNING] wrangler.toml already exists!
+
+        ",
+        }
+      `);
+    });
+
+    it("should display warning when wrangler.toml already exists in the target directory, and exit if user does not want to carry on", async () => {
+      fs.mkdirSync("path/to/worker", { recursive: true });
+      fs.writeFileSync(
+        "path/to/worker/wrangler.toml",
+        'compatibility_date="something-else"', // use a fake value to make sure the file is not overwritten
+        "utf-8"
+      );
+      mockConfirm({
+        text: "Do you want to continue initializing this project?",
+        result: false,
+      });
+      await runWrangler("init path/to/worker");
+      expect(std.warn).toContain("wrangler.toml already exists!");
+      const parsed = TOML.parse(
+        await fsp.readFile("path/to/worker/wrangler.toml", "utf-8")
+      );
+      expect(parsed.compatibility_date).toBe("something-else");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "",
+          "warn": "▲ [WARNING] path/to/worker/wrangler.toml already exists!
+
+        ",
+        }
+      `);
     });
 
     it("should not overwrite an existing wrangler.toml, after agreeing to other prompts", async () => {
@@ -227,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\\""`
@@ -261,9 +329,85 @@ describe("init", () => {
         }
       );
       await runWrangler("init");
-      expect(std.warn).toContain("wrangler.toml file already exists!");
+      expect(std.warn).toContain("wrangler.toml already exists!");
       const parsed = TOML.parse(await fsp.readFile("./wrangler.toml", "utf-8"));
       expect(parsed.compatibility_date).toBe("something-else");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "",
+          "warn": "▲ [WARNING] wrangler.toml already exists!
+
+        ",
+        }
+      `);
+    });
+
+    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 * * * *");
     });
   });
 
@@ -284,13 +428,16 @@ describe("init", () => {
         Object {
           "debug": "",
           "err": "",
-          "out": "✨ Successfully created wrangler.toml
+          "out": "✨ Created wrangler.toml
         ✨ Initialized git repository",
           "warn": "",
         }
       `);
       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 () => {
@@ -304,23 +451,75 @@ describe("init", () => {
         Object {
           "debug": "",
           "err": "",
-          "out": "✨ Successfully created wrangler.toml
-        ✨ Initialized git repository
+          "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": "",
+        }
+      `);
+    });
+
+    it("should not offer to initialize a git repo if it's already inside one (when using a path as name)", async () => {
+      fs.mkdirSync("path/to/worker", { recursive: true });
+      await execa("git", ["init"], { cwd: "path/to/worker" });
+      expect(fs.lstatSync("path/to/worker/.git").isDirectory()).toBe(true);
+
+      await runWrangler("init path/to/worker/my-worker -y");
+
+      // Note the lack of "✨ Initialized git repository" in the log
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "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
+        ✨ 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 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", () => {
@@ -337,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(
@@ -355,6 +554,15 @@ describe("init", () => {
       });
       expect(fs.existsSync("./tsconfig.json")).toBe(false);
       expect(mockPackageManager.install).toHaveBeenCalled();
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Created package.json",
+          "warn": "",
+        }
+      `);
     });
 
     it("should create a package.json, with the specified name, if none is found and user confirms", async () => {
@@ -370,17 +578,26 @@ 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 my-worker/src/index.js?",
+        result: "none",
+      });
       await runWrangler("init my-worker");
       const packageJson = JSON.parse(
         fs.readFileSync("./my-worker/package.json", "utf-8")
       );
       expect(packageJson.name).toBe("my-worker");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created my-worker/wrangler.toml
+        ✨ Created my-worker/package.json",
+          "warn": "",
+        }
+      `);
     });
 
     it("should not touch an existing package.json in the same directory", async () => {
@@ -390,18 +607,18 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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",
@@ -415,28 +632,81 @@ describe("init", () => {
       );
       expect(packageJson.name).toEqual("test");
       expect(packageJson.version).toEqual("1.0.0");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
 
-    it("should offer to install wrangler into an existing package.json", async () => {
+    it("should not touch an existing package.json in a target directory", async () => {
       mockConfirm(
         {
           text: "Would you like to use git to manage this Worker?",
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
-          result: true,
+          text: "Would you like to install wrangler into path/to/worker/package.json?",
+          result: false,
         },
         {
           text: "Would you like to use TypeScript?",
           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",
+        JSON.stringify({ name: "test", version: "1.0.0" }),
+        "utf-8"
+      );
+
+      await runWrangler("init path/to/worker/my-worker");
+      const packageJson = JSON.parse(
+        fs.readFileSync("path/to/worker/package.json", "utf-8")
+      );
+      expect(packageJson.name).toEqual("test");
+      expect(packageJson.version).toEqual("1.0.0");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created path/to/worker/my-worker/wrangler.toml",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should offer to install wrangler into an existing package.json", async () => {
+      mockConfirm(
+        {
+          text: "Would you like to use git to manage this Worker?",
+          result: false,
+        },
+        {
+          text: "Would you like to install wrangler into package.json?",
+          result: true,
         },
         {
-          text: "Would you like to create a Worker at src/index.js?",
+          text: "Would you like to use TypeScript?",
           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" }),
@@ -452,28 +722,87 @@ describe("init", () => {
       expect(mockPackageManager.addDevDeps).toHaveBeenCalledWith(
         `wrangler@${wranglerVersion}`
       );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Installed wrangler into devDependencies",
+          "warn": "",
+        }
+      `);
     });
 
-    it("should not touch an existing package.json in an ancestor directory", async () => {
+    it("should offer to install wrangler into a package.json relative to the target directory", async () => {
       mockConfirm(
         {
           text: "Would you like to use git to manage this Worker?",
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
-          result: false,
+          text: "Would you like to install wrangler into path/to/worker/package.json?",
+          result: true,
         },
         {
           text: "Would you like to use TypeScript?",
           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",
+        JSON.stringify({ name: "test", version: "1.0.0" }),
+        "utf-8"
+      );
+
+      await runWrangler("init path/to/worker/my-worker");
+      const packageJson = JSON.parse(
+        fs.readFileSync("path/to/worker/package.json", "utf-8")
+      );
+      expect(packageJson.name).toEqual("test");
+      expect(packageJson.version).toEqual("1.0.0");
+      expect(mockPackageManager.addDevDeps).toHaveBeenCalledWith(
+        `wrangler@${wranglerVersion}`
+      );
+      expect(mockPackageManager.cwd).toBe(process.cwd());
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created path/to/worker/my-worker/wrangler.toml
+        ✨ Installed wrangler into devDependencies",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not touch an existing package.json in an ancestor directory", async () => {
+      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.js?",
+          text: "Would you like to install wrangler into ../../package.json?",
+          result: false,
+        },
+        {
+          text: "Would you like to use TypeScript?",
           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" }),
@@ -496,6 +825,14 @@ describe("init", () => {
           "version": "1.0.0",
         }
       `);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
   });
 
@@ -507,19 +844,20 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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" }),
@@ -529,6 +867,18 @@ describe("init", () => {
       await runWrangler("init");
       expect(fs.existsSync("./src/index.js")).toBe(true);
       expect(fs.existsSync("./src/index.ts")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Created src/index.js
+
+        To start developing your Worker, run \`npx wrangler dev\`
+        To publish your Worker to the Internet, run \`npx wrangler publish\`",
+          "warn": "",
+        }
+      `);
     });
 
     it("should offer to create a worker in a typescript project", async () => {
@@ -538,19 +888,20 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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" }),
@@ -560,6 +911,20 @@ describe("init", () => {
       await runWrangler("init");
       expect(fs.existsSync("./src/index.js")).toBe(false);
       expect(fs.existsSync("./src/index.ts")).toBe(true);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ 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\`",
+          "warn": "",
+        }
+      `);
     });
 
     it("should add scripts for a typescript project with .ts extension", async () => {
@@ -573,18 +938,18 @@ describe("init", () => {
           result: true,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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);
@@ -596,17 +961,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(`
-        "✨ Successfully created wrangler.toml
+        "✨ 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\`"
       `);
     });
 
@@ -617,24 +983,24 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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",
           },
         })
       );
@@ -647,11 +1013,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(`
-        "✨ Successfully created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        "✨ Created wrangler.toml
+        ✨ 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\`"
@@ -665,7 +1032,7 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
@@ -686,6 +1053,58 @@ describe("init", () => {
       await runWrangler("init");
       expect(fs.existsSync("./src/index.js")).toBe(false);
       expect(fs.readFileSync("./src/index.ts", "utf-8")).toBe(PLACEHOLDER);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not offer to create a worker in a ts project for a named worker if a file already exists at the location", async () => {
+      mockConfirm(
+        {
+          text: "Would you like to use git to manage this Worker?",
+          result: false,
+        },
+        {
+          text: "Would you like to install wrangler into package.json?",
+          result: false,
+        },
+        {
+          text: "Would you like to use TypeScript?",
+          result: true,
+        }
+      );
+
+      fs.writeFileSync(
+        "./package.json",
+        JSON.stringify({ name: "test", version: "1.0.0" }),
+        "utf-8"
+      );
+      fs.mkdirSync("./my-worker/src", { recursive: true });
+      const PLACEHOLDER = "/* placeholder text */";
+      fs.writeFileSync("./my-worker/src/index.ts", PLACEHOLDER, "utf-8");
+
+      await runWrangler("init my-worker");
+      expect(fs.existsSync("./my-worker/src/index.js")).toBe(false);
+      expect(fs.readFileSync("./my-worker/src/index.ts", "utf-8")).toBe(
+        PLACEHOLDER
+      );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created my-worker/wrangler.toml
+        ✨ Created my-worker/tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
+          "warn": "",
+        }
+      `);
     });
 
     it("should create a tsconfig.json and install `workers-types` if none is found and user confirms", async () => {
@@ -701,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 } =
@@ -722,6 +1141,17 @@ describe("init", () => {
         "@cloudflare/workers-types",
         "typescript"
       );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Created package.json
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
+          "warn": "",
+        }
+      `);
     });
 
     it("should not touch an existing tsconfig.json in the same directory", async () => {
@@ -743,22 +1173,82 @@ 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(
         fs.readFileSync("./tsconfig.json", "utf-8")
       );
       expect(tsconfigJson.compilerOptions).toEqual({});
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Created src/index.ts
+
+        To start developing your Worker, run \`npx wrangler dev\`
+        To publish your Worker to the Internet, run \`npx wrangler publish\`",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not touch an existing tsconfig.json in the ancestor of a target directory", async () => {
+      fs.mkdirSync("path/to/worker", { recursive: true });
+      fs.writeFileSync(
+        "path/to/worker/package.json",
+        JSON.stringify({
+          name: "test",
+          version: "1.0.0",
+          devDependencies: {
+            wrangler: "0.0.0",
+            "@cloudflare/workers-types": "0.0.0",
+          },
+        }),
+        "utf-8"
+      );
+      fs.writeFileSync(
+        "path/to/worker/tsconfig.json",
+        JSON.stringify({ compilerOptions: {} }),
+        "utf-8"
+      );
+
+      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(
+        fs.readFileSync("path/to/worker/tsconfig.json", "utf-8")
+      );
+      expect(tsconfigJson.compilerOptions).toEqual({});
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created path/to/worker/my-worker/wrangler.toml
+        ✨ Created path/to/worker/my-worker/src/index.ts
+
+        To start developing your Worker, run \`npx wrangler dev\`
+        To publish your Worker to the Internet, run \`npx wrangler publish\`",
+          "warn": "",
+        }
+      `);
     });
 
     it("should offer to install type definitions in an existing typescript project", async () => {
@@ -768,18 +1258,18 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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({
@@ -803,6 +1293,16 @@ describe("init", () => {
       expect(mockPackageManager.addDevDeps).toHaveBeenCalledWith(
         "@cloudflare/workers-types"
       );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Installed @cloudflare/workers-types into devDependencies
+        🚨 Please add \\"@cloudflare/workers-types\\" to compilerOptions.types in tsconfig.json",
+          "warn": "",
+        }
+      `);
     });
 
     it("should not touch an existing tsconfig.json in an ancestor directory", async () => {
@@ -824,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");
@@ -851,7 +1350,7 @@ describe("init", () => {
         Object {
           "debug": "",
           "err": "",
-          "out": "✨ Successfully created wrangler.toml
+          "out": "✨ Created wrangler.toml
         ✨ Created src/index.ts
 
         To start developing your Worker, run \`npx wrangler dev\`
@@ -874,18 +1373,18 @@ describe("init", () => {
           result: true,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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);
@@ -897,16 +1396,16 @@ 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(`
-        "✨ Successfully created wrangler.toml
+        "✨ Created wrangler.toml
         ✨ Created package.json
         ✨ 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\`"
       `);
     });
 
@@ -917,24 +1416,24 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
           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",
           },
         })
       );
@@ -947,9 +1446,9 @@ 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(`
-        "✨ Successfully created wrangler.toml
+        "✨ Created wrangler.toml
         ✨ Created src/index.js
 
         To start developing your Worker, run \`npx wrangler dev\`
@@ -964,7 +1463,7 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to install wrangler into your package.json?",
+          text: "Would you like to install wrangler into package.json?",
           result: false,
         },
         {
@@ -985,6 +1484,54 @@ describe("init", () => {
       await runWrangler("init");
       expect(fs.readFileSync("./src/index.js", "utf-8")).toBe(PLACEHOLDER);
       expect(fs.existsSync("./src/index.ts")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not offer to create a worker in a non-ts named worker project if a file already exists at the location", async () => {
+      mockConfirm(
+        {
+          text: "Would you like to use git to manage this Worker?",
+          result: false,
+        },
+        {
+          text: "Would you like to install wrangler into package.json?",
+          result: false,
+        },
+        {
+          text: "Would you like to use TypeScript?",
+          result: false,
+        }
+      );
+
+      fs.writeFileSync(
+        "./package.json",
+        JSON.stringify({ name: "test", version: "1.0.0" }),
+        "utf-8"
+      );
+      fs.mkdirSync("./my-worker/src", { recursive: true });
+      const PLACEHOLDER = "/* placeholder text */";
+      fs.writeFileSync("./my-worker/src/index.js", PLACEHOLDER, "utf-8");
+
+      await runWrangler("init my-worker");
+      expect(fs.readFileSync("./my-worker/src/index.js", "utf-8")).toBe(
+        PLACEHOLDER
+      );
+      expect(fs.existsSync("./my-worker/src/index.ts")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created my-worker/wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
   });
 
@@ -1009,6 +1556,22 @@ describe("init", () => {
       expect(parsed.name).toBe(path.basename(process.cwd()).toLowerCase());
       expect(fs.existsSync("./my-worker/package.json")).toBe(false);
       expect(fs.existsSync("./my-worker/tsconfig.json")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Initialized git repository
+        ✨ Created package.json
+        ✨ 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 deploy\`",
+          "warn": "",
+        }
+      `);
     });
 
     it('should create a worker in a nested directory if "name" is path/to/worker', async () => {
@@ -1022,6 +1585,22 @@ describe("init", () => {
       expect(parsed.name).toBe("worker");
       expect(fs.existsSync("./my-worker/package.json")).toBe(false);
       expect(fs.existsSync("./my-worker/tsconfig.json")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "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
+        ✨ 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 deploy\`",
+          "warn": "",
+        }
+      `);
     });
 
     it("should normalize characters that aren't lowercase alphanumeric, underscores, or dashes", async () => {
@@ -1037,6 +1616,22 @@ describe("init", () => {
       expect(parsed.name).toBe("weird_w0rkr_n4m3-js-tsx-tar-gz");
       expect(fs.existsSync("./my-worker/package.json")).toBe(false);
       expect(fs.existsSync("./my-worker/tsconfig.json")).toBe(false);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "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
+        ✨ 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 deploy\`",
+          "warn": "",
+        }
+      `);
     });
   });
 });