wrangler 2.0.6 → 2.0.9

package/src/__tests__/kv.test.ts

@@ -663,7 +663,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -685,7 +685,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
@@ -856,7 +856,7 @@ describe("wrangler", () => {
         `);
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
       });
     });
@@ -1044,7 +1044,7 @@ describe("wrangler", () => {
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -1205,10 +1205,10 @@ describe("wrangler", () => {
         );
         expect(requests.count).toEqual(3);
         expect(std.out).toMatchInlineSnapshot(`
-          "Uploaded 0 of 12000.
-          Uploaded 5000 of 12000.
-          Uploaded 10000 of 12000.
-          Uploaded 12000 of 12000.
+          "Uploaded 0% (0 out of 12,000)
+          Uploaded 41% (5,000 out of 12,000)
+          Uploaded 83% (10,000 out of 12,000)
+          Uploaded 100% (12,000 out of 12,000)
           Success!"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -1226,7 +1226,7 @@ describe("wrangler", () => {
               `);
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -1288,7 +1288,7 @@ describe("wrangler", () => {
 
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.warn).toMatchInlineSnapshot(`
           "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
@@ -1358,10 +1358,10 @@ describe("wrangler", () => {
         );
         expect(requests.count).toEqual(3);
         expect(std.out).toMatchInlineSnapshot(`
-          "Deleted 0 of 12000.
-          Deleted 5000 of 12000.
-          Deleted 10000 of 12000.
-          Deleted 12000 of 12000.
+          "Deleted 0% (0 out of 12,000)
+          Deleted 41% (5,000 out of 12,000)
+          Deleted 83% (10,000 out of 12,000)
+          Deleted 100% (12,000 out of 12,000)
           Success!"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -1429,7 +1429,7 @@ describe("wrangler", () => {
               `);
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -1454,7 +1454,7 @@ describe("wrangler", () => {
               `);
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });

package/src/__tests__/package-manager.test.ts

@@ -7,100 +7,210 @@ const { getPackageManager, getPackageManagerName } =
   jest.requireActual("../package-manager");
 interface TestCase {
   npm: boolean;
+  pnpm: boolean;
   yarn: boolean;
   npmLockFile: boolean;
   yarnLockFile: boolean;
+  pnpmLockFile: boolean;
   expectedPackageManager: string;
 }
 
 const testCases: TestCase[] = [
-  // npm binary - no yarn binary
+  // npm binary only
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: false,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
 
-  // yarn binary - no npm binary
+  // yarn binary only
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: false,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
 
+  // pnpm binary only
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: false,
+    yarn: false,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: true,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+
   // npm and yarn binaries
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: false,
+    pnpmLockFile: false,
     expectedPackageManager: "npm",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: false,
     yarnLockFile: true,
+    pnpmLockFile: false,
     expectedPackageManager: "yarn",
   },
   {
     npm: true,
     yarn: true,
+    pnpm: false,
     npmLockFile: true,
     yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  // npm, yarn and pnpm binaries
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: false,
+    pnpmLockFile: false,
+    expectedPackageManager: "npm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: true,
+    pnpmLockFile: false,
+    expectedPackageManager: "yarn",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: false,
+    yarnLockFile: false,
+    pnpmLockFile: true,
+    expectedPackageManager: "pnpm",
+  },
+  {
+    npm: true,
+    yarn: true,
+    pnpm: true,
+    npmLockFile: true,
+    yarnLockFile: true,
+    pnpmLockFile: true,
     expectedPackageManager: "npm",
   },
 ];
@@ -112,12 +222,13 @@ describe("getPackageManager()", () => {
   describe("no supported package manager", () => {
     mockYarn(false);
     mockNpm(false);
+    mockPnpm(false);
 
     it("should throw an error", async () => {
       await expect(() =>
         getPackageManager(process.cwd())
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Unable to find a package manager. Supported managers are: npm and yarn."`
+        `"Unable to find a package manager. Supported managers are: npm, yarn, and pnpm."`
       );
     });
   });
@@ -125,16 +236,26 @@ describe("getPackageManager()", () => {
   for (const {
     npm,
     yarn,
+    pnpm,
     npmLockFile,
     yarnLockFile,
+    pnpmLockFile,
     expectedPackageManager,
   } of testCases) {
     describe(
-      getTestCaseDescription(npm, yarn, npmLockFile, yarnLockFile),
+      getTestCaseDescription(
+        npm,
+        yarn,
+        pnpm,
+        npmLockFile,
+        yarnLockFile,
+        pnpmLockFile
+      ),
       () => {
         mockYarn(yarn);
         mockNpm(npm);
-        mockLockFiles(npmLockFile, yarnLockFile);
+        mockPnpm(pnpm);
+        mockLockFiles(npmLockFile, yarnLockFile, pnpmLockFile);
 
         it(`should return the ${expectedPackageManager} package manager`, async () => {
           const actualPackageManager = await getPackageManager(process.cwd());
@@ -169,10 +290,25 @@ function mockNpm(succeed: boolean): void {
   afterEach(() => unMock());
 }
 
+/**
+ * Create a fake pnpm binary
+ */
+function mockPnpm(succeed: boolean): void {
+  let unMock: () => void;
+  beforeEach(async () => {
+    unMock = await mockBinary("pnpm", `process.exit(${succeed ? 0 : 1})`);
+  });
+  afterEach(() => unMock());
+}
+
 /**
  * Create a fake lock files.
  */
-function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
+function mockLockFiles(
+  npmLockFile: boolean,
+  yarnLockFile: boolean,
+  pnpmLockFile: boolean
+) {
   beforeEach(() => {
     if (npmLockFile) {
       writeFileSync("package-lock.json", "");
@@ -180,14 +316,19 @@ function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
     if (yarnLockFile) {
       writeFileSync("yarn.lock", "");
     }
+    if (pnpmLockFile) {
+      writeFileSync("pnpm-lock.yaml", "");
+    }
   });
 }
 
 function getTestCaseDescription(
   npm: boolean,
   yarn: boolean,
+  pnpm: boolean,
   npmLockFile: boolean,
-  yarnLockFile: boolean
+  yarnLockFile: boolean,
+  pnpmLockFile: boolean
 ): string {
   const criteria: string[] = [];
   if (npm) {
@@ -202,5 +343,11 @@ function getTestCaseDescription(
   if (yarnLockFile) {
     criteria.push("yarn.lock");
   }
+  if (pnpm) {
+    criteria.push("pnpm");
+  }
+  if (pnpmLockFile) {
+    criteria.push("pnpm-lock.yaml");
+  }
   return "using " + criteria.join("; ");
 }