react-router 7.0.0-pre.6 → 7.0.1-pre.0

package/CHANGELOG.md

@@ -1,69 +1,8 @@
 # `react-router`
 
-## 7.0.0-pre.6
+## 7.0.1-pre.0
 
-### Patch Changes
-
-- chore: re-enable development warnings through a `development` exports condition. ([#12269](https://github.com/remix-run/react-router/pull/12269))
-- Remove unneeded dependency on @web3-storage/multipart-parser ([#12274](https://github.com/remix-run/react-router/pull/12274))
-- fix(react-router): (v7) fix static prerender of non-ascii characters ([#12161](https://github.com/remix-run/react-router/pull/12161))
-- Remove unneeded dependency on source-map ([#12275](https://github.com/remix-run/react-router/pull/12275))
-
-## 7.0.0-pre.5
-
-## 7.0.0-pre.4
-
-## 7.0.0-pre.3
-
-## 7.0.0-pre.2
-
-### Major Changes
-
-- Migrate Remix type generics to React Router ([#12180](https://github.com/remix-run/react-router/pull/12180))
-
-  - These generics are provided for Remix v2 migration purposes
-  - These generics and the APIs they exist on should be considered informally deprecated in favor of the new `Route.*` types
-  - Anyone migrating from React Router v6 should probably not leverage these new generics and should migrate straight to the `Route.*` types
-  - For React Router v6 users, these generics are new and should not impact your app, with one exception
-    - `useFetcher` previously had an optional generic (used primarily by Remix v2) that expected the data type
-    - This has been updated in v7 to expect the type of the function that generates the data (i.e., `typeof loader`/`typeof action`)
-    - Therefore, you should update your usages:
-      - ❌ `useFetcher<LoaderData>()`
-      - ✅ `useFetcher<typeof loader>()`
-
-- - Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router` ([#12177](https://github.com/remix-run/react-router/pull/12177))
-    - Examples: `LoaderFunction`, `LoaderFunctionArgs`, `ActionFunction`, `ActionFunctionArgs`, `DataFunctionArgs`, `RouteManifest`, `LinksFunction`, `Route`, `EntryRoute`
-    - The `RouteManifest` type used by the "remix" code is now slightly stricter because it is using the former `@remix-run/router` `RouteManifest`
-      - `Record<string, Route> -> Record<string, Route | undefined>`
-    - Removed `AppData` type in favor of inlining `unknown` in the few locations it was used
-    - Removed `ServerRuntimeMeta*` types in favor of the `Meta*` types they were duplicated from
-- Drop support for Node 18, update minimum Node vestion to 20 ([#12171](https://github.com/remix-run/react-router/pull/12171))
-
-  - Remove `installGlobals()` as this should no longer be necessary
-
-- Update `cookie` dependency to `^1.0.1` - please see the [release notes](https://github.com/jshttp/cookie/releases) for any breaking changes ([#12172](https://github.com/remix-run/react-router/pull/12172))
-
-### Patch Changes
-
-- Replace `substr` with `substring` ([#12080](https://github.com/remix-run/react-router/pull/12080))
-- Remove the deprecated `json` utility ([#12146](https://github.com/remix-run/react-router/pull/12146))
-
-  - You can use [`Response.json`](https://developer.mozilla.org/en-US/docs/Web/API/Response/json_static) if you still need to construct JSON responses in your app
-
-- Updated dependencies:
-  - `react-router@7.0.0-pre.2`
-
-## 7.0.0-pre.1
-
-### Patch Changes
-
-- Fix typegen for routes with a client loader but no server loader ([#12117](https://github.com/remix-run/react-router/pull/12117))
-- - Fix `react-router-serve` handling of prerendered HTML files by removing the `redirect: false` option so it now falls back on the default `redirect: true` behavior of redirecting from `/folder` -> `/folder/` which will then pick up `/folder/index.html` from disk. See https://expressjs.com/en/resources/middleware/serve-static.html ([#12071](https://github.com/remix-run/react-router/pull/12071))
-  - Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time
-- Updated dependencies:
-  - `react-router@7.0.0-pre.1`
-
-## 7.0.0-pre.0
+## 7.0.0
 
 ### Major Changes
 
@@ -79,16 +18,22 @@
   - Collapse `react-router-dom` into `react-router`
   - Collapse `@remix-run/server-runtime` into `react-router`
   - Collapse `@remix-run/testing` into `react-router`
+
 - Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+
 - Drop support for Node 16, React Router SSR now requires Node 18 or higher ([#11391](https://github.com/remix-run/react-router/pull/11391))
+
 - Remove `future.v7_startTransition` flag ([#11696](https://github.com/remix-run/react-router/pull/11696))
+
 - - Expose the underlying router promises from the following APIs for compsition in React 19 APIs: ([#11521](https://github.com/remix-run/react-router/pull/11521))
     - `useNavigate()`
     - `useSubmit`
     - `useFetcher().load`
     - `useFetcher().submit`
     - `useRevalidator.revalidate`
+
 - Remove `future.v7_normalizeFormMethod` future flag ([#11697](https://github.com/remix-run/react-router/pull/11697))
+
 - For Remix consumers migrating to React Router, the `crypto` global from the [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API) is now required when using cookie and session APIs. This means that the following APIs are provided from `react-router` rather than platform-specific packages: ([#11837](https://github.com/remix-run/react-router/pull/11837))
 
   - `createCookie`
@@ -139,27 +84,62 @@
     - `Search`
 
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
+
 - Remove `future.v7_prependBasename` from the ionternalized `@remix-run/router` package ([#11726](https://github.com/remix-run/react-router/pull/11726))
+
+- Migrate Remix type generics to React Router ([#12180](https://github.com/remix-run/react-router/pull/12180))
+
+  - These generics are provided for Remix v2 migration purposes
+  - These generics and the APIs they exist on should be considered informally deprecated in favor of the new `Route.*` types
+  - Anyone migrating from React Router v6 should probably not leverage these new generics and should migrate straight to the `Route.*` types
+  - For React Router v6 users, these generics are new and should not impact your app, with one exception
+    - `useFetcher` previously had an optional generic (used primarily by Remix v2) that expected the data type
+    - This has been updated in v7 to expect the type of the function that generates the data (i.e., `typeof loader`/`typeof action`)
+    - Therefore, you should update your usages:
+      - ❌ `useFetcher<LoaderData>()`
+      - ✅ `useFetcher<typeof loader>()`
+
 - Remove `future.v7_throwAbortReason` from internalized `@remix-run/router` package ([#11728](https://github.com/remix-run/react-router/pull/11728))
+
 - Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
+
 - node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
+
 - renamed RemixContext to FrameworkContext ([#11705](https://github.com/remix-run/react-router/pull/11705))
+
 - updates the minimum React version to 18 ([#11689](https://github.com/remix-run/react-router/pull/11689))
+
 - PrefetchPageDescriptor replaced by PageLinkDescriptor ([#11960](https://github.com/remix-run/react-router/pull/11960))
+
+- - Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router` ([#12177](https://github.com/remix-run/react-router/pull/12177))
+    - Examples: `LoaderFunction`, `LoaderFunctionArgs`, `ActionFunction`, `ActionFunctionArgs`, `DataFunctionArgs`, `RouteManifest`, `LinksFunction`, `Route`, `EntryRoute`
+    - The `RouteManifest` type used by the "remix" code is now slightly stricter because it is using the former `@remix-run/router` `RouteManifest`
+      - `Record<string, Route> -> Record<string, Route | undefined>`
+    - Removed `AppData` type in favor of inlining `unknown` in the few locations it was used
+    - Removed `ServerRuntimeMeta*` types in favor of the `Meta*` types they were duplicated from
+
 - - Remove the `future.v7_partialHydration` flag ([#11725](https://github.com/remix-run/react-router/pull/11725))
     - This also removes the `<RouterProvider fallbackElement>` prop
       - To migrate, move the `fallbackElement` to a `hydrateFallbackElement`/`HydrateFallback` on your root route
     - Also worth nothing there is a related breaking changer with this future flag:
       - Without `future.v7_partialHydration` (when using `fallbackElement`), `state.navigation` was populated during the initial load
       - With `future.v7_partialHydration`, `state.navigation` remains in an `"idle"` state during the initial load
+
 - Remove `v7_relativeSplatPath` future flag ([#11695](https://github.com/remix-run/react-router/pull/11695))
+
+- Drop support for Node 18, update minimum Node vestion to 20 ([#12171](https://github.com/remix-run/react-router/pull/12171))
+
+  - Remove `installGlobals()` as this should no longer be necessary
+
 - Remove remaining future flags ([#11820](https://github.com/remix-run/react-router/pull/11820))
 
   - React Router `v7_skipActionErrorRevalidation`
   - Remix `v3_fetcherPersist`, `v3_relativeSplatPath`, `v3_throwAbortReason`
 
 - rename createRemixStub to createRoutesStub ([#11692](https://github.com/remix-run/react-router/pull/11692))
+
 - Remove `@remix-run/router` deprecated `detectErrorBoundary` option in favor of `mapRouteProperties` ([#11751](https://github.com/remix-run/react-router/pull/11751))
+
 - Add `react-router/dom` subpath export to properly enable `react-dom` as an optional `peerDependency` ([#11851](https://github.com/remix-run/react-router/pull/11851))
 
   - This ensures that we don't blindly `import ReactDOM from "react-dom"` in `<RouterProvider>` in order to access `ReactDOM.flushSync()`, since that would break `createMemoryRouter` use cases in non-DOM environments
@@ -171,6 +151,8 @@
 
 - Remove `future.v7_fetcherPersist` flag ([#11731](https://github.com/remix-run/react-router/pull/11731))
 
+- Update `cookie` dependency to `^1.0.1` - please see the [release notes](https://github.com/jshttp/cookie/releases) for any breaking changes ([#12172](https://github.com/remix-run/react-router/pull/12172))
+
 ### Minor Changes
 
 - - Add support for `prerender` config in the React Router vite plugin, to support existing SSG use-cases ([#11539](https://github.com/remix-run/react-router/pull/11539))
@@ -178,19 +160,17 @@
     - `prerender` can either be an array of string paths, or a function (sync or async) that returns an array of strings so that you can dynamically generate the paths by talking to your CMS, etc.
 
   ```ts
-  export default defineConfig({
-    plugins: [
-      reactRouter({
-        async prerender() {
-          let slugs = await fakeGetSlugsFromCms();
-          // Prerender these paths into `.html` files at build time, and `.data`
-          // files if they have loaders
-          return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
-        },
-      }),
-      tsconfigPaths(),
-    ],
-  });
+  // react-router.config.ts
+  import type { Config } from "@react-router/dev/config";
+
+  export default {
+    async prerender() {
+      let slugs = await fakeGetSlugsFromCms();
+      // Prerender these paths into `.html` files at build time, and `.data`
+      // files if they have loaders
+      return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
+    },
+  } satisfies Config;
 
   async function fakeGetSlugsFromCms() {
     await new Promise((r) => setTimeout(r, 1000));
@@ -198,10 +178,6 @@
   }
   ```
 
-- [REMOVE] Allow returning undefined from loaders/actions part 2 ([#12057](https://github.com/remix-run/react-router/pull/12057))
-
-  - This is a follow up to #11680 which missed some of the Remix codepaths
-
 - Params, loader data, and action data as props for route component exports ([#11961](https://github.com/remix-run/react-router/pull/11961))
 
   ```tsx
@@ -212,6 +188,7 @@
   ```
 
 - Remove duplicate `RouterProvider` impliementations ([#11679](https://github.com/remix-run/react-router/pull/11679))
+
 - ### Typesafety improvements ([#12019](https://github.com/remix-run/react-router/pull/12019))
 
   React Router now generates types for each of your route modules.
@@ -233,16 +210,6 @@
   - `LoaderData` : Loader data from `loader` and/or `clientLoader` within your route module
   - `ActionData` : Action data from `action` and/or `clientAction` within your route module
 
-  These types are then used to create types for route export args and props:
-
-  - `LoaderArgs`
-  - `ClientLoaderArgs`
-  - `ActionArgs`
-  - `ClientActionArgs`
-  - `HydrateFallbackProps`
-  - `ComponentProps` (for the `default` export)
-  - `ErrorBoundaryProps`
-
   In the future, we plan to add types for the rest of the route module exports: `meta`, `links`, `headers`, `shouldRevalidate`, etc.
   We also plan to generate types for typesafe `Link`s:
 
@@ -252,123 +219,36 @@
   // typesafe `to` and `params` based on the available routes in your app
   ```
 
-  #### Setup
-
-  React Router will generate types into a `.react-router/` directory at the root of your app.
-  This directory is fully managed by React Router and is derived based on your route config (`routes.ts`).
-
-  👉 **Add `.react-router/` to `.gitignore`**
-
-  ```txt
-  .react-router
-  ```
-
-  You should also ensure that generated types for routes are always present before running typechecking,
-  especially for running typechecking in CI.
-
-  👉 **Add `react-router typegen` to your `typecheck` command in `package.json`**
-
-  ```json
-  {
-    "scripts": {
-      "typecheck": "react-router typegen && tsc"
-    }
-  }
-  ```
-
-  To get TypeScript to use those generated types, you'll need to add them to `include` in `tsconfig.json`.
-  And to be able to import them as if they files next to your route modules, you'll also need to configure `rootDirs`.
+  Check out our docs for more:
 
-  👉 **Configure `tsconfig.json` for generated types**
+  - [_Explanations > Type Safety_](https://reactrouter.com/dev/guides/explanation/type-safety)
+  - [_How-To > Setting up type safety_](https://reactrouter.com/dev/guides/how-to/setting-up-type-safety)
 
-  ```json
-  {
-    "include": [".react-router/types/**/*"],
-    "compilerOptions": {
-      "rootDirs": [".", "./.react-router/types"]
-    }
-  }
-  ```
-
-  #### `typegen` command
-
-  You can manually generate types with the new `typegen` command:
-
-  ```sh
-  react-router typegen
-  ```
-
-  However, manual type generation is tedious and types can get out of sync quickly if you ever forget to run `typegen`.
-  Instead, we recommend that you setup our new TypeScript plugin which will automatically generate fresh types whenever routes change.
-  That way, you'll always have up-to-date types.
-
-  #### TypeScript plugin
-
-  To get automatic type generation, you can use our new TypeScript plugin.
-
-  👉 **Add the TypeScript plugin to `tsconfig.json`**
-
-  ```json
-  {
-    "compilerOptions": {
-      "plugins": [{ "name": "@react-router/dev" }]
-    }
-  }
-  ```
-
-  We plan to add some other goodies to our TypeScript plugin soon, including:
-
-  - Automatic `jsdoc` for route exports that include links to official docs
-  - Autocomplete for route exports
-  - Warnings for non-HMR compliant exports
-
-  ##### VSCode
-
-  TypeScript looks for plugins registered in `tsconfig.json` in the local `node_modules/`,
-  but VSCode ships with its own copy of TypeScript that is installed outside of your project.
-  For TypeScript plugins to work, you'll need to tell VSCode to use the local workspace version of TypeScript.
-  For security reasons, [VSCode won't use the workspace version of TypeScript](https://code.visualstudio.com/docs/typescript/typescript-compiling#_using-the-workspace-version-of-typescript) until you manually opt-in.
+- Stabilize `unstable_dataStrategy` ([#11969](https://github.com/remix-run/react-router/pull/11969))
 
-  Your project should have a `.vscode/settings.json` with the following settings:
+- Stabilize `unstable_patchRoutesOnNavigation` ([#11970](https://github.com/remix-run/react-router/pull/11970))
 
-  ```json
-  {
-    "typescript.tsdk": "node_modules/typescript/lib",
-    "typescript.enablePromptUseWorkspaceTsdk": true
-  }
-  ```
+### Patch Changes
 
-  That way [VSCode will ask you](https://code.visualstudio.com/updates/v1_45#_prompt-users-to-switch-to-the-workspace-version-of-typescript) if you want to use the workspace version of TypeScript the first time you open a TS file in that project.
+- No changes ([`506329c4e`](https://github.com/remix-run/react-router/commit/506329c4e2e7aba9837cbfa44df6103b49423745))
 
-  > [!IMPORTANT]
-  > You'll need to install dependencies first so that the workspace version of TypeScript is available.
+- chore: re-enable development warnings through a `development` exports condition. ([#12269](https://github.com/remix-run/react-router/pull/12269))
 
-  👉 **Select "Allow" when VSCode asks if you want to use the workspace version of TypeScript**
+- Remove unstable upload handler. ([#12015](https://github.com/remix-run/react-router/pull/12015))
 
-  Otherwise, you can also manually opt-in to the workspace version:
+- Remove unneeded dependency on @web3-storage/multipart-parser ([#12274](https://github.com/remix-run/react-router/pull/12274))
 
-  1. Open up any TypeScript file in your project
-  2. Open up the VSCode Command Palette (<kbd>Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>)
-  3. Search for `Select TypeScript Version`
-  4. Choose `Use Workspace Version`
-  5. Quit and reopen VSCode
+- Fix redirects returned from loaders/actions using `data()` ([#12021](https://github.com/remix-run/react-router/pull/12021))
 
-  ##### Troubleshooting
+- fix(react-router): (v7) fix static prerender of non-ascii characters ([#12161](https://github.com/remix-run/react-router/pull/12161))
 
-  In VSCode, open up any TypeScript file in your project and then use <kbd>CMD</kbd>+<kbd>SHIFT</kbd>+<kbd>P</kbd> to select `Open TS Server log`.
-  There should be a log for `[react-router] setup` that indicates that the plugin was resolved correctly.
-  Then look for any errors in the log.
+- Replace `substr` with `substring` ([#12080](https://github.com/remix-run/react-router/pull/12080))
 
-- Stabilize `unstable_dataStrategy` ([#11969](https://github.com/remix-run/react-router/pull/11969))
-- Stabilize `unstable_patchRoutesOnNavigation` ([#11970](https://github.com/remix-run/react-router/pull/11970))
+- Remove the deprecated `json` utility ([#12146](https://github.com/remix-run/react-router/pull/12146))
 
-### Patch Changes
+  - You can use [`Response.json`](https://developer.mozilla.org/en-US/docs/Web/API/Response/json_static) if you still need to construct JSON responses in your app
 
-- Remove unstable upload handler. ([#12015](https://github.com/remix-run/react-router/pull/12015))
-- Fix redirects returned from loaders/actions using `data()` ([#12021](https://github.com/remix-run/react-router/pull/12021))
-- [REMOVE] Rename RemixRouter->DataRouter ([#12062](https://github.com/remix-run/react-router/pull/12062))
-- Updated dependencies:
-  - `react-router@7.0.0-pre.0`
+- Remove unneeded dependency on source-map ([#12275](https://github.com/remix-run/react-router/pull/12275))
 
 ## 6.28.0
 

package/README.md

@@ -1,3 +1,7 @@
-# React Router
+`react-router` is the primary package in the React Router project.
 
-The `react-router` package is the heart of [React Router](https://github.com/remix-run/react-router) and provides all the core functionality.
+## Installation
+
+```sh
+npm i react-router
+```

package/dist/development/{chunk-CQOJUIYR.mjs → chunk-MFVUHSGM.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4214,7 +4214,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`
@@ -6980,7 +6980,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.0.0-pre.6";
+    window.__reactRouterVersion = "7.0.1-pre.0";
   }
 } catch (e) {
 }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3558,7 +3558,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-CQOJUIYR.mjs";
+} from "./chunk-MFVUHSGM.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4359,7 +4359,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`
@@ -7125,7 +7125,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.0.0-pre.6";
+    window.__reactRouterVersion = "7.0.1-pre.0";
   }
 } catch (e) {
 }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -119,7 +119,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-CQOJUIYR.mjs";
+} from "./chunk-MFVUHSGM.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/route-module.d.mts

@@ -6,6 +6,7 @@ type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type RouteModule = {
     meta?: Func;
     links?: Func;
+    headers?: Func;
     loader?: Func;
     clientLoader?: Func;
     action?: Func;
@@ -42,6 +43,12 @@ type CreateMetaArgs<T extends RouteInfo> = {
     matches: MetaMatches<T["parents"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
+type HeadersArgs = {
+    loaderHeaders: Headers;
+    parentHeaders: Headers;
+    actionHeaders: Headers;
+    errorHeaders: Headers | undefined;
+};
 type IsHydrate<ClientLoader> = ClientLoader extends {
     hydrate: true;
 } ? true : ClientLoader extends {
@@ -99,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

package/dist/development/lib/types/route-module.d.ts

@@ -6,6 +6,7 @@ type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type RouteModule = {
     meta?: Func;
     links?: Func;
+    headers?: Func;
     loader?: Func;
     clientLoader?: Func;
     action?: Func;
@@ -42,6 +43,12 @@ type CreateMetaArgs<T extends RouteInfo> = {
     matches: MetaMatches<T["parents"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
+type HeadersArgs = {
+    loaderHeaders: Headers;
+    parentHeaders: Headers;
+    actionHeaders: Headers;
+    errorHeaders: Headers | undefined;
+};
 type IsHydrate<ClientLoader> = ClientLoader extends {
     hydrate: true;
 } ? true : ClientLoader extends {
@@ -99,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

package/dist/development/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/{chunk-X537FOHI.mjs → chunk-U7UKN772.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4214,7 +4214,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`
@@ -6980,7 +6980,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.0.0-pre.6";
+    window.__reactRouterVersion = "7.0.1-pre.0";
   }
 } catch (e) {
 }

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3558,7 +3558,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-X537FOHI.mjs";
+} from "./chunk-U7UKN772.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/production/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4359,7 +4359,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     let parentPath = parentRoute && parentRoute.path || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at "${parentPathname}" (under <Route path="${parentPath}">) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render.
 
 Please change the parent <Route path="${parentPath}"> to <Route path="${parentPath === "/" ? "*" : `${parentPath}/*`}">.`
@@ -7125,7 +7125,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.0.0-pre.6";
+    window.__reactRouterVersion = "7.0.1-pre.0";
   }
 } catch (e) {
 }

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -119,7 +119,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-X537FOHI.mjs";
+} from "./chunk-U7UKN772.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/lib/types/route-module.d.mts

@@ -6,6 +6,7 @@ type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type RouteModule = {
     meta?: Func;
     links?: Func;
+    headers?: Func;
     loader?: Func;
     clientLoader?: Func;
     action?: Func;
@@ -42,6 +43,12 @@ type CreateMetaArgs<T extends RouteInfo> = {
     matches: MetaMatches<T["parents"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
+type HeadersArgs = {
+    loaderHeaders: Headers;
+    parentHeaders: Headers;
+    actionHeaders: Headers;
+    errorHeaders: Headers | undefined;
+};
 type IsHydrate<ClientLoader> = ClientLoader extends {
     hydrate: true;
 } ? true : ClientLoader extends {
@@ -99,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

package/dist/production/lib/types/route-module.d.ts

@@ -6,6 +6,7 @@ type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type RouteModule = {
     meta?: Func;
     links?: Func;
+    headers?: Func;
     loader?: Func;
     clientLoader?: Func;
     action?: Func;
@@ -42,6 +43,12 @@ type CreateMetaArgs<T extends RouteInfo> = {
     matches: MetaMatches<T["parents"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
+type HeadersArgs = {
+    loaderHeaders: Headers;
+    parentHeaders: Headers;
+    actionHeaders: Headers;
+    errorHeaders: Headers | undefined;
+};
 type IsHydrate<ClientLoader> = ClientLoader extends {
     hydrate: true;
 } ? true : ClientLoader extends {
@@ -99,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

package/dist/production/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.0.0-pre.6
+ * react-router v7.0.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.0.0-pre.6",
+  "version": "7.0.1-pre.0",
   "description": "Declarative routing for React",
   "keywords": [
     "react",