Skip to content

Commit

Permalink
updated existing PR on Updating examples using react-router-dom v6
Browse files Browse the repository at this point in the history
  • Loading branch information
Adagedo committed Sep 19, 2024
1 parent 913daab commit 42703d2
Show file tree
Hide file tree
Showing 25 changed files with 1,564 additions and 1,113 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@reduxjs/toolkit": "^1.6.0-rc.1",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const router = createBrowserRouter([
path: '/',
element: <AppLayout />,
children: [
{ path: '/login', element: <Login /> },
{ path: 'login', element: <Login /> },
{
path: '*',
element: <PrivateOutlet />,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,28 @@ import { worker } from './mocks/browser'
import { Provider } from 'react-redux'

// Initialize the msw worker, wait for the service worker registration to resolve, then mount
worker.start({ quiet: true }).then(() =>
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<React.StrictMode>
<Provider store={store}>
<ChakraProvider>
<App />
</ChakraProvider>
</Provider>
</React.StrictMode>
)
)

async function StartApp(){
try {
await worker.start({quiet:true})
} catch (error) {
console.log("error starting worker",error)
}
const rootElement = document.getElementById('root') as HTMLElement;
if(rootElement){
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<Provider store={store}>
<ChakraProvider>
<App />
</ChakraProvider>
</Provider>
</React.StrictMode>
)
}else throw new Error("root element not found")
}


StartApp()


10 changes: 5 additions & 5 deletions examples/query/react/authentication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@reduxjs/toolkit": "^1.6.0-rc.1",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
24 changes: 14 additions & 10 deletions examples/query/react/authentication/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,25 @@ import { worker } from './mocks/browser'
import { Provider } from 'react-redux'

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

return rootNode.render(
const rootElement = document.getElementById('root') as HTMLElement
if(rootElement){
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<Provider store={store}>
<ChakraProvider>
<App />
</ChakraProvider>
</Provider>
</React.StrictMode>
</React.StrictMode>
)
})
.catch(console.error)
}else throw new Error("root element not found")
}

StartApp()
10 changes: 5 additions & 5 deletions examples/query/react/graphql-codegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mswjs/data": "^0.4.0",
"@reduxjs/toolkit": "^1.6.0",
"@rtk-query/graphql-request-base-query": "^2.0.0",
"faker": "^5.5.3",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"graphql": "^15.5.0",
"graphql-request": "^3.4.0",
"msw": "0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
35 changes: 22 additions & 13 deletions examples/query/react/graphql-codegen/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,25 @@ import { worker } from './mocks/browser'
import { ApiProvider } from '@reduxjs/toolkit/query/react'

// Initialize the msw worker, wait for the service worker registration to resolve, then mount
worker.start({ quiet: true }).then(() => {
return ReactDOM.createRoot(
document.getElementById('root') as HTMLElement
).render(
<React.StrictMode>
<ApiProvider api={api}>
<ChakraProvider>
<App />
</ChakraProvider>
</ApiProvider>
</React.StrictMode>
)
})
async function StartApp(){
try {
await worker.start({quiet:true})
} catch (error) {
console.log("error starting msw worker",error)
}

const rootElement = document.getElementById('root') as HTMLElement
if(rootElement){
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<ApiProvider api={api}>
<ChakraProvider>
<App />
</ChakraProvider>
</ApiProvider>
</React.StrictMode>
)
}else throw new Error("root element not found")
}

StartApp()
10 changes: 5 additions & 5 deletions examples/query/react/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mswjs/data": "^0.3.0",
"@reduxjs/toolkit": "^1.6.0-rc.1",
"@rtk-query/graphql-request-base-query": "^2.0.0",
"faker": "^5.5.3",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"graphql": "^15.5.0",
"graphql-request": "^3.4.0",
"msw": "0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
33 changes: 20 additions & 13 deletions examples/query/react/graphql/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,23 @@ import { worker } from './mocks/browser'
import { ApiProvider } from '@reduxjs/toolkit/query/react'

// Initialize the msw worker, wait for the service worker registration to resolve, then mount
worker.start({ quiet: true }).then(() => {
return ReactDOM.createRoot(
document.getElementById('root') as HTMLElement
).render(
<React.StrictMode>
<ApiProvider api={api}>
<ChakraProvider>
<App />
</ChakraProvider>
</ApiProvider>
</React.StrictMode>
)
})
async function StartApp(){
try {
await worker.start({ quiet: true })
} catch (error) {
console.log("error starting msw worker",error)
}
const rootElement = document.getElementById('root') as HTMLElement;
if(rootElement){
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<ApiProvider api={api}>
<ChakraProvider>
<App />
</ChakraProvider>
</ApiProvider>
</React.StrictMode>
)
}else throw new Error("root element not found")
}
StartApp()
6 changes: 5 additions & 1 deletion examples/query/react/kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
"keywords": [],
"main": "src/index.tsx",
"dependencies": {
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@reduxjs/toolkit": "1.8.1",
"framer-motion": "^11.5.5",
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/query/react/kitchen-sink/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const router = createBrowserRouter([
{ path: '/', element: <TimeList /> },
{ path: '/counters', element: <CounterList /> },
{
path: '/posts/*',
path: 'posts/*',
element: <PostsManager />,
},
{ path: '/bundleSplitting', element: <Lazy /> },
Expand Down
6 changes: 5 additions & 1 deletion examples/query/react/kitchen-sink/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import { worker } from './mocks/browser'
// Initialize the msw worker, wait for the service worker registration to resolve, then mount
async function render() {
if (process.env.NODE_ENV === 'development') {
await worker.start()
try {
await worker.start()
} catch (error) {
console.log("error starting msw worker",error)
}
}

const rootNode = ReactDOM.createRoot(
Expand Down
10 changes: 5 additions & 5 deletions examples/query/react/mutations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mswjs/data": "^0.3.0",
"@reduxjs/toolkit": "^1.6.0-rc.1",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1"
},
"devDependencies": {
Expand Down
34 changes: 22 additions & 12 deletions examples/query/react/mutations/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,28 @@ import App from './App'
import { store } from './store'
import { Provider } from 'react-redux'
import { ChakraProvider } from '@chakra-ui/react'

import { worker } from './mocks/browser'

// Initialize the msw worker, wait for the service worker registration to resolve, then mount
worker.start({ quiet: true }).then(() =>
ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<React.StrictMode>
<Provider store={store}>
<ChakraProvider>
<App />
</ChakraProvider>
</Provider>
</React.StrictMode>
)
)
async function StartApp(){
try {
await worker.start({ quiet: true })
} catch (error) {
console.log("error starting the mws worker")

}
const rootElement = document.getElementById('root') as HTMLElement;
if(rootElement){
ReactDOM.createRoot(rootElement).render(
<React.StrictMode>
<Provider store={store}>
<ChakraProvider>
<App />
</ChakraProvider>
</Provider>
</React.StrictMode>
)
}else throw new Error("rootElement not found")
}
StartApp()

10 changes: 5 additions & 5 deletions examples/query/react/optimistic-update/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
"keywords": [],
"main": "./src/index.tsx",
"dependencies": {
"@chakra-ui/react": "1.0.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@chakra-ui/react": "2.8.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mswjs/data": "^0.3.0",
"@reduxjs/toolkit": "^1.6.0-rc.1",
"framer-motion": "^2.9.5",
"framer-motion": "^11.5.5",
"msw": "^0.40.2",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "3.11.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.8.0",
"react-router-dom": "6.26.2",
"react-scripts": "5.0.1",
"uuid": "^8.3.2"
},
Expand Down
Loading

0 comments on commit 42703d2

Please sign in to comment.