fix e2e

Author: sommeeeer

packages/open-next/src/core/routing/matcher.ts

@@ -418,7 +418,14 @@ export function fixDataPage(
 export function handleFallbackFalse(
   internalEvent: InternalEvent,
   prerenderManifest: PrerenderManifest,
+  isExternalRewrite: boolean,
 ): { event: InternalEvent; isISR: boolean } {
+  if (isExternalRewrite) {
+    return {
+      event: internalEvent,
+      isISR: false,
+    };
+  }
   const { rawPath } = internalEvent;
   const { dynamicRoutes, routes } = prerenderManifest;
   const prerenderedFallbackRoutes = Object.entries(dynamicRoutes).filter(

packages/open-next/src/core/routingHandler.ts

@@ -138,9 +138,11 @@ export default async function routingHandler(
     }
 
     // We want to run this just before the dynamic route check
+    // We can skip it if its an external rewrite
     const { event: fallbackEvent, isISR } = handleFallbackFalse(
       internalEvent,
       PrerenderManifest,
+      isExternalRewrite,
     );
     internalEvent = fallbackEvent;
 

packages/tests-e2e/tests/pagesRouter/data.test.ts

@@ -17,5 +17,8 @@ test("fix _next/data", async ({ page }) => {
   expect(response2.request().url()).toMatch(/\/_next\/data\/.*\/en\.json$/);
   await page.waitForURL("/");
   const body = await response2.json();
-  expect(body).toEqual({ pageProps: { hello: "world" }, __N_SSG: true });
+  expect(body).toEqual({
+    pageProps: { subpage: [], pageType: "home" },
+    __N_SSG: true,
+  });
 });

packages/tests-e2e/tests/pagesRouter/rewrite.test.ts

@@ -3,35 +3,37 @@ import { validateMd5 } from "../utils";
 
 const EXT_PNG_MD5 = "405f45cc3397b09717a13ebd6f1e027b";
 
-test("Single Rewrite", async ({ page }) => {
-  await page.goto("/rewrite");
-
-  const el = page.getByText("Nextjs Pages Router");
-  await expect(el).toBeVisible();
-});
-
-test("Rewrite with query", async ({ page }) => {
-  await page.goto("/rewriteUsingQuery?d=ssr");
-
-  const el = page.getByText("SSR");
-  await expect(el).toBeVisible();
-});
-
-test("Rewrite to external image", async ({ request }) => {
-  const response = await request.get("/external-on-image");
-  expect(response.status()).toBe(200);
-  expect(response.headers()["content-type"]).toBe("image/png");
-  expect(validateMd5(await response.body(), EXT_PNG_MD5)).toBe(true);
-});
-
-test("Rewrite with query in destination", async ({ request }) => {
-  const response = await request.get("/rewriteWithQuery");
-  expect(response.status()).toBe(200);
-  expect(await response.json()).toEqual({ query: { q: "1" } });
-});
-
-test("Rewrite with query should merge query params", async ({ request }) => {
-  const response = await request.get("/rewriteWithQuery?b=2");
-  expect(response.status()).toBe(200);
-  expect(await response.json()).toEqual({ query: { q: "1", b: "2" } });
+test.describe("Rewrites should work", () => {
+  test("Single Rewrite", async ({ page }) => {
+    await page.goto("/rewrite");
+
+    const el = page.getByText("Nextjs Pages Router");
+    await expect(el).toBeVisible();
+  });
+
+  test("Rewrite with query", async ({ page }) => {
+    await page.goto("/rewriteUsingQuery?d=ssr");
+
+    const el = page.getByText("SSR");
+    await expect(el).toBeVisible();
+  });
+
+  test("Rewrite to external image", async ({ request }) => {
+    const response = await request.get("/external-on-image");
+    expect(response.status()).toBe(200);
+    expect(response.headers()["content-type"]).toBe("image/png");
+    expect(validateMd5(await response.body(), EXT_PNG_MD5)).toBe(true);
+  });
+
+  test("Rewrite with query in destination", async ({ request }) => {
+    const response = await request.get("/rewriteWithQuery");
+    expect(response.status()).toBe(200);
+    expect(await response.json()).toEqual({ query: { q: "1" } });
+  });
+
+  test("Rewrite with query should merge query params", async ({ request }) => {
+    const response = await request.get("/rewriteWithQuery?b=2");
+    expect(response.status()).toBe(200);
+    expect(await response.json()).toEqual({ query: { q: "1", b: "2" } });
+  });
 });