@react-router/dev 0.0.0-experimental-f8522255d → 0.0.0-experimental-6f53aff26

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # `@react-router/dev`
 
+## 7.10.1
+
+### Patch Changes
+
+- Import ESM package `pkg-types` with a dynamic `import()` to fix issues on Node 20.18 ([#14624](https://github.com/remix-run/react-router/pull/14624))
+- Update `valibot` dependency to `^1.2.0` to address [GHSA-vqpr-j7v3-hqw9](https://github.com/advisories/GHSA-vqpr-j7v3-hqw9) ([#14608](https://github.com/remix-run/react-router/pull/14608))
+- Updated dependencies:
+  - `react-router@7.10.1`
+  - `@react-router/node@7.10.1`
+  - `@react-router/serve@7.10.1`
+
 ## 7.10.0
 
 ### Minor Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-f8522255d
+ * @react-router/dev v0.0.0-experimental-6f53aff26
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -6,22 +6,36 @@ import {
   loadServerAction,
   renderToReadableStream,
 } from "@vitejs/plugin-rsc/rsc";
-import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
+import {
+  RouterContextProvider,
+  unstable_matchRSCServerRequest as matchRSCServerRequest,
+} from "react-router";
 
+// Import the routes generated by routes.ts
 import routes from "virtual:react-router/unstable_rsc/routes";
 import basename from "virtual:react-router/unstable_rsc/basename";
 import unstable_reactRouterServeConfig from "virtual:react-router/unstable_rsc/react-router-serve-config";
 
-export async function fetchServer(request: Request) {
-  return await matchRSCServerRequest({
+export { unstable_reactRouterServeConfig };
+
+export function fetchServer(
+  request: Request,
+  requestContext?: RouterContextProvider,
+) {
+  return matchRSCServerRequest({
+    basename,
+    // Provide the React Server touchpoints.
     createTemporaryReferenceSet,
     decodeAction,
     decodeFormState,
     decodeReply,
     loadServerAction,
+    // The incoming request.
     request,
+    requestContext,
+    // The app routes.
     routes,
-    basename,
+    // Encode the match with the React Server implementation.
     generateResponse(match, options) {
       return new Response(renderToReadableStream(match.payload, options), {
         status: match.statusCode,
@@ -31,14 +45,22 @@ export async function fetchServer(request: Request) {
   });
 }
 
-export { unstable_reactRouterServeConfig };
+export default {
+  async fetch(request: Request, requestContext?: RouterContextProvider) {
+    if (requestContext && !(requestContext instanceof RouterContextProvider)) {
+      requestContext = undefined;
+    }
 
-export default async function handler(request: Request) {
-  const ssr = await import.meta.viteRsc.loadModule<
-    typeof import("./entry.ssr")
-  >("ssr", "index");
-  return ssr.default(request, await fetchServer(request));
-}
+    const ssr = await import.meta.viteRsc.loadModule<
+      typeof import("./entry.ssr.tsx")
+    >("ssr", "index");
+
+    return await ssr.generateHTML(
+      request,
+      await fetchServer(request, requestContext),
+    );
+  },
+};
 
 if (import.meta.hot) {
   import.meta.hot.accept();

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

@@ -1,31 +1,38 @@
 import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
-// @ts-expect-error
-import * as ReactDomServer from "react-dom/server.edge";
+// @ts-expect-error - no types for this, can import from root once on latest 19
+import { renderToReadableStream } from "react-dom/server.edge";
 import {
-  unstable_RSCStaticRouter as RSCStaticRouter,
   unstable_routeRSCServerRequest as routeRSCServerRequest,
+  unstable_RSCStaticRouter as RSCStaticRouter,
 } from "react-router";
 
-export default async function handler(
+export async function generateHTML(
   request: Request,
   serverResponse: Response,
-) {
-  const bootstrapScriptContent =
-    await import.meta.viteRsc.loadBootstrapScriptContent("index");
-
-  return routeRSCServerRequest({
+): Promise<Response> {
+  return await routeRSCServerRequest({
+    // The incoming request.
     request,
+    // The response from the RSC server.
     serverResponse,
+    // Provide the React Server touchpoints.
     createFromReadableStream,
-    async renderHTML(getPayload) {
-      const payload = getPayload();
+    // Render the router to HTML.
+    async renderHTML(getPayload, options) {
+      const payload = await getPayload();
+      const formState =
+        payload.type === "render" ? await payload.formState : undefined;
+
+      const bootstrapScriptContent =
+        await import.meta.viteRsc.loadBootstrapScriptContent("index");
 
-      return ReactDomServer.renderToReadableStream(
+      return await renderToReadableStream(
         <RSCStaticRouter getPayload={getPayload} />,
         {
+          ...options,
           bootstrapScriptContent,
+          formState,
           signal: request.signal,
-          formState: await payload.formState,
         },
       );
     },

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-f8522255d
+ * @react-router/dev v0.0.0-experimental-6f53aff26
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-f8522255d
+ * @react-router/dev v0.0.0-experimental-6f53aff26
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-f8522255d
+ * @react-router/dev v0.0.0-experimental-6f53aff26
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-f8522255d
+ * @react-router/dev v0.0.0-experimental-6f53aff26
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -639,11 +639,11 @@ async function createConfigLoader({
         fsWatcher = import_chokidar.default.watch([root, appDirectory], {
           ignoreInitial: true,
           ignored: (path9) => {
-            let dirname5 = import_pathe3.default.dirname(path9);
-            return !dirname5.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
+            let dirname4 = import_pathe3.default.dirname(path9);
+            return !dirname4.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
             // that are at the root level, not nested in subdirectories
             path9 !== root && // Watch the root directory itself
-            dirname5 !== root;
+            dirname4 !== root;
           }
         });
         fsWatcher.on("all", async (...args) => {
@@ -775,6 +775,30 @@ async function resolveEntryFiles({
   let entryServerFilePath = userEntryServerFile ? import_pathe3.default.resolve(reactRouterConfig.appDirectory, userEntryServerFile) : import_pathe3.default.resolve(defaultsDirectory, entryServerFile);
   return { entryClientFilePath, entryServerFilePath };
 }
+async function resolveRSCEntryFiles({
+  reactRouterConfig
+}) {
+  let { appDirectory } = reactRouterConfig;
+  let defaultsDirectory = import_pathe3.default.resolve(
+    import_pathe3.default.dirname(require.resolve("@react-router/dev/package.json")),
+    "dist",
+    "config",
+    "default-rsc-entries"
+  );
+  let userEntryClientFile = findEntry(appDirectory, "entry.client", {
+    absolute: true
+  });
+  let userEntryRSCFile = findEntry(appDirectory, "entry.rsc", {
+    absolute: true
+  });
+  let userEntrySSRFile = findEntry(appDirectory, "entry.ssr", {
+    absolute: true
+  });
+  let client = userEntryClientFile ?? import_pathe3.default.join(defaultsDirectory, "entry.client.tsx");
+  let rsc = userEntryRSCFile ?? import_pathe3.default.join(defaultsDirectory, "entry.rsc.tsx");
+  let ssr = userEntrySSRFile ?? import_pathe3.default.join(defaultsDirectory, "entry.ssr.tsx");
+  return { client, rsc, ssr };
+}
 function omitRoutes(config) {
   return {
     ...config,
@@ -5014,7 +5038,6 @@ var import_es_module_lexer3 = require("es-module-lexer");
 var Path5 = __toESM(require("pathe"));
 var babel2 = __toESM(require("@babel/core"));
 var import_picocolors5 = __toESM(require("picocolors"));
-var import_fs = require("fs");
 var import_promises3 = require("fs/promises");
 var import_pathe6 = __toESM(require("pathe"));
 
@@ -5355,7 +5378,7 @@ function reactRouterRSCVitePlugin() {
   let resolvedViteConfig;
   let routeIdByFile;
   let logger;
-  const defaultEntries2 = getDefaultEntries();
+  let entries;
   let config;
   let rootRouteFile;
   function updateConfig(newConfig) {
@@ -5418,6 +5441,9 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         logger = vite2.createLogger(viteUserConfig.logLevel, {
           prefix: "[react-router]"
         });
+        entries = await resolveRSCEntryFiles({
+          reactRouterConfig: config
+        });
         return {
           resolve: {
             dedupe: [
@@ -5433,7 +5459,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
           },
           optimizeDeps: {
             entries: getOptimizeDepsEntries({
-              entryClientFilePath: defaultEntries2.client,
+              entryClientFilePath: entries.client,
               reactRouterConfig: config
             }),
             esbuildOptions: {
@@ -5460,7 +5486,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               build: {
                 rollupOptions: {
                   input: {
-                    index: defaultEntries2.client
+                    index: entries.client
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "client")
@@ -5476,11 +5502,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               build: {
                 rollupOptions: {
                   input: {
-                    // We use a virtual entry here so that consumers can import
-                    // it as `virtual:react-router/unstable_rsc/rsc-entry`
-                    // without needing to know the actual file path, which is
-                    // important when using the default entries.
-                    index: defaultEntries2.rsc
+                    index: entries.rsc
                   },
                   output: {
                     entryFileNames: config.serverBuildFile,
@@ -5488,13 +5510,18 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "server")
+              },
+              resolve: {
+                noExternal: [
+                  "@react-router/dev/config/default-rsc-entries/entry.ssr"
+                ]
               }
             },
             ssr: {
               build: {
                 rollupOptions: {
                   input: {
-                    index: defaultEntries2.ssr
+                    index: entries.ssr
                   },
                   output: {
                     // Note: We don't set `entryFileNames` here because it's
@@ -5505,6 +5532,11 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "server/__ssr_build")
+              },
+              resolve: {
+                noExternal: [
+                  "@react-router/dev/config/default-rsc-entries/entry.rsc"
+                ]
               }
             }
           },
@@ -5608,12 +5640,6 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         (await typegenWatcherPromise)?.close();
       }
     },
-    {
-      name: "react-router/rsc/virtual-rsc-entry",
-      resolveId(id) {
-        if (id === virtual2.rscEntry.id) return defaultEntries2.rsc;
-      }
-    },
     {
       name: "react-router/rsc/virtual-route-config",
       resolveId(id) {
@@ -5689,7 +5715,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         const reactRefreshDir = import_pathe6.default.dirname(
           require.resolve("react-refresh/package.json")
         );
-        const reactRefreshRuntimePath = import_pathe6.default.join(
+        const reactRefreshRuntimePath = (0, import_pathe6.join)(
           reactRefreshDir,
           "cjs/react-refresh-runtime.development.js"
         );
@@ -5816,7 +5842,6 @@ var virtual2 = {
   injectHmrRuntime: create("unstable_rsc/inject-hmr-runtime"),
   hmrRuntime: create("unstable_rsc/runtime"),
   basename: create("unstable_rsc/basename"),
-  rscEntry: create("unstable_rsc/rsc-entry"),
   reactRouterServeConfig: create("unstable_rsc/react-router-serve-config")
 };
 function invalidateVirtualModules2(viteDevServer) {
@@ -5832,33 +5857,6 @@ function invalidateVirtualModules2(viteDevServer) {
 function getRootDirectory(viteUserConfig) {
   return viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 }
-function getDevPackageRoot() {
-  const currentDir = (0, import_pathe6.dirname)(__dirname);
-  let dir = currentDir;
-  while (dir !== (0, import_pathe6.dirname)(dir)) {
-    try {
-      const packageJsonPath = (0, import_pathe6.join)(dir, "package.json");
-      (0, import_fs.readFileSync)(packageJsonPath, "utf-8");
-      return dir;
-    } catch {
-      dir = (0, import_pathe6.dirname)(dir);
-    }
-  }
-  throw new Error("Could not find package.json");
-}
-function getDefaultEntries() {
-  const defaultEntriesDir2 = (0, import_pathe6.join)(
-    getDevPackageRoot(),
-    "dist",
-    "config",
-    "default-rsc-entries"
-  );
-  return {
-    rsc: (0, import_pathe6.join)(defaultEntriesDir2, "entry.rsc.tsx"),
-    ssr: (0, import_pathe6.join)(defaultEntriesDir2, "entry.ssr.tsx"),
-    client: (0, import_pathe6.join)(defaultEntriesDir2, "entry.client.tsx")
-  };
-}
 function getModulesWithImporters(modules) {
   const visited = /* @__PURE__ */ new Set();
   const result = /* @__PURE__ */ new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-f8522255d",
+  "version": "0.0.0-experimental-6f53aff26",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -13,6 +13,9 @@
   },
   "license": "MIT",
   "exports": {
+    "./config/default-rsc-entries/entry.client": "./dist/config/default-rsc-entries/entry.client.tsx",
+    "./config/default-rsc-entries/entry.rsc": "./dist/config/default-rsc-entries/entry.rsc.tsx",
+    "./config/default-rsc-entries/entry.ssr": "./dist/config/default-rsc-entries/entry.ssr.tsx",
     "./config": {
       "types": "./dist/config.d.ts",
       "default": "./dist/config.js"
@@ -21,6 +24,7 @@
       "types": "./dist/routes.d.ts",
       "default": "./dist/routes.js"
     },
+    "./rsc-types": "./rsc-types.d.ts",
     "./vite": {
       "types": "./dist/vite.d.ts",
       "default": "./dist/vite.js"
@@ -87,7 +91,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-f8522255d"
+    "@react-router/node": "0.0.0-experimental-6f53aff26"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -95,6 +99,7 @@
     "@types/babel__traverse": "^7.20.7",
     "@types/dedent": "^0.7.0",
     "@types/express": "^4.17.9",
+    "@types/jest": "^29.5.4",
     "@types/jsesc": "^3.0.1",
     "@types/lodash": "^4.14.182",
     "@types/node": "^20.0.0",
@@ -110,16 +115,16 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^0.0.0-experimental-f8522255d",
-    "@react-router/serve": "0.0.0-experimental-f8522255d"
+    "@react-router/serve": "0.0.0-experimental-6f53aff26",
+    "react-router": "^0.0.0-experimental-6f53aff26"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "*",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-f8522255d",
-    "react-router": "^0.0.0-experimental-f8522255d"
+    "@react-router/serve": "^0.0.0-experimental-6f53aff26",
+    "react-router": "^0.0.0-experimental-6f53aff26"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {
@@ -142,6 +147,7 @@
     "dist/",
     "module-sync-enabled/",
     "bin.js",
+    "rsc-types.d.ts",
     "CHANGELOG.md",
     "LICENSE.md",
     "README.md"

package/rsc-types.d.ts

@@ -0,0 +1,21 @@
+declare module "virtual:react-router/unstable_rsc/routes" {
+  import type { unstable_RSCRouteConfig as RSCRouteConfig } from "react-router";
+
+  const routes: RSCRouteConfig;
+  export default routes;
+}
+
+declare module "virtual:react-router/unstable_rsc/basename" {
+  const basename: string;
+  export default basename;
+}
+
+declare module "virtual:react-router/unstable_rsc/react-router-serve-config" {
+  const unstable_reactRouterServeConfig: {
+    publicPath: string;
+    assetsBuildDirectory: string;
+  };
+  export default unstable_reactRouterServeConfig;
+}
+
+declare module "virtual:react-router/unstable_rsc/inject-hmr-runtime" {}