@react-router/dev 7.8.1 → 7.8.2-pre.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.8.2-pre.0
+
+### Patch Changes
+
+- fix: memory leak in default entry.server ([#14200](https://github.com/remix-run/react-router/pull/14200))
+- Updated dependencies:
+  - `react-router@7.8.2-pre.0`
+  - `@react-router/node@7.8.2-pre.0`
+  - `@react-router/serve@7.8.2-pre.0`
+
 ## 7.8.1
 
 ### Patch Changes
@@ -718,7 +728,6 @@
   ```
 
   This initial implementation targets type inference for:
-
   - `Params` : Path parameters from your routing config in `routes.ts` including file-based routing
   - `LoaderData` : Loader data from `loader` and/or `clientLoader` within your route module
   - `ActionData` : Action data from `action` and/or `clientAction` within your route module
@@ -733,7 +742,6 @@
   ```
 
   Check out our docs for more:
-
   - [_Explanations > Type Safety_](https://reactrouter.com/dev/guides/explanation/type-safety)
   - [_How-To > Setting up type safety_](https://reactrouter.com/dev/guides/how-to/setting-up-type-safety)
 
@@ -933,7 +941,6 @@
 - Vite: Provide `Unstable_ServerBundlesFunction` and `Unstable_VitePluginConfig` types ([#8654](https://github.com/remix-run/remix/pull/8654))
 
 - Vite: add `--sourcemapClient` and `--sourcemapServer` flags to `remix vite:build` ([#8613](https://github.com/remix-run/remix/pull/8613))
-
   - `--sourcemapClient`
 
   - `--sourcemapClient=inline`
@@ -1270,7 +1277,6 @@
 - Add support for `clientLoader`/`clientAction`/`HydrateFallback` route exports ([RFC](https://github.com/remix-run/remix/discussions/7634)) ([#8173](https://github.com/remix-run/remix/pull/8173))
 
   Remix now supports loaders/actions that run on the client (in addition to, or instead of the loader/action that runs on the server). While we still recommend server loaders/actions for the majority of your data needs in a Remix app - these provide some levers you can pull for more advanced use-cases such as:
-
   - Leveraging a data source local to the browser (i.e., `localStorage`)
   - Managing a client-side cache of server data (like `IndexedDB`)
   - Bypassing the Remix server in a BFF setup and hitting your API directly from the browser
@@ -1674,7 +1680,6 @@
 - Output esbuild metafiles for bundle analysis ([#6772](https://github.com/remix-run/remix/pull/6772))
 
   Written to server build directory (`build/` by default):
-
   - `metafile.css.json`
   - `metafile.js.json` (browser JS)
   - `metafile.server.json` (server JS)
@@ -1772,7 +1777,6 @@
 - built-in tls support ([#6483](https://github.com/remix-run/remix/pull/6483))
 
   New options:
-
   - `--tls-key` / `tlsKey`: TLS key
   - `--tls-cert` / `tlsCert`: TLS Certificate
 
@@ -2043,7 +2047,6 @@
   ```
 
   The dev server will:
-
   - force `NODE_ENV=development` and warn you if it was previously set to something else
   - rebuild your app whenever your Remix app code changes
   - restart your app server whenever rebuilds succeed

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.8.1
+ * @react-router/dev v7.8.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

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 v7.8.1
+ * @react-router/dev v7.8.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/internal.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.8.1
+ * @react-router/dev v7.8.2-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1348,19 +1348,39 @@ function invalidDestructureError(name) {
 }
 
 // vite/rsc/virtual-route-modules.ts
+var SERVER_ONLY_COMPONENT_EXPORTS = ["ServerComponent"];
 var SERVER_ONLY_ROUTE_EXPORTS = [
+  ...SERVER_ONLY_COMPONENT_EXPORTS,
   "loader",
   "action",
   "unstable_middleware",
-  "headers",
-  "ServerComponent"
+  "headers"
 ];
-var COMPONENT_EXPORTS = [
-  "default",
+var SERVER_ONLY_ROUTE_EXPORTS_SET = new Set(SERVER_ONLY_ROUTE_EXPORTS);
+function isServerOnlyRouteExport(name) {
+  return SERVER_ONLY_ROUTE_EXPORTS_SET.has(name);
+}
+var COMMON_COMPONENT_EXPORTS = [
   "ErrorBoundary",
   "HydrateFallback",
   "Layout"
 ];
+var SERVER_FIRST_COMPONENT_EXPORTS = [
+  ...COMMON_COMPONENT_EXPORTS,
+  ...SERVER_ONLY_COMPONENT_EXPORTS
+];
+var SERVER_FIRST_COMPONENT_EXPORTS_SET = new Set(
+  SERVER_FIRST_COMPONENT_EXPORTS
+);
+function isServerFirstComponentExport(name) {
+  return SERVER_FIRST_COMPONENT_EXPORTS_SET.has(
+    name
+  );
+}
+var CLIENT_COMPONENT_EXPORTS = [
+  ...COMMON_COMPONENT_EXPORTS,
+  "default"
+];
 var CLIENT_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
@@ -1376,25 +1396,43 @@ function isClientNonComponentExport(name) {
 }
 var CLIENT_ROUTE_EXPORTS = [
   ...CLIENT_NON_COMPONENT_EXPORTS,
-  ...COMPONENT_EXPORTS
+  ...CLIENT_COMPONENT_EXPORTS
 ];
 var CLIENT_ROUTE_EXPORTS_SET = new Set(CLIENT_ROUTE_EXPORTS);
 function isClientRouteExport(name) {
   return CLIENT_ROUTE_EXPORTS_SET.has(name);
 }
+var ROUTE_EXPORTS = [
+  ...SERVER_ONLY_ROUTE_EXPORTS,
+  ...CLIENT_ROUTE_EXPORTS
+];
+var ROUTE_EXPORTS_SET = new Set(ROUTE_EXPORTS);
+function isRouteExport(name) {
+  return ROUTE_EXPORTS_SET.has(name);
+}
+function isCustomRouteExport(name) {
+  return !isRouteExport(name);
+}
+function hasReactServerCondition(viteEnvironment) {
+  return viteEnvironment.config.resolve.conditions.includes("react-server");
+}
 function transformVirtualRouteModules({
   id,
   code,
-  viteCommand
+  viteCommand,
+  routeIdByFile,
+  viteEnvironment
 }) {
-  if (!id.includes("route-module")) {
-    return;
-  }
-  if (isVirtualRouteModuleId(id)) {
-    return createVirtualRouteModuleCode({ id, code, viteCommand });
+  if (isVirtualRouteModuleId(id) || routeIdByFile.has(id)) {
+    return createVirtualRouteModuleCode({
+      id,
+      code,
+      viteCommand,
+      viteEnvironment
+    });
   }
   if (isVirtualServerRouteModuleId(id)) {
-    return createVirtualServerRouteModuleCode({ id, code });
+    return createVirtualServerRouteModuleCode({ id, code, viteEnvironment });
   }
   if (isVirtualClientRouteModuleId(id)) {
     return createVirtualClientRouteModuleCode({ id, code, viteCommand });
@@ -1403,22 +1441,44 @@ function transformVirtualRouteModules({
 async function createVirtualRouteModuleCode({
   id,
   code: routeSource,
-  viteCommand
+  viteCommand,
+  viteEnvironment
 }) {
+  const isReactServer = hasReactServerCondition(viteEnvironment);
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
   const clientModuleId = getVirtualClientModuleId(id);
   const serverModuleId = getVirtualServerModuleId(id);
   let code = "";
   if (isServerFirstRoute) {
+    if (staticExports.some(isServerFirstComponentExport)) {
+      code += `import React from "react";
+`;
+    }
     for (const staticExport of staticExports) {
       if (isClientNonComponentExport(staticExport)) {
         code += `export { ${staticExport} } from "${clientModuleId}";
 `;
-      } else if (staticExport === "ServerComponent") {
-        code += `export { ServerComponent as default } from "${serverModuleId}";
+      } else if (isReactServer && isServerFirstComponentExport(staticExport) && // Layout wraps all other component exports so doesn't need CSS injected
+      staticExport !== "Layout") {
+        code += `import { ${staticExport} as ${staticExport}WithoutCss } from "${serverModuleId}";
+`;
+        code += `export ${staticExport === "ServerComponent" ? "default " : " "}function ${staticExport}(props) {
 `;
-      } else {
+        code += `  return React.createElement(React.Fragment, null,
+`;
+        code += `    import.meta.viteRsc.loadCss(),
+`;
+        code += `    React.createElement(${staticExport}WithoutCss, props),
+`;
+        code += `  );
+`;
+        code += `}
+`;
+      } else if (isReactServer && isRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${serverModuleId}";
+`;
+      } else if (isCustomRouteExport(staticExport)) {
+        code += `export { ${staticExport} } from "${isReactServer ? serverModuleId : clientModuleId}";
 `;
       }
     }
@@ -1431,8 +1491,11 @@ async function createVirtualRouteModuleCode({
       if (isClientRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${clientModuleId}";
 `;
-      } else {
+      } else if (isReactServer && isServerOnlyRouteExport(staticExport)) {
         code += `export { ${staticExport} } from "${serverModuleId}";
+`;
+      } else if (isCustomRouteExport(staticExport)) {
+        code += `export { ${staticExport} } from "${isReactServer ? serverModuleId : clientModuleId}";
 `;
       }
     }
@@ -1445,8 +1508,18 @@ async function createVirtualRouteModuleCode({
 }
 function createVirtualServerRouteModuleCode({
   id,
-  code: routeSource
+  code: routeSource,
+  viteEnvironment
 }) {
+  if (!hasReactServerCondition(viteEnvironment)) {
+    throw new Error(
+      [
+        "Virtual server route module was loaded outside of the RSC environment.",
+        `Environment Name: ${viteEnvironment.name}`,
+        `Module ID: ${id}`
+      ].join("\n")
+    );
+  }
   const { staticExports, isServerFirstRoute } = parseRouteExports(routeSource);
   const clientModuleId = getVirtualClientModuleId(id);
   const serverRouteModuleAst = import_parser.parse(routeSource, {
@@ -1474,7 +1547,7 @@ function createVirtualClientRouteModuleCode({
   viteCommand
 }) {
   const { staticExports, isServerFirstRoute, hasClientExports } = parseRouteExports(routeSource);
-  const exportsToRemove = isServerFirstRoute ? [...SERVER_ONLY_ROUTE_EXPORTS, ...COMPONENT_EXPORTS] : SERVER_ONLY_ROUTE_EXPORTS;
+  const exportsToRemove = isServerFirstRoute ? [...SERVER_ONLY_ROUTE_EXPORTS, ...CLIENT_COMPONENT_EXPORTS] : SERVER_ONLY_ROUTE_EXPORTS;
   const clientRouteModuleAst = import_parser.parse(routeSource, {
     sourceType: "module"
   });
@@ -1612,9 +1685,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: {
@@ -1686,7 +1771,14 @@ function reactRouterRSCVitePlugin() {
     {
       name: "react-router/rsc/virtual-route-modules",
       transform(code, id) {
-        return transformVirtualRouteModules({ code, id, viteCommand });
+        if (!routeIdByFile) return;
+        return transformVirtualRouteModules({
+          code,
+          id,
+          viteCommand,
+          routeIdByFile,
+          viteEnvironment: this.environment
+        });
       }
     },
     {
@@ -1747,8 +1839,8 @@ function reactRouterRSCVitePlugin() {
         const isJSX = filepath.endsWith("x");
         const useFastRefresh = !ssr && (isJSX || code.includes(devRuntime));
         if (!useFastRefresh) return;
-        const routeId = routeIdByFile?.get(filepath);
-        if (routeId !== void 0) {
+        if (isVirtualClientRouteModuleId(id)) {
+          const routeId = routeIdByFile?.get(filepath);
           return { code: addRefreshWrapper({ routeId, code, id }) };
         }
         const result = await babel.transformAsync(code, {

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.8.1",
+  "version": "7.8.2-pre.0",
   "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": "7.8.1"
+    "@react-router/node": "7.8.2-pre.0"
   },
   "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": "7.8.1",
-    "react-router": "^7.8.1"
+    "@react-router/serve": "7.8.2-pre.0",
+    "react-router": "^7.8.2-pre.0"
   },
   "peerDependencies": {
     "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.8.1",
-    "react-router": "^7.8.1"
+    "@react-router/serve": "^7.8.2-pre.0",
+    "react-router": "^7.8.2-pre.0"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {