Skip to content

Commit 42703d2

Browse files
AdagedoAdagedo
committed
updated existing PR on Updating examples using react-router-dom v6
1 parent 913daab commit 42703d2

File tree

25 files changed

+1564
-1113
lines changed

25 files changed

+1564
-1113
lines changed

‎examples/query/react/authentication-with-extrareducers/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"keywords": [],
77
"main": "./src/index.tsx",
88
"dependencies": {
9-
"@chakra-ui/react": "1.0.0",
10-
"@emotion/react": "^11.4.0",
11-
"@emotion/styled": "^11.3.0",
9+
"@chakra-ui/react": "2.8.0",
10+
"@emotion/react": "^11.13.3",
11+
"@emotion/styled": "^11.13.0",
1212
"@reduxjs/toolkit": "^1.6.0-rc.1",
13-
"framer-motion": "^2.9.5",
13+
"framer-motion": "^11.5.5",
1414
"msw": "^0.40.2",
1515
"react": "^18.1.0",
1616
"react-dom": "^18.1.0",
1717
"react-icons": "3.11.0",
1818
"react-redux": "^8.0.2",
19-
"react-router-dom": "^6.8.0",
19+
"react-router-dom": "6.26.2",
2020
"react-scripts": "5.0.1"
2121
},
2222
"devDependencies": {

‎examples/query/react/authentication-with-extrareducers/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const router = createBrowserRouter([
3131
path: '/',
3232
element: <AppLayout />,
3333
children: [
34-
{ path: '/login', element: <Login /> },
34+
{ path: 'login', element: <Login /> },
3535
{
3636
path: '*',
3737
element: <PrivateOutlet />,

‎examples/query/react/authentication-with-extrareducers/src/index.tsx

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,28 @@ import { worker } from './mocks/browser'
99
import { Provider } from 'react-redux'
1010

1111
// Initialize the msw worker, wait for the service worker registration to resolve, then mount
12-
worker.start({ quiet: true }).then(() =>
13-
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
14-
<React.StrictMode>
15-
<Provider store={store}>
16-
<ChakraProvider>
17-
<App />
18-
</ChakraProvider>
19-
</Provider>
20-
</React.StrictMode>
21-
)
22-
)
12+
13+
async function StartApp(){
14+
try {
15+
await worker.start({quiet:true})
16+
} catch (error) {
17+
console.log("error starting worker",error)
18+
}
19+
const rootElement = document.getElementById('root') as HTMLElement;
20+
if(rootElement){
21+
ReactDOM.createRoot(rootElement).render(
22+
<React.StrictMode>
23+
<Provider store={store}>
24+
<ChakraProvider>
25+
<App />
26+
</ChakraProvider>
27+
</Provider>
28+
</React.StrictMode>
29+
)
30+
}else throw new Error("root element not found")
31+
}
32+
33+
34+
StartApp()
35+
36+

‎examples/query/react/authentication/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"keywords": [],
77
"main": "./src/index.tsx",
88
"dependencies": {
9-
"@chakra-ui/react": "1.0.0",
10-
"@emotion/react": "^11.4.0",
11-
"@emotion/styled": "^11.3.0",
9+
"@chakra-ui/react": "2.8.0",
10+
"@emotion/react": "^11.13.3",
11+
"@emotion/styled": "^11.13.0",
1212
"@reduxjs/toolkit": "^1.6.0-rc.1",
13-
"framer-motion": "^2.9.5",
13+
"framer-motion": "^11.5.5",
1414
"msw": "^0.40.2",
1515
"react": "^18.1.0",
1616
"react-dom": "^18.1.0",
1717
"react-icons": "3.11.0",
1818
"react-redux": "^8.0.2",
19-
"react-router-dom": "^6.8.0",
19+
"react-router-dom": "6.26.2",
2020
"react-scripts": "5.0.1"
2121
},
2222
"devDependencies": {

‎examples/query/react/authentication/src/index.tsx

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,25 @@ import { worker } from './mocks/browser'
77
import { Provider } from 'react-redux'
88

99
// Initialize the msw worker, wait for the service worker registration to resolve, then mount
10-
worker
11-
.start({ quiet: true })
12-
.then(() => {
13-
const rootNode = ReactDOM.createRoot(
14-
document.getElementById('root') as HTMLElement
15-
)
10+
async function StartApp() {
11+
try {
12+
await worker.start({quiet:true})
13+
} catch (error) {
14+
console.log("error starting worker",error)
15+
}
1616

17-
return rootNode.render(
17+
const rootElement = document.getElementById('root') as HTMLElement
18+
if(rootElement){
19+
ReactDOM.createRoot(rootElement).render(
1820
<React.StrictMode>
1921
<Provider store={store}>
2022
<ChakraProvider>
2123
<App />
2224
</ChakraProvider>
2325
</Provider>
24-
</React.StrictMode>
26+
</React.StrictMode>
2527
)
26-
})
27-
.catch(console.error)
28+
}else throw new Error("root element not found")
29+
}
30+
31+
StartApp()

‎examples/query/react/graphql-codegen/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"keywords": [],
66
"main": "./src/index.tsx",
77
"dependencies": {
8-
"@chakra-ui/react": "1.0.0",
9-
"@emotion/react": "^11.4.0",
10-
"@emotion/styled": "^11.3.0",
8+
"@chakra-ui/react": "2.8.0",
9+
"@emotion/react": "^11.13.3",
10+
"@emotion/styled": "^11.13.0",
1111
"@mswjs/data": "^0.4.0",
1212
"@reduxjs/toolkit": "^1.6.0",
1313
"@rtk-query/graphql-request-base-query": "^2.0.0",
1414
"faker": "^5.5.3",
15-
"framer-motion": "^2.9.5",
15+
"framer-motion": "^11.5.5",
1616
"graphql": "^15.5.0",
1717
"graphql-request": "^3.4.0",
1818
"msw": "0.40.2",
1919
"react": "^18.1.0",
2020
"react-dom": "^18.1.0",
2121
"react-icons": "3.11.0",
2222
"react-redux": "^8.0.2",
23-
"react-router-dom": "^6.8.0",
23+
"react-router-dom": "6.26.2",
2424
"react-scripts": "5.0.1"
2525
},
2626
"devDependencies": {

‎examples/query/react/graphql-codegen/src/index.tsx

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,25 @@ import { worker } from './mocks/browser'
88
import { ApiProvider } from '@reduxjs/toolkit/query/react'
99

1010
// Initialize the msw worker, wait for the service worker registration to resolve, then mount
11-
worker.start({ quiet: true }).then(() => {
12-
return ReactDOM.createRoot(
13-
document.getElementById('root') as HTMLElement
14-
).render(
15-
<React.StrictMode>
16-
<ApiProvider api={api}>
17-
<ChakraProvider>
18-
<App />
19-
</ChakraProvider>
20-
</ApiProvider>
21-
</React.StrictMode>
22-
)
23-
})
11+
async function StartApp(){
12+
try {
13+
await worker.start({quiet:true})
14+
} catch (error) {
15+
console.log("error starting msw worker",error)
16+
}
17+
18+
const rootElement = document.getElementById('root') as HTMLElement
19+
if(rootElement){
20+
ReactDOM.createRoot(rootElement).render(
21+
<React.StrictMode>
22+
<ApiProvider api={api}>
23+
<ChakraProvider>
24+
<App />
25+
</ChakraProvider>
26+
</ApiProvider>
27+
</React.StrictMode>
28+
)
29+
}else throw new Error("root element not found")
30+
}
31+
32+
StartApp()

‎examples/query/react/graphql/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
"keywords": [],
77
"main": "./src/index.tsx",
88
"dependencies": {
9-
"@chakra-ui/react": "1.0.0",
10-
"@emotion/react": "^11.4.0",
11-
"@emotion/styled": "^11.3.0",
9+
"@chakra-ui/react": "2.8.0",
10+
"@emotion/react": "^11.13.3",
11+
"@emotion/styled": "^11.13.0",
1212
"@mswjs/data": "^0.3.0",
1313
"@reduxjs/toolkit": "^1.6.0-rc.1",
1414
"@rtk-query/graphql-request-base-query": "^2.0.0",
1515
"faker": "^5.5.3",
16-
"framer-motion": "^2.9.5",
16+
"framer-motion": "^11.5.5",
1717
"graphql": "^15.5.0",
1818
"graphql-request": "^3.4.0",
1919
"msw": "0.40.2",
2020
"react": "^18.1.0",
2121
"react-dom": "^18.1.0",
2222
"react-icons": "3.11.0",
2323
"react-redux": "^8.0.2",
24-
"react-router-dom": "^6.8.0",
24+
"react-router-dom": "6.26.2",
2525
"react-scripts": "5.0.1"
2626
},
2727
"devDependencies": {

‎examples/query/react/graphql/src/index.tsx

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,23 @@ import { worker } from './mocks/browser'
88
import { ApiProvider } from '@reduxjs/toolkit/query/react'
99

1010
// Initialize the msw worker, wait for the service worker registration to resolve, then mount
11-
worker.start({ quiet: true }).then(() => {
12-
return ReactDOM.createRoot(
13-
document.getElementById('root') as HTMLElement
14-
).render(
15-
<React.StrictMode>
16-
<ApiProvider api={api}>
17-
<ChakraProvider>
18-
<App />
19-
</ChakraProvider>
20-
</ApiProvider>
21-
</React.StrictMode>
22-
)
23-
})
11+
async function StartApp(){
12+
try {
13+
await worker.start({ quiet: true })
14+
} catch (error) {
15+
console.log("error starting msw worker",error)
16+
}
17+
const rootElement = document.getElementById('root') as HTMLElement;
18+
if(rootElement){
19+
ReactDOM.createRoot(rootElement).render(
20+
<React.StrictMode>
21+
<ApiProvider api={api}>
22+
<ChakraProvider>
23+
<App />
24+
</ChakraProvider>
25+
</ApiProvider>
26+
</React.StrictMode>
27+
)
28+
}else throw new Error("root element not found")
29+
}
30+
StartApp()

‎examples/query/react/kitchen-sink/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
"keywords": [],
77
"main": "src/index.tsx",
88
"dependencies": {
9+
"@chakra-ui/react": "2.8.0",
10+
"@emotion/react": "^11.13.3",
11+
"@emotion/styled": "^11.13.0",
912
"@reduxjs/toolkit": "1.8.1",
13+
"framer-motion": "^11.5.5",
1014
"msw": "^0.40.2",
1115
"react": "^18.1.0",
1216
"react-dom": "^18.1.0",
1317
"react-redux": "^8.0.2",
14-
"react-router-dom": "^6.8.0",
18+
"react-router-dom": "6.26.2",
1519
"react-scripts": "5.0.1"
1620
},
1721
"devDependencies": {

0 commit comments

Comments
 (0)