wrangler 2.0.7 → 2.0.11

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("; ");
 }

package/src/__tests__/pages.test.ts

@@ -19,7 +19,7 @@ function assertLater(fn: () => void) {
 }
 
 function mockGetToken(jwt: string) {
-  setMockResponse(
+  return setMockResponse(
     "/accounts/:accountId/pages/projects/foo/upload-token",
     async ([_url, accountId]) => {
       assertLater(() => {
@@ -79,7 +79,7 @@ describe("pages", () => {
       expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
-        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"
       `);
     });
 
@@ -89,7 +89,7 @@ describe("pages", () => {
       expect(std.out).toMatchInlineSnapshot(`
         "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
 
-        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"
       `);
     });
   });
@@ -374,10 +374,10 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-            }
-          `);
+                          Object {
+                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+                          }
+                      `);
           });
 
           return {
@@ -445,10 +445,10 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-            }
-          `);
+                          Object {
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
           });
 
           return {
@@ -488,6 +488,103 @@ describe("pages", () => {
       `);
     });
 
+    it("should refetch a JWT if it expires while uploading", async () => {
+      writeFileSync("logo.txt", "foobar");
+
+      const cancelMockGetToken = mockGetToken("<<funfetti-auth-jwt>>");
+
+      setMockResponse(
+        "/pages/assets/check-missing",
+        "POST",
+        async (_, init) => {
+          const body = JSON.parse(init.body as string) as { hashes: string[] };
+          assertLater(() => {
+            expect(init.headers).toMatchObject({
+              Authorization: "Bearer <<funfetti-auth-jwt>>",
+            });
+            expect(body).toMatchObject({
+              hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
+            });
+          });
+          return body.hashes;
+        }
+      );
+
+      // Accumulate multiple requests then assert afterwards
+      const requests: RequestInit[] = [];
+      setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+        requests.push(init);
+
+        // Fail just the first request
+        if (requests.length < 2) {
+          cancelMockGetToken();
+          mockGetToken("<<funfetti-auth-jwt2>>");
+          return createFetchResult(null, false, [
+            {
+              code: 8000013,
+              message: "Authorization failed",
+            },
+          ]);
+        } else {
+          return createFetchResult(null, true);
+        }
+      });
+
+      setMockResponse(
+        "/accounts/:accountId/pages/projects/foo/deployments",
+        async ([_url, accountId], init) => {
+          assertLater(() => {
+            expect(accountId).toEqual("some-account-id");
+            expect(init.method).toEqual("POST");
+            const body = init.body as FormData;
+            const manifest = JSON.parse(body.get("manifest") as string);
+            expect(manifest).toMatchInlineSnapshot(`
+                          Object {
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
+          });
+
+          return {
+            url: "https://abcxyz.foo.pages.dev/",
+          };
+        }
+      );
+
+      await runWrangler("pages publish . --project-name=foo");
+
+      // Assert two requests
+      expect(requests.length).toBe(2);
+
+      expect(requests[0].headers).toMatchObject({
+        Authorization: "Bearer <<funfetti-auth-jwt>>",
+      });
+
+      expect(requests[1].headers).toMatchObject({
+        Authorization: "Bearer <<funfetti-auth-jwt2>>",
+      });
+
+      for (const init of requests) {
+        const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+        expect(body).toMatchObject([
+          {
+            key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+            value: Buffer.from("foobar").toString("base64"),
+            metadata: {
+              contentType: "text/plain",
+            },
+            base64: true,
+          },
+        ]);
+      }
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "✨ Success! Uploaded 1 files (TIMINGS)
+
+        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+      `);
+    });
+
     it("should try to use multiple buckets (up to the max concurrency)", async () => {
       writeFileSync("logo.txt", "foobar");
       writeFileSync("logo.png", "foobar");
@@ -533,13 +630,13 @@ describe("pages", () => {
             const body = init.body as FormData;
             const manifest = JSON.parse(body.get("manifest") as string);
             expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
-              "/logo.js": "6be321bef99e758250dac034474ddbb8",
-              "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-              "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-            }
-          `);
+                          Object {
+                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+                          }
+                      `);
           });
 
           return {