-
-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into markdalgleish/require-web-crypto
- Loading branch information
Showing
109 changed files
with
3,820 additions
and
5,365 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| --- | ||
| "react-router": major | ||
| --- | ||
|
|
||
| Imports/Exports cleanup | ||
|
|
||
| - Removed the following exports that were previously public API from `@remix-run/router` | ||
| - types | ||
| - `AgnosticDataIndexRouteObject` | ||
| - `AgnosticDataNonIndexRouteObject` | ||
| - `AgnosticDataRouteMatch` | ||
| - `AgnosticDataRouteObject` | ||
| - `AgnosticIndexRouteObject` | ||
| - `AgnosticNonIndexRouteObject` | ||
| - `AgnosticRouteMatch` | ||
| - `AgnosticRouteObject` | ||
| - `TrackedPromise` | ||
| - `unstable_AgnosticPatchRoutesOnMissFunction` | ||
| - `Action` -> exported as `NavigationType` via `react-router` | ||
| - `Router` exported as `RemixRouter` to differentiate from RR's `<Router>` | ||
| - API | ||
| - `getToPathname` (`@private`) | ||
| - `joinPaths` (`@private`) | ||
| - `normalizePathname` (`@private`) | ||
| - `resolveTo` (`@private`) | ||
| - `stripBasename` (`@private`) | ||
| - `createBrowserHistory` -> in favor of `createBrowserRouter` | ||
| - `createHashHistory` -> in favor of `createHashRouter` | ||
| - `createMemoryHistory` -> in favor of `createMemoryRouter` | ||
| - `createRouter` | ||
| - `createStaticHandler` -> in favor of wrapper `createStaticHandler` in RR Dom | ||
| - `getStaticContextFromError` | ||
| - Removed the following exports that were previously public API from `react-router` | ||
| - `Hash` | ||
| - `Pathname` | ||
| - `Search` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- | ||
| "react-router": major | ||
| --- | ||
|
|
||
| Remove remaining future flags | ||
|
|
||
| - React Router `v7_skipActionErrorRevalidation` | ||
| - Remix `v3_fetcherPersist`, `v3_relativeSplatPath`, `v3_throwAbortReason` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| "react-router": major | ||
| --- | ||
|
|
||
| Add `react-router/dom` subpath export to properly enable `react-dom` as an optional `peerDependency` | ||
|
|
||
| - 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 | ||
| - DOM environments should import from `react-router/dom` to get the proper component that makes `ReactDOM.flushSync()` available: | ||
| - If you are using the Vite plugin, use this in your `entry.client.tsx`: | ||
| - `import { HydratedRouter } from 'react-router/dom'` | ||
| - If you are not using the Vite plugin and are manually calling `createBrowserRouter`/`createHashRouter`: | ||
| - `import { RouterProvider } from "react-router/dom"` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.