@react-router/dev 0.0.0-experimental-479e73b7b → 0.0.0-experimental-2a01b6fd8

package/dist/{build-BZ8ZGxs4.js → build-BY8q9ar7.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-DSDdbRfE.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CydnYlE9.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 v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * 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-DSDdbRfE.js";
+import { _ as getVite, l as hasNodeDependency, n as watch, t as run$1, u as loadConfig, v as preloadVite } from "../typegen-CydnYlE9.js";
 import { createRequire } from "node:module";
 import { parseArgs } from "node:util";
 import semver from "semver";
@@ -23,10 +23,6 @@ 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
@@ -72,24 +68,6 @@ function formatRoutesAsJsx(routeManifest) {
 	return output;
 }
 //#endregion
-//#region cli/useJavascript.ts
-async function transpile(tsx, options = {}) {
-	let mjs = babel.transformSync(tsx, {
-		compact: false,
-		cwd: options.cwd,
-		filename: options.filename,
-		plugins: [babelPluginSyntaxJSX],
-		presets: [[babelPresetTypeScript, { jsx: "preserve" }]],
-		retainLines: true
-	});
-	if (!mjs || !mjs.code) throw new Error("Could not parse TypeScript");
-	/**
-	* Babel's `compact` and `retainLines` options are both bad at formatting code.
-	* Use Prettier for nicer formatting.
-	*/
-	return await prettier.format(mjs.code, { parser: "babel" });
-}
-//#endregion
 //#region vite/profiler.ts
 const getSession = () => global.__reactRouter_profile_session;
 const start = async (callback) => {
@@ -180,7 +158,7 @@ async function routes(rootDirectory, flags = {}) {
 }
 async function build(root, options = {}) {
 	root = resolveRootDirectory(root, options);
-	let { build } = await import("../build-BZ8ZGxs4.js");
+	let { build } = await import("../build-BY8q9ar7.js");
 	if (options.profile) await start();
 	try {
 		await build(root, options);
@@ -190,7 +168,7 @@ async function build(root, options = {}) {
 }
 async function dev(root, options = {}) {
 	if (developmentConditionEnabled) {
-		let { dev } = await import("../dev-6WvjrRMD.js");
+		let { dev } = await import("../dev-D4wCelLk.js");
 		if (options.profile) await start();
 		exitHook(() => stop(console.info));
 		root = resolveRootDirectory(root, options);
@@ -273,20 +251,13 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
 		await copyFile(defaultEntry, outputFile);
 	} else {
 		let pkgJson = await readPackageJSON(rootDirectory);
-		let defaultEntryClient = path$1.resolve(defaultsDirectory, "entry.client.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;
-		let outputEntry = `${entry}.${useTypeScript ? "tsx" : "jsx"}`;
+		let outputExtension = flags.typescript ?? true ? "tsx" : "jsx";
+		let defaultEntryClient = path$1.resolve(defaultsDirectory, `entry.client.${outputExtension}`);
+		let defaultEntryServer = path$1.resolve(defaultsDirectory, hasNodeDependency(pkgJson.dependencies) && !configResult.value.future.unstable_enableNodeReadableStream ? `entry.server.node.${outputExtension}` : `entry.server.web.${outputExtension}`);
+		let contents = entry === "entry.server" ? await createServerEntry(rootDirectory, appDirectory, defaultEntryServer) : await createClientEntry(rootDirectory, appDirectory, defaultEntryClient);
+		let outputEntry = `${entry}.${outputExtension}`;
 		outputFile = path$1.resolve(appDirectory, outputEntry);
-		if (!useTypeScript) {
-			let javascript = await transpile(contents, {
-				cwd: rootDirectory,
-				filename: isServerEntry ? defaultEntryServer : defaultEntryClient
-			});
-			await writeFile(outputFile, javascript, "utf-8");
-		} else await writeFile(outputFile, contents, "utf-8");
+		await writeFile(outputFile, contents, "utf-8");
 	}
 	console.log(colors.blue(`Entry file ${entry} created at ${path$1.relative(rootDirectory, outputFile)}.`));
 }
@@ -379,7 +350,7 @@ ${colors.blueBright("react-router")}
     --json              Print the routes as JSON
   \`reveal\` Options:
     --config, -c        Use specified Vite config file (string)
-    --no-typescript     Generate plain JavaScript files
+    --no-typescript     Generate plain JavaScript files (deprecated; will be removed in v9)
   \`typegen\` Options:
     --watch             Automatically regenerate types whenever route config (\`routes.ts\`) or route modules change
 
@@ -516,7 +487,10 @@ async function run(argv = process.argv.slice(2), { isMain = false } = {}) {
 		return;
 	}
 	flags.interactive = flags.interactive ?? isMain;
-	if (values["no-typescript"]) flags.typescript = false;
+	if (values["no-typescript"]) {
+		console.warn(colors.yellow("The --no-typescript flag is deprecated and will be removed in React Router v9."));
+		flags.typescript = false;
+	}
 	switch (input[0]) {
 		case "routes":
 			await routes(input[1], flags);

package/dist/config/defaults/entry.client.jsx

@@ -0,0 +1,12 @@
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+import { HydratedRouter } from "react-router/dom";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <HydratedRouter />
+    </StrictMode>,
+  );
+});

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

@@ -0,0 +1,82 @@
+import { PassThrough } from "node:stream";
+
+import { createReadableStreamFromReadable } from "@react-router/node";
+import { ServerRouter } from "react-router";
+import { isbot } from "isbot";
+
+import { renderToPipeableStream } from "react-dom/server";
+
+export const streamTimeout = 5_000;
+
+export default function handleRequest(
+  request,
+  responseStatusCode,
+  responseHeaders,
+  routerContext,
+  loadContext,
+) {
+  // https://httpwg.org/specs/rfc9110.html#HEAD
+  if (request.method.toUpperCase() === "HEAD") {
+    return new Response(null, {
+      status: responseStatusCode,
+      headers: responseHeaders,
+    });
+  }
+
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    let userAgent = request.headers.get("user-agent");
+
+    // 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
+    let readyOption =
+      (userAgent && isbot(userAgent)) || routerContext.isSpaMode
+        ? "onAllReady"
+        : "onShellReady";
+
+    // Abort the rendering stream after the `streamTimeout` so it has time to
+    // flush down the rejected boundaries
+    let timeoutId = setTimeout(() => abort(), streamTimeout + 1000);
+
+    const { pipe, abort } = renderToPipeableStream(
+      <ServerRouter context={routerContext} url={request.url} />,
+      {
+        [readyOption]() {
+          shellRendered = true;
+          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,
+            }),
+          );
+        },
+        onShellError(error) {
+          reject(error);
+        },
+        onError(error) {
+          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);
+          }
+        },
+      },
+    );
+  });
+}

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

@@ -0,0 +1,53 @@
+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,
+  responseStatusCode,
+  responseHeaders,
+  routerContext,
+  _loadContext,
+) {
+  // 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) {
+        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.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/{dev-6WvjrRMD.js → dev-D4wCelLk.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,7 @@
  *
  * @license MIT
  */
-import { _ as getVite, v as preloadVite } from "./typegen-DSDdbRfE.js";
+import { _ as getVite, v as preloadVite } from "./typegen-CydnYlE9.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-D18xtDiC.js → routes-BLQxq7lr.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * 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-D18xtDiC.js";
+import { a as prefix, i as layout, n as getAppDirectory, o as relative, r as index, s as route } from "./routes-BLQxq7lr.js";
 export { getAppDirectory, index, layout, prefix, relative, route };

package/dist/{typegen-DSDdbRfE.js → typegen-CydnYlE9.js}

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * 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-D18xtDiC.js";
+import { c as setAppDirectory, l as validateRouteConfig, t as configRoutesToRouteManifest, u as invariant } from "./routes-BLQxq7lr.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 v0.0.0-experimental-479e73b7b
+ * @react-router/dev v0.0.0-experimental-2a01b6fd8
  *
  * 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-DSDdbRfE.js";
-import { u as invariant } from "./routes-D18xtDiC.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-CydnYlE9.js";
+import { u as invariant } from "./routes-BLQxq7lr.js";
 import { createRequire } from "node:module";
 import colors from "picocolors";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
@@ -21,9 +21,9 @@ import { createRequestHandler, matchRoutes, unstable_setDevServerHooks } from "r
 import * as Path from "pathe";
 import path$1, { join } from "pathe";
 import pick from "lodash/pick.js";
-import * as babel from "@babel/core";
 import { createHash } from "node:crypto";
 import * as url from "node:url";
+import * as babel from "@babel/core";
 import { createRequest, sendResponse } from "@remix-run/node-fetch-server";
 import { init, parse } from "es-module-lexer";
 import jsesc from "jsesc";
@@ -2724,7 +2724,7 @@ const nodeRequire = createRequire(import.meta.url);
 function hasDependency({ name, rootDirectory }) {
 	try {
 		return Boolean(nodeRequire.resolve(name, { paths: [rootDirectory] }));
-	} catch (e) {
+	} catch {
 		return false;
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-router/dev",
   "type": "module",
-  "version": "0.0.0-experimental-479e73b7b",
+  "version": "0.0.0-experimental-2a01b6fd8",
   "description": "Dev tools and CLI for React Router",
   "keywords": [
     "react",
@@ -88,8 +88,6 @@
     "@babel/core": "^7.29.7",
     "@babel/generator": "^7.29.7",
     "@babel/parser": "^7.29.7",
-    "@babel/plugin-syntax-jsx": "^7.29.7",
-    "@babel/preset-typescript": "^7.29.7",
     "@babel/traverse": "^7.29.7",
     "@babel/types": "^7.29.7",
     "@remix-run/node-fetch-server": "^0.13.3",
@@ -105,14 +103,15 @@
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "pkg-types": "^2.3.1",
-    "prettier": "^3.8.3",
     "react-refresh": "^0.18.0",
     "semver": "^7.8.1",
     "tinyglobby": "^0.2.16",
     "valibot": "^1.4.1",
-    "@react-router/node": "0.0.0-experimental-479e73b7b"
+    "@react-router/node": "0.0.0-experimental-2a01b6fd8"
   },
   "devDependencies": {
+    "@babel/plugin-syntax-jsx": "^7.29.7",
+    "@babel/preset-typescript": "^7.29.7",
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.27.0",
     "@types/babel__traverse": "^7.28.0",
@@ -127,13 +126,14 @@
     "esbuild-register": "^3.6.0",
     "execa": "9.6.1",
     "fast-glob": "3.3.3",
+    "prettier": "^3.8.3",
     "tsdown": "^0.22.0",
     "typescript": "^6.0.3",
     "vite": "^7.0.0",
     "wireit": "0.14.12",
     "wrangler": "^4.95.0",
-    "@react-router/serve": "0.0.0-experimental-479e73b7b",
-    "react-router": "^0.0.0-experimental-479e73b7b"
+    "@react-router/serve": "0.0.0-experimental-2a01b6fd8",
+    "react-router": "^0.0.0-experimental-2a01b6fd8"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.26",
@@ -141,8 +141,8 @@
     "typescript": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "vite": "^7.0.0 || ^8.0.0",
     "wrangler": "^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-479e73b7b",
-    "react-router": "^0.0.0-experimental-479e73b7b"
+    "react-router": "^0.0.0-experimental-2a01b6fd8",
+    "@react-router/serve": "^0.0.0-experimental-2a01b6fd8"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {