Merge branch 'v8' into brophdawg11/v8-deps

Author: brophdawg11

packages/react-router-dev/config/config.ts

@@ -706,12 +706,10 @@ async function resolveConfig({
         "The `future.v8_viteEnvironmentApi` flag has been removed because Vite Environment API usage is now always enabled",
       );
     }
-    if ("unstable_trailingSlashAwareDataRequests" in futureConfig) {
-      return err(
-        "The `future.unstable_trailingSlashAwareDataRequests` flag has been removed because trailing slash-aware data requests are now the default behavior",
-      );
-    }
-    if ("v8_trailingSlashAwareDataRequests" in futureConfig) {
+    if (
+      "unstable_trailingSlashAwareDataRequests" in futureConfig ||
+      "v8_trailingSlashAwareDataRequests" in futureConfig
+    ) {
       return err(
         "The `future.v8_trailingSlashAwareDataRequests` flag has been removed because trailing slash-aware data requests are now the default behavior",
       );

packages/react-router-serve/.changes/minor.bump-express

@@ -0,0 +1 @@
+Upgrade `express` from `4.21.2` to `5.2.1`

packages/react-router-serve/cli.ts

@@ -8,6 +8,7 @@ import { createRequestHandler } from "@react-router/express";
 import { createRequestListener } from "@remix-run/node-fetch-server";
 import compression from "compression";
 import express from "express";
+import type { RequestHandler as ExpressRequestHandler } from "express";
 import morgan from "morgan";
 import sourceMapSupport from "source-map-support";
 import getPort from "get-port";
@@ -52,12 +53,12 @@ type NormalizedBuild = {
 function isRSCServerBuild(build: unknown): build is RSCServerBuildModule {
   return Boolean(
     typeof build === "object" &&
-      build &&
-      "default" in build &&
-      typeof build.default === "object" &&
-      build.default &&
-      "fetch" in build.default &&
-      typeof build.default.fetch === "function",
+    build &&
+    "default" in build &&
+    typeof build.default === "object" &&
+    build.default &&
+    "fetch" in build.default &&
+    typeof build.default.fetch === "function",
   );
 }
 
@@ -68,6 +69,20 @@ function parseNumber(raw?: string) {
   return maybe;
 }
 
+function getExpressPath(publicPath: string) {
+  // Vite allows `base` to be an absolute URL, but Express route paths must be
+  // pathnames. Strip any origin before mounting static asset middleware.
+  let pathname: string;
+
+  try {
+    pathname = new URL(publicPath).pathname;
+  } catch {
+    pathname = publicPath;
+  }
+
+  return pathname.startsWith("/") ? pathname : `/${pathname}`;
+}
+
 async function run() {
   let port = parseNumber(process.env.PORT) ?? (await getPort({ port: 3000 }));
 
@@ -103,7 +118,10 @@ async function run() {
     build = buildModule as ServerBuild;
   }
 
-  let onListen = () => {
+  let onListen = (error: unknown) => {
+    if (error) {
+      throw error;
+    }
     let address =
       process.env.HOST ||
       Object.values(os.networkInterfaces())
@@ -124,29 +142,34 @@ async function run() {
   app.disable("x-powered-by");
 
   if (!isRSCBuild) {
-    app.use(compression());
+    // `compression` may resolve to Express 4 types from transitive deps while
+    // `react-router-serve` uses Express 5, but the runtime middleware signature
+    // is compatible.
+    app.use(compression() as unknown as ExpressRequestHandler);
   }
 
+  let expressPublicPath = getExpressPath(build.publicPath);
+
   app.use(
-    path.posix.join(build.publicPath, "assets"),
+    path.posix.join(expressPublicPath, "assets"),
     express.static(path.join(build.assetsBuildDirectory, "assets"), {
       immutable: true,
       maxAge: "1y",
     }),
   );
-  app.use(build.publicPath, express.static(build.assetsBuildDirectory));
+  app.use(expressPublicPath, express.static(build.assetsBuildDirectory));
   app.use(express.static("public", { maxAge: "1h" }));
   app.use(morgan("tiny"));
 
   if (build.fetch) {
-    app.all("*", createRequestListener(build.fetch));
+    app.all("/{*splat}", createRequestListener(build.fetch));
   } else {
     app.all(
-      "*",
+      "/{*splat}",
       createRequestHandler({
         build: buildModule,
         mode: process.env.NODE_ENV,
-      }),
+      }) as unknown as ExpressRequestHandler,
     );
   }
 

packages/react-router-serve/package.json

@@ -42,7 +42,7 @@
     "@react-router/node": "workspace:*",
     "@remix-run/node-fetch-server": "^0.13.3",
     "compression": "^1.8.1",
-    "express": "^4.19.2",
+    "express": "^5.2.1",
     "get-port": "7.2.0",
     "morgan": "^1.10.1",
     "source-map-support": "^0.5.21"
@@ -52,7 +52,7 @@
   },
   "devDependencies": {
     "@types/compression": "^1.8.1",
-    "@types/express": "^4.17.9",
+    "@types/express": "^5.0.6",
     "@types/morgan": "^1.9.10",
     "@types/node": "^22.19.19",
     "@types/source-map-support": "^0.5.6",

packages/react-router/lib/rsc/server.rsc.ts

@@ -747,7 +747,7 @@ async function generateResourceResponse(
           return generateErrorResponse(error);
         }
       },
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, basename),
     });
     return response;
   } catch (error) {
@@ -837,7 +837,7 @@ async function generateRenderResponse(
       ...(routeIdsToLoad
         ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) }
         : {}),
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, basename),
       async generateMiddlewareResponse(query) {
         // If this is an RSC server action, process that and then call query as a
         // revalidation.  If this is a RR Form/Fetcher submission,

packages/react-router/lib/server-runtime/server.ts

@@ -104,7 +104,10 @@ function derive(build: ServerBuild, mode?: string) {
     loadContext = initialContext || new RouterContextProvider();
 
     let requestUrl = new URL(request.url);
-    let normalizedPathname = getNormalizedPath(request).pathname;
+    let normalizedPathname = getNormalizedPath(
+      request,
+      build.basename,
+    ).pathname;
 
     let isSpaMode =
       getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
@@ -491,7 +494,7 @@ async function handleDocumentRequest(
           return new Response(null, { status: 500 });
         }
       },
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, build.basename),
     });
 
     if (!isResponse(result)) {
@@ -667,7 +670,7 @@ async function handleResourceRequest(
           return handleQueryRouteError(error);
         }
       },
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, build.basename),
     });
 
     return handleQueryRouteResult(result);

packages/react-router/lib/server-runtime/single-fetch.ts

@@ -68,7 +68,7 @@ export async function singleFetchAction(
           return handleQueryError(error);
         }
       },
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, build.basename),
     });
 
     return handleQueryResult(result);
@@ -151,7 +151,7 @@ export async function singleFetchLoaders(
           return handleQueryError(error);
         }
       },
-      normalizePath: (r) => getNormalizedPath(r),
+      normalizePath: (r) => getNormalizedPath(r, build.basename),
     });
 
     return handleQueryResult(result);

packages/react-router/lib/server-runtime/urls.ts

@@ -1,6 +1,11 @@
 import type { Path } from "../router/history";
+import { stripBasename } from "../router/utils";
 
-export function getNormalizedPath(request: Request): Path {
+export function getNormalizedPath(
+  request: Request,
+  basename: string | undefined,
+): Path {
+  basename = basename || "/";
   let url = new URL(request.url);
   let pathname = url.pathname;
 
@@ -12,6 +17,10 @@ export function getNormalizedPath(request: Request): Path {
     pathname = pathname.replace(/\.data$/, "");
   }
 
+  if (stripBasename(pathname, basename) !== "/" && pathname.endsWith("/")) {
+    pathname = pathname.slice(0, -1);
+  }
+
   // Strip _routes param
   let searchParams = new URLSearchParams(url.search);
   searchParams.delete("_routes");