Merge branch 'dev' into markdalgleish/css-code-split-disabled

markdalgleish · markdalgleish · commit bcde072947f2 · 2025-07-08T09:28:49.000+10:00
diff --git a/.changeset/brave-buttons-build.md b/.changeset/brave-buttons-build.md
@@ -0,0 +1,5 @@
+---
+"@react-router/remix-routes-option-adapter": minor
+---
+
+Export `DefineRouteFunction` type alongside `DefineRoutesFunction`
diff --git a/.changeset/light-pens-approve.md b/.changeset/light-pens-approve.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Fix prerender file locations when `cwd` differs from project root
diff --git a/.changeset/nine-eyes-beam.md b/.changeset/nine-eyes-beam.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Improve chunk error logging when a chunk cannot be found during the build
diff --git a/.changeset/proud-scissors-tickle.md b/.changeset/proud-scissors-tickle.md
@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+Do not throw if the url hash is not a valid URI component
diff --git a/contributors.yml b/contributors.yml
@@ -18,6 +18,7 @@
 - akamfoad
 - alany411
 - alberto
+- AlemTuzlak
 - Aleuck
 - alexandernanberg
 - alexanderson1993
@@ -51,6 +52,7 @@
 - BDomzalski
 - bhbs
 - bilalk711
+- bmsuseluda
 - bobziroll
 - bravo-kernel
 - Brendonovich
@@ -195,6 +197,7 @@
 - ken0x0a
 - kentcdodds
 - kettanaito
+- kigawas
 - kilavvy
 - kiliman
 - kkirsche
@@ -297,6 +300,7 @@
 - pyitphyoaung
 - redabacha
 - refusado
+- remorses
 - renyu-io
 - reyronald
 - rifaidev
@@ -362,6 +366,7 @@
 - ThornWu
 - tiborbarsi
 - timdorr
+- timfisher
 - TkDodo
 - tkindy
 - tlinhart
@@ -385,6 +390,7 @@
 - ValiantCat
 - vdusart
 - vesan
+- vezaynk
 - VictorElHajj
 - vijaypushkin
 - vikingviolinist
diff --git a/docs/start/rsc/vite.md b/docs/start/rsc/vite.md
@@ -28,7 +28,7 @@ npm i react-router react react-dom react-server-dom-parcel @mjackson/node-fetch-
 Along with development dependencies
 
 ```shellscript nonumber
-npm i -D vite vite-plugin-devtools-json @hiogawa/vite-rsc typescript @types/react @types/react-dom @types/express @types/compression @types/node
+npm i -D vite vite-plugin-devtools-json @vitejs/plugin-rsc typescript @types/react @types/react-dom @types/express @types/compression @types/node
 ```
 
 ## Configure Parcel
@@ -58,7 +58,7 @@ import {
   decodeReply,
   loadServerAction,
   renderToReadableStream,
-} from "@hiogawa/vite-rsc/rsc";
+} from "@vitejs/plugin-rsc/rsc";
 import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
 
 import { routes } from "./routes/routes";
@@ -102,18 +102,21 @@ export default async function handler(request: Request) {
 Create a `src/prerender.tsx` file that will be responsible for rendering our application to HTML.
 
 ```tsx nonnumber
-import { createFromReadableStream } from "@hiogawa/vite-rsc/ssr";
+import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
 import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge";
 import {
   unstable_routeRSCServerRequest as routeRSCServerRequest,
   unstable_RSCStaticRouter as RSCStaticRouter,
 } from "react-router";
-import bootstrapScriptContent from "virtual:vite-rsc/bootstrap-script-content";
 
 export async function prerender(
   request: Request,
   fetchServer: (request: Request) => Promise<Response>
 ): Promise<Response> {
+  const bootstrapScriptContent =
+    await import.meta.viteRsc.loadBootstrapScriptContent(
+      "index"
+    );
   return await routeRSCServerRequest({
     // The incoming request.
     request,
@@ -151,7 +154,7 @@ import {
   createFromReadableStream,
   encodeReply,
   setServerCallback,
-} from "@hiogawa/vite-rsc/browser";
+} from "@vitejs/plugin-rsc/browser";
 import { startTransition, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
 import {
diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json
@@ -9,7 +9,7 @@
     "typecheck": "tsc"
   },
   "devDependencies": {
-    "@hiogawa/vite-rsc": "0.4.4",
+    "@vitejs/plugin-rsc": "0.4.11",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
     "@types/react": "^19.1.8",
diff --git a/integration/helpers/rsc-vite/src/entry.browser.tsx b/integration/helpers/rsc-vite/src/entry.browser.tsx
@@ -5,7 +5,7 @@ import {
   createTemporaryReferenceSet,
   encodeReply,
   setServerCallback,
-} from "@hiogawa/vite-rsc/browser";
+} from "@vitejs/plugin-rsc/browser";
 import {
   unstable_createCallServer as createCallServer,
   unstable_getRSCStream as getRSCStream,
diff --git a/integration/helpers/rsc-vite/src/entry.rsc.tsx b/integration/helpers/rsc-vite/src/entry.rsc.tsx
@@ -4,7 +4,7 @@ import {
   decodeReply,
   loadServerAction,
   renderToReadableStream,
-} from "@hiogawa/vite-rsc/rsc";
+} from "@vitejs/plugin-rsc/rsc";
 import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
 
 import { routes } from "./routes";
diff --git a/integration/helpers/rsc-vite/src/entry.ssr.tsx b/integration/helpers/rsc-vite/src/entry.ssr.tsx
@@ -1,5 +1,4 @@
-import bootstrapScriptContent from "virtual:vite-rsc/bootstrap-script-content";
-import { createFromReadableStream } from "@hiogawa/vite-rsc/ssr";
+import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
 // @ts-expect-error
 import * as ReactDomServer from "react-dom/server.edge";
 import {
@@ -11,6 +10,8 @@ export default async function handler(
   request: Request,
   fetchServer: (request: Request) => Promise<Response>
 ) {
+  const bootstrapScriptContent =
+    await import.meta.viteRsc.loadBootstrapScriptContent("index");
   return routeRSCServerRequest({
     request,
     fetchServer,
diff --git a/integration/helpers/rsc-vite/tsconfig.json b/integration/helpers/rsc-vite/tsconfig.json
@@ -11,7 +11,7 @@
     "module": "ESNext",
     "target": "ESNext",
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
-    "types": ["vite/client", "@hiogawa/vite-rsc/types"],
+    "types": ["vite/client", "@vitejs/plugin-rsc/types"],
     "jsx": "react-jsx"
   }
 }
diff --git a/integration/helpers/rsc-vite/vite.config.ts b/integration/helpers/rsc-vite/vite.config.ts
@@ -1,4 +1,4 @@
-import rsc from "@hiogawa/vite-rsc/plugin";
+import rsc from "@vitejs/plugin-rsc";
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 
diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json
@@ -64,6 +64,7 @@
     }
   },
   "dependencies": {
+    "isbot": "^5.1.11",
     "@babel/core": "^7.27.7",
     "@babel/generator": "^7.27.5",
     "@babel/parser": "^7.27.7",
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
@@ -332,7 +332,7 @@ const getReactRouterManifestBuildAssets = (
   route: RouteManifestEntry | null
 ): ReactRouterManifest["entry"] & { css: string[] } => {
   let entryChunk = resolveChunk(ctx, viteManifest, entryFilePath);
-  invariant(entryChunk, "Chunk not found");
+  invariant(entryChunk, `Chunk not found: ${entryFilePath}`);
 
   let isRootRoute = Boolean(route && route.parentId === undefined);
 
@@ -342,7 +342,7 @@ const getReactRouterManifestBuildAssets = (
   let prependedAssetChunks = isRootRoute
     ? [ctx.entryClientFilePath].map((filePath) => {
         let chunk = resolveChunk(ctx, viteManifest, filePath);
-        invariant(chunk, "Chunk not found");
+        invariant(chunk, `Chunk not found: ${filePath}`);
         return chunk;
       })
     : [];
@@ -2688,7 +2688,7 @@ async function handleSpaMode(
 
   // Write out the HTML file for the SPA
   await writeFile(path.join(clientBuildDirectory, filename), html);
-  let prettyDir = path.relative(process.cwd(), clientBuildDirectory);
+  let prettyDir = path.relative(viteConfig.root, clientBuildDirectory);
   let prettyPath = path.join(prettyDir, filename);
   if (build.prerender.length > 0) {
     viteConfig.logger.info(
@@ -2862,12 +2862,13 @@ async function prerenderData(
   }
 
   // Write out the .data file
-  let outdir = path.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path.join(outdir, ...normalizedPath.split("/"));
+  let outfile = path.join(clientBuildDirectory, ...normalizedPath.split("/"));
   await mkdir(path.dirname(outfile), { recursive: true });
   await writeFile(outfile, data);
   viteConfig.logger.info(
-    `Prerender (data): ${prerenderPath} -> ${colors.bold(outfile)}`
+    `Prerender (data): ${prerenderPath} -> ${colors.bold(
+      path.relative(viteConfig.root, outfile)
+    )}`
   );
   return data;
 }
@@ -2921,12 +2922,17 @@ async function prerenderRoute(
   }
 
   // Write out the HTML file
-  let outdir = path.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path.join(outdir, ...normalizedPath.split("/"), "index.html");
+  let outfile = path.join(
+    clientBuildDirectory,
+    ...normalizedPath.split("/"),
+    "index.html"
+  );
   await mkdir(path.dirname(outfile), { recursive: true });
   await writeFile(outfile, html);
   viteConfig.logger.info(
-    `Prerender (html): ${prerenderPath} -> ${colors.bold(outfile)}`
+    `Prerender (html): ${prerenderPath} -> ${colors.bold(
+      path.relative(viteConfig.root, outfile)
+    )}`
   );
 }
 
@@ -2954,12 +2960,13 @@ async function prerenderResourceRoute(
   }
 
   // Write out the resource route file
-  let outdir = path.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path.join(outdir, ...normalizedPath.split("/"));
+  let outfile = path.join(clientBuildDirectory, ...normalizedPath.split("/"));
   await mkdir(path.dirname(outfile), { recursive: true });
   await writeFile(outfile, content);
   viteConfig.logger.info(
-    `Prerender (resource): ${prerenderPath} -> ${colors.bold(outfile)}`
+    `Prerender (resource): ${prerenderPath} -> ${colors.bold(
+      path.relative(viteConfig.root, outfile)
+    )}`
   );
 }
 
diff --git a/packages/react-router-remix-routes-option-adapter/defineRoutes.ts b/packages/react-router-remix-routes-option-adapter/defineRoutes.ts
@@ -28,7 +28,7 @@ interface DefineRouteChildren {
   (): void;
 }
 
-interface DefineRouteFunction {
+export interface DefineRouteFunction {
   (
     /**
      * The path this route uses to match the URL pathname.
diff --git a/packages/react-router-remix-routes-option-adapter/index.ts b/packages/react-router-remix-routes-option-adapter/index.ts
@@ -1,9 +1,13 @@
 import { type RouteConfigEntry } from "@react-router/dev/routes";
 
 import { routeManifestToRouteConfig } from "./manifest";
-import { defineRoutes, type DefineRoutesFunction } from "./defineRoutes";
+import {
+  defineRoutes,
+  type DefineRoutesFunction,
+  type DefineRouteFunction,
+} from "./defineRoutes";
 
-export type { DefineRoutesFunction };
+export type { DefineRoutesFunction, DefineRouteFunction };
 
 /**
  * Adapts routes defined using [Remix's `routes` config
diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
@@ -2090,14 +2090,23 @@ export function useScrollRestoration({
       }
 
       // try to scroll to the hash
-      if (location.hash) {
-        let el = document.getElementById(
-          decodeURIComponent(location.hash.slice(1))
-        );
-        if (el) {
-          el.scrollIntoView();
-          return;
+      try {
+        if (location.hash) {
+          let el = document.getElementById(
+            decodeURIComponent(location.hash.slice(1))
+          );
+          if (el) {
+            el.scrollIntoView();
+            return;
+          }
         }
+      } catch {
+        warning(
+          false,
+          `"${location.hash.slice(
+            1
+          )}" is not a decodable element ID. The view will not scroll to it.`
+        );
       }
 
       // Don't reset if this navigation opted out
