@react-router/dev 0.0.0-experimental-3d7dcee → 0.0.0-experimental-7ed11be

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.8.1
+
+### Patch Changes
+
+- Update generated `Route.MetaArgs` type so `loaderData` is only potentially undefined when an `ErrorBoundary` export is present ([#14173](https://github.com/remix-run/react-router/pull/14173))
+- Updated dependencies:
+  - `react-router@7.8.1`
+  - `@react-router/node@7.8.1`
+  - `@react-router/serve@7.8.1`
+
 ## 7.8.0
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1417,6 +1417,13 @@ var init_with_props = __esm({
   }
 });
 
+// vite/plugins/validate-plugin-order.ts
+var init_validate_plugin_order = __esm({
+  "vite/plugins/validate-plugin-order.ts"() {
+    "use strict";
+  }
+});
+
 // vite/plugin.ts
 async function resolveViteConfig({
   configFile,
@@ -1685,6 +1692,7 @@ var init_plugin = __esm({
     init_vite();
     init_config();
     init_with_props();
+    init_validate_plugin_order();
     CLIENT_NON_COMPONENT_EXPORTS = [
       "clientAction",
       "clientLoader",
@@ -1824,7 +1832,7 @@ async function viteAppBuild(root, {
         },
         configResolved(config) {
           let hasReactRouterPlugin = config.plugins.find(
-            (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
+            (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc"
           );
           if (!hasReactRouterPlugin) {
             throw new Error(
@@ -1964,7 +1972,7 @@ async function dev(root, {
     logLevel
   });
   if (!server.config.plugins.find(
-    (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
+    (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc"
   )) {
     console.error(
       import_picocolors6.default.red("React Router Vite plugin not found in Vite config")

package/dist/config/defaults/entry.server.node.tsx

@@ -29,24 +29,38 @@ export default function handleRequest(
         ? "onAllReady"
         : "onShellReady";
 
+    // Abort the rendering stream after the `streamTimeout` so it has time to
+    // flush down the rejected boundaries
+    let timeoutId: ReturnType<typeof setTimeout> | undefined = setTimeout(
+      () => abort(),
+      streamTimeout + 1000,
+    );
+
     const { pipe, abort } = renderToPipeableStream(
       <ServerRouter context={routerContext} url={request.url} />,
       {
         [readyOption]() {
           shellRendered = true;
-          const body = new PassThrough();
+          const body = new PassThrough({
+            final(callback) {
+              // Clear the timeout to prevent retaining the closure and memory leak
+              clearTimeout(timeoutId);
+              timeoutId = undefined;
+              callback();
+            },
+          });
           const stream = createReadableStreamFromReadable(body);
 
           responseHeaders.set("Content-Type", "text/html");
 
+          pipe(body);
+
           resolve(
             new Response(stream, {
               headers: responseHeaders,
               status: responseStatusCode,
             }),
           );
-
-          pipe(body);
         },
         onShellError(error: unknown) {
           reject(error);
@@ -62,9 +76,5 @@ export default function handleRequest(
         },
       },
     );
-
-    // Abort the rendering stream after the `streamTimeout` so it has time to
-    // flush down the rejected boundaries
-    setTimeout(abort, streamTimeout + 1000);
   });
 }

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1534,6 +1534,32 @@ function isVirtualServerRouteModuleId(id) {
   return /(\?|&)server-route-module(&|$)/.test(id);
 }
 
+// vite/plugins/validate-plugin-order.ts
+function validatePluginOrder() {
+  return {
+    name: "react-router:validate-plugin-order",
+    configResolved(viteConfig) {
+      let pluginIndex = (pluginName) => {
+        pluginName = Array.isArray(pluginName) ? pluginName : [pluginName];
+        return viteConfig.plugins.findIndex(
+          (plugin) => pluginName.includes(plugin.name)
+        );
+      };
+      let rollupPrePlugins = [
+        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
+      ];
+      for (let prePlugin of rollupPrePlugins) {
+        let prePluginIndex = pluginIndex(prePlugin.pluginName);
+        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
+          throw new Error(
+            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
+          );
+        }
+      }
+    }
+  };
+}
+
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
   let configLoader;
@@ -1543,7 +1569,7 @@ function reactRouterRSCVitePlugin() {
   let routeIdByFile;
   return [
     {
-      name: "react-router/rsc/config",
+      name: "react-router/rsc",
       async config(viteUserConfig, { command, mode }) {
         await import_es_module_lexer2.init;
         viteCommand = command;
@@ -1586,9 +1612,21 @@ function reactRouterRSCVitePlugin() {
             jsxDev: viteCommand !== "build"
           },
           environments: {
-            client: { build: { outDir: "build/client" } },
-            rsc: { build: { outDir: "build/server" } },
-            ssr: { build: { outDir: "build/server/__ssr_build" } }
+            client: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "client")
+              }
+            },
+            rsc: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server")
+              }
+            },
+            ssr: {
+              build: {
+                outDir: (0, import_pathe5.join)(config.buildDirectory, "server/__ssr_build")
+              }
+            }
           },
           build: {
             rollupOptions: {
@@ -1783,6 +1821,7 @@ function reactRouterRSCVitePlugin() {
         return modules;
       }
     },
+    validatePluginOrder(),
     (0, import_plugin_rsc.default)({ entries: getRscEntries() })
   ];
 }

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3d7dcee
+ * @react-router/dev v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2329,6 +2329,32 @@ function toFunctionExpression(decl) {
   );
 }
 
+// vite/plugins/validate-plugin-order.ts
+function validatePluginOrder() {
+  return {
+    name: "react-router:validate-plugin-order",
+    configResolved(viteConfig) {
+      let pluginIndex = (pluginName) => {
+        pluginName = Array.isArray(pluginName) ? pluginName : [pluginName];
+        return viteConfig.plugins.findIndex(
+          (plugin) => pluginName.includes(plugin.name)
+        );
+      };
+      let rollupPrePlugins = [
+        { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
+      ];
+      for (let prePlugin of rollupPrePlugins) {
+        let prePluginIndex = pluginIndex(prePlugin.pluginName);
+        if (prePluginIndex >= 0 && prePluginIndex > pluginIndex(["react-router", "react-router/rsc"])) {
+          throw new Error(
+            `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
+          );
+        }
+      }
+    }
+  };
+}
+
 // vite/plugin.ts
 function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
@@ -2671,10 +2697,6 @@ var reactRouterVitePlugin = () => {
       buildManifest
     };
   };
-  let pluginIndex = (pluginName) => {
-    invariant(viteConfig);
-    return viteConfig.plugins.findIndex((plugin) => plugin.name === pluginName);
-  };
   let getServerEntry = async ({ routeIds }) => {
     invariant(viteConfig, "viteconfig required to generate the server entry");
     let routes = routeIds ? (
@@ -3238,17 +3260,6 @@ var reactRouterVitePlugin = () => {
           childCompilerConfigFile,
           "Vite config file was unable to be resolved for React Router child compiler"
         );
-        let rollupPrePlugins = [
-          { pluginName: "@mdx-js/rollup", displayName: "@mdx-js/rollup" }
-        ];
-        for (let prePlugin of rollupPrePlugins) {
-          let prePluginIndex = pluginIndex(prePlugin.pluginName);
-          if (prePluginIndex >= 0 && prePluginIndex > pluginIndex("react-router")) {
-            throw new Error(
-              `The "${prePlugin.displayName}" plugin should be placed before the React Router plugin in your Vite config file`
-            );
-          }
-        }
         const childCompilerPlugins = await asyncFlatten(
           childCompilerConfigFile.config.plugins ?? []
         );
@@ -3266,7 +3277,7 @@ var reactRouterVitePlugin = () => {
           envFile: false,
           plugins: [
             childCompilerPlugins.filter(
-              (plugin) => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router:route-exports" && plugin.name !== "react-router:hmr-updates"
+              (plugin) => typeof plugin === "object" && plugin !== null && "name" in plugin && plugin.name !== "react-router" && plugin.name !== "react-router:route-exports" && plugin.name !== "react-router:hmr-updates" && plugin.name !== "react-router:validate-plugin-order"
             ).map((plugin) => ({
               ...plugin,
               configureServer: void 0,
@@ -3955,7 +3966,8 @@ var reactRouterVitePlugin = () => {
           server.environments.client.reloadModule(clientModule);
         }
       }
-    }
+    },
+    validatePluginOrder()
   ];
 };
 function getParentClientNodes(clientModuleGraph, module2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-3d7dcee",
+  "version": "0.0.0-experimental-7ed11be",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -91,7 +91,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-3d7dcee"
+    "@react-router/node": "0.0.0-experimental-7ed11be"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -114,15 +114,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-3d7dcee",
-    "react-router": "^0.0.0-experimental-3d7dcee"
+    "@react-router/serve": "0.0.0-experimental-7ed11be",
+    "react-router": "^0.0.0-experimental-7ed11be"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "react-router": "^0.0.0-experimental-3d7dcee",
-    "@react-router/serve": "^0.0.0-experimental-3d7dcee"
+    "@react-router/serve": "^0.0.0-experimental-7ed11be",
+    "react-router": "^0.0.0-experimental-7ed11be"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {