Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: upgrade react router to v6 #174

Merged
merged 7 commits into from
Oct 18, 2023
Merged

feat: upgrade react router to v6 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f24a216
feat: upgrade react router to v6
Syed-Ali-Abbas-Zaidi Mar 20, 2023
1d49196
Merge branch 'master' of github.com:edx/frontend-app-ora-grading into…
Syed-Ali-Abbas-Zaidi Aug 29, 2023
86a014e
Merge branch 'master' of github.com:edx/frontend-app-ora-grading into…
Syed-Ali-Abbas-Zaidi Sep 18, 2023
d13b04e
Merge branch 'master' of github.com:edx/frontend-app-ora-grading into…
Syed-Ali-Abbas-Zaidi Oct 2, 2023
8e29645
Merge branch 'master' of github.com:edx/frontend-app-ora-grading into…
Syed-Ali-Abbas-Zaidi Oct 10, 2023
3db2105
Merge branch 'master' of github.com:edx/frontend-app-ora-grading into…
Syed-Ali-Abbas-Zaidi Oct 18, 2023
d1448de
Merge branch 'master' into Ali-Abbas/react-router-upgrade
mattcarter Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 36 additions & 78 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@edx/brand": "npm:@edx/brand-openedx@^1.2.0",
"@edx/frontend-component-footer": "12.2.1",
"@edx/frontend-component-header": "4.6.0",
"@edx/frontend-platform": "4.6.3",
"@edx/frontend-platform": "5.6.1",
"@edx/paragon": "^20.44.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
Expand Down Expand Up @@ -59,8 +59,8 @@
"react-intl": "^5.20.9",
"react-pdf": "^5.5.0",
"react-redux": "^7.2.9",
"react-router": "5.3.4",
"react-router-dom": "5.3.4",
"react-router": "6.15.0",
"react-router-dom": "6.15.0",
"react-router-redux": "^5.0.0-alpha.9",
"redux": "4.2.1",
"redux-beacon": "^2.1.0",
Expand Down
1 change: 1 addition & 0 deletions src/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ exports[`app registry subscribe: APP_READY. links App to root element 1`] = `
Symbol(Symbol.observable): [Function],
}
}
wrapWithRouter={false}
>
<App />
</AppProvider>
Expand Down
2 changes: 1 addition & 1 deletion src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import App from './App';

subscribe(APP_READY, () => {
ReactDOM.render(
<AppProvider store={store}>
<AppProvider store={store} wrapWithRouter={false}>
<App />
</AppProvider>,
document.getElementById('root'),
Expand Down