@react-router/dev 7.7.1-pre.0 → 7.8.0-pre.0

package/CHANGELOG.md

@@ -1,14 +1,24 @@
 # `@react-router/dev`
 
-## 7.7.1-pre.0
+## 7.8.0-pre.0
+
+### Patch Changes
+
+- Fix rename without mkdir in Vite plugin ([#14105](https://github.com/remix-run/react-router/pull/14105))
+- Updated dependencies:
+  - `react-router@7.8.0-pre.0`
+  - `@react-router/node@7.8.0-pre.0`
+  - `@react-router/serve@7.8.0-pre.0`
+
+## 7.7.1
 
 ### Patch Changes
 
 - Update to Prettier v3 for formatting when running `react-router reveal --no-typescript` ([#14049](https://github.com/remix-run/react-router/pull/14049))
 - Updated dependencies:
-  - `react-router@7.7.1-pre.0`
-  - `@react-router/node@7.7.1-pre.0`
-  - `@react-router/serve@7.7.1-pre.0`
+  - `react-router@7.7.1`
+  - `@react-router/node@7.7.1`
+  - `@react-router/serve@7.7.1`
 
 ## 7.7.0
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.7.1-pre.0
+ * @react-router/dev v7.8.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -223,9 +223,12 @@ ${message}`
       ].flat().join("\n\n")
     };
   }
-  return { valid: true };
+  return {
+    valid: true,
+    routeConfig
+  };
 }
-function configRoutesToRouteManifest(appDirectory, routes2, rootId = "root") {
+function configRoutesToRouteManifest(appDirectory, routes2) {
   let routeManifest = {};
   function walk(route, parentId) {
     let id = route.id || createRouteId(route.file);
@@ -250,7 +253,7 @@ function configRoutesToRouteManifest(appDirectory, routes2, rootId = "root") {
     }
   }
   for (let route of routes2) {
-    walk(route, rootId);
+    walk(route);
   }
   return routeManifest;
 }
@@ -424,11 +427,11 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes2 = {};
-  if (!skipRoutes) {
-    routes2 = {
-      root: { path: "", id: "root", file: rootRouteFile }
-    };
+  let routes2;
+  let routeConfig = [];
+  if (skipRoutes) {
+    routes2 = {};
+  } else {
     let routeConfigFile = findEntry(appDirectory, "routes");
     try {
       if (!routeConfigFile) {
@@ -444,18 +447,22 @@ async function resolveConfig({
       let routeConfigExport = (await viteNodeContext.runner.executeFile(
         import_pathe3.default.join(appDirectory, routeConfigFile)
       )).default;
-      let routeConfig = await routeConfigExport;
       let result = validateRouteConfig({
         routeConfigFile,
-        routeConfig
+        routeConfig: await routeConfigExport
       });
       if (!result.valid) {
         return err(result.message);
       }
-      routes2 = {
-        ...routes2,
-        ...configRoutesToRouteManifest(appDirectory, routeConfig)
-      };
+      routeConfig = [
+        {
+          id: "root",
+          path: "",
+          file: rootRouteFile,
+          children: result.routeConfig
+        }
+      ];
+      routes2 = configRoutesToRouteManifest(appDirectory, routeConfig);
     } catch (error) {
       return err(
         [
@@ -488,7 +495,8 @@ async function resolveConfig({
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
-    ssr
+    ssr,
+    unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });
@@ -1816,7 +1824,7 @@ async function viteAppBuild(root, {
         },
         configResolved(config) {
           let hasReactRouterPlugin = config.plugins.find(
-            (plugin) => plugin.name === "react-router"
+            (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
           );
           if (!hasReactRouterPlugin) {
             throw new Error(
@@ -1955,7 +1963,9 @@ async function dev(root, {
     clearScreen,
     logLevel
   });
-  if (!server.config.plugins.find((plugin) => plugin.name === "react-router")) {
+  if (!server.config.plugins.find(
+    (plugin) => plugin.name === "react-router" || plugin.name === "react-router/rsc/config"
+  )) {
     console.error(
       import_picocolors6.default.red("React Router Vite plugin not found in Vite config")
     );

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

@@ -0,0 +1,36 @@
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+import {
+  createFromReadableStream,
+  createTemporaryReferenceSet,
+  encodeReply,
+  setServerCallback,
+} from "@vitejs/plugin-rsc/browser";
+import {
+  unstable_createCallServer as createCallServer,
+  unstable_getRSCStream as getRSCStream,
+  unstable_RSCHydratedRouter as RSCHydratedRouter,
+} from "react-router";
+import type { unstable_RSCPayload as RSCPayload } from "react-router";
+
+setServerCallback(
+  createCallServer({
+    createFromReadableStream,
+    createTemporaryReferenceSet,
+    encodeReply,
+  }),
+);
+
+createFromReadableStream<RSCPayload>(getRSCStream()).then((payload) => {
+  startTransition(() => {
+    hydrateRoot(
+      document,
+      <StrictMode>
+        <RSCHydratedRouter
+          payload={payload}
+          createFromReadableStream={createFromReadableStream}
+        />
+      </StrictMode>,
+    );
+  });
+});

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

@@ -0,0 +1,34 @@
+import {
+  createTemporaryReferenceSet,
+  decodeAction,
+  decodeReply,
+  loadServerAction,
+  renderToReadableStream,
+} from "@vitejs/plugin-rsc/rsc";
+import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
+
+import routes from "virtual:react-router/unstable_rsc/routes";
+
+export async function fetchServer(request: Request) {
+  return await matchRSCServerRequest({
+    createTemporaryReferenceSet,
+    decodeReply,
+    decodeAction,
+    loadServerAction,
+    request,
+    routes,
+    generateResponse(match, options) {
+      return new Response(renderToReadableStream(match.payload, options), {
+        status: match.statusCode,
+        headers: match.headers,
+      });
+    },
+  });
+}
+
+export default async function handler(request: Request) {
+  const ssr = await import.meta.viteRsc.loadModule<
+    typeof import("./entry.ssr")
+  >("ssr", "index");
+  return ssr.default(request, fetchServer);
+}

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

@@ -0,0 +1,29 @@
+import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
+// @ts-expect-error
+import * as ReactDomServer from "react-dom/server.edge";
+import {
+  unstable_RSCStaticRouter as RSCStaticRouter,
+  unstable_routeRSCServerRequest as routeRSCServerRequest,
+} from "react-router";
+
+export default async function handler(
+  request: Request,
+  fetchServer: (request: Request) => Promise<Response>,
+) {
+  const bootstrapScriptContent =
+    await import.meta.viteRsc.loadBootstrapScriptContent("index");
+  return routeRSCServerRequest({
+    request,
+    fetchServer,
+    createFromReadableStream,
+    renderHTML(getPayload) {
+      return ReactDomServer.renderToReadableStream(
+        <RSCStaticRouter getPayload={getPayload} />,
+        {
+          bootstrapScriptContent,
+          signal: request.signal,
+        },
+      );
+    },
+  });
+}

package/dist/config.d.ts

@@ -1,5 +1,5 @@
 import * as Vite from 'vite';
-import { R as RouteManifest, a as RouteManifestEntry } from './routes-DHIOx0R9.js';
+import { R as RouteManifest, a as RouteManifestEntry, b as RouteConfigEntry } from './routes-CZR-bKRt.js';
 import 'valibot';
 
 declare const excludedConfigPresetKeys: readonly ["presets"];
@@ -202,6 +202,10 @@ type ResolvedReactRouterConfig = Readonly<{
      * SPA without server-rendering. Default's to `true`.
      */
     ssr: boolean;
+    /**
+     * The resolved array of route config entries exported from `routes.ts`
+     */
+    unstable_routeConfig: RouteConfigEntry[];
 }>;
 
 export type { BuildManifest, ReactRouterConfig as Config, Preset, ServerBundlesFunction };

package/dist/config.js

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

package/dist/internal.d.ts

@@ -0,0 +1,9 @@
+import * as Vite from 'vite';
+
+declare function reactRouterRSCVitePlugin(): Vite.PluginOption[];
+
+declare const __INTERNAL_DO_NOT_USE_OR_YOU_WILL_GET_A_STRONGLY_WORDED_LETTER__: {
+    unstable_reactRouterRSC: typeof reactRouterRSCVitePlugin;
+};
+
+export { __INTERNAL_DO_NOT_USE_OR_YOU_WILL_GET_A_STRONGLY_WORDED_LETTER__ };