@react-router/dev 8.1.0 → 8.2.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # `@react-router/dev`
 
+## v8.2.0
+
+### Minor Changes
+
+- Add a Web Streams default server entry for non-Node Framework mode apps ([#15290](https://github.com/remix-run/react-router/pull/15290))
+  - Apps using `@react-router/node`, `@react-router/express`, or `@react-router/serve` continue to use the `renderToPipeableStream` default server entry
+  - Apps without those Node server adapter dependencies use a `renderToReadableStream` default server entry
+  - Non-Node apps with their own `entry.server.tsx` may be able to remove it in favor of the default if it is not doing anything custom
+- Detect `nub` as a supported package manager when installing framework dependencies ([#15276](https://github.com/remix-run/react-router/pull/15276))
+
+### Patch Changes
+
+- Detect user `rolldownOptions` config in Vite 8+ ([#15278](https://github.com/remix-run/react-router/pull/15278))
+
+### Unstable Changes
+
+⚠️  _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+
+- Add the [`future.unstable_enableNodeReadableStream`](https://reactrouter.com/upgrading/future#futureunstable_enablenodereadablestream) flag to opt Node Framework mode apps into using `renderToReadableStream` instead of `renderToPipeableStream` ([#15290](https://github.com/remix-run/react-router/pull/15290))
+  - This flag has no effect if you have your own `entry.server.tsx`
+- Updated dependencies:
+  - [`react-router@8.2.0`](https://github.com/remix-run/react-router/releases/tag/react-router@8.2.0)
+  - [`@react-router/node@8.2.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@8.2.0)
+  - [`@react-router/serve@8.2.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@8.2.0)
+
 ## v8.1.0
 
 ### Patch Changes

package/dist/{build-9Do1SAoZ.js → build-r3D94V53.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { g as preloadVite, h as getVite } from "./typegen-BdAwfkLl.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CNpfI4aI.js";
 //#region vite/build.ts
 async function build(root, viteBuildOptions) {
 	await preloadVite();

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,7 +9,7 @@
  *
  * @license MIT
  */
-import { g as preloadVite, h as getVite, l as loadConfig, n as watch, t as run$1 } from "../typegen-BdAwfkLl.js";
+import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-CNpfI4aI.js";
 import { createRequire } from "node:module";
 import { parseArgs } from "node:util";
 import semver from "semver";
@@ -141,7 +141,7 @@ async function routes(rootDirectory, flags = {}) {
 }
 async function build(root, options = {}) {
 	root = resolveRootDirectory(root, options);
-	let { build } = await import("../build-9Do1SAoZ.js");
+	let { build } = await import("../build-r3D94V53.js");
 	if (options.profile) await start();
 	try {
 		await build(root, options);
@@ -150,7 +150,7 @@ async function build(root, options = {}) {
 	}
 }
 async function dev(root, options = {}) {
-	let { dev } = await import("../dev-Bnoz8B89.js");
+	let { dev } = await import("../dev-BfZiothP.js");
 	if (options.profile) await start();
 	exitHook(() => stop(console.info));
 	root = resolveRootDirectory(root, options);
@@ -231,12 +231,9 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
 		}
 		await copyFile(defaultEntry, outputFile);
 	} else {
-		if (!((await readPackageJSON(rootDirectory)).dependencies ?? {})["@react-router/node"]) {
-			console.error(colors.red(`No default server entry detected.`));
-			return;
-		}
+		let pkgJson = await readPackageJSON(rootDirectory);
 		let defaultEntryClient = path$1.resolve(defaultsDirectory, "entry.client.tsx");
-		let defaultEntryServer = path$1.resolve(defaultsDirectory, `entry.server.node.tsx`);
+		let defaultEntryServer = path$1.resolve(defaultsDirectory, hasNodeDependency(pkgJson.dependencies) && !configResult.value.future.unstable_enableNodeReadableStream ? `entry.server.node.tsx` : `entry.server.web.tsx`);
 		let isServerEntry = entry === "entry.server";
 		let contents = isServerEntry ? await createServerEntry(rootDirectory, appDirectory, defaultEntryServer) : await createClientEntry(rootDirectory, appDirectory, defaultEntryClient);
 		let useTypeScript = flags.typescript ?? true;

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

@@ -0,0 +1,54 @@
+import type { EntryContext, RouterContextProvider } from "react-router";
+import { ServerRouter } from "react-router";
+import { isbot } from "isbot";
+import { renderToReadableStream } from "react-dom/server";
+
+export const streamTimeout = 5_000;
+
+export default async function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  routerContext: EntryContext,
+  _loadContext: RouterContextProvider,
+) {
+  // https://httpwg.org/specs/rfc9110.html#HEAD
+  if (request.method.toUpperCase() === "HEAD") {
+    return new Response(null, {
+      status: responseStatusCode,
+      headers: responseHeaders,
+    });
+  }
+
+  let shellRendered = false;
+  let userAgent = request.headers.get("user-agent");
+
+  const body = await renderToReadableStream(
+    <ServerRouter context={routerContext} url={request.url} />,
+    {
+      signal: AbortSignal.timeout(streamTimeout + 1000),
+      onError(error: unknown) {
+        responseStatusCode = 500;
+        // Log streaming rendering errors from inside the shell. Don't log
+        // errors encountered during initial shell rendering since they'll
+        // reject and get logged in handleDocumentRequest.
+        if (shellRendered) {
+          console.error(error);
+        }
+      },
+    },
+  );
+  shellRendered = true;
+
+  // Ensure requests from bots and SPA Mode renders wait for all content to load before responding
+  // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
+  if ((userAgent && isbot(userAgent)) || routerContext.isSpaMode) {
+    await body.allReady;
+  }
+
+  responseHeaders.set("Content-Type", "text/html");
+  return new Response(body, {
+    headers: responseHeaders,
+    status: responseStatusCode,
+  });
+}

package/dist/{config-DvmRcD4Z.d.ts → config-t89niiFv.d.ts}

@@ -38,6 +38,7 @@ type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
+  unstable_enableNodeReadableStream: boolean;
   unstable_optimizeDeps: boolean;
 }
 type SplitRouteModulesOption = boolean | "enforce";

package/dist/config.d.ts

@@ -1,3 +1,3 @@
 
-import { i as ServerBundlesFunction, n as Preset, r as ReactRouterConfig, t as BuildManifest } from "./config-DvmRcD4Z.js";
+import { i as ServerBundlesFunction, n as Preset, r as ReactRouterConfig, t as BuildManifest } from "./config-t89niiFv.js";
 export type { BuildManifest, ReactRouterConfig as Config, Preset, ServerBundlesFunction };

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/{dev-Bnoz8B89.js → dev-BfZiothP.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { g as preloadVite, h as getVite } from "./typegen-BdAwfkLl.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CNpfI4aI.js";
 import { n as start, r as stop, t as getSession } from "./cli/index.js";
 import colors from "picocolors";
 //#region vite/dev.ts

package/dist/{routes-DGRRTCk8.js → routes-CdiIrVIn.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,5 +8,5 @@
  *
  * @license MIT
  */
-import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-DGRRTCk8.js";
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-CdiIrVIn.js";
 export { getAppDirectory, index, layout, prefix, relative, route };

package/dist/{typegen-BdAwfkLl.js → typegen-CNpfI4aI.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-DGRRTCk8.js";
+import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-CdiIrVIn.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import fs from "node:fs";
@@ -66,6 +66,16 @@ function defineOptimizeDepsCompilerOptions(options) {
 	let vite = getVite();
 	return parseInt(vite.version.split(".")[0], 10) >= 8 ? { rolldownOptions: options.rolldown } : { esbuildOptions: options.esbuild };
 }
+/**
+* Read the user-supplied build options from either `rollupOptions` (Vite <=7)
+* or `rolldownOptions` (Vite >=8).
+*/
+function getUserBuildRollupOptions(environment) {
+	if (environment?.build) {
+		if ("rollupOptions" in environment.build) return environment.build.rollupOptions;
+		if ("rolldownOptions" in environment.build) return environment.build.rolldownOptions;
+	}
+}
 //#endregion
 //#region vite/ssr-externals.ts
 const ssrExternals = isReactRouterRepo() ? [
@@ -118,7 +128,7 @@ async function createContext$1({ root, mode, customLogger }) {
 /**
 * Determine which package manager the user prefers.
 *
-* npm, pnpm and Yarn set the user agent environment variable
+* npm, pnpm, Yarn, Bun, and nub set the user agent environment variable
 * that can be used to determine which package manager ran
 * the command.
 */
@@ -131,6 +141,7 @@ const detectPackageManager = () => {
 		if (pkgManager === "pnpm") return "pnpm";
 		if (pkgManager === "yarn") return "yarn";
 		if (pkgManager === "bun") return "bun";
+		if (pkgManager === "nub") return "nub";
 		return;
 	} catch {
 		return;
@@ -283,7 +294,10 @@ async function resolveConfig({ root, viteRunnerContext, reactRouterConfigFile, s
 		if ("unstable_trailingSlashAwareDataRequests" in futureConfig || "v8_trailingSlashAwareDataRequests" in futureConfig) return err("The `future.v8_trailingSlashAwareDataRequests` flag has been removed because trailing slash-aware data requests are now the default behavior");
 		if ("unstable_subResourceIntegrity" in futureConfig) return err("The `future.unstable_subResourceIntegrity` flag has been stabilized and moved to a top-level `config.subResourceIntegrity` field");
 	}
-	let future = { unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false };
+	let future = {
+		unstable_enableNodeReadableStream: userAndPresetConfigs.future?.unstable_enableNodeReadableStream ?? false,
+		unstable_optimizeDeps: userAndPresetConfigs.future?.unstable_optimizeDeps ?? false
+	};
 	let allowedActionOrigins = userAndPresetConfigs.allowedActionOrigins ?? false;
 	let splitRouteModules = userAndPresetConfigs.splitRouteModules ?? true;
 	let subResourceIntegrity = userAndPresetConfigs.subResourceIntegrity ?? false;
@@ -432,7 +446,6 @@ async function resolveEntryFiles({ rootDirectory, reactRouterConfig }) {
 		if (!packageJsonPath) throw new Error(`Could not find package.json in ${rootDirectory} or any of its parent directories. Please add a package.json, or provide a custom entry.server.tsx/jsx file in your app directory.`);
 		let packageJsonDirectory = path.dirname(packageJsonPath);
 		let deps = (await readPackageJSON(packageJsonDirectory)).dependencies ?? {};
-		if (!deps["@react-router/node"]) throw new Error(`Could not determine server runtime. Please install @react-router/node, or provide a custom entry.server.tsx/jsx file in your app directory.`);
 		if (!deps["isbot"]) {
 			console.log("adding `isbot@5` to your package.json, you should commit this change");
 			await updatePackage(packageJsonPath, (pkg) => {
@@ -445,7 +458,7 @@ async function resolveEntryFiles({ rootDirectory, reactRouterConfig }) {
 				stdio: "inherit"
 			});
 		}
-		entryServerFile = `entry.server.node.tsx`;
+		entryServerFile = hasNodeDependency(deps) && !reactRouterConfig.future.unstable_enableNodeReadableStream ? `entry.server.node.tsx` : `entry.server.web.tsx`;
 	}
 	return {
 		entryClientFilePath: userEntryClientFile ? path.resolve(reactRouterConfig.appDirectory, userEntryClientFile) : path.resolve(defaultsDirectory, entryClientFile),
@@ -478,6 +491,9 @@ const entryExts = [
 	".mjs",
 	".mts"
 ];
+function hasNodeDependency(deps) {
+	return !deps || Boolean(deps["@react-router/node"] || deps["@react-router/express"] || deps["@react-router/serve"]);
+}
 function isEntryFile(entryBasename, filename) {
 	return entryExts.some((ext) => filename === `${entryBasename}${ext}`);
 }
@@ -866,4 +882,4 @@ async function watch(rootDirectory, { mode, logger, rsc }) {
 	return { close: async () => await ctx.configLoader.close() };
 }
 //#endregion
-export { t$1 as a, createConfigLoader as c, resolveRSCEntryFiles as d, ssrExternals as f, preloadVite as g, getVite as h, parse$1 as i, loadConfig as l, defineOptimizeDepsCompilerOptions as m, watch as n, traverse as o, defineCompilerOptions as p, generate as r, configRouteToBranchRoute as s, run as t, resolveEntryFiles as u };
+export { getVite as _, t$1 as a, createConfigLoader as c, resolveEntryFiles as d, resolveRSCEntryFiles as f, getUserBuildRollupOptions as g, defineOptimizeDepsCompilerOptions as h, parse$1 as i, hasNodeDependency as l, defineCompilerOptions as m, watch as n, traverse as o, ssrExternals as p, generate as r, configRouteToBranchRoute as s, run as t, loadConfig as u, preloadVite as v };

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.1.0
+ * @react-router/dev v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,8 +8,8 @@
  *
  * @license MIT
  */
-import { a as t, c as createConfigLoader, d as resolveRSCEntryFiles, f as ssrExternals, g as preloadVite, h as getVite, i as parse$1, m as defineOptimizeDepsCompilerOptions, n as watch, o as traverse, p as defineCompilerOptions, r as generate, s as configRouteToBranchRoute, u as resolveEntryFiles } from "./typegen-BdAwfkLl.js";
-import { u as invariant } from "./routes-DGRRTCk8.js";
+import { _ as getVite, a as t, c as createConfigLoader, d as resolveEntryFiles, f as resolveRSCEntryFiles, g as getUserBuildRollupOptions, h as defineOptimizeDepsCompilerOptions, i as parse$1, l as hasNodeDependency, m as defineCompilerOptions, n as watch, o as traverse, p as ssrExternals, r as generate, s as configRouteToBranchRoute, v as preloadVite } from "./typegen-CNpfI4aI.js";
+import { u as invariant } from "./routes-CdiIrVIn.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
@@ -2582,7 +2582,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
 		let maybeDevelopmentConditions = viteCommand === "build" ? [] : ["development"];
 		let maybeDefaultServerConditions = vite.defaultServerConditions || [];
 		let defaultExternalConditions = vite.defaultExternalConditions ?? ["node"];
-		if (!(!pkgJson.dependencies || pkgJson.dependencies["@react-router/node"] || pkgJson.dependencies["@react-router/express"] || pkgJson.dependencies["@react-router/serve"])) {
+		if (!hasNodeDependency(pkgJson.dependencies)) {
 			maybeDefaultServerConditions = maybeDefaultServerConditions.filter((c) => c !== "node");
 			defaultExternalConditions = defaultExternalConditions.filter((c) => c !== "node");
 		}
@@ -2597,7 +2597,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
 				ssrEmitAssets: true,
 				copyPublicDir: false,
 				rollupOptions: {
-					input: viteUserConfig.environments?.ssr?.build?.rollupOptions?.input ?? virtual$1.serverBuild.id,
+					input: getUserBuildRollupOptions(viteUserConfig.environments?.ssr)?.input ?? virtual$1.serverBuild.id,
 					output: {
 						entryFileNames: serverBuildFile,
 						format: serverModuleFormat
@@ -2614,7 +2614,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
 				let code = readFileSync(routeFilePath, "utf-8");
 				return [`${routeFilePath}${BUILD_CLIENT_ROUTE_QUERY_STRING}`, ...ctx.reactRouterConfig.splitRouteModules && !isRootRoute ? routeChunkExportNames.map((exportName) => code.includes(exportName) ? getRouteChunkModuleId(routeFilePath, exportName) : null) : []].filter(isNonNullable);
 			})],
-			output: viteUserConfig?.environments?.client?.build?.rollupOptions?.output ?? { entryFileNames: ({ moduleIds }) => {
+			output: getUserBuildRollupOptions(viteUserConfig?.environments?.client)?.output ?? { entryFileNames: ({ moduleIds }) => {
 				let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
 				let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(routeChunkModuleId)?.replace("unstable_", "") : null;
 				let routeChunkSuffix = routeChunkName ? `-${kebabCase(routeChunkName)}` : "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/dev",
   "type": "module",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "description": "Dev tools and CLI for React Router",
   "keywords": [
     "react",
@@ -105,7 +105,7 @@
     "semver": "^7.8.1",
     "tinyglobby": "^0.2.16",
     "valibot": "^1.4.1",
-    "@react-router/node": "8.1.0"
+    "@react-router/node": "8.2.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -127,8 +127,8 @@
     "vite": "^7.0.0",
     "wireit": "0.14.12",
     "wrangler": "^4.95.0",
-    "@react-router/serve": "8.1.0",
-    "react-router": "^8.1.0"
+    "@react-router/serve": "8.2.0",
+    "react-router": "^8.2.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.26",
@@ -136,8 +136,8 @@
     "typescript": "^5.1.0 || ^6.0.0",
     "vite": "^7.0.0 || ^8.0.0",
     "wrangler": "^4.0.0",
-    "react-router": "^8.1.0",
-    "@react-router/serve": "^8.1.0"
+    "@react-router/serve": "^8.2.0",
+    "react-router": "^8.2.0"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {