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

package/dist/{routes-DHIOx0R9.d.ts → routes-CZR-bKRt.d.ts}

@@ -120,4 +120,4 @@ declare const helpers: {
  */
 declare function relative(directory: string): typeof helpers;
 
-export { type RouteManifest as R, type RouteManifestEntry as a, type RouteConfig as b, type RouteConfigEntry as c, relative as d, getAppDirectory as g, index as i, layout as l, prefix as p, route as r };
+export { type RouteManifest as R, type RouteManifestEntry as a, type RouteConfigEntry as b, type RouteConfig as c, relative as d, getAppDirectory as g, index as i, layout as l, prefix as p, route as r };

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
-export { b as RouteConfig, c as RouteConfigEntry, g as getAppDirectory, i as index, l as layout, p as prefix, d as relative, r as route } from './routes-DHIOx0R9.js';
+export { c as RouteConfig, b as RouteConfigEntry, g as getAppDirectory, i as index, l as layout, p as prefix, d as relative, r as route } from './routes-CZR-bKRt.js';
 import 'valibot';

package/dist/routes.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/vite/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { UNSAFE_MiddlewareEnabled, unstable_InitialContext, AppLoadContext } from 'react-router';
+import { UNSAFE_MiddlewareEnabled, unstable_RouterContextProvider, AppLoadContext } from 'react-router';
 import { Plugin } from 'vite';
 import { PlatformProxy, GetPlatformProxyOptions } from 'wrangler';
 
@@ -10,7 +10,7 @@ type LoadContext<Env, Cf extends CfProperties> = {
 type GetLoadContext<Env, Cf extends CfProperties> = (args: {
     request: Request;
     context: LoadContext<Env, Cf>;
-}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<unstable_InitialContext> : MaybePromise<AppLoadContext>;
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<unstable_RouterContextProvider> : MaybePromise<AppLoadContext>;
 /**
  * Vite plugin that provides [Node proxies to local workerd
  * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)

package/dist/vite/cloudflare.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.
  *
@@ -316,9 +316,12 @@ ${message}`
       ].flat().join("\n\n")
     };
   }
-  return { valid: true };
+  return {
+    valid: true,
+    routeConfig
+  };
 }
-function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
+function configRoutesToRouteManifest(appDirectory, routes) {
   let routeManifest = {};
   function walk(route, parentId) {
     let id = route.id || createRouteId(route.file);
@@ -343,7 +346,7 @@ function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
     }
   }
   for (let route of routes) {
-    walk(route, rootId);
+    walk(route);
   }
   return routeManifest;
 }
@@ -520,11 +523,11 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes = {};
-  if (!skipRoutes) {
-    routes = {
-      root: { path: "", id: "root", file: rootRouteFile }
-    };
+  let routes;
+  let routeConfig = [];
+  if (skipRoutes) {
+    routes = {};
+  } else {
     let routeConfigFile = findEntry(appDirectory, "routes");
     try {
       if (!routeConfigFile) {
@@ -540,18 +543,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);
       }
-      routes = {
-        ...routes,
-        ...configRoutesToRouteManifest(appDirectory, routeConfig)
-      };
+      routeConfig = [
+        {
+          id: "root",
+          path: "",
+          file: rootRouteFile,
+          children: result.routeConfig
+        }
+      ];
+      routes = configRoutesToRouteManifest(appDirectory, routeConfig);
     } catch (error) {
       return err(
         [
@@ -584,7 +591,8 @@ async function resolveConfig({
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
-    ssr
+    ssr,
+    unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });

package/dist/vite.d.ts

@@ -1,5 +1,5 @@
 import * as Vite from 'vite';
-import './routes-DHIOx0R9.js';
+import './routes-CZR-bKRt.js';
 import 'valibot';
 
 type ReactRouterVitePlugin = () => Vite.Plugin[];

package/dist/vite.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.
  *
@@ -253,9 +253,12 @@ ${message}`
       ].flat().join("\n\n")
     };
   }
-  return { valid: true };
+  return {
+    valid: true,
+    routeConfig
+  };
 }
-function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
+function configRoutesToRouteManifest(appDirectory, routes) {
   let routeManifest = {};
   function walk(route, parentId) {
     let id = route.id || createRouteId(route.file);
@@ -280,7 +283,7 @@ function configRoutesToRouteManifest(appDirectory, routes, rootId = "root") {
     }
   }
   for (let route of routes) {
-    walk(route, rootId);
+    walk(route);
   }
   return routeManifest;
 }
@@ -480,11 +483,11 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes = {};
-  if (!skipRoutes) {
-    routes = {
-      root: { path: "", id: "root", file: rootRouteFile }
-    };
+  let routes;
+  let routeConfig = [];
+  if (skipRoutes) {
+    routes = {};
+  } else {
     let routeConfigFile = findEntry(appDirectory, "routes");
     try {
       if (!routeConfigFile) {
@@ -500,18 +503,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);
       }
-      routes = {
-        ...routes,
-        ...configRoutesToRouteManifest(appDirectory, routeConfig)
-      };
+      routeConfig = [
+        {
+          id: "root",
+          path: "",
+          file: rootRouteFile,
+          children: result.routeConfig
+        }
+      ];
+      routes = configRoutesToRouteManifest(appDirectory, routeConfig);
     } catch (error) {
       return err(
         [
@@ -544,7 +551,8 @@ async function resolveConfig({
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
-    ssr
+    ssr,
+    unstable_routeConfig: routeConfig
   });
   for (let preset of reactRouterUserConfig.presets ?? []) {
     await preset.reactRouterConfigResolved?.({ reactRouterConfig });
@@ -1510,6 +1518,7 @@ var removeExports = (ast, exportsToRemove) => {
   let previouslyReferencedIdentifiers = (0, import_babel_dead_code_elimination.findReferencedIdentifiers)(ast);
   let exportsFiltered = false;
   let markedForRemoval = /* @__PURE__ */ new Set();
+  let removedExportLocalNames = /* @__PURE__ */ new Set();
   traverse(ast, {
     ExportDeclaration(path6) {
       if (path6.node.type === "ExportNamedDeclaration") {
@@ -1518,6 +1527,9 @@ var removeExports = (ast, exportsToRemove) => {
             if (specifier.type === "ExportSpecifier" && specifier.exported.type === "Identifier") {
               if (exportsToRemove.includes(specifier.exported.name)) {
                 exportsFiltered = true;
+                if (specifier.local && specifier.local.name !== specifier.exported.name) {
+                  removedExportLocalNames.add(specifier.local.name);
+                }
                 return false;
               }
             }
@@ -1558,8 +1570,30 @@ var removeExports = (ast, exportsToRemove) => {
           }
         }
       }
-      if (path6.node.type === "ExportDefaultDeclaration" && exportsToRemove.includes("default")) {
-        markedForRemoval.add(path6);
+      if (path6.node.type === "ExportDefaultDeclaration") {
+        if (exportsToRemove.includes("default")) {
+          markedForRemoval.add(path6);
+          if (path6.node.declaration) {
+            if (path6.node.declaration.type === "Identifier") {
+              removedExportLocalNames.add(path6.node.declaration.name);
+            } else if ((path6.node.declaration.type === "FunctionDeclaration" || path6.node.declaration.type === "ClassDeclaration") && path6.node.declaration.id) {
+              removedExportLocalNames.add(path6.node.declaration.id.name);
+            }
+          }
+        }
+      }
+    }
+  });
+  traverse(ast, {
+    ExpressionStatement(path6) {
+      if (!path6.parentPath.isProgram()) {
+        return;
+      }
+      if (path6.node.expression.type === "AssignmentExpression") {
+        const left = path6.node.expression.left;
+        if (left.type === "MemberExpression" && left.object.type === "Identifier" && (exportsToRemove.includes(left.object.name) || removedExportLocalNames.has(left.object.name))) {
+          markedForRemoval.add(path6);
+        }
       }
     }
   });
@@ -3397,6 +3431,7 @@ var reactRouterVitePlugin = () => {
             let dest = path5.join(clientBuildDirectory, ssrAssetPath);
             if (!userSsrEmitAssets) {
               if (!(0, import_node_fs2.existsSync)(dest)) {
+                await (0, import_promises2.mkdir)(path5.dirname(dest), { recursive: true });
                 await (0, import_promises2.rename)(src, dest);
                 movedAssetPaths.push(dest);
               } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.7.1-pre.0",
+  "version": "7.8.0-pre.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -29,6 +29,10 @@
       "types": "./dist/vite/cloudflare.d.ts",
       "default": "./dist/vite/cloudflare.js"
     },
+    "./internal": {
+      "types": "./dist/internal.d.ts",
+      "default": "./dist/internal.js"
+    },
     "./package.json": "./package.json"
   },
   "imports": {
@@ -69,6 +73,8 @@
     "@babel/traverse": "^7.27.7",
     "@babel/types": "^7.27.7",
     "@npmcli/package-json": "^4.0.1",
+    "@vitejs/plugin-react": "^4.5.2",
+    "@vitejs/plugin-rsc": "0.4.11",
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
     "chokidar": "^4.0.0",
@@ -86,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "7.7.1-pre.0"
+    "@react-router/node": "7.8.0-pre.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,15 +115,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "7.7.1-pre.0",
-    "react-router": "^7.7.1-pre.0"
+    "@react-router/serve": "7.8.0-pre.0",
+    "react-router": "^7.8.0-pre.0"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.7.1-pre.0",
-    "react-router": "^7.7.1-pre.0"
+    "@react-router/serve": "^7.8.0-pre.0",
+    "react-router": "^7.8.0-pre.0"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {