@react-router/dev 7.9.4-pre.0 → 7.9.5-pre.0

package/CHANGELOG.md

@@ -1,10 +1,24 @@
 # `@react-router/dev`
 
-## 7.9.4-pre.0
+## 7.9.5-pre.0
+
+### Patch Changes
+
+- Introduce a `prerender.unstable_concurrency` option, to support running the prerendering concurrently, potentially speeding up the build. ([#14380](https://github.com/remix-run/react-router/pull/14380))
+- Move RSCHydratedRouter and utils to `/dom` export. ([#14457](https://github.com/remix-run/react-router/pull/14457))
+- Ensure route navigation doesn't remove CSS `link` elements used by dynamic imports ([#14463](https://github.com/remix-run/react-router/pull/14463))
+- Typegen: only register route module types for routes within the app directory ([#14439](https://github.com/remix-run/react-router/pull/14439))
+- Updated dependencies:
+  - `react-router@7.9.5-pre.0`
+  - `@react-router/node@7.9.5-pre.0`
+  - `@react-router/serve@7.9.5-pre.0`
+
+## 7.9.4
 
 ### Patch Changes
 
 - Update `valibot` dependency to `^1.1.0` ([#14379](https://github.com/remix-run/react-router/pull/14379))
+
 - New (unstable) `useRoute` hook for accessing data from specific routes ([#14407](https://github.com/remix-run/react-router/pull/14407))
 
   For example, let's say you have an `admin` route somewhere in your app and you want any child routes of `admin` to all have access to the `loaderData` and `actionData` from `admin.`
@@ -106,9 +120,9 @@
   ```
 
 - Updated dependencies:
-  - `react-router@7.9.4-pre.0`
-  - `@react-router/node@7.9.4-pre.0`
-  - `@react-router/serve@7.9.4-pre.0`
+  - `react-router@7.9.4`
+  - `@react-router/node@7.9.4`
+  - `@react-router/serve@7.9.4`
 
 ## 7.9.3
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.9.4-pre.0
+ * @react-router/dev v7.9.5-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -390,11 +390,20 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  let isValidPrerenderConfig = prerender == null || typeof prerender === "boolean" || Array.isArray(prerender) || typeof prerender === "function";
-  if (!isValidPrerenderConfig) {
-    return err(
-      "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
-    );
+  if (prerender) {
+    let isValidPrerenderPathsConfig = (p) => typeof p === "boolean" || typeof p === "function" || Array.isArray(p);
+    let isValidPrerenderConfig = isValidPrerenderPathsConfig(prerender) || typeof prerender === "object" && "paths" in prerender && isValidPrerenderPathsConfig(prerender.paths);
+    if (!isValidPrerenderConfig) {
+      return err(
+        "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
+      );
+    }
+    let isValidConcurrencyConfig = typeof prerender != "object" || !("unstable_concurrency" in prerender) || typeof prerender.unstable_concurrency === "number" && Number.isInteger(prerender.unstable_concurrency) && prerender.unstable_concurrency > 0;
+    if (!isValidConcurrencyConfig) {
+      return err(
+        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+      );
+    }
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {
@@ -1061,13 +1070,13 @@ function routeModulesType(ctx) {
         (route) => t2.tsPropertySignature(
           t2.stringLiteral(route.id),
           t2.tsTypeAnnotation(
-            t2.tsTypeQuery(
+            isInAppDirectory(ctx, route.file) ? t2.tsTypeQuery(
               t2.tsImportType(
                 t2.stringLiteral(
                   `./${Path3.relative(ctx.rootDirectory, ctx.config.appDirectory)}/${route.file}`
                 )
               )
-            )
+            ) : t2.tsUnknownKeyword()
           )
         )
       )
@@ -1771,7 +1780,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, import_node_fs3, import_promises2, path7, url, babel2, import_node_fetch_server2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors5, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, import_node_fs3, import_promises2, path7, url, babel2, import_node_fetch_server2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors5, import_kebabCase, import_p_map, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1788,6 +1797,7 @@ var init_plugin = __esm({
     import_jsesc = __toESM(require("jsesc"));
     import_picocolors5 = __toESM(require("picocolors"));
     import_kebabCase = __toESM(require("lodash/kebabCase"));
+    import_p_map = __toESM(require("p-map"));
     init_typegen();
     init_invariant();
     init_babel();

package/dist/config/default-rsc-entries/entry.client.tsx

@@ -12,8 +12,8 @@ import {
   unstable_createCallServer as createCallServer,
   unstable_getRSCStream as getRSCStream,
   unstable_RSCHydratedRouter as RSCHydratedRouter,
-} from "react-router";
-import type { unstable_RSCPayload as RSCPayload } from "react-router";
+  type unstable_RSCPayload as RSCPayload,
+} from "react-router/dom";
 
 setServerCallback(
   createCallServer({

package/dist/config.d.ts

@@ -58,6 +58,9 @@ type BuildEndHook = (args: {
     reactRouterConfig: ResolvedReactRouterConfig;
     viteConfig: Vite.ResolvedConfig;
 }) => void | Promise<void>;
+type PrerenderPaths = boolean | Array<string> | ((args: {
+    getStaticPaths: () => string[];
+}) => Array<string> | Promise<Array<string>>);
 /**
  * Config to be exported via the default export from `react-router.config.ts`.
  */
@@ -93,10 +96,17 @@ type ReactRouterConfig = {
     /**
      * An array of URLs to prerender to HTML files at build time.  Can also be a
      * function returning an array to dynamically generate URLs.
-     */
-    prerender?: boolean | Array<string> | ((args: {
-        getStaticPaths: () => string[];
-    }) => Array<string> | Promise<Array<string>>);
+     *
+     * `unstable_concurrency` defaults to 1, which means "no concurrency" - fully serial execution.
+     * Setting it to a value more than 1 enables concurrent prerendering.
+     * Setting it to a value higher than one can increase the speed of the build,
+     * but may consume more resources, and send more concurrent requests to the
+     * server/CMS.
+     */
+    prerender?: PrerenderPaths | {
+        paths: PrerenderPaths;
+        unstable_concurrency?: number;
+    };
     /**
      * An array of React Router plugin config presets to ease integration with
      * other platforms and tools.

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.4-pre.0
+ * @react-router/dev v7.9.5-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.4-pre.0
+ * @react-router/dev v7.9.5-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.4-pre.0
+ * @react-router/dev v7.9.5-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -420,11 +420,20 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  let isValidPrerenderConfig = prerender == null || typeof prerender === "boolean" || Array.isArray(prerender) || typeof prerender === "function";
-  if (!isValidPrerenderConfig) {
-    return err(
-      "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
-    );
+  if (prerender) {
+    let isValidPrerenderPathsConfig = (p) => typeof p === "boolean" || typeof p === "function" || Array.isArray(p);
+    let isValidPrerenderConfig = isValidPrerenderPathsConfig(prerender) || typeof prerender === "object" && "paths" in prerender && isValidPrerenderPathsConfig(prerender.paths);
+    if (!isValidPrerenderConfig) {
+      return err(
+        "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
+      );
+    }
+    let isValidConcurrencyConfig = typeof prerender != "object" || !("unstable_concurrency" in prerender) || typeof prerender.unstable_concurrency === "number" && Number.isInteger(prerender.unstable_concurrency) && prerender.unstable_concurrency > 0;
+    if (!isValidConcurrencyConfig) {
+      return err(
+        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+      );
+    }
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.9.4-pre.0
+ * @react-router/dev v7.9.5-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -59,6 +59,7 @@ var import_pick3 = __toESM(require("lodash/pick"));
 var import_jsesc = __toESM(require("jsesc"));
 var import_picocolors4 = __toESM(require("picocolors"));
 var import_kebabCase = __toESM(require("lodash/kebabCase"));
+var import_p_map = __toESM(require("p-map"));
 
 // typegen/index.ts
 var import_promises = __toESM(require("fs/promises"));
@@ -447,11 +448,20 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  let isValidPrerenderConfig = prerender == null || typeof prerender === "boolean" || Array.isArray(prerender) || typeof prerender === "function";
-  if (!isValidPrerenderConfig) {
-    return err(
-      "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
-    );
+  if (prerender) {
+    let isValidPrerenderPathsConfig = (p) => typeof p === "boolean" || typeof p === "function" || Array.isArray(p);
+    let isValidPrerenderConfig = isValidPrerenderPathsConfig(prerender) || typeof prerender === "object" && "paths" in prerender && isValidPrerenderPathsConfig(prerender.paths);
+    if (!isValidPrerenderConfig) {
+      return err(
+        "The `prerender`/`prerender.paths` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths."
+      );
+    }
+    let isValidConcurrencyConfig = typeof prerender != "object" || !("unstable_concurrency" in prerender) || typeof prerender.unstable_concurrency === "number" && Number.isInteger(prerender.unstable_concurrency) && prerender.unstable_concurrency > 0;
+    if (!isValidConcurrencyConfig) {
+      return err(
+        "The `prerender.unstable_concurrency` config must be a positive integer if specified."
+      );
+    }
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {
@@ -1049,13 +1059,13 @@ function routeModulesType(ctx) {
         (route) => t2.tsPropertySignature(
           t2.stringLiteral(route.id),
           t2.tsTypeAnnotation(
-            t2.tsTypeQuery(
+            isInAppDirectory(ctx, route.file) ? t2.tsTypeQuery(
               t2.tsImportType(
                 t2.stringLiteral(
                   `./${Path3.relative(ctx.rootDirectory, ctx.config.appDirectory)}/${route.file}`
                 )
               )
-            )
+            ) : t2.tsUnknownKeyword()
           )
         )
       )
@@ -2549,7 +2559,7 @@ var getClientEntryChunk = (ctx, viteManifest) => {
   invariant(chunk, `Chunk not found: ${filePath}`);
   return chunk;
 };
-var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, entryFilePath, route) => {
+var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, allDynamicCssFiles, entryFilePath, route) => {
   let entryChunk = resolveChunk(ctx, viteManifest, entryFilePath);
   invariant(entryChunk, `Chunk not found: ${entryFilePath}`);
   let isRootRoute = Boolean(route && route.parentId === void 0);
@@ -2582,7 +2592,10 @@ var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, entryFil
         // in the manifest that isn't tied to any route file. If we want to render these
         // styles correctly, we need to include them in the root route.
         isRootRoute ? getCssCodeSplitDisabledFile(ctx, viteConfig, viteManifest) : null,
-        chunks.flatMap((e) => e.css ?? []).map((href) => `${ctx.publicPath}${href}`)
+        chunks.flatMap((e) => e.css ?? []).map((href) => {
+          let publicHref = `${ctx.publicPath}${href}`;
+          return allDynamicCssFiles.has(href) ? `${publicHref}#` : publicHref;
+        })
       ].flat(1).filter(isNonNullable)
     )
   };
@@ -2605,6 +2618,44 @@ function resolveDependantChunks(viteManifest, entryChunks) {
   }
   return Array.from(chunks);
 }
+function getAllDynamicCssFiles(ctx, viteManifest) {
+  let allDynamicCssFiles = /* @__PURE__ */ new Set();
+  for (let route of Object.values(ctx.reactRouterConfig.routes)) {
+    let routeFile = path6.join(ctx.reactRouterConfig.appDirectory, route.file);
+    let entryChunk = resolveChunk(
+      ctx,
+      viteManifest,
+      `${routeFile}${BUILD_CLIENT_ROUTE_QUERY_STRING}`
+    );
+    if (entryChunk) {
+      let walk2 = function(chunk, isDynamicImportContext) {
+        if (visitedChunks.has(chunk)) {
+          return;
+        }
+        visitedChunks.add(chunk);
+        if (isDynamicImportContext && chunk.css) {
+          for (let cssFile of chunk.css) {
+            allDynamicCssFiles.add(cssFile);
+          }
+        }
+        if (chunk.dynamicImports) {
+          for (let dynamicImportKey of chunk.dynamicImports) {
+            walk2(viteManifest[dynamicImportKey], true);
+          }
+        }
+        if (chunk.imports) {
+          for (let importKey of chunk.imports) {
+            walk2(viteManifest[importKey], isDynamicImportContext);
+          }
+        }
+      };
+      var walk = walk2;
+      let visitedChunks = /* @__PURE__ */ new Set();
+      walk2(entryChunk, false);
+    }
+  }
+  return allDynamicCssFiles;
+}
 function dedupe(array2) {
   return [...new Set(array2)];
 }
@@ -2894,10 +2945,12 @@ var reactRouterVitePlugin = () => {
     let viteManifest = await loadViteManifest(
       getClientBuildDirectory(ctx.reactRouterConfig)
     );
+    let allDynamicCssFiles = getAllDynamicCssFiles(ctx, viteManifest);
     let entry = getReactRouterManifestBuildAssets(
       ctx,
       viteConfig2,
       viteManifest,
+      allDynamicCssFiles,
       ctx.entryClientFilePath,
       null
     );
@@ -2949,6 +3002,7 @@ var reactRouterVitePlugin = () => {
           ctx,
           viteConfig2,
           viteManifest,
+          allDynamicCssFiles,
           `${routeFile}${BUILD_CLIENT_ROUTE_QUERY_STRING}`,
           route
         ),
@@ -3778,7 +3832,7 @@ var reactRouterVitePlugin = () => {
               "",
               `  But other route exports in '${importerShort}' depend on '${id}'.`,
               "",
-              "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
+              "  See https://reactrouter.com/explanation/code-splitting#removal-of-server-code",
               ""
             ].join("\n")
           );
@@ -3789,7 +3843,7 @@ var reactRouterVitePlugin = () => {
             "",
             `    '${id}' imported by '${importerShort}'`,
             "",
-            "  See https://remix.run/docs/en/main/guides/vite#splitting-up-client-and-server-code",
+            "  See https://reactrouter.com/explanation/code-splitting#removal-of-server-code",
             ""
           ].join("\n")
         );
@@ -4202,10 +4256,10 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     }
   }
   let buildRoutes = createPrerenderRoutes(build.routes);
-  for (let path9 of build.prerender) {
+  let prerenderSinglePath = async (path9) => {
     let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path9}/`.replace(/^\/\/+/, "/"));
     if (!matches) {
-      continue;
+      return;
     }
     let leafRoute = matches ? matches[matches.length - 1].route : null;
     let manifestRoute = leafRoute ? build.routes[leafRoute.id]?.module : null;
@@ -4262,7 +4316,13 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
         } : void 0
       );
     }
+  };
+  let concurrency = 1;
+  let { prerender } = reactRouterConfig;
+  if (typeof prerender === "object" && "unstable_concurrency" in prerender) {
+    concurrency = prerender.unstable_concurrency ?? 1;
   }
+  await (0, import_p_map.default)(build.prerender, prerenderSinglePath, { concurrency });
 }
 function getStaticPrerenderPaths(routes) {
   let paths = ["/"];
@@ -4378,31 +4438,40 @@ ${content.toString("utf8")}`
   );
 }
 async function getPrerenderPaths(prerender, ssr, routes, logWarning = false) {
-  let prerenderPaths = [];
-  if (prerender != null && prerender !== false) {
-    let prerenderRoutes = createPrerenderRoutes(routes);
-    if (prerender === true) {
-      let { paths, paramRoutes } = getStaticPrerenderPaths(prerenderRoutes);
-      if (logWarning && !ssr && paramRoutes.length > 0) {
-        console.warn(
-          import_picocolors4.default.yellow(
-            [
-              "\u26A0\uFE0F Paths with dynamic/splat params cannot be prerendered when using `prerender: true`. You may want to use the `prerender()` API to prerender the following paths:",
-              ...paramRoutes.map((p) => "  - " + p)
-            ].join("\n")
-          )
-        );
-      }
-      prerenderPaths = paths;
-    } else if (typeof prerender === "function") {
-      prerenderPaths = await prerender({
-        getStaticPaths: () => getStaticPrerenderPaths(prerenderRoutes).paths
-      });
-    } else {
-      prerenderPaths = prerender || ["/"];
+  if (prerender == null || prerender === false) {
+    return [];
+  }
+  let pathsConfig;
+  if (typeof prerender === "object" && "paths" in prerender) {
+    pathsConfig = prerender.paths;
+  } else {
+    pathsConfig = prerender;
+  }
+  if (pathsConfig === false) {
+    return [];
+  }
+  let prerenderRoutes = createPrerenderRoutes(routes);
+  if (pathsConfig === true) {
+    let { paths, paramRoutes } = getStaticPrerenderPaths(prerenderRoutes);
+    if (logWarning && !ssr && paramRoutes.length > 0) {
+      console.warn(
+        import_picocolors4.default.yellow(
+          [
+            "\u26A0\uFE0F Paths with dynamic/splat params cannot be prerendered when using `prerender: true`. You may want to use the `prerender()` API to prerender the following paths:",
+            ...paramRoutes.map((p) => "  - " + p)
+          ].join("\n")
+        )
+      );
     }
+    return paths;
+  }
+  if (typeof pathsConfig === "function") {
+    let paths = await pathsConfig({
+      getStaticPaths: () => getStaticPrerenderPaths(prerenderRoutes).paths
+    });
+    return paths;
   }
-  return prerenderPaths;
+  return pathsConfig;
 }
 function groupRoutesByParentId2(manifest) {
   let routes = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.9.4-pre.0",
+  "version": "7.9.5-pre.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -78,6 +78,7 @@
     "isbot": "^5.1.11",
     "jsesc": "3.0.2",
     "lodash": "^4.17.21",
+    "p-map": "^7.0.3",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",
     "prettier": "^3.6.2",
@@ -86,7 +87,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.1.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "7.9.4-pre.0"
+    "@react-router/node": "7.9.5-pre.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,16 +110,16 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "7.9.4-pre.0",
-    "react-router": "^7.9.4-pre.0"
+    "@react-router/serve": "7.9.5-pre.0",
+    "react-router": "^7.9.5-pre.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.9.4-pre.0",
-    "react-router": "^7.9.4-pre.0"
+    "@react-router/serve": "^7.9.5-pre.0",
+    "react-router": "^7.9.5-pre.0"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {