@react-router/dev 8.2.0 → 8.3.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # `@react-router/dev`
 
+## v8.3.0
+
+### Minor Changes
+
+- Restart `react-router dev` with `--conditions=development` when not already configured ([#15291](https://github.com/remix-run/react-router/pull/15291))
+
+### Patch Changes
+
+- Allow `typescript@7` to be used ([#15317](https://github.com/remix-run/react-router/pull/15317))
+
+### Unstable Changes
+
+⚠️  _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+
+- Add `unstable_rsc/client-version` client build version virtual module ([#15318](https://github.com/remix-run/react-router/pull/15318))
+
+- Support the `subResourceIntegrity` config option in RSC Framework Mode ([#15321](https://github.com/remix-run/react-router/pull/15321))
+
+  #### Migration guide
+
+  No changes are required when using the default RSC SSR entry. If you maintain a custom `app/entry.ssr.tsx`, import the new virtual module and pass its hashes to React's `importMap` render option:
+
+  ```diff
+  +import subResourceIntegrity from "virtual:react-router/unstable_rsc/subresource-integrity";
+
+  return renderToReadableStream(<RSCStaticRouter getPayload={getPayload} />, {
+    ...options,
+    bootstrapScriptContent,
+    formState,
+  + importMap: subResourceIntegrity
+  +   ? { integrity: subResourceIntegrity }
+  +   : undefined,
+    signal: request.signal,
+  });
+  ```
+- Updated dependencies:
+  - [`react-router@8.3.0`](https://github.com/remix-run/react-router/releases/tag/react-router@8.3.0)
+  - [`@react-router/node@8.3.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/node@8.3.0)
+  - [`@react-router/serve@8.3.0`](https://github.com/remix-run/react-router/releases/tag/@react-router/serve@8.3.0)
+
 ## v8.2.0
 
 ### Minor Changes
@@ -16,7 +56,7 @@
 
 ### Unstable Changes
 
-⚠️  _[Unstable features](https://reactrouter.com/community/api-development-strategy#unstable-flags) are not recommended for production use_
+⚠️ _[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`

package/development-condition-enabled/false.d.mts

@@ -0,0 +1,2 @@
+declare const developmentConditionEnabled: boolean;
+export default developmentConditionEnabled;

package/development-condition-enabled/false.mjs

@@ -0,0 +1,2 @@
+const developmentConditionEnabled = false;
+export default developmentConditionEnabled;

package/development-condition-enabled/true.d.mts

@@ -0,0 +1,2 @@
+declare const developmentConditionEnabled: boolean;
+export default developmentConditionEnabled;

package/development-condition-enabled/true.mjs

@@ -0,0 +1,2 @@
+const developmentConditionEnabled = true;
+export default developmentConditionEnabled;

package/dist/{build-r3D94V53.js → build-B8O1OXuF.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.2.0
+ * @react-router/dev v8.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-CNpfI4aI.js";
+import { _ as getVite, v as preloadVite } from "./typegen-C6qQ4fuP.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.2.0
+ * @react-router/dev v8.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,7 +9,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-CNpfI4aI.js";
+import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-C6qQ4fuP.js";
 import { createRequire } from "node:module";
 import { parseArgs } from "node:util";
 import semver from "semver";
@@ -21,10 +21,13 @@ import path from "node:path";
 import exitHook from "exit-hook";
 import { readPackageJSON } from "pkg-types";
 import "react-router";
+import developmentConditionEnabled from "#development-condition-enabled";
+import { spawn } from "node:child_process";
 import * as babel from "@babel/core";
 import babelPluginSyntaxJSX from "@babel/plugin-syntax-jsx";
 import babelPresetTypeScript from "@babel/preset-typescript";
 import prettier from "prettier";
+import process$1 from "node:process";
 import packageJson from "@react-router/dev/package.json" with { type: "json" };
 //#region config/format.ts
 function formatRoutes(routeManifest, format) {
@@ -124,6 +127,42 @@ async function hasReactRouterRscPlugin({ root, viteBuildOptions: { config, logLe
 	}, "build", "production", "production")).plugins.some((plugin) => plugin?.name === "react-router/rsc");
 }
 //#endregion
+//#region restart-with-conditions.ts
+/**
+* Restarts the current Node process, appending new flags to the
+* existing NODE_OPTIONS. SIGINT/SIGTERM are always forwarded to the child.
+*/
+function restartWithMergedOptions(nodeOptions) {
+	if (process$1.env.REACT_ROUTER_DEV_RESTARTED === "true") throw new Error("restartWithMergedOptions() was called, but the process has already been restarted. This is likely a bug in @react-router/dev.");
+	const mergedOptions = [process$1.env.NODE_OPTIONS, nodeOptions].filter(Boolean).join(" ").trim();
+	console.log(`[restart] Relaunching with NODE_OPTIONS: ${mergedOptions}`);
+	const [cmd, ...args] = process$1.argv;
+	const child = spawn(cmd, args, {
+		env: {
+			...process$1.env,
+			NODE_OPTIONS: mergedOptions,
+			REACT_ROUTER_DEV_RESTARTED: "true"
+		},
+		stdio: "inherit"
+	});
+	let signalHandlers = ["SIGINT", "SIGTERM"].map((sig) => {
+		let handler = () => {
+			child.kill(sig);
+		};
+		process$1.on(sig, handler);
+		return [sig, handler];
+	});
+	child.on("exit", (code, signal) => {
+		for (let [sig, handler] of signalHandlers) process$1.off(sig, handler);
+		if (signal) process$1.kill(process$1.pid, signal);
+		else process$1.exit(code ?? 0);
+	});
+	child.on("error", (err) => {
+		console.error("[restart] Failed to spawn child process:", err);
+		process$1.exit(1);
+	});
+}
+//#endregion
 //#region cli/commands.ts
 const nodeRequire = createRequire(import.meta.url);
 async function routes(rootDirectory, flags = {}) {
@@ -141,7 +180,7 @@ async function routes(rootDirectory, flags = {}) {
 }
 async function build(root, options = {}) {
 	root = resolveRootDirectory(root, options);
-	let { build } = await import("../build-r3D94V53.js");
+	let { build } = await import("../build-B8O1OXuF.js");
 	if (options.profile) await start();
 	try {
 		await build(root, options);
@@ -150,11 +189,13 @@ async function build(root, options = {}) {
 	}
 }
 async function dev(root, options = {}) {
-	let { dev } = await import("../dev-BfZiothP.js");
-	if (options.profile) await start();
-	exitHook(() => stop(console.info));
-	root = resolveRootDirectory(root, options);
-	await dev(root, options);
+	if (developmentConditionEnabled) {
+		let { dev } = await import("../dev-CznbsRZe.js");
+		if (options.profile) await start();
+		exitHook(() => stop(console.info));
+		root = resolveRootDirectory(root, options);
+		await dev(root, options);
+	} else restartWithMergedOptions("--conditions=development");
 	await new Promise(() => {});
 }
 let clientEntries = [

package/dist/config/default-rsc-entries/entry.rsc.tsx

@@ -15,6 +15,7 @@ import {
 import routes from "virtual:react-router/unstable_rsc/routes";
 import routeDiscovery from "virtual:react-router/unstable_rsc/route-discovery";
 import basename from "virtual:react-router/unstable_rsc/basename";
+import clientVersion from "virtual:react-router/unstable_rsc/client-version";
 import unstable_reactRouterServeConfig from "virtual:react-router/unstable_rsc/react-router-serve-config";
 
 export { unstable_reactRouterServeConfig };
@@ -31,6 +32,8 @@ export function fetchServer(
     decodeFormState,
     decodeReply,
     loadServerAction,
+    // Detect stale clients after a new deployment.
+    clientVersion,
     // The incoming request.
     request,
     requestContext,

package/dist/config/default-rsc-entries/entry.ssr.tsx

@@ -4,6 +4,7 @@ import {
   unstable_routeRSCServerRequest as routeRSCServerRequest,
   unstable_RSCStaticRouter as RSCStaticRouter,
 } from "react-router";
+import subResourceIntegrity from "virtual:react-router/unstable_rsc/subresource-integrity";
 
 export async function generateHTML(
   request: Request,
@@ -31,6 +32,9 @@ export async function generateHTML(
           ...options,
           bootstrapScriptContent,
           formState,
+          importMap: subResourceIntegrity
+            ? { integrity: subResourceIntegrity }
+            : undefined,
           signal: request.signal,
         },
       );

package/dist/config.js

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

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.2.0
+ * @react-router/dev v8.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-CNpfI4aI.js";
+import { _ as getVite, v as preloadVite } from "./typegen-C6qQ4fuP.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-CdiIrVIn.js → routes-BwOSW5AT.js}

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

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.2.0
+ * @react-router/dev v8.3.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-CdiIrVIn.js";
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-BwOSW5AT.js";
 export { getAppDirectory, index, layout, prefix, relative, route };

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.2.0
+ * @react-router/dev v8.3.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-CdiIrVIn.js";
+import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-BwOSW5AT.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import fs from "node:fs";

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v8.2.0
+ * @react-router/dev v8.3.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,8 +8,8 @@
  *
  * @license MIT
  */
-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 { _ 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-C6qQ4fuP.js";
+import { u as invariant } from "./routes-BwOSW5AT.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
@@ -3184,6 +3184,10 @@ function reactRouterRSCVitePlugin() {
 			jsxDev: viteCommand !== "build"
 		})).code;
 	}
+	async function getClientVersion(source) {
+		const digest = await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(source));
+		return Array.from(new Uint8Array(digest)).map((byte) => byte.toString(16).padStart(2, "0")).join("").slice(0, 8);
+	}
 	return [
 		{
 			name: "react-router/rsc",
@@ -3207,7 +3211,6 @@ function reactRouterRSCVitePlugin() {
 						if (userConfig.buildEnd) errors.push("buildEnd");
 						if (userConfig.presets?.length) errors.push("presets");
 						if (userConfig.serverBundles) errors.push("serverBundles");
-						if (userConfig.subResourceIntegrity) errors.push("subResourceIntegrity");
 						if (errors.length) return `RSC Framework Mode does not currently support the following React Router config:\n${errors.map((x) => ` - ${x}`).join("\n")}\n`;
 					}
 				});
@@ -3412,6 +3415,29 @@ format: config.serverModuleFormat }
 				(await typegenWatcherPromise)?.close();
 			}
 		} : null,
+		(() => {
+			let sri;
+			return {
+				name: "react-router/rsc/subresource-integrity",
+				sharedDuringBuild: true,
+				resolveId(id) {
+					if (id === virtual.subResourceIntegrity.id) return virtual.subResourceIntegrity.resolvedId;
+				},
+				load(id) {
+					if (id === virtual.subResourceIntegrity.resolvedId) return `export default ${JSON.stringify(sri)};`;
+				},
+				writeBundle(_options, bundle) {
+					if (this.environment.name !== "client" || !config.subResourceIntegrity) return;
+					sri = {};
+					for (let output of Object.values(bundle)) {
+						if (!output.fileName.endsWith(".js")) continue;
+						let contents = output.type === "chunk" ? output.code : output.source;
+						let hash = createHash("sha384").update(contents).digest("base64");
+						sri[`${resolvedViteConfig.base}${output.fileName}`] = `sha384-${hash}`;
+					}
+				}
+			};
+		})(),
 		{
 			name: "react-router/rsc/virtual-route-config",
 			resolveId(id) {
@@ -3456,6 +3482,27 @@ format: config.serverModuleFormat }
 				if (id === virtual.routeDiscovery.resolvedId) return `export default ${JSON.stringify(config.ssr === false ? { mode: "initial" } : config.routeDiscovery ?? { mode: "lazy" })};`;
 			}
 		},
+		{
+			name: "react-router/rsc/virtual-client-version",
+			resolveId(id) {
+				if (id === virtual.clientVersion.id) return virtual.clientVersion.resolvedId;
+			},
+			load(id) {
+				if (id === virtual.clientVersion.resolvedId) return viteCommand === "build" ? `
+import assetsManifest from "virtual:vite-rsc/assets-manifest";
+export default assetsManifest.clientVersion;
+` : `export default "development";`;
+			},
+			generateBundle: {
+				order: "post",
+				async handler() {
+					if (this.environment.name !== "client") return;
+					const assetsManifest = resolvedViteConfig.plugins.find((plugin) => plugin.name === "rsc:minimal")?.api?.manager?.buildAssetsManifest;
+					invariant(assetsManifest, "Vite RSC assets manifest not found");
+					assetsManifest.clientVersion = await getClientVersion(JSON.stringify(assetsManifest));
+				}
+			}
+		},
 		{
 			name: "react-router/rsc/hmr/inject-runtime",
 			enforce: "pre",
@@ -3568,7 +3615,9 @@ format: config.serverModuleFormat }
 }
 const virtual = {
 	routeConfig: create("unstable_rsc/routes"),
+	subResourceIntegrity: create("unstable_rsc/subresource-integrity"),
 	routeDiscovery: create("unstable_rsc/route-discovery"),
+	clientVersion: create("unstable_rsc/client-version"),
 	injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
 	basename: create("unstable_rsc/basename"),
 	reactRouterServeConfig: create("unstable_rsc/react-router-serve-config")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/dev",
   "type": "module",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "description": "Dev tools and CLI for React Router",
   "keywords": [
     "react",
@@ -40,6 +40,10 @@
     "./package.json": "./package.json"
   },
   "imports": {
+    "#development-condition-enabled": {
+      "development": "./development-condition-enabled/true.mjs",
+      "default": "./development-condition-enabled/false.mjs"
+    },
     "#module-sync-enabled": {
       "module-sync": "./module-sync-enabled/true.mjs",
       "default": "./module-sync-enabled/false.cjs"
@@ -66,6 +70,7 @@
         "../../pnpm-workspace.yaml",
         "cli/**",
         "config/**",
+        "development-condition-enabled/**",
         "module-sync-enabled/**",
         "typegen/**",
         "vite/**",
@@ -105,7 +110,7 @@
     "semver": "^7.8.1",
     "tinyglobby": "^0.2.16",
     "valibot": "^1.4.1",
-    "@react-router/node": "8.2.0"
+    "@react-router/node": "8.3.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -127,17 +132,17 @@
     "vite": "^7.0.0",
     "wireit": "0.14.12",
     "wrangler": "^4.95.0",
-    "@react-router/serve": "8.2.0",
-    "react-router": "^8.2.0"
+    "react-router": "^8.3.0",
+    "@react-router/serve": "8.3.0"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.26",
     "react-server-dom-webpack": "^19.2.7",
-    "typescript": "^5.1.0 || ^6.0.0",
+    "typescript": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "vite": "^7.0.0 || ^8.0.0",
     "wrangler": "^4.0.0",
-    "@react-router/serve": "^8.2.0",
-    "react-router": "^8.2.0"
+    "react-router": "^8.3.0",
+    "@react-router/serve": "^8.3.0"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {
@@ -161,6 +166,7 @@
   },
   "files": [
     "dist/",
+    "development-condition-enabled/",
     "module-sync-enabled/",
     "bin.cjs",
     "rsc-types.d.ts",

package/rsc-types.d.ts

@@ -15,6 +15,11 @@ declare module "virtual:react-router/unstable_rsc/ssr" {
   export default ssr;
 }
 
+declare module "virtual:react-router/unstable_rsc/subresource-integrity" {
+  const subResourceIntegrity: Record<string, string> | undefined;
+  export default subResourceIntegrity;
+}
+
 declare module "virtual:react-router/unstable_rsc/react-router-serve-config" {
   const unstable_reactRouterServeConfig: {
     publicPath: string;
@@ -35,4 +40,9 @@ declare module "virtual:react-router/unstable_rsc/route-discovery" {
   export default routeDiscovery;
 }
 
+declare module "virtual:react-router/unstable_rsc/client-version" {
+  const clientVersion: string;
+  export default clientVersion;
+}
+
 declare module "virtual:react-router/unstable_rsc/inject-hmr-runtime" {}