@react-router/dev 0.0.0-experimental-653010f49 → 0.0.0-experimental-3fe27584d

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # `@react-router/dev`
 
+## 7.11.0
+
+### Minor Changes
+
+- feat: add `vite preview` support ([#14507](https://github.com/remix-run/react-router/pull/14507))
+
+### Patch Changes
+
+- rsc framework mode manual chunking for react and react-router deps ([#14655](https://github.com/remix-run/react-router/pull/14655))
+- add support for throwing redirect Response's at RSC render time ([#14596](https://github.com/remix-run/react-router/pull/14596))
+- support custom entrypoints for RSC framework mode ([#14643](https://github.com/remix-run/react-router/pull/14643))
+- `routeRSCServerRequest` replace `fetchServer` with `serverResponse` ([#14597](https://github.com/remix-run/react-router/pull/14597))
+- rsc framewlrk mode - optimize react-server-dom-webpack if in project package.json ([#14656](https://github.com/remix-run/react-router/pull/14656))
+- Updated dependencies:
+  - `react-router@7.11.0`
+  - `@react-router/serve@7.11.0`
+  - `@react-router/node@7.11.0`
+
 ## 7.10.1
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-653010f49
+ * @react-router/dev v0.0.0-experimental-3fe27584d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -506,6 +506,7 @@ async function resolveConfig({
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
     v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false

package/dist/config.d.ts

@@ -39,6 +39,7 @@ type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
     unstable_optimizeDeps: boolean;
     unstable_subResourceIntegrity: boolean;
+    unstable_trailingSlashAwareDataRequests: boolean;
     /**
      * Enable route middleware
      */

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-653010f49
+ * @react-router/dev v0.0.0-experimental-3fe27584d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-653010f49
+ * @react-router/dev v0.0.0-experimental-3fe27584d
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-653010f49
+ * @react-router/dev v0.0.0-experimental-3fe27584d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -535,6 +535,7 @@ async function resolveConfig({
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
     v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-653010f49
+ * @react-router/dev v0.0.0-experimental-3fe27584d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -562,6 +562,7 @@ async function resolveConfig({
   let future = {
     unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false,
     unstable_subResourceIntegrity: userAndPresetConfigs.future?.unstable_subResourceIntegrity ?? false,
+    unstable_trailingSlashAwareDataRequests: userAndPresetConfigs.future?.unstable_trailingSlashAwareDataRequests ?? false,
     v8_middleware: userAndPresetConfigs.future?.v8_middleware ?? false,
     v8_splitRouteModules: userAndPresetConfigs.future?.v8_splitRouteModules ?? false,
     v8_viteEnvironmentApi: userAndPresetConfigs.future?.v8_viteEnvironmentApi ?? false
@@ -3536,6 +3537,9 @@ var reactRouterVitePlugin = () => {
       },
       configurePreviewServer(previewServer) {
         return () => {
+          if (!ctx.reactRouterConfig.ssr) {
+            return;
+          }
           previewServer.middlewares.use(async (req, res, next) => {
             try {
               let serverBuildDirectory = getServerBuildDirectory(
@@ -4099,10 +4103,8 @@ var reactRouterVitePlugin = () => {
         if (this.environment.name !== "ssr" && modules.length <= 0) {
           return;
         }
-        let clientModules = uniqueNodes(
-          modules.flatMap(
-            (mod) => getParentClientNodes(server.environments.client.moduleGraph, mod)
-          )
+        let clientModules = modules.flatMap(
+          (mod) => getParentClientNodes(server.environments.client.moduleGraph, mod)
         );
         for (let clientModule of clientModules) {
           server.environments.client.reloadModule(clientModule);
@@ -4113,30 +4115,22 @@ var reactRouterVitePlugin = () => {
     warnOnClientSourceMaps()
   ];
 };
-function getParentClientNodes(clientModuleGraph, module2) {
+function getParentClientNodes(clientModuleGraph, module2, seenNodes = /* @__PURE__ */ new Set()) {
   if (!module2.id) {
     return [];
   }
+  if (seenNodes.has(module2.url)) {
+    return [];
+  }
+  seenNodes.add(module2.url);
   let clientModule = clientModuleGraph.getModuleById(module2.id);
   if (clientModule) {
     return [clientModule];
   }
   return [...module2.importers].flatMap(
-    (importer) => getParentClientNodes(clientModuleGraph, importer)
+    (importer) => getParentClientNodes(clientModuleGraph, importer, seenNodes)
   );
 }
-function uniqueNodes(nodes) {
-  let nodeUrls = /* @__PURE__ */ new Set();
-  let unique = [];
-  for (let node of nodes) {
-    if (nodeUrls.has(node.url)) {
-      continue;
-    }
-    nodeUrls.add(node.url);
-    unique.push(node);
-  }
-  return unique;
-}
 function addRefreshWrapper(reactRouterConfig, code, id) {
   let route = getRoute(reactRouterConfig, id);
   let acceptExports = route ? CLIENT_NON_COMPONENT_EXPORTS : [];
@@ -4411,7 +4405,21 @@ function getStaticPrerenderPaths(routes) {
   };
 }
 async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
-  let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
+  let dataRequestPath;
+  if (reactRouterConfig.future.unstable_trailingSlashAwareDataRequests) {
+    if (prerenderPath.endsWith("/")) {
+      dataRequestPath = `${prerenderPath}_.data`;
+    } else {
+      dataRequestPath = `${prerenderPath}.data`;
+    }
+  } else {
+    if (prerenderPath === "/") {
+      dataRequestPath = "/_root.data";
+    } else {
+      dataRequestPath = `${prerenderPath.replace(/\/$/, "")}.data`;
+    }
+  }
+  let normalizedPath = `${reactRouterConfig.basename}${dataRequestPath}`.replace(/\/\/+/g, "/");
   let url2 = new URL(`http://localhost${normalizedPath}`);
   if (onlyRoutes?.length) {
     url2.searchParams.set("_routes", onlyRoutes.join(","));
@@ -4789,13 +4797,13 @@ async function getBuildManifest({
   if (!serverBundles) {
     return { routes };
   }
-  let { normalizePath: normalizePath2 } = await import("vite");
+  let { normalizePath } = await import("vite");
   let serverBuildDirectory = getServerBuildDirectory(reactRouterConfig);
   let resolvedAppDirectory = path6.resolve(rootDirectory, appDirectory);
   let rootRelativeRoutes = Object.fromEntries(
     Object.entries(routes).map(([id, route]) => {
       let filePath = path6.join(resolvedAppDirectory, route.file);
-      let rootRelativeFilePath = normalizePath2(
+      let rootRelativeFilePath = normalizePath(
         path6.relative(rootDirectory, filePath)
       );
       return [id, { ...route, file: rootRelativeFilePath }];
@@ -4837,7 +4845,7 @@ async function getBuildManifest({
       buildManifest.routeIdToServerBundleId[route.id] = serverBundleId;
       buildManifest.serverBundles[serverBundleId] ??= {
         id: serverBundleId,
-        file: normalizePath2(
+        file: normalizePath(
           path6.join(
             path6.relative(
               rootDirectory,
@@ -5034,7 +5042,6 @@ async function asyncFlatten(arr) {
 }
 
 // vite/rsc/plugin.ts
-var Vite = __toESM(require("vite"));
 var import_es_module_lexer3 = require("es-module-lexer");
 var Path5 = __toESM(require("pathe"));
 var babel2 = __toESM(require("@babel/core"));
@@ -5373,6 +5380,9 @@ function isRootRouteFile({
 
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
+  let runningWithinTheReactRouterMonoRepo = Boolean(
+    arguments && arguments.length === 1 && typeof arguments[0] === "object" && arguments[0] && "__runningWithinTheReactRouterMonoRepo" in arguments[0] && arguments[0].__runningWithinTheReactRouterMonoRepo === true
+  );
   let configLoader;
   let typegenWatcherPromise;
   let viteCommand;
@@ -5445,6 +5455,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         entries = await resolveRSCEntryFiles({
           reactRouterConfig: config
         });
+        let viteNormalizePath = (await import("vite")).normalizePath;
         return {
           resolve: {
             dedupe: [
@@ -5486,11 +5497,13 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                 name: "react-server-dom-webpack",
                 rootDirectory
               }) ? ["react-server-dom-webpack"] : [],
-              "react-router",
+              ...runningWithinTheReactRouterMonoRepo ? [] : [
+                "react-router",
+                "react-router/dom",
+                "react-router/internal/react-server-client"
+              ],
               "react-router > cookie",
-              "react-router > set-cookie-parser",
-              "react-router/dom",
-              "react-router/internal/react-server-client"
+              "react-router > set-cookie-parser"
             ]
           },
           esbuild: {
@@ -5506,7 +5519,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   },
                   output: {
                     manualChunks(id) {
-                      const normalized = Vite.normalizePath(id);
+                      const normalized = viteNormalizePath(id);
                       if (normalized.includes("node_modules/react/") || normalized.includes("node_modules/react-dom/") || normalized.includes(
                         "node_modules/react-server-dom-webpack/"
                       ) || normalized.includes("node_modules/@vitejs/plugin-rsc/")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-653010f49",
+  "version": "0.0.0-experimental-3fe27584d",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -48,6 +48,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "cli/**",
         "config/**",
         "module-sync-enabled/**",
@@ -91,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-653010f49"
+    "@react-router/node": "0.0.0-experimental-3fe27584d"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -105,7 +106,7 @@
     "@types/node": "^20.0.0",
     "@types/npmcli__package-json": "^4.0.0",
     "@types/semver": "^7.7.0",
-    "@vitejs/plugin-rsc": "~0.5.6",
+    "@vitejs/plugin-rsc": "~0.5.7",
     "esbuild-register": "^3.6.0",
     "execa": "5.1.1",
     "express": "^4.19.2",
@@ -115,17 +116,17 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^0.0.0-experimental-653010f49",
-    "@react-router/serve": "0.0.0-experimental-653010f49"
+    "react-router": "^0.0.0-experimental-3fe27584d",
+    "@react-router/serve": "0.0.0-experimental-3fe27584d"
   },
   "peerDependencies": {
-    "@vitejs/plugin-rsc": "~0.5.6",
-    "react-server-dom-webpack": "*",
+    "@vitejs/plugin-rsc": "~0.5.7",
+    "react-server-dom-webpack": "^19.2.3",
     "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-653010f49",
-    "react-router": "^0.0.0-experimental-653010f49"
+    "@react-router/serve": "^0.0.0-experimental-3fe27584d",
+    "react-router": "^0.0.0-experimental-3fe27584d"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {