wrangler 0.0.32 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.32",
+  "version": "2.0.0",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

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

@@ -1,4 +1,5 @@
 import { confirm, prompt } from "../../dialogs";
+import { normalizeSlashes } from "./mock-console";
 
 /**
  * The expected values for a confirmation request.
@@ -20,7 +21,7 @@ export interface ConfirmExpectation {
 export function mockConfirm(...expectations: ConfirmExpectation[]) {
   (confirm as jest.Mock).mockImplementation((text: string) => {
     for (const { text: expectedText, result } of expectations) {
-      if (text === expectedText) {
+      if (normalizeSlashes(text) === normalizeSlashes(expectedText)) {
         return Promise.resolve(result);
       }
     }

package/src/__tests__/init.test.ts

@@ -43,7 +43,7 @@ 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
@@ -69,11 +69,11 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created my-worker/src/index.ts
 
         To start developing your Worker, run \`cd my-worker && npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`"
@@ -94,7 +94,7 @@ 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
@@ -166,6 +166,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 +195,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 +217,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 () => {
@@ -261,9 +318,19 @@ 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!
+
+        ",
+        }
+      `);
     });
   });
 
@@ -284,7 +351,7 @@ describe("init", () => {
         Object {
           "debug": "",
           "err": "",
-          "out": "✨ Successfully created wrangler.toml
+          "out": "✨ Created wrangler.toml
         ✨ Initialized git repository",
           "warn": "",
         }
@@ -304,8 +371,7 @@ 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 src/index.ts
@@ -317,6 +383,30 @@ describe("init", () => {
       `);
     });
 
+    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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/my-worker/src/index.ts
+
+        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\`",
+          "warn": "",
+        }
+      `);
+    });
+
     it.todo(
       "should not offer to initialize a git repo if git is not installed"
     );
@@ -355,6 +445,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 () => {
@@ -372,7 +471,7 @@ describe("init", () => {
           result: false,
         },
         {
-          text: "Would you like to create a Worker at src/index.js?",
+          text: "Would you like to create a Worker at my-worker/src/index.js?",
           result: false,
         }
       );
@@ -381,6 +480,15 @@ describe("init", () => {
         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,7 +498,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,
         },
         {
@@ -415,6 +523,57 @@ 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 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 path/to/worker/package.json?",
+          result: false,
+        },
+        {
+          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,
+        }
+      );
+
+      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 () => {
@@ -424,7 +583,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: true,
         },
         {
@@ -452,6 +611,63 @@ describe("init", () => {
       expect(mockPackageManager.addDevDeps).toHaveBeenCalledWith(
         `wrangler@${wranglerVersion}`
       );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Installed wrangler",
+          "warn": "",
+        }
+      `);
+    });
+
+    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 path/to/worker/package.json?",
+          result: true,
+        },
+        {
+          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,
+        }
+      );
+
+      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",
+          "warn": "",
+        }
+      `);
     });
 
     it("should not touch an existing package.json in an ancestor directory", async () => {
@@ -461,7 +677,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,
         },
         {
@@ -496,6 +712,14 @@ describe("init", () => {
           "version": "1.0.0",
         }
       `);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml",
+          "warn": "",
+        }
+      `);
     });
   });
 
@@ -507,7 +731,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,
         },
         {
@@ -529,6 +753,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,7 +774,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,
         },
         {
@@ -560,6 +796,19 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ 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 add scripts for a typescript project with .ts extension", async () => {
@@ -573,7 +822,7 @@ 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,
         },
         {
@@ -600,7 +849,7 @@ describe("init", () => {
       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 src/index.ts
@@ -617,7 +866,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,
         },
         {
@@ -649,7 +898,7 @@ describe("init", () => {
       expect(packageJson.scripts.start).toBe("test-start");
       expect(packageJson.scripts.publish).toBe("test-publish");
       expect(std.out).toMatchInlineSnapshot(`
-        "✨ Successfully created wrangler.toml
+        "✨ Created wrangler.toml
         ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
         ✨ Created src/index.ts
 
@@ -665,7 +914,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 +935,56 @@ 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 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 into devDependencies",
+          "warn": "",
+        }
+      `);
     });
 
     it("should create a tsconfig.json and install `workers-types` if none is found and user confirms", async () => {
@@ -722,6 +1021,16 @@ 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 into devDependencies",
+          "warn": "",
+        }
+      `);
     });
 
     it("should not touch an existing tsconfig.json in the same directory", async () => {
@@ -759,6 +1068,68 @@ describe("init", () => {
         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,
+        },
+        {
+          text: "Would you like to create a Worker at path/to/worker/my-worker/src/index.ts?",
+          result: true,
+        }
+      );
+
+      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,7 +1139,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,
         },
         {
@@ -803,6 +1174,16 @@ describe("init", () => {
       expect(mockPackageManager.addDevDeps).toHaveBeenCalledWith(
         "@cloudflare/workers-types"
       );
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "✨ Created wrangler.toml
+        ✨ Installed @cloudflare/workers-types.
+        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 () => {
@@ -851,7 +1232,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,7 +1255,7 @@ 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,
         },
         {
@@ -901,7 +1282,7 @@ describe("init", () => {
       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
 
@@ -917,7 +1298,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,
         },
         {
@@ -949,7 +1330,7 @@ describe("init", () => {
       expect(packageJson.scripts.start).toBe("test-start");
       expect(packageJson.scripts.publish).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 +1345,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 +1366,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 +1438,21 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created src/index.ts
+
+        To start developing your Worker, run \`npm start\`
+        To publish your Worker to the Internet, run \`npm run publish\`",
+          "warn": "",
+        }
+      `);
     });
 
     it('should create a worker in a nested directory if "name" is path/to/worker', async () => {
@@ -1022,6 +1466,21 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/src/index.ts
+
+        To start developing your Worker, run \`cd path/to/worker && npm start\`
+        To publish your Worker to the Internet, run \`npm run publish\`",
+          "warn": "",
+        }
+      `);
     });
 
     it("should normalize characters that aren't lowercase alphanumeric, underscores, or dashes", async () => {
@@ -1037,6 +1496,21 @@ 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, installed @cloudflare/workers-types into devDependencies
+        ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/src/index.ts
+
+        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\`",
+          "warn": "",
+        }
+      `);
     });
   });
 });

package/src/index.tsx

@@ -359,7 +359,12 @@ export async function main(argv: string[]): Promise<void> {
       let justCreatedWranglerToml = false;
 
       if (fs.existsSync(wranglerTomlDestination)) {
-        logger.warn(`${wranglerTomlDestination} file already exists!`);
+        logger.warn(
+          `${path.relative(
+            process.cwd(),
+            wranglerTomlDestination
+          )} already exists!`
+        );
         const shouldContinue = await confirm(
           "Do you want to continue initializing this project?"
         );
@@ -379,18 +384,28 @@ export async function main(argv: string[]): Promise<void> {
             }) + "\n"
           );
 
-          logger.log(`✨ Successfully created wrangler.toml`);
+          logger.log(
+            `✨ Created ${path.relative(
+              process.cwd(),
+              wranglerTomlDestination
+            )}`
+          );
           justCreatedWranglerToml = true;
         } catch (err) {
           throw new Error(
-            `Failed to create wrangler.toml.\n${(err as Error).message ?? err}`
+            `Failed to create ${path.relative(
+              process.cwd(),
+              wranglerTomlDestination
+            )}.\n${(err as Error).message ?? err}`
           );
         }
       }
 
       const yesFlag = args.yes ?? false;
 
-      const isInsideGitProject = Boolean(await findUp(".git"));
+      const isInsideGitProject = Boolean(
+        await findUp(".git", { cwd: creationDirectory, type: "directory" })
+      );
       const isGitInstalled = (await execa("git", ["--version"])).exitCode === 0;
       if (!isInsideGitProject && isGitInstalled) {
         const shouldInitGit =
@@ -402,11 +417,20 @@ export async function main(argv: string[]): Promise<void> {
             path.join(creationDirectory, ".gitignore"),
             readFileSync(path.join(__dirname, "../templates/gitignore"))
           );
-          logger.log(`✨ Initialized git repository`);
+          logger.log(
+            args.name && args.name !== "."
+              ? `✨ Initialized git repository at ${path.relative(
+                  process.cwd(),
+                  creationDirectory
+                )}`
+              : `✨ Initialized git repository`
+          );
         }
       }
 
-      let pathToPackageJson = await findUp("package.json");
+      let pathToPackageJson = await findUp("package.json", {
+        cwd: creationDirectory,
+      });
       let shouldCreatePackageJson = false;
 
       if (!pathToPackageJson) {
@@ -435,8 +459,10 @@ export async function main(argv: string[]): Promise<void> {
           );
 
           await packageManager.install();
-          logger.log(`✨ Created package.json`);
           pathToPackageJson = path.join(creationDirectory, "package.json");
+          logger.log(
+            `✨ Created ${path.relative(process.cwd(), pathToPackageJson)}`
+          );
         } else {
           return;
         }
@@ -456,7 +482,10 @@ export async function main(argv: string[]): Promise<void> {
           const shouldInstall =
             yesFlag ||
             (await confirm(
-              "Would you like to install wrangler into your package.json?"
+              `Would you like to install wrangler into ${path.relative(
+                process.cwd(),
+                pathToPackageJson
+              )}?`
             ));
           if (shouldInstall) {
             await packageManager.addDevDeps(`wrangler@${wranglerVersion}`);
@@ -466,7 +495,9 @@ export async function main(argv: string[]): Promise<void> {
       }
 
       let isTypescriptProject = false;
-      let pathToTSConfig = await findUp("tsconfig.json");
+      let pathToTSConfig = await findUp("tsconfig.json", {
+        cwd: creationDirectory,
+      });
       if (!pathToTSConfig) {
         // If there's no tsconfig, offer to create one
         // and install @cloudflare/workers-types
@@ -480,11 +511,13 @@ export async function main(argv: string[]): Promise<void> {
             "@cloudflare/workers-types",
             "typescript"
           );
-
+          pathToTSConfig = path.join(creationDirectory, "tsconfig.json");
           logger.log(
-            `✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies`
+            `✨ Created ${path.relative(
+              process.cwd(),
+              pathToTSConfig
+            )}, installed @cloudflare/workers-types into devDependencies`
           );
-          pathToTSConfig = path.join(creationDirectory, "tsconfig.json");
         }
       } else {
         isTypescriptProject = true;
@@ -510,7 +543,10 @@ export async function main(argv: string[]): Promise<void> {
             // and we don't want to break them. Instead, we simply
             // tell the user that they need to update their tsconfig.json
             logger.log(
-              `✨ Installed @cloudflare/workers-types.\nPlease add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig.json`
+              `✨ Installed @cloudflare/workers-types.\nPlease add "@cloudflare/workers-types" to compilerOptions.types in ${path.relative(
+                process.cwd(),
+                pathToTSConfig
+              )}`
             );
           }
         }
@@ -592,12 +628,13 @@ export async function main(argv: string[]): Promise<void> {
 
       if (isTypescriptProject) {
         if (!fs.existsSync(path.join(creationDirectory, "./src/index.ts"))) {
-          let shouldCreateSource = false;
-
-          shouldCreateSource =
+          const shouldCreateSource =
             yesFlag ||
             (await confirm(
-              `Would you like to create a Worker at src/index.ts?`
+              `Would you like to create a Worker at ${path.relative(
+                process.cwd(),
+                path.join(creationDirectory, "./src/index.ts")
+              )}?`
             ));
 
           if (shouldCreateSource) {
@@ -609,7 +646,12 @@ export async function main(argv: string[]): Promise<void> {
               readFileSync(path.join(__dirname, "../templates/new-worker.ts"))
             );
 
-            logger.log(`✨ Created src/index.ts`);
+            logger.log(
+              `✨ Created ${path.relative(
+                process.cwd(),
+                path.join(creationDirectory, "./src/index.ts")
+              )}`
+            );
 
             await writePackageJsonScriptsAndUpdateWranglerToml(
               shouldWritePackageJsonScripts,
@@ -620,20 +662,31 @@ export async function main(argv: string[]): Promise<void> {
           }
         }
       } else {
-        if (!fs.existsSync("./src/index.js")) {
-          const shouldCreateSource = await confirm(
-            `Would you like to create a Worker at src/index.js?`
-          );
+        if (!fs.existsSync(path.join(creationDirectory, "./src/index.js"))) {
+          const shouldCreateSource =
+            yesFlag ||
+            (await confirm(
+              `Would you like to create a Worker at ${path.relative(
+                process.cwd(),
+                path.join(creationDirectory, "./src/index.js")
+              )}?`
+            ));
+
           if (shouldCreateSource) {
             await mkdir(path.join(creationDirectory, "./src"), {
               recursive: true,
             });
             await writeFile(
-              path.join(path.join(creationDirectory, "./src/index.js")),
+              path.join(creationDirectory, "./src/index.js"),
               readFileSync(path.join(__dirname, "../templates/new-worker.js"))
             );
 
-            logger.log(`✨ Created src/index.js`);
+            logger.log(
+              `✨ Created ${path.relative(
+                process.cwd(),
+                path.join(creationDirectory, "./src/index.js")
+              )}`
+            );
 
             await writePackageJsonScriptsAndUpdateWranglerToml(
               shouldWritePackageJsonScripts,

package/wrangler-dist/cli.js

@@ -104810,7 +104810,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "0.0.32";
+var version = "2.0.0";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -111787,7 +111787,7 @@ Have you considered using Cloudflare Pages instead? See https://pages.cloudflare
     const wranglerTomlDestination = import_node_path21.default.join(creationDirectory, "./wrangler.toml");
     let justCreatedWranglerToml = false;
     if (fs8.existsSync(wranglerTomlDestination)) {
-      logger.warn(`${wranglerTomlDestination} file already exists!`);
+      logger.warn(`${import_node_path21.default.relative(process.cwd(), wranglerTomlDestination)} already exists!`);
       const shouldContinue = await confirm("Do you want to continue initializing this project?");
       if (!shouldContinue) {
         return;
@@ -111800,25 +111800,27 @@ Have you considered using Cloudflare Pages instead? See https://pages.cloudflare
           name: workerName,
           compatibility_date: compatibilityDate
         }) + "\n");
-        logger.log(`\u2728 Successfully created wrangler.toml`);
+        logger.log(`\u2728 Created ${import_node_path21.default.relative(process.cwd(), wranglerTomlDestination)}`);
         justCreatedWranglerToml = true;
       } catch (err2) {
-        throw new Error(`Failed to create wrangler.toml.
+        throw new Error(`Failed to create ${import_node_path21.default.relative(process.cwd(), wranglerTomlDestination)}.
 ${err2.message ?? err2}`);
       }
     }
     const yesFlag = args.yes ?? false;
-    const isInsideGitProject = Boolean(await findUp(".git"));
+    const isInsideGitProject = Boolean(await findUp(".git", { cwd: creationDirectory, type: "directory" }));
     const isGitInstalled = (await execa("git", ["--version"])).exitCode === 0;
     if (!isInsideGitProject && isGitInstalled) {
       const shouldInitGit = yesFlag || await confirm("Would you like to use git to manage this Worker?");
       if (shouldInitGit) {
         await execa("git", ["init"], { cwd: creationDirectory });
         await (0, import_promises10.writeFile)(import_node_path21.default.join(creationDirectory, ".gitignore"), readFileSync5(import_node_path21.default.join(__dirname, "../templates/gitignore")));
-        logger.log(`\u2728 Initialized git repository`);
+        logger.log(args.name && args.name !== "." ? `\u2728 Initialized git repository at ${import_node_path21.default.relative(process.cwd(), creationDirectory)}` : `\u2728 Initialized git repository`);
       }
     }
-    let pathToPackageJson = await findUp("package.json");
+    let pathToPackageJson = await findUp("package.json", {
+      cwd: creationDirectory
+    });
     let shouldCreatePackageJson = false;
     if (!pathToPackageJson) {
       shouldCreatePackageJson = yesFlag || await confirm("No package.json found. Would you like to create one?");
@@ -111832,15 +111834,15 @@ ${err2.message ?? err2}`);
           private: true
         }, null, "  ") + "\n");
         await packageManager.install();
-        logger.log(`\u2728 Created package.json`);
         pathToPackageJson = import_node_path21.default.join(creationDirectory, "package.json");
+        logger.log(`\u2728 Created ${import_node_path21.default.relative(process.cwd(), pathToPackageJson)}`);
       } else {
         return;
       }
     } else {
       const packageJson = parseJSON(readFileSync5(pathToPackageJson), pathToPackageJson);
       if (!(packageJson.devDependencies?.wrangler || packageJson.dependencies?.wrangler)) {
-        const shouldInstall = yesFlag || await confirm("Would you like to install wrangler into your package.json?");
+        const shouldInstall = yesFlag || await confirm(`Would you like to install wrangler into ${import_node_path21.default.relative(process.cwd(), pathToPackageJson)}?`);
         if (shouldInstall) {
           await packageManager.addDevDeps(`wrangler@${version}`);
           logger.log(`\u2728 Installed wrangler`);
@@ -111848,14 +111850,16 @@ ${err2.message ?? err2}`);
       }
     }
     let isTypescriptProject = false;
-    let pathToTSConfig = await findUp("tsconfig.json");
+    let pathToTSConfig = await findUp("tsconfig.json", {
+      cwd: creationDirectory
+    });
     if (!pathToTSConfig) {
       if (yesFlag || await confirm("Would you like to use TypeScript?")) {
         isTypescriptProject = true;
         await (0, import_promises10.writeFile)(import_node_path21.default.join(creationDirectory, "./tsconfig.json"), readFileSync5(import_node_path21.default.join(__dirname, "../templates/tsconfig.json")));
         await packageManager.addDevDeps("@cloudflare/workers-types", "typescript");
-        logger.log(`\u2728 Created tsconfig.json, installed @cloudflare/workers-types into devDependencies`);
         pathToTSConfig = import_node_path21.default.join(creationDirectory, "tsconfig.json");
+        logger.log(`\u2728 Created ${import_node_path21.default.relative(process.cwd(), pathToTSConfig)}, installed @cloudflare/workers-types into devDependencies`);
       }
     } else {
       isTypescriptProject = true;
@@ -111865,7 +111869,7 @@ ${err2.message ?? err2}`);
         if (shouldInstall) {
           await packageManager.addDevDeps("@cloudflare/workers-types");
           logger.log(`\u2728 Installed @cloudflare/workers-types.
-Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig.json`);
+Please add "@cloudflare/workers-types" to compilerOptions.types in ${import_node_path21.default.relative(process.cwd(), pathToTSConfig)}`);
         }
       }
     }
@@ -111901,26 +111905,25 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
     }
     if (isTypescriptProject) {
       if (!fs8.existsSync(import_node_path21.default.join(creationDirectory, "./src/index.ts"))) {
-        let shouldCreateSource = false;
-        shouldCreateSource = yesFlag || await confirm(`Would you like to create a Worker at src/index.ts?`);
+        const shouldCreateSource = yesFlag || await confirm(`Would you like to create a Worker at ${import_node_path21.default.relative(process.cwd(), import_node_path21.default.join(creationDirectory, "./src/index.ts"))}?`);
         if (shouldCreateSource) {
           await (0, import_promises10.mkdir)(import_node_path21.default.join(creationDirectory, "./src"), {
             recursive: true
           });
           await (0, import_promises10.writeFile)(import_node_path21.default.join(creationDirectory, "./src/index.ts"), readFileSync5(import_node_path21.default.join(__dirname, "../templates/new-worker.ts")));
-          logger.log(`\u2728 Created src/index.ts`);
+          logger.log(`\u2728 Created ${import_node_path21.default.relative(process.cwd(), import_node_path21.default.join(creationDirectory, "./src/index.ts"))}`);
           await writePackageJsonScriptsAndUpdateWranglerToml(shouldWritePackageJsonScripts, justCreatedWranglerToml, pathToPackageJson, "src/index.ts");
         }
       }
     } else {
-      if (!fs8.existsSync("./src/index.js")) {
-        const shouldCreateSource = await confirm(`Would you like to create a Worker at src/index.js?`);
+      if (!fs8.existsSync(import_node_path21.default.join(creationDirectory, "./src/index.js"))) {
+        const shouldCreateSource = yesFlag || await confirm(`Would you like to create a Worker at ${import_node_path21.default.relative(process.cwd(), import_node_path21.default.join(creationDirectory, "./src/index.js"))}?`);
         if (shouldCreateSource) {
           await (0, import_promises10.mkdir)(import_node_path21.default.join(creationDirectory, "./src"), {
             recursive: true
           });
-          await (0, import_promises10.writeFile)(import_node_path21.default.join(import_node_path21.default.join(creationDirectory, "./src/index.js")), readFileSync5(import_node_path21.default.join(__dirname, "../templates/new-worker.js")));
-          logger.log(`\u2728 Created src/index.js`);
+          await (0, import_promises10.writeFile)(import_node_path21.default.join(creationDirectory, "./src/index.js"), readFileSync5(import_node_path21.default.join(__dirname, "../templates/new-worker.js")));
+          logger.log(`\u2728 Created ${import_node_path21.default.relative(process.cwd(), import_node_path21.default.join(creationDirectory, "./src/index.js"))}`);
           await writePackageJsonScriptsAndUpdateWranglerToml(shouldWritePackageJsonScripts, justCreatedWranglerToml, pathToPackageJson, "src/index.js");
         }
       }