improve e2e

Author: sommeeeer

examples/app-pages-router/pages/[[...page]].tsx

@@ -6,13 +6,18 @@ import type {
 } from "next";
 
 const validRootPages = ["conico974", "kheuzy", "sommeeer"];
+const validLongPaths = ["super/long/path/to/secret/page"];
 
 export async function getStaticPaths(): Promise<GetStaticPathsResult> {
   const rootPaths = validRootPages.map((page) => ({
     params: { page: [page] },
   }));
 
-  const paths = [{ params: { page: [] } }, ...rootPaths];
+  const longPaths = validLongPaths.map((path) => ({
+    params: { page: path.split("/") },
+  }));
+
+  const paths = [{ params: { page: [] } }, ...rootPaths, ...longPaths];
 
   return {
     paths,
@@ -40,6 +45,10 @@ export async function getStaticProps(context: GetStaticPropsContext) {
     };
   }
 
+  const pagePath = page.join("/");
+  if (validLongPaths.includes(pagePath)) {
+    return { props: { subpage: page, pageType: "long-path" } };
+  }
   return { notFound: true };
 }
 
@@ -52,7 +61,8 @@ export default function Page({
   }
   return (
     <div>
-      <h1>{pageType === "home" ? "Homepage" : `Root page: ${subpage}`}</h1>
+      <h1 data-testid="page">{`Page: ${subpage}`}</h1>
+      <p>Page type: {pageType}</p>
       <p>Path: {subpage.join("/")}</p>
     </div>
   );

examples/sst/sst.config.ts

@@ -1,9 +1,6 @@
 import type { SSTConfig } from "sst";
 
 import { AppPagesRouter } from "./stacks/AppPagesRouter";
-import { AppRouter } from "./stacks/AppRouter";
-import { Experimental } from "./stacks/Experimental";
-import { PagesRouter } from "./stacks/PagesRouter";
 
 export default {
   config(_input) {
@@ -14,9 +11,9 @@ export default {
   },
   stacks(app) {
     app
-      .stack(AppRouter)
-      .stack(PagesRouter)
-      .stack(AppPagesRouter)
-      .stack(Experimental);
+      // .stack(AppRouter)
+      // .stack(PagesRouter)
+      .stack(AppPagesRouter);
+    // .stack(Experimental);
   },
 } satisfies SSTConfig;

packages/tests-e2e/tests/appPagesRouter/catch-all.test.ts

@@ -1,12 +1,30 @@
-import { test } from "@playwright/test";
+import { test, expect } from "@playwright/test";
 
 // Going to `/`, `/conico974`, `/kheuzy` and `/sommeeer` should be catched by our `[[...page]]` route.
-test("Optional Catch all route in root should work", async ({ page }) => {
-  await page.goto("/");
-  await page.locator("h1").getByText("App Router").isVisible();
-  await page.locator("h1").getByText("Pages Router").isVisible();
+// Also the /super/long/path/to/secret/page should be pregenerated by the `getStaticPaths` function.
+test.describe("Catch-all route in root should work", () => {
+  test("should be possible to visit home and a pregenerated subpage", async ({
+    page,
+  }) => {
+    await page.goto("/");
+    await page.locator("h1").getByText("App Router").isVisible();
+    await page.locator("h1").getByText("Pages Router").isVisible();
 
-  await page.goto("/conico974");
-  const pElement = page.getByText("Path: conico974", { exact: true });
-  await pElement.isVisible();
+    await page.goto("/conico974");
+    const pElement = page.getByText("Path: conico974", { exact: true });
+    await pElement.isVisible();
+  });
+  test("should be possible to visit a long path", async ({ page }) => {
+    await page.goto("/super/long/path/to/secret/page");
+    const h1Text =  await page.getByTestId("page").textContent();;
+    expect(h1Text).toBe("Page: super,long,path,to,secret,page");
+  });
+  test("should be possible to request an API route when you have a catch-all in root", async ({
+    request,
+  }) => {
+      const response = await request.get("/api/hello");
+      expect(response.status()).toBe(200);
+      const body = await response.json();
+      expect(body).toEqual({ hello: "world" });
+  });
 });