review

Author: sommeeeer

packages/open-next/src/adapters/config/index.ts

@@ -11,6 +11,7 @@ import {
   loadFunctionsConfigManifest,
   loadHtmlPages,
   loadMiddlewareManifest,
+  loadPagesManifest,
   loadPrerenderManifest,
   loadRoutesManifest,
 } from "./util.js";
@@ -28,6 +29,7 @@ export const RoutesManifest = /* @__PURE__ */ loadRoutesManifest(NEXT_DIR);
 export const ConfigHeaders = /* @__PURE__ */ loadConfigHeaders(NEXT_DIR);
 export const PrerenderManifest =
   /* @__PURE__ */ loadPrerenderManifest(NEXT_DIR);
+export const PagesManifest = /* @__PURE__ */ loadPagesManifest(NEXT_DIR);
 export const AppPathsManifestKeys =
   /* @__PURE__ */ loadAppPathsManifestKeys(NEXT_DIR);
 export const MiddlewareManifest =

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

@@ -418,14 +418,7 @@ 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/routing/routeMatcher.ts

@@ -1,5 +1,8 @@
-import { AppPathRoutesManifest, NEXT_DIR, RoutesManifest } from "config/index";
-import { loadPagesManifest } from "config/util";
+import {
+  AppPathRoutesManifest,
+  PagesManifest,
+  RoutesManifest,
+} from "config/index";
 import type { RouteDefinition } from "types/next-types";
 import type { ResolvedRoute, RouteType } from "types/open-next";
 
@@ -73,7 +76,6 @@ function getStaticAPIRoutes(): RouteDefinition[] {
   const dynamicRoutePages = new Set(
     RoutesManifest.routes.dynamic.map(({ page }) => page),
   );
-  const PagesManifest = loadPagesManifest(NEXT_DIR);
   const pagesStaticAPIRoutes = Object.keys(PagesManifest)
     .filter(
       (route) => route.startsWith("/api/") && !dynamicRoutePages.has(route),

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

@@ -137,14 +137,17 @@ export default async function routingHandler(
       isExternalRewrite = afterRewrites.isExternalRewrite;
     }
 
+    let isISR = false;
     // 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;
+    if (!isExternalRewrite) {
+      const fallbackResult = handleFallbackFalse(
+        internalEvent,
+        PrerenderManifest,
+      );
+      internalEvent = fallbackResult.event;
+      isISR = fallbackResult.isISR;
+    }
 
     const foundDynamicRoute = dynamicRouteMatcher(internalEvent.rawPath);
     const isDynamicRoute = !isExternalRewrite && foundDynamicRoute.length > 0;

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

@@ -3,7 +3,7 @@ import { validateMd5 } from "../utils";
 
 const EXT_PNG_MD5 = "405f45cc3397b09717a13ebd6f1e027b";
 
-test.describe("Rewrites should work", () => {
+test.describe("Rewrite", () => {
   test("Single Rewrite", async ({ page }) => {
     await page.goto("/rewrite");
 

packages/tests-unit/tests/core/routing/matcher.test.ts

@@ -65,30 +65,17 @@ vi.mock("@opennextjs/aws/adapters/config/index.js", () => ({
       ],
     },
   },
-  getStaticAPIRoutes: () => [
-    {
-      page: "/api/app",
-      regex: "^/api/app(?:/)?$",
-    },
-  ],
-  NEXT_DIR:
-    "/home/opennextuser/coding/git/mynextproject/.open-next/server-functions/default/.next",
-}));
-vi.mock("@opennextjs/aws/core/routing/i18n/index.js", () => ({
-  localizePath: (event: InternalEvent) => event.rawPath,
-  handleLocaleRedirect: (_event: InternalEvent) => false,
-}));
-
-vi.mock("@opennextjs/aws/adapters/config/util.js", () => ({
-  loadPagesManifest: () => ({
+  PagesManifest: {
     "/_app": "pages/_app.js",
     "/_document": "pages/_document.js",
-    "/api/hello": "pages/api/hello.js",
-    "/mypage": "pages/mypage.html",
     "/_error": "pages/_error.js",
-    "/[[...subpage]]": "pages/[[...subpage]].js",
     "/404": "pages/404.html",
-  }),
+  },
+}));
+
+vi.mock("@opennextjs/aws/core/routing/i18n/index.js", () => ({
+  localizePath: (event: InternalEvent) => event.rawPath,
+  handleLocaleRedirect: (_event: InternalEvent) => false,
 }));
 
 type PartialEvent = Partial<

packages/tests-unit/tests/core/routing/routeMatcher.test.ts

@@ -60,26 +60,13 @@ vi.mock("@opennextjs/aws/adapters/config/index.js", () => ({
       ],
     },
   },
-  getStaticAPIRoutes: () => [
-    {
-      page: "/api/app",
-      regex: "^/api/app(?:/)?$",
-    },
-  ],
-  NEXT_DIR:
-    "/home/opennextuser/coding/git/mynextproject/.open-next/server-functions/default/.next",
-}));
-
-vi.mock("@opennextjs/aws/adapters/config/util.js", () => ({
-  loadPagesManifest: () => ({
+  PagesManifest: {
     "/_app": "pages/_app.js",
     "/_document": "pages/_document.js",
     "/api/hello": "pages/api/hello.js",
-    "/mypage": "pages/mypage.html",
     "/_error": "pages/_error.js",
-    "/[[...subpage]]": "pages/[[...subpage]].js",
     "/404": "pages/404.html",
-  }),
+  },
 }));
 
 describe("routeMatcher", () => {