Skip to content

Commit 33b1cd6

Browse files
patricklafrancepatricklafrance
authored
feat: Delay React Router loaders execution until MSW is ready (#559)
1 parent 8e04d7f commit 33b1cd6

36 files changed

Lines changed: 390 additions & 73 deletions

‎.changeset/light-knives-deny.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@squide/firefly-module-federation": minor
3+
"@squide/firefly-rsbuild-storybook": minor
4+
"@squide/firefly": minor
5+
---
6+
7+
React Router loaders execution is now delayed until MSW is ready.

‎docs/essentials/fetch-protected-global-data.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function BootstrappingRoute() {
7171
export function App() {
7272
return (
7373
<AppRouter waitForProtectedData>
74-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
74+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
7575
return (
7676
<RouterProvider
7777
router={createBrowserRouter([
@@ -84,7 +84,7 @@ export function App() {
8484
}
8585
]
8686
}
87-
])}
87+
], routerProps)}
8888
{...routerProviderProps}
8989
/>
9090
);

‎docs/essentials/fetch-public-global-data.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function BootstrappingRoute() {
7171
export function App() {
7272
return (
7373
<AppRouter waitForPublicData>
74-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
74+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
7575
return (
7676
<RouterProvider
7777
router={createBrowserRouter([
@@ -84,7 +84,7 @@ export function App() {
8484
}
8585
]
8686
}
87-
])}
87+
], routerProps)}
8888
{...routerProviderProps}
8989
/>
9090
);

‎docs/essentials/register-deferred-nav-items.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function BootstrappingRoute() {
128128
export function App() {
129129
return (
130130
<AppRouter waitForPublicData>
131-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
131+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
132132
return (
133133
<RouterProvider
134134
router={createBrowserRouter([
@@ -141,7 +141,7 @@ export function App() {
141141
}
142142
]
143143
}
144-
])}
144+
], routerProps)}
145145
{...routerProviderProps}
146146
/>
147147
);
@@ -173,7 +173,7 @@ function BootstrappingRoute() {
173173
export function App() {
174174
return (
175175
<AppRouter>
176-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
176+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
177177
return (
178178
<RouterProvider
179179
router={createBrowserRouter([
@@ -186,7 +186,7 @@ export function App() {
186186
}
187187
]
188188
}
189-
])}
189+
], routerProps)}
190190
{...routerProviderProps}
191191
/>
192192
);

‎docs/essentials/set-honeycomb-custom-attributes.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function BootstrappingRoute() {
5858
export function App() {
5959
return (
6060
<AppRouter waitForProtectedData>
61-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
61+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
6262
return (
6363
<RouterProvider
6464
router={createBrowserRouter([
@@ -71,7 +71,7 @@ export function App() {
7171
}
7272
]
7373
}
74-
])}
74+
], routerProps)}
7575
{...routerProviderProps}
7676
/>
7777
);

‎docs/integrations/setup-i18next.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function BootstrappingRoute() {
122122
export function App() {
123123
return (
124124
<AppRouter waitForProtectedData>
125-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
125+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
126126
return (
127127
<RouterProvider
128128
router={createBrowserRouter([
@@ -135,7 +135,7 @@ export function App() {
135135
}
136136
]
137137
}
138-
])}
138+
], routerProps)}
139139
{...routerProviderProps}
140140
/>
141141
);

‎docs/introduction/create-host.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function BootstrappingRoute() {
9090
export function App() {
9191
return (
9292
<AppRouter>
93-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
93+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
9494
return (
9595
<RouterProvider
9696
router={createBrowserRouter([
@@ -103,7 +103,7 @@ export function App() {
103103
}
104104
]
105105
}
106-
])}
106+
], routerProps)}
107107
{...routerProviderProps}
108108
/>
109109
);

‎docs/module-federation/create-host.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ import { RouterProvider } from "react-router/dom";
110110
export function App() {
111111
return (
112112
<AppRouter>
113-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
113+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
114114
return (
115115
<RouterProvider
116116
router={createBrowserRouter([
117117
{
118118
element: rootRoute,
119119
children: registeredRoutes
120120
}
121-
])}
121+
], routerProps)}
122122
{...routerProviderProps}
123123
/>
124124
);

‎docs/module-federation/develop-a-module-in-isolation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import { RootErrorBoundary } from "./RootErrorBoundary.tsx";
5252
export function AppRouter() {
5353
return (
5454
<FireflyAppRouter>
55-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
55+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
5656
return (
5757
<RouterProvider
5858
router={createBrowserRouter([
@@ -61,7 +61,7 @@ export function AppRouter() {
6161
errorElement: <RootErrorBoundary />,
6262
children: registeredRoutes
6363
}
64-
])}
64+
], routerProps)}
6565
{...routerProviderProps}
6666
/>
6767
);

‎docs/module-federation/override-a-react-context.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ export function App() {
1818
return (
1919
<BackgroundColorContext.Provider value="blue">
2020
<AppRouter>
21-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
21+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
2222
return (
2323
<RouterProvider
2424
router={createBrowserRouter([
2525
{
2626
element: rootRoute,
2727
children: registeredRoutes
2828
}
29-
])}
29+
], routerProps)}
3030
{...routerProviderProps}
3131
/>
3232
);
@@ -130,15 +130,15 @@ export function App() {
130130
return (
131131
<ThemeContext.Provider value="dark">
132132
<AppRouter>
133-
{({ rootRoute, registeredRoutes, routerProviderProps }) => {
133+
{({ rootRoute, registeredRoutes, routerProps, routerProviderProps }) => {
134134
return (
135135
<RouterProvider
136136
router={createBrowserRouter([
137137
{
138138
element: rootRoute,
139139
children: registeredRoutes
140140
}
141-
])}
141+
], routerProps)}
142142
{...routerProviderProps}
143143
/>
144144
);

0 commit comments

Comments
 (0)