@react-router/dev 0.0.0-experimental-afe1c2609 → 0.0.0-experimental-21239dcc5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # `@react-router/dev`
 
+## 7.9.2
+
+### Patch Changes
+
+- Fix preset future flags being ignored during config resolution ([#14369](https://github.com/remix-run/react-router/pull/14369))
+
+  Fixes a bug where future flags defined by presets were completely ignored. The config resolution was incorrectly reading from `reactRouterUserConfig.future` instead of the merged `userAndPresetConfigs.future`, causing all preset-defined future flags to be lost.
+
+  This fix ensures presets can properly enable experimental features as intended by the preset system design.
+
+- Add unstable support for RSC Framework Mode ([#14336](https://github.com/remix-run/react-router/pull/14336))
+
+- Switch internal vite plugin Response logic to use `@remix-run/node-fetch-server` ([#13927](https://github.com/remix-run/react-router/pull/13927))
+
+- Updated dependencies:
+  - `react-router@7.9.2`
+  - `@react-router/serve@7.9.2`
+  - `@react-router/node@7.9.2`
+
 ## 7.9.1
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-afe1c2609
+ * @react-router/dev v0.0.0-experimental-21239dcc5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -390,20 +390,11 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  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 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"
+    );
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {
@@ -493,11 +484,11 @@ async function resolveConfig({
     }
   }
   let future = {
-    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
-    unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
+    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -1520,15 +1511,6 @@ var init_warn_on_client_source_maps = __esm({
   }
 });
 
-// vite/pmap.js
-var pMapSkip;
-var init_pmap = __esm({
-  "vite/pmap.js"() {
-    "use strict";
-    pMapSkip = Symbol("skip");
-  }
-});
-
 // vite/plugin.ts
 async function resolveViteConfig({
   configFile,
@@ -1803,7 +1785,6 @@ var init_plugin = __esm({
     init_load_dotenv();
     init_validate_plugin_order();
     init_warn_on_client_source_maps();
-    init_pmap();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",

package/dist/config.d.ts

@@ -58,9 +58,6 @@ 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`.
  */
@@ -96,17 +93,10 @@ 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.
-     *
-     * `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;
-    };
+     */
+    prerender?: boolean | Array<string> | ((args: {
+        getStaticPaths: () => string[];
+    }) => Array<string> | Promise<Array<string>>);
     /**
      * 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 v0.0.0-experimental-afe1c2609
+ * @react-router/dev v0.0.0-experimental-21239dcc5
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-afe1c2609
+ * @react-router/dev v0.0.0-experimental-21239dcc5
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-afe1c2609
+ * @react-router/dev v0.0.0-experimental-21239dcc5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -420,20 +420,11 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  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 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"
+    );
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {
@@ -523,11 +514,11 @@ async function resolveConfig({
     }
   }
   let future = {
-    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
-    unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
+    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-afe1c2609
+ * @react-router/dev v0.0.0-experimental-21239dcc5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -447,20 +447,11 @@ async function resolveConfig({
   if (!ssr && serverBundles) {
     serverBundles = void 0;
   }
-  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 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"
+    );
   }
   let routeDiscovery;
   if (userRouteDiscovery == null) {
@@ -550,11 +541,11 @@ async function resolveConfig({
     }
   }
   let future = {
-    v8_middleware: reactRouterUserConfig.future?.v8_middleware ?? false,
-    unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
-    unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
-    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
-    unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
+    v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
+    unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
+    unstable_splitRouteModules: userAndPresetConfigs.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_viteEnvironmentApi: userAndPresetConfigs.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
     appDirectory,
@@ -2421,129 +2412,6 @@ function warnOnClientSourceMaps() {
   };
 }
 
-// vite/pmap.js
-async function pMap(iterable, mapper, {
-  concurrency = Number.POSITIVE_INFINITY,
-  stopOnError = true,
-  signal
-} = {}) {
-  return new Promise((resolve_, reject_) => {
-    if (iterable[Symbol.iterator] === void 0 && iterable[Symbol.asyncIterator] === void 0) {
-      throw new TypeError(`Expected \`input\` to be either an \`Iterable\` or \`AsyncIterable\`, got (${typeof iterable})`);
-    }
-    if (typeof mapper !== "function") {
-      throw new TypeError("Mapper function is required");
-    }
-    if (!(Number.isSafeInteger(concurrency) && concurrency >= 1 || concurrency === Number.POSITIVE_INFINITY)) {
-      throw new TypeError(`Expected \`concurrency\` to be an integer from 1 and up or \`Infinity\`, got \`${concurrency}\` (${typeof concurrency})`);
-    }
-    const result = [];
-    const errors = [];
-    const skippedIndexesMap = /* @__PURE__ */ new Map();
-    let isRejected = false;
-    let isResolved = false;
-    let isIterableDone = false;
-    let resolvingCount = 0;
-    let currentIndex = 0;
-    const iterator = iterable[Symbol.iterator] === void 0 ? iterable[Symbol.asyncIterator]() : iterable[Symbol.iterator]();
-    const signalListener = () => {
-      reject(signal.reason);
-    };
-    const cleanup = () => {
-      signal?.removeEventListener("abort", signalListener);
-    };
-    const resolve6 = (value) => {
-      resolve_(value);
-      cleanup();
-    };
-    const reject = (reason) => {
-      isRejected = true;
-      isResolved = true;
-      reject_(reason);
-      cleanup();
-    };
-    if (signal) {
-      if (signal.aborted) {
-        reject(signal.reason);
-      }
-      signal.addEventListener("abort", signalListener, { once: true });
-    }
-    const next = async () => {
-      if (isResolved) {
-        return;
-      }
-      const nextItem = await iterator.next();
-      const index = currentIndex;
-      currentIndex++;
-      if (nextItem.done) {
-        isIterableDone = true;
-        if (resolvingCount === 0 && !isResolved) {
-          if (!stopOnError && errors.length > 0) {
-            reject(new AggregateError(errors));
-            return;
-          }
-          isResolved = true;
-          if (skippedIndexesMap.size === 0) {
-            resolve6(result);
-            return;
-          }
-          const pureResult = [];
-          for (const [index2, value] of result.entries()) {
-            if (skippedIndexesMap.get(index2) === pMapSkip) {
-              continue;
-            }
-            pureResult.push(value);
-          }
-          resolve6(pureResult);
-        }
-        return;
-      }
-      resolvingCount++;
-      (async () => {
-        try {
-          const element = await nextItem.value;
-          if (isResolved) {
-            return;
-          }
-          const value = await mapper(element, index);
-          if (value === pMapSkip) {
-            skippedIndexesMap.set(index, value);
-          }
-          result[index] = value;
-          resolvingCount--;
-          await next();
-        } catch (error) {
-          if (stopOnError) {
-            reject(error);
-          } else {
-            errors.push(error);
-            resolvingCount--;
-            try {
-              await next();
-            } catch (error2) {
-              reject(error2);
-            }
-          }
-        }
-      })();
-    };
-    (async () => {
-      for (let index = 0; index < concurrency; index++) {
-        try {
-          await next();
-        } catch (error) {
-          reject(error);
-          break;
-        }
-        if (isIterableDone || isRejected) {
-          break;
-        }
-      }
-    })();
-  });
-}
-var pMapSkip = Symbol("skip");
-
 // vite/plugin.ts
 function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
@@ -4311,76 +4179,67 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     }
   }
   let buildRoutes = createPrerenderRoutes(build.routes);
-  await pMap(
-    build.prerender,
-    async (path9) => {
-      let matches = (0, import_react_router2.matchRoutes)(
-        buildRoutes,
-        `/${path9}/`.replace(/^\/\/+/, "/")
-      );
-      if (!matches) {
-        return;
-      }
-      let leafRoute = matches ? matches[matches.length - 1].route : null;
-      let manifestRoute = leafRoute ? build.routes[leafRoute.id]?.module : null;
-      let isResourceRoute = manifestRoute && !manifestRoute.default && !manifestRoute.ErrorBoundary;
-      if (isResourceRoute) {
-        invariant(leafRoute);
-        invariant(manifestRoute);
-        if (manifestRoute.loader) {
-          await prerenderData(
-            handler,
-            path9,
-            [leafRoute.id],
-            clientBuildDirectory,
-            reactRouterConfig,
-            viteConfig
-          );
-          await prerenderResourceRoute(
-            handler,
-            path9,
-            clientBuildDirectory,
-            reactRouterConfig,
-            viteConfig
-          );
-        } else {
-          viteConfig.logger.warn(
-            `\u26A0\uFE0F Skipping prerendering for resource route without a loader: ${leafRoute?.id}`
-          );
-        }
+  for (let path9 of build.prerender) {
+    let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path9}/`.replace(/^\/\/+/, "/"));
+    if (!matches) {
+      continue;
+    }
+    let leafRoute = matches ? matches[matches.length - 1].route : null;
+    let manifestRoute = leafRoute ? build.routes[leafRoute.id]?.module : null;
+    let isResourceRoute = manifestRoute && !manifestRoute.default && !manifestRoute.ErrorBoundary;
+    if (isResourceRoute) {
+      invariant(leafRoute);
+      invariant(manifestRoute);
+      if (manifestRoute.loader) {
+        await prerenderData(
+          handler,
+          path9,
+          [leafRoute.id],
+          clientBuildDirectory,
+          reactRouterConfig,
+          viteConfig
+        );
+        await prerenderResourceRoute(
+          handler,
+          path9,
+          clientBuildDirectory,
+          reactRouterConfig,
+          viteConfig
+        );
       } else {
-        let hasLoaders = matches.some(
-          (m) => build.assets.routes[m.route.id]?.hasLoader
+        viteConfig.logger.warn(
+          `\u26A0\uFE0F Skipping prerendering for resource route without a loader: ${leafRoute?.id}`
         );
-        let data;
-        if (!isResourceRoute && hasLoaders) {
-          data = await prerenderData(
-            handler,
-            path9,
-            null,
-            clientBuildDirectory,
-            reactRouterConfig,
-            viteConfig
-          );
-        }
-        await prerenderRoute(
+      }
+    } else {
+      let hasLoaders = matches.some(
+        (m) => build.assets.routes[m.route.id]?.hasLoader
+      );
+      let data;
+      if (!isResourceRoute && hasLoaders) {
+        data = await prerenderData(
           handler,
           path9,
+          null,
           clientBuildDirectory,
           reactRouterConfig,
-          viteConfig,
-          data ? {
-            headers: {
-              "X-React-Router-Prerender-Data": encodeURI(data)
-            }
-          } : void 0
+          viteConfig
         );
       }
-    },
-    {
-      concurrency: typeof reactRouterConfig.prerender === "object" && "paths" in reactRouterConfig.prerender ? reactRouterConfig.prerender.unstable_concurrency || 1 : 1
+      await prerenderRoute(
+        handler,
+        path9,
+        clientBuildDirectory,
+        reactRouterConfig,
+        viteConfig,
+        data ? {
+          headers: {
+            "X-React-Router-Prerender-Data": encodeURI(data)
+          }
+        } : void 0
+      );
     }
-  );
+  }
 }
 function getStaticPrerenderPaths(routes) {
   let paths = ["/"];
@@ -4496,40 +4355,31 @@ ${content.toString("utf8")}`
   );
 }
 async function getPrerenderPaths(prerender, ssr, routes, logWarning = false) {
-  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")
-        )
-      );
+  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 || ["/"];
     }
-    return paths;
-  }
-  if (typeof pathsConfig === "function") {
-    let paths = await pathsConfig({
-      getStaticPaths: () => getStaticPrerenderPaths(prerenderRoutes).paths
-    });
-    return paths;
   }
-  return pathsConfig;
+  return prerenderPaths;
 }
 function groupRoutesByParentId2(manifest) {
   let routes = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-afe1c2609",
+  "version": "0.0.0-experimental-21239dcc5",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-afe1c2609"
+    "@react-router/node": "0.0.0-experimental-21239dcc5"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,16 +109,16 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^0.0.0-experimental-afe1c2609",
-    "@react-router/serve": "0.0.0-experimental-afe1c2609"
+    "@react-router/serve": "0.0.0-experimental-21239dcc5",
+    "react-router": "^0.0.0-experimental-21239dcc5"
   },
   "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": "^0.0.0-experimental-afe1c2609",
-    "react-router": "^0.0.0-experimental-afe1c2609"
+    "@react-router/serve": "^0.0.0-experimental-21239dcc5",
+    "react-router": "^0.0.0-experimental-21239dcc5"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {