@react-router/dev 0.0.0-experimental-e0b6ce9 → 0.0.0-experimental-de3b900

package/CHANGELOG.md

@@ -1,5 +1,116 @@
 # `@react-router/dev`
 
+## 7.9.4
+
+### Patch Changes
+
+- Update `valibot` dependency to `^1.1.0` ([#14379](https://github.com/remix-run/react-router/pull/14379))
+
+- New (unstable) `useRoute` hook for accessing data from specific routes ([#14407](https://github.com/remix-run/react-router/pull/14407))
+
+  For example, let's say you have an `admin` route somewhere in your app and you want any child routes of `admin` to all have access to the `loaderData` and `actionData` from `admin.`
+
+  ```tsx
+  // app/routes/admin.tsx
+  import { Outlet } from "react-router";
+
+  export const loader = () => ({ message: "Hello, loader!" });
+
+  export const action = () => ({ count: 1 });
+
+  export default function Component() {
+    return (
+      <div>
+        {/* ... */}
+        <Outlet />
+        {/* ... */}
+      </div>
+    );
+  }
+  ```
+
+  You might even want to create a reusable widget that all of the routes nested under `admin` could use:
+
+  ```tsx
+  import { unstable_useRoute as useRoute } from "react-router";
+
+  export function AdminWidget() {
+    // How to get `message` and `count` from `admin` route?
+  }
+  ```
+
+  In framework mode, `useRoute` knows all your app's routes and gives you TS errors when invalid route IDs are passed in:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/dmin");
+    //                      ^^^^^^^^^^^
+  }
+  ```
+
+  `useRoute` returns `undefined` if the route is not part of the current page:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/admin");
+    if (!admin) {
+      throw new Error(`AdminWidget used outside of "routes/admin"`);
+    }
+  }
+  ```
+
+  Note: the `root` route is the exception since it is guaranteed to be part of the current page.
+  As a result, `useRoute` never returns `undefined` for `root`.
+
+  `loaderData` and `actionData` are marked as optional since they could be accessed before the `action` is triggered or after the `loader` threw an error:
+
+  ```tsx
+  export function AdminWidget() {
+    const admin = useRoute("routes/admin");
+    if (!admin) {
+      throw new Error(`AdminWidget used outside of "routes/admin"`);
+    }
+    const { loaderData, actionData } = admin;
+    console.log(loaderData);
+    //          ^? { message: string } | undefined
+    console.log(actionData);
+    //          ^? { count: number } | undefined
+  }
+  ```
+
+  If instead of a specific route, you wanted access to the _current_ route's `loaderData` and `actionData`, you can call `useRoute` without arguments:
+
+  ```tsx
+  export function AdminWidget() {
+    const currentRoute = useRoute();
+    currentRoute.loaderData;
+    currentRoute.actionData;
+  }
+  ```
+
+  This usage is equivalent to calling `useLoaderData` and `useActionData`, but consolidates all route data access into one hook: `useRoute`.
+
+  Note: when calling `useRoute()` (without a route ID), TS has no way to know which route is the current route.
+  As a result, `loaderData` and `actionData` are typed as `unknown`.
+  If you want more type-safety, you can either narrow the type yourself with something like `zod` or you can refactor your app to pass down typed props to your `AdminWidget`:
+
+  ```tsx
+  export function AdminWidget({
+    message,
+    count,
+  }: {
+    message: string;
+    count: number;
+  }) {
+    /* ... */
+  }
+  ```
+
+- Updated dependencies:
+  - `react-router@7.9.4`
+  - `@react-router/node@7.9.4`
+  - `@react-router/serve@7.9.4`
+
 ## 7.9.3
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-e0b6ce9
+ * @react-router/dev v0.0.0-experimental-de3b900
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -980,9 +980,10 @@ function generateRoutes(ctx) {
           interface Register {
             pages: Pages
             routeFiles: RouteFiles
+            routeModules: RouteModules
           }
         }
-      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code
+      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code + "\n\n" + generate(routeModulesType(ctx)).code
   };
   const allAnnotations = Array.from(fileToRoutes.entries()).filter(([file]) => isInAppDirectory(ctx, file)).map(
     ([file, routeIds]) => getRouteAnnotations({ ctx, file, routeIds, lineages })
@@ -1051,6 +1052,28 @@ function routeFilesType({
     )
   );
 }
+function routeModulesType(ctx) {
+  return t2.tsTypeAliasDeclaration(
+    t2.identifier("RouteModules"),
+    null,
+    t2.tsTypeLiteral(
+      Object.values(ctx.config.routes).map(
+        (route) => t2.tsPropertySignature(
+          t2.stringLiteral(route.id),
+          t2.tsTypeAnnotation(
+            isInAppDirectory(ctx, route.file) ? t2.tsTypeQuery(
+              t2.tsImportType(
+                t2.stringLiteral(
+                  `./${Path3.relative(ctx.rootDirectory, ctx.config.appDirectory)}/${route.file}`
+                )
+              )
+            ) : t2.tsUnknownKeyword()
+          )
+        )
+      )
+    )
+  );
+}
 function isInAppDirectory(ctx, routeFile) {
   const path9 = Path3.resolve(ctx.config.appDirectory, routeFile);
   return path9.startsWith(ctx.config.appDirectory);

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

@@ -12,8 +12,8 @@ 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";
+  type unstable_RSCPayload as RSCPayload,
+} from "react-router/dom";
 
 setServerCallback(
   createCallServer({

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-e0b6ce9
+ * @react-router/dev v0.0.0-experimental-de3b900
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -968,9 +968,10 @@ function generateRoutes(ctx) {
           interface Register {
             pages: Pages
             routeFiles: RouteFiles
+            routeModules: RouteModules
           }
         }
-      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code
+      ` + "\n\n" + generate(pagesType(allPages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code + "\n\n" + generate(routeModulesType(ctx)).code
   };
   const allAnnotations = Array.from(fileToRoutes.entries()).filter(([file]) => isInAppDirectory(ctx, file)).map(
     ([file, routeIds]) => getRouteAnnotations({ ctx, file, routeIds, lineages })
@@ -1039,6 +1040,28 @@ function routeFilesType({
     )
   );
 }
+function routeModulesType(ctx) {
+  return t2.tsTypeAliasDeclaration(
+    t2.identifier("RouteModules"),
+    null,
+    t2.tsTypeLiteral(
+      Object.values(ctx.config.routes).map(
+        (route) => t2.tsPropertySignature(
+          t2.stringLiteral(route.id),
+          t2.tsTypeAnnotation(
+            isInAppDirectory(ctx, route.file) ? t2.tsTypeQuery(
+              t2.tsImportType(
+                t2.stringLiteral(
+                  `./${Path3.relative(ctx.rootDirectory, ctx.config.appDirectory)}/${route.file}`
+                )
+              )
+            ) : t2.tsUnknownKeyword()
+          )
+        )
+      )
+    )
+  );
+}
 function isInAppDirectory(ctx, routeFile) {
   const path9 = Path3.resolve(ctx.config.appDirectory, routeFile);
   return path9.startsWith(ctx.config.appDirectory);
@@ -2526,7 +2549,7 @@ var getClientEntryChunk = (ctx, viteManifest) => {
   invariant(chunk, `Chunk not found: ${filePath}`);
   return chunk;
 };
-var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, entryFilePath, route) => {
+var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, allDynamicCssFiles, entryFilePath, route) => {
   let entryChunk = resolveChunk(ctx, viteManifest, entryFilePath);
   invariant(entryChunk, `Chunk not found: ${entryFilePath}`);
   let isRootRoute = Boolean(route && route.parentId === void 0);
@@ -2559,7 +2582,10 @@ var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, entryFil
         // in the manifest that isn't tied to any route file. If we want to render these
         // styles correctly, we need to include them in the root route.
         isRootRoute ? getCssCodeSplitDisabledFile(ctx, viteConfig, viteManifest) : null,
-        chunks.flatMap((e) => e.css ?? []).map((href) => `${ctx.publicPath}${href}`)
+        chunks.flatMap((e) => e.css ?? []).map((href) => {
+          let publicHref = `${ctx.publicPath}${href}`;
+          return allDynamicCssFiles.has(href) ? `${publicHref}#` : publicHref;
+        })
       ].flat(1).filter(isNonNullable)
     )
   };
