react-router-dom-v5-compat 6.20.1 → 6.21.0-pre.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +141 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +21 -10
- package/dist/index.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/react-router-dom/index.d.ts +1 -1
- package/dist/umd/react-router-dom-v5-compat.development.js +40 -29
- package/dist/umd/react-router-dom-v5-compat.development.js.map +1 -1
- package/dist/umd/react-router-dom-v5-compat.production.min.js +2 -2
- package/dist/umd/react-router-dom-v5-compat.production.min.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,146 @@
|
|
|
1
1
|
# `react-router-dom-v5-compat`
|
|
2
2
|
|
|
3
|
+
## 6.21.0-pre.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- Add a new `future.v7_relativeSplatPath` flag to implenent a breaking bug fix to relative routing when inside a splat route. ([#11087](https://github.com/remix-run/react-router/pull/11087))
|
|
8
|
+
|
|
9
|
+
This fix was originally added in [#10983](https://github.com/remix-run/react-router/issues/10983) and was later reverted in [#11078](https://github.com/remix-run/react-router/issues/110788) because it was determined that a large number of existing applications were relying on the buggy behavior (see [#11052](https://github.com/remix-run/react-router/issues/11052))
|
|
10
|
+
|
|
11
|
+
**The Bug**
|
|
12
|
+
The buggy behavior is that without this flag, the default behavior when resolving relative paths is to _ignore_ any splat (`*`) portion of the current route path.
|
|
13
|
+
|
|
14
|
+
**The Background**
|
|
15
|
+
This decision was originally made thinking that it would make the concept of nested different sections of your apps in `<Routes>` easier if relative routing would _replace_ the current splat:
|
|
16
|
+
|
|
17
|
+
```jsx
|
|
18
|
+
<BrowserRouter>
|
|
19
|
+
<Routes>
|
|
20
|
+
<Route path="/" element={<Home />} />
|
|
21
|
+
<Route path="dashboard/*" element={<Dashboard />} />
|
|
22
|
+
</Routes>
|
|
23
|
+
</BrowserRouter>
|
|
24
|
+
```
|
|
25
|
+
|
|
26
|
+
Any paths like `/dashboard`, `/dashboard/team`, `/dashboard/projects` will match the `Dashboard` route. The dashboard component itself can then render nested `<Routes>`:
|
|
27
|
+
|
|
28
|
+
```jsx
|
|
29
|
+
function Dashboard() {
|
|
30
|
+
return (
|
|
31
|
+
<div>
|
|
32
|
+
<h2>Dashboard</h2>
|
|
33
|
+
<nav>
|
|
34
|
+
<Link to="/">Dashboard Home</Link>
|
|
35
|
+
<Link to="team">Team</Link>
|
|
36
|
+
<Link to="projects">Projects</Link>
|
|
37
|
+
</nav>
|
|
38
|
+
|
|
39
|
+
<Routes>
|
|
40
|
+
<Route path="/" element={<DashboardHome />} />
|
|
41
|
+
<Route path="team" element={<DashboardTeam />} />
|
|
42
|
+
<Route path="projects" element={<DashboardProjects />} />
|
|
43
|
+
</Routes>
|
|
44
|
+
</div>
|
|
45
|
+
);
|
|
46
|
+
}
|
|
47
|
+
```
|
|
48
|
+
|
|
49
|
+
Now, all links and route paths are relative to the router above them. This makes code splitting and compartmentalizing your app really easy. You could render the `Dashboard` as its own independent app, or embed it into your large app without making any changes to it.
|
|
50
|
+
|
|
51
|
+
**The Problem**
|
|
52
|
+
|
|
53
|
+
The problem is that this concept of ignoring part of a pth breaks a lot of other assumptions in React Router - namely that `"."` always means the current location pathname for that route. When we ignore the splat portion, we start getting invalid paths when using `"."`:
|
|
54
|
+
|
|
55
|
+
```jsx
|
|
56
|
+
// If we are on URL /dashboard/team, and we want to link to /dashboard/team:
|
|
57
|
+
function DashboardTeam() {
|
|
58
|
+
// ❌ This is broken and results in <a href="/dashboard">
|
|
59
|
+
return <Link to=".">A broken link to the Current URL</Link>;
|
|
60
|
+
|
|
61
|
+
// ✅ This is fixed but super unintuitive since we're already at /dashboard/team!
|
|
62
|
+
return <Link to="./team">A broken link to the Current URL</Link>;
|
|
63
|
+
}
|
|
64
|
+
```
|
|
65
|
+
|
|
66
|
+
We've also introduced an issue that we can no longer move our `DashboardTeam` component around our route hierarchy easily - since it behaves differently if we're underneath a non-splat route, such as `/dashboard/:widget`. Now, our `"."` links will, properly point to ourself _inclusive of the dynamic param value_ so behavior will break from it's corresponding usage in a `/dashboard/*` route.
|
|
67
|
+
|
|
68
|
+
Even worse, consider a nested splat route configuration:
|
|
69
|
+
|
|
70
|
+
```jsx
|
|
71
|
+
<BrowserRouter>
|
|
72
|
+
<Routes>
|
|
73
|
+
<Route path="dashboard">
|
|
74
|
+
<Route path="*" element={<Dashboard />} />
|
|
75
|
+
</Route>
|
|
76
|
+
</Routes>
|
|
77
|
+
</BrowserRouter>
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
Now, a `<Link to=".">` and a `<Link to="..">` inside the `Dashboard` component go to the same place! That is definitely not correct!
|
|
81
|
+
|
|
82
|
+
Another common issue arose in Data Routers (and Remix) where any `<Form>` should post to it's own route `action` if you the user doesn't specify a form action:
|
|
83
|
+
|
|
84
|
+
```jsx
|
|
85
|
+
let router = createBrowserRouter({
|
|
86
|
+
path: "/dashboard",
|
|
87
|
+
children: [
|
|
88
|
+
{
|
|
89
|
+
path: "*",
|
|
90
|
+
action: dashboardAction,
|
|
91
|
+
Component() {
|
|
92
|
+
// ❌ This form is broken! It throws a 405 error when it submits because
|
|
93
|
+
// it tries to submit to /dashboard (without the splat value) and the parent
|
|
94
|
+
// `/dashboard` route doesn't have an action
|
|
95
|
+
return <Form method="post">...</Form>;
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
],
|
|
99
|
+
});
|
|
100
|
+
```
|
|
101
|
+
|
|
102
|
+
This is just a compounded issue from the above because the default location for a `Form` to submit to is itself (`"."`) - and if we ignore the splat portion, that now resolves to the parent route.
|
|
103
|
+
|
|
104
|
+
**The Solution**
|
|
105
|
+
If you are leveraging this behavior, it's recommended to enable the future flag, move your splat to it's own route, and leverage `../` for any links to "sibling" pages:
|
|
106
|
+
|
|
107
|
+
```jsx
|
|
108
|
+
<BrowserRouter>
|
|
109
|
+
<Routes>
|
|
110
|
+
<Route path="dashboard">
|
|
111
|
+
<Route path="*" element={<Dashboard />} />
|
|
112
|
+
</Route>
|
|
113
|
+
</Routes>
|
|
114
|
+
</BrowserRouter>
|
|
115
|
+
|
|
116
|
+
function Dashboard() {
|
|
117
|
+
return (
|
|
118
|
+
<div>
|
|
119
|
+
<h2>Dashboard</h2>
|
|
120
|
+
<nav>
|
|
121
|
+
<Link to="..">Dashboard Home</Link>
|
|
122
|
+
<Link to="../team">Team</Link>
|
|
123
|
+
<Link to="../projects">Projects</Link>
|
|
124
|
+
</nav>
|
|
125
|
+
|
|
126
|
+
<Routes>
|
|
127
|
+
<Route path="/" element={<DashboardHome />} />
|
|
128
|
+
<Route path="team" element={<DashboardTeam />} />
|
|
129
|
+
<Route path="projects" element={<DashboardProjects />} />
|
|
130
|
+
</Router>
|
|
131
|
+
</div>
|
|
132
|
+
);
|
|
133
|
+
}
|
|
134
|
+
```
|
|
135
|
+
|
|
136
|
+
This way, `.` means "the full current pathname for my route" in all cases (including static, dynamic, and splat routes) and `..` always means "my parents pathname".
|
|
137
|
+
|
|
138
|
+
### Patch Changes
|
|
139
|
+
|
|
140
|
+
- Updated dependencies:
|
|
141
|
+
- `react-router@6.21.0-pre.0`
|
|
142
|
+
- `react-router-dom@6.21.0-pre.0`
|
|
143
|
+
|
|
3
144
|
## 6.20.1
|
|
4
145
|
|
|
5
146
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
* would break. We could stop doing two bundles in v6 "react-router-dom" and
|
|
47
47
|
* deprecate the deep require if we wanted to avoid the duplication here.
|
|
48
48
|
*/
|
|
49
|
-
export type { ActionFunction, ActionFunctionArgs, AwaitProps, BrowserRouterProps, DataRouteMatch, DataRouteObject, ErrorResponse, Fetcher, FetcherWithComponents, FormEncType, FormMethod, FormProps, GetScrollRestorationKeyFunction, Hash, HashRouterProps, HistoryRouterProps, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, LinkProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavLinkProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, ParamKeyValuePair, ParamParseKey, Params, Path, PathMatch, PathParam, PathPattern, PathRouteProps, Pathname, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, ScrollRestorationProps, Search, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, SubmitFunction, SubmitOptions, To, URLSearchParamsInit, UIMatch, unstable_Blocker, unstable_BlockerFunction, } from "./react-router-dom";
|
|
49
|
+
export type { ActionFunction, ActionFunctionArgs, AwaitProps, BrowserRouterProps, DataRouteMatch, DataRouteObject, ErrorResponse, Fetcher, FetcherWithComponents, FormEncType, FormMethod, FormProps, FutureConfig, GetScrollRestorationKeyFunction, Hash, HashRouterProps, HistoryRouterProps, IndexRouteObject, IndexRouteProps, JsonFunction, LayoutRouteProps, LinkProps, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouterProps, NavLinkProps, NavigateFunction, NavigateOptions, NavigateProps, Navigation, Navigator, NonIndexRouteObject, OutletProps, ParamKeyValuePair, ParamParseKey, Params, Path, PathMatch, PathParam, PathPattern, PathRouteProps, Pathname, RedirectFunction, RelativeRoutingType, RouteMatch, RouteObject, RouteProps, RouterProps, RouterProviderProps, RoutesProps, ScrollRestorationProps, Search, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, SubmitFunction, SubmitOptions, To, URLSearchParamsInit, UIMatch, unstable_Blocker, unstable_BlockerFunction, } from "./react-router-dom";
|
|
50
50
|
export { AbortedDeferredError, Await, BrowserRouter, Form, HashRouter, Link, MemoryRouter, NavLink, Navigate, NavigationType, Outlet, Route, Router, RouterProvider, Routes, ScrollRestoration, UNSAFE_DataRouterContext, UNSAFE_DataRouterStateContext, UNSAFE_LocationContext, UNSAFE_NavigationContext, UNSAFE_RouteContext, UNSAFE_useRouteId, UNSAFE_useScrollRestoration, createBrowserRouter, createHashRouter, createMemoryRouter, createPath, createRoutesFromChildren, createRoutesFromElements, createSearchParams, defer, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, parsePath, redirect, redirectDocument, renderMatches, resolvePath, unstable_HistoryRouter, useBlocker, unstable_usePrompt, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, } from "./react-router-dom";
|
|
51
51
|
export type { StaticRouterProps } from "./lib/components";
|
|
52
52
|
export { CompatRoute, CompatRouter, StaticRouter } from "./lib/components";
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* React Router DOM v5 Compat v6.
|
|
2
|
+
* React Router DOM v5 Compat v6.21.0-pre.0
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Remix Software Inc.
|
|
5
5
|
*
|
|
@@ -523,6 +523,11 @@ function RouterProvider(_ref) {
|
|
|
523
523
|
setInterruption(undefined);
|
|
524
524
|
}
|
|
525
525
|
}, [vtContext.isTransitioning, interruption]);
|
|
526
|
+
React.useEffect(() => {
|
|
527
|
+
process.env.NODE_ENV !== "production" ? UNSAFE_warning(fallbackElement == null || !router.future.v7_partialHydration, "`<RouterProvider fallbackElement>` is deprecated when using `v7_partialHydration`") : void 0;
|
|
528
|
+
// Only log this once on initial mount
|
|
529
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
530
|
+
}, []);
|
|
526
531
|
let navigator = React.useMemo(() => {
|
|
527
532
|
return {
|
|
528
533
|
createHref: router.createHref,
|
|
@@ -544,7 +549,10 @@ function RouterProvider(_ref) {
|
|
|
544
549
|
router,
|
|
545
550
|
navigator,
|
|
546
551
|
static: false,
|
|
547
|
-
basename
|
|
552
|
+
basename,
|
|
553
|
+
future: {
|
|
554
|
+
v7_relativeSplatPath: router.future.v7_relativeSplatPath
|
|
555
|
+
}
|
|
548
556
|
}), [router, navigator, basename]);
|
|
549
557
|
// The fragment and {null} here are important! We need them to keep React 18's
|
|
550
558
|
// useId happy when we are server-rendering since we may have a <script> here
|
|
@@ -567,15 +575,17 @@ function RouterProvider(_ref) {
|
|
|
567
575
|
navigator: navigator
|
|
568
576
|
}, state.initialized ? /*#__PURE__*/React.createElement(DataRoutes, {
|
|
569
577
|
routes: router.routes,
|
|
578
|
+
future: router.future,
|
|
570
579
|
state: state
|
|
571
580
|
}) : fallbackElement))))), null);
|
|
572
581
|
}
|
|
573
582
|
function DataRoutes(_ref3) {
|
|
574
583
|
let {
|
|
575
584
|
routes,
|
|
585
|
+
future,
|
|
576
586
|
state
|
|
577
587
|
} = _ref3;
|
|
578
|
-
return UNSAFE_useRoutesImpl(routes, undefined, state);
|
|
588
|
+
return UNSAFE_useRoutesImpl(routes, undefined, state, future);
|
|
579
589
|
}
|
|
580
590
|
/**
|
|
581
591
|
* A `<Router>` for use in web browsers. Provides the cleanest URLs.
|
|
@@ -611,7 +621,8 @@ function BrowserRouter(_ref4) {
|
|
|
611
621
|
children: children,
|
|
612
622
|
location: state.location,
|
|
613
623
|
navigationType: state.action,
|
|
614
|
-
navigator: history
|
|
624
|
+
navigator: history,
|
|
625
|
+
future: future
|
|
615
626
|
});
|
|
616
627
|
}
|
|
617
628
|
/**
|
|
@@ -649,7 +660,8 @@ function HashRouter(_ref5) {
|
|
|
649
660
|
children: children,
|
|
650
661
|
location: state.location,
|
|
651
662
|
navigationType: state.action,
|
|
652
|
-
navigator: history
|
|
663
|
+
navigator: history,
|
|
664
|
+
future: future
|
|
653
665
|
});
|
|
654
666
|
}
|
|
655
667
|
/**
|
|
@@ -681,7 +693,8 @@ function HistoryRouter(_ref6) {
|
|
|
681
693
|
children: children,
|
|
682
694
|
location: state.location,
|
|
683
695
|
navigationType: state.action,
|
|
684
|
-
navigator: history
|
|
696
|
+
navigator: history,
|
|
697
|
+
future: future
|
|
685
698
|
});
|
|
686
699
|
}
|
|
687
700
|
if (process.env.NODE_ENV !== "production") {
|
|
@@ -1072,10 +1085,8 @@ function useFormAction(action, _temp2) {
|
|
|
1072
1085
|
let path = _extends({}, useResolvedPath(action ? action : ".", {
|
|
1073
1086
|
relative
|
|
1074
1087
|
}));
|
|
1075
|
-
//
|
|
1076
|
-
//
|
|
1077
|
-
// the intended behavior of when "." is specifically provided as
|
|
1078
|
-
// the form action, but inconsistent w/ browsers when the action is omitted.
|
|
1088
|
+
// If no action was specified, browsers will persist current search params
|
|
1089
|
+
// when determining the path, so match that behavior
|
|
1079
1090
|
// https://github.com/remix-run/remix/issues/927
|
|
1080
1091
|
let location = useLocation();
|
|
1081
1092
|
if (action == null) {
|