review

Author: sommeeeer

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

@@ -1,6 +1,5 @@
 import path from "node:path";
 
-import type { RouteDefinition } from "types/next-types";
 import { debug } from "../logger";
 import {
   loadAppPathRoutesManifest,
@@ -12,7 +11,6 @@ import {
   loadFunctionsConfigManifest,
   loadHtmlPages,
   loadMiddlewareManifest,
-  loadPagesManifest,
   loadPrerenderManifest,
   loadRoutesManifest,
 } from "./util.js";
@@ -41,38 +39,3 @@ export const AppPathRoutesManifest =
 
 export const FunctionsConfigManifest =
   /* @__PURE__ */ loadFunctionsConfigManifest(NEXT_DIR);
-
-/**
- * Returns static API routes for both app and pages router cause Next will filter them out in staticRoutes in `routes-manifest.json`.
- * We also need to filter out page files that are under `app/api/*` as those would not be present in the routes manifest either.
- * This line from Next.js skips it:
- * https://github.com/vercel/next.js/blob/ded56f952154a40dcfe53bdb38c73174e9eca9e5/packages/next/src/build/index.ts#L1299
- *
- * Without it handleFallbackFalse will 404 on static API routes if there is a catch-all route on root level.
- */
-export function getStaticAPIRoutes(): RouteDefinition[] {
-  const createRouteDefinition = (route: string) => ({
-    page: route,
-    regex: `^${route}(?:/)?$`,
-  });
-  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),
-    )
-    .map(createRouteDefinition);
-
-  // We filter out both static API and page routes from the app paths manifest
-  const appPathsStaticAPIRoutes = Object.values(AppPathRoutesManifest)
-    .filter(
-      (route) =>
-        route.startsWith("/api/") ||
-        (route === "/api" && !dynamicRoutePages.has(route)),
-    )
-    .map(createRouteDefinition);
-
-  return [...pagesStaticAPIRoutes, ...appPathsStaticAPIRoutes];
-}

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

@@ -437,8 +437,8 @@ export function handleFallbackFalse(
     ? rawPath
     : `/${NextConfig.i18n?.defaultLocale}${rawPath}`;
   // We need to remove the trailing slash if it exists
-  // Not if localizedPath is "/" tho, because that would not make it find `isPregenerated` below since it would be try to match an empty string.
   if (
+    // Not if localizedPath is "/" tho, because that would not make it find `isPregenerated` below since it would be try to match an empty string.
     localizedPath !== "/" &&
     NextConfig.trailingSlash &&
     localizedPath.endsWith("/")

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

@@ -1,8 +1,5 @@
-import {
-  AppPathRoutesManifest,
-  RoutesManifest,
-  getStaticAPIRoutes,
-} from "config/index";
+import { AppPathRoutesManifest, NEXT_DIR, RoutesManifest } from "config/index";
+import { loadPagesManifest } from "config/util";
 import type { RouteDefinition } from "types/next-types";
 import type { ResolvedRoute, RouteType } from "types/open-next";
 
@@ -62,3 +59,38 @@ export const staticRouteMatcher = routeMatcher([
   ...getStaticAPIRoutes(),
 ]);
 export const dynamicRouteMatcher = routeMatcher(RoutesManifest.routes.dynamic);
+
+/**
+ * Returns static API routes for both app and pages router cause Next will filter them out in staticRoutes in `routes-manifest.json`.
+ * We also need to filter out page files that are under `app/api/*` as those would not be present in the routes manifest either.
+ * This line from Next.js skips it:
+ * https://github.com/vercel/next.js/blob/ded56f952154a40dcfe53bdb38c73174e9eca9e5/packages/next/src/build/index.ts#L1299
+ *
+ * Without it handleFallbackFalse will 404 on static API routes if there is a catch-all route on root level.
+ */
+export function getStaticAPIRoutes(): RouteDefinition[] {
+  const createRouteDefinition = (route: string) => ({
+    page: route,
+    regex: `^${route}(?:/)?$`,
+  });
+  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),
+    )
+    .map(createRouteDefinition);
+
+  // We filter out both static API and page routes from the app paths manifest
+  const appPathsStaticAPIRoutes = Object.values(AppPathRoutesManifest)
+    .filter(
+      (route) =>
+        route.startsWith("/api/") ||
+        (route === "/api" && !dynamicRoutePages.has(route)),
+    )
+    .map(createRouteDefinition);
+
+  return [...pagesStaticAPIRoutes, ...appPathsStaticAPIRoutes];
+}