diff --git a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
@@ -120,10 +120,10 @@ export function createRoutesStub(
     future,
   }: RoutesTestStubProps) {
     let routerRef = React.useRef<ReturnType<typeof createMemoryRouter>>();
-    let remixContextRef = React.useRef<FrameworkContextObject>();
+    let frameworkContextRef = React.useRef<FrameworkContextObject>();
 
     if (routerRef.current == null) {
-      remixContextRef.current = {
+      frameworkContextRef.current = {
         future: {
           unstable_subResourceIntegrity:
             future?.unstable_subResourceIntegrity === true,
@@ -147,8 +147,8 @@ export function createRoutesStub(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
         // types compared to `AgnosticRouteObject`
         convertRoutesToDataRoutes(routes, (r) => r),
-        remixContextRef.current.manifest,
-        remixContextRef.current.routeModules
+        frameworkContextRef.current.manifest,
+        frameworkContextRef.current.routeModules
       );
       routerRef.current = createMemoryRouter(patched, {
         unstable_getContext,
@@ -159,7 +159,7 @@ export function createRoutesStub(
     }
 
     return (
-      <FrameworkContext.Provider value={remixContextRef.current}>
+      <FrameworkContext.Provider value={frameworkContextRef.current}>
         <RouterProvider router={routerRef.current} />
       </FrameworkContext.Provider>
     );
@@ -175,7 +175,7 @@ function processRoutes(
   return routes.map((route) => {
     if (!route.id) {
       throw new Error(
-        "Expected a route.id in @remix-run/testing processRoutes() function"
+        "Expected a route.id in react-router processRoutes() function"
       );
     }
 
diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json
@@ -9,7 +9,7 @@
     "typecheck": "tsc"
   },
   "devDependencies": {
-    "@hiogawa/vite-rsc": "0.4.4",
+    "@vitejs/plugin-rsc": "0.4.11",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.1",
     "@types/react": "^19.1.8",
diff --git a/playground/rsc-vite/src/entry.browser.tsx b/playground/rsc-vite/src/entry.browser.tsx
@@ -5,7 +5,7 @@ import {
   createTemporaryReferenceSet,
   encodeReply,
   setServerCallback,
-} from "@hiogawa/vite-rsc/browser";
+} from "@vitejs/plugin-rsc/browser";
 import {
   unstable_createCallServer as createCallServer,
   unstable_getRSCStream as getRSCStream,
diff --git a/playground/rsc-vite/src/entry.rsc.tsx b/playground/rsc-vite/src/entry.rsc.tsx
@@ -4,7 +4,7 @@ import {
   decodeReply,
   loadServerAction,
   renderToReadableStream,
-} from "@hiogawa/vite-rsc/rsc";
+} from "@vitejs/plugin-rsc/rsc";
 import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
 
 import { routes } from "./routes";
diff --git a/playground/rsc-vite/src/entry.ssr.tsx b/playground/rsc-vite/src/entry.ssr.tsx
diff --git a/playground/rsc-vite/tsconfig.json b/playground/rsc-vite/tsconfig.json
diff --git a/playground/rsc-vite/vite.config.ts b/playground/rsc-vite/vite.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@react-router/remix-routes-option-adapter": minor
 +---
++
 +Export `DefineRouteFunction` type alongside `DefineRoutesFunction`