wrangler 2.0.3 → 2.0.7

package/src/__tests__/index.test.ts

@@ -2,6 +2,8 @@ import { getPackageManager } from "../package-manager";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import { writeWorkerSource } from "./helpers/write-worker-source";
+import writeWranglerToml from "./helpers/write-wrangler-toml";
 import type { PackageManager } from "../package-manager";
 
 describe("wrangler", () => {
@@ -63,10 +65,7 @@ describe("wrangler", () => {
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        "
-      `);
-      expect(std.err).toMatchInlineSnapshot(`
-        "wrangler
+        wrangler
 
         Commands:
           wrangler init [name]       📥 Create a wrangler.toml configuration file
@@ -86,8 +85,10 @@ describe("wrangler", () => {
         Flags:
           -c, --config   Path to .toml configuration file  [string]
           -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]
-        X [ERROR] Unknown argument: invalid-command
+          -v, --version  Show version number  [boolean]"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] Unknown argument: invalid-command
 
         "
       `);
@@ -114,9 +115,6 @@ describe("wrangler", () => {
   });
 
   describe("subcommand implicit help ran on incomplete command execution", () => {
-    function endEventLoop() {
-      return new Promise((resolve) => setImmediate(resolve));
-    }
     it("no subcommand for 'secret' should display a list of available subcommands", async () => {
       await runWrangler("secret");
       await endEventLoop();
@@ -196,6 +194,7 @@ describe("wrangler", () => {
           -v, --version  Show version number  [boolean]"
       `);
     });
+
     it("no subcommand 'r2' should display a list of available subcommands", async () => {
       await runWrangler("r2");
       await endEventLoop();
@@ -214,6 +213,7 @@ describe("wrangler", () => {
       `);
     });
   });
+
   describe("Deprecated commands", () => {
     it("should print a deprecation message for 'generate'", async () => {
       await runWrangler("generate").catch((err) => {
@@ -230,13 +230,27 @@ describe("wrangler", () => {
         `);
       });
     });
-    it("should print a deprecation message for 'build'", async () => {
-      await runWrangler("build").catch((err) => {
-        expect(err.message).toMatchInlineSnapshot(`
-          "Deprecation:
-          \`wrangler build\` has been deprecated, please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build for alternatives"
-        `);
-      });
+  });
+
+  it("should print a deprecation message for 'build' and then try to run `publish --dry-run --outdir`", async () => {
+    writeWranglerToml({
+      main: "index.js",
     });
+    writeWorkerSource();
+    await runWrangler("build");
+    await endEventLoop();
+    expect(std.out).toMatchInlineSnapshot(`
+      "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
+
+        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build for more information.
+        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
+
+
+      --dry-run: exiting now."
+    `);
   });
 });
+
+function endEventLoop() {
+  return new Promise((resolve) => setImmediate(resolve));
+}

package/src/__tests__/init.test.ts

@@ -2,7 +2,7 @@ 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";
@@ -46,8 +46,9 @@ describe("init", () => {
         "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`"
@@ -72,8 +73,9 @@ describe("init", () => {
         "✨ Created my-worker/wrangler.toml
         ✨ Initialized git repository at my-worker
         ✨ Created my-worker/package.json
-        ✨ Created my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created my-worker/tsconfig.json
         ✨ Created my-worker/src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd my-worker && npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`"
@@ -97,8 +99,9 @@ describe("init", () => {
           "out": "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",
@@ -373,8 +376,9 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",
@@ -397,8 +401,9 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created path/to/worker/my-worker/wrangler.toml
         ✨ Created path/to/worker/my-worker/package.json
-        ✨ Created path/to/worker/my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/my-worker/tsconfig.json
         ✨ Created path/to/worker/my-worker/src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd path/to/worker/my-worker && npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",
@@ -407,10 +412,37 @@ describe("init", () => {
       `);
     });
 
+    // 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", () => {
@@ -616,7 +648,7 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Installed wrangler",
+        ✨ Installed wrangler into devDependencies",
           "warn": "",
         }
       `);
@@ -664,7 +696,7 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created path/to/worker/my-worker/wrangler.toml
-        ✨ Installed wrangler",
+        ✨ Installed wrangler into devDependencies",
           "warn": "",
         }
       `);
@@ -801,8 +833,9 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npx wrangler dev\`
         To publish your Worker to the Internet, run \`npx wrangler publish\`",
@@ -851,8 +884,9 @@ describe("init", () => {
       expect(std.out).toMatchInlineSnapshot(`
         "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`"
@@ -899,8 +933,9 @@ describe("init", () => {
       expect(packageJson.scripts.publish).toBe("test-publish");
       expect(std.out).toMatchInlineSnapshot(`
         "✨ Created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npx wrangler dev\`
         To publish your Worker to the Internet, run \`npx wrangler publish\`"
@@ -940,7 +975,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -981,7 +1017,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created my-worker/wrangler.toml
-        ✨ Created my-worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created my-worker/tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -1027,7 +1064,8 @@ describe("init", () => {
           "err": "",
           "out": "✨ Created wrangler.toml
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies",
+        ✨ Created tsconfig.json
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies",
           "warn": "",
         }
       `);
@@ -1179,8 +1217,8 @@ describe("init", () => {
           "debug": "",
           "err": "",
           "out": "✨ Created wrangler.toml
-        ✨ Installed @cloudflare/workers-types.
-        Please add \\"@cloudflare/workers-types\\" to compilerOptions.types in tsconfig.json",
+        ✨ Installed @cloudflare/workers-types into devDependencies
+        🚨 Please add \\"@cloudflare/workers-types\\" to compilerOptions.types in tsconfig.json",
           "warn": "",
         }
       `);
@@ -1445,8 +1483,9 @@ describe("init", () => {
           "out": "✨ Created wrangler.toml
         ✨ Initialized git repository
         ✨ Created package.json
-        ✨ Created tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created tsconfig.json
         ✨ Created src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",
@@ -1473,8 +1512,9 @@ describe("init", () => {
           "out": "✨ Created path/to/worker/wrangler.toml
         ✨ Initialized git repository at path/to/worker
         ✨ Created path/to/worker/package.json
-        ✨ Created path/to/worker/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created path/to/worker/tsconfig.json
         ✨ Created path/to/worker/src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd path/to/worker && npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",
@@ -1503,8 +1543,9 @@ describe("init", () => {
           "out": "✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/wrangler.toml
         ✨ Initialized git repository at WEIRD_w0rkr_N4m3.js.tsx.tar.gz
         ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/package.json
-        ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/tsconfig.json, installed @cloudflare/workers-types into devDependencies
+        ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/tsconfig.json
         ✨ Created WEIRD_w0rkr_N4m3.js.tsx.tar.gz/src/index.ts
+        ✨ Installed @cloudflare/workers-types and typescript into devDependencies
 
         To start developing your Worker, run \`cd WEIRD_w0rkr_N4m3.js.tsx.tar.gz && npm start\`
         To publish your Worker to the Internet, run \`npm run publish\`",