@@ -2582,6 +2608,44 @@ function resolveDependantChunks(viteManifest, entryChunks) {
   }
   return Array.from(chunks);
 }
+function getAllDynamicCssFiles(ctx, viteManifest) {
+  let allDynamicCssFiles = /* @__PURE__ */ new Set();
+  for (let route of Object.values(ctx.reactRouterConfig.routes)) {
+    let routeFile = path6.join(ctx.reactRouterConfig.appDirectory, route.file);
+    let entryChunk = resolveChunk(
+      ctx,
+      viteManifest,
+      `${routeFile}${BUILD_CLIENT_ROUTE_QUERY_STRING}`
+    );
+    if (entryChunk) {
+      let walk2 = function(chunk, isDynamicImportContext) {
+        if (visitedChunks.has(chunk)) {
+          return;
+        }
+        visitedChunks.add(chunk);
+        if (isDynamicImportContext && chunk.css) {
+          for (let cssFile of chunk.css) {
+            allDynamicCssFiles.add(cssFile);
+          }
+        }
+        if (chunk.dynamicImports) {
+          for (let dynamicImportKey of chunk.dynamicImports) {
+            walk2(viteManifest[dynamicImportKey], true);
+          }
+        }
+        if (chunk.imports) {
+          for (let importKey of chunk.imports) {
+            walk2(viteManifest[importKey], isDynamicImportContext);
+          }
+        }
+      };
+      var walk = walk2;
+      let visitedChunks = /* @__PURE__ */ new Set();
+      walk2(entryChunk, false);
+    }
+  }
+  return allDynamicCssFiles;
+}
 function dedupe(array2) {
   return [...new Set(array2)];
 }
@@ -2871,10 +2935,12 @@ var reactRouterVitePlugin = () => {
     let viteManifest = await loadViteManifest(
       getClientBuildDirectory(ctx.reactRouterConfig)
     );
+    let allDynamicCssFiles = getAllDynamicCssFiles(ctx, viteManifest);
     let entry = getReactRouterManifestBuildAssets(
       ctx,
       viteConfig2,
       viteManifest,
+      allDynamicCssFiles,
       ctx.entryClientFilePath,
       null
     );
@@ -2926,6 +2992,7 @@ var reactRouterVitePlugin = () => {
           ctx,
           viteConfig2,
           viteManifest,
+          allDynamicCssFiles,
           `${routeFile}${BUILD_CLIENT_ROUTE_QUERY_STRING}`,
           route
         ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-e0b6ce9",
+  "version": "0.0.0-experimental-de3b900",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.1.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-e0b6ce9"
+    "@react-router/node": "0.0.0-experimental-de3b900"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,16 +109,16 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-e0b6ce9",
-    "react-router": "^0.0.0-experimental-e0b6ce9"
+    "react-router": "^0.0.0-experimental-de3b900",
+    "@react-router/serve": "0.0.0-experimental-de3b900"
   },
   "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-e0b6ce9",
-    "react-router": "^0.0.0-experimental-e0b6ce9"
+    "@react-router/serve": "^0.0.0-experimental-de3b900",
+    "react-router": "^0.0.0-experimental-de3b900"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {