Skip to content

Commit a4598d6

Browse files
committed
merge: merge branch 'THU/upgrade_dependencies'
2 parents 36bb41b + 1e72888 commit a4598d6

File tree

3 files changed

+1886
-247
lines changed

3 files changed

+1886
-247
lines changed

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
"@cosmotech/azure": "^2.0.1",
88
"@cosmotech/core": "^2.0.0",
99
"@cosmotech/ui": "^9.6.0",
10-
"@emotion/react": "^11.13.0",
11-
"@emotion/styled": "^11.13.0",
12-
"@microsoft/applicationinsights-web": "^3.3.4",
13-
"@mui/icons-material": "^5.16.5",
14-
"@mui/lab": "^5.0.0-alpha.173",
15-
"@mui/material": "^5.16.5",
16-
"@mui/styles": "^5.16.5",
10+
"@emotion/react": "^11.14.0",
11+
"@emotion/styled": "^11.14.0",
12+
"@microsoft/applicationinsights-web": "^3.3.5",
13+
"@mui/icons-material": "^5.16.14",
14+
"@mui/lab": "^5.0.0-alpha.175",
15+
"@mui/material": "^5.16.14",
16+
"@mui/styles": "^5.16.14",
1717
"@reduxjs/toolkit": "^1.9.7",
1818
"axios": "^1.7.9",
1919
"date-fns": "^4.1.0",
2020
"deepmerge": "^4.3.1",
2121
"fast-deep-equal": "^3.1.3",
2222
"i18next": "^23.16.8",
2323
"i18next-browser-languagedetector": "^7.2.2",
24-
"i18next-http-backend": "^2.7.1",
24+
"i18next-http-backend": "^2.7.3",
2525
"prop-types": "^15.8.1",
2626
"react": "^17.0.2",
2727
"react-countdown": "^2.3.6",
2828
"react-dom": "^17.0.2",
2929
"react-fade-in": "^2.0.1",
30-
"react-hook-form": "^7.52.1",
30+
"react-hook-form": "^7.54.2",
3131
"react-i18next": "^13.5.0",
3232
"react-idle-timer": "^5.7.2",
3333
"react-redux": "^7.2.9",
34-
"react-router-dom": "^6.25.1",
34+
"react-router-dom": "^6.29.0",
3535
"redux": "^4.2.1",
3636
"redux-saga": "^1.3.0",
3737
"rfdc": "^1.4.1",
3838
"rxjs": "^7.8.1",
39-
"sass": "^1.77.8",
39+
"sass": "^1.85.0",
4040
"tslib": "^2.8.1",
41-
"zod": "^3.24.1"
41+
"zod": "^3.24.2"
4242
},
4343
"scripts": {
4444
"start": "cross-env ESLINT_NO_DEV_ERRORS=true REACT_APP_APP_VERSION=$npm_package_version HOST=localhost react-app-rewired start",
@@ -69,10 +69,10 @@
6969
},
7070
"devDependencies": {
7171
"@azure/msal-node": "^2.16.2",
72-
"@babel/core": "^7.25.2",
72+
"@babel/core": "^7.26.9",
7373
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
74-
"@babel/preset-env": "^7.25.2",
75-
"@babel/preset-react": "^7.24.7",
74+
"@babel/preset-env": "^7.26.9",
75+
"@babel/preset-react": "^7.26.3",
7676
"@testing-library/jest-dom": "^6.6.3",
7777
"@testing-library/react": "^12.1.5",
7878
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
@@ -82,19 +82,19 @@
8282
"crypto-browserify": "^3.12.1",
8383
"csp-html-webpack-plugin": "^5.1.0",
8484
"customize-cra": "^1.0.0",
85-
"cypress": "^13.16.1",
85+
"cypress": "^13.17.0",
8686
"cypress-file-upload": "^5.0.8",
8787
"cypress-localstorage-commands": "^2.2.7",
8888
"cypress-mochawesome-reporter": "^3.8.2",
89-
"eslint": "^8.57.0",
89+
"eslint": "^8.57.1",
9090
"eslint-config-prettier": "^9.1.0",
9191
"eslint-config-standard": "^17.1.0",
9292
"eslint-plugin-cypress": "^2.15.2",
9393
"eslint-plugin-import": "^2.29.1",
9494
"eslint-plugin-jest": "^27.9.0",
9595
"eslint-plugin-n": "^16.6.2",
9696
"eslint-plugin-node": "^11.1.0",
97-
"eslint-plugin-prettier": "^5.2.1",
97+
"eslint-plugin-prettier": "^5.2.3",
9898
"eslint-plugin-promise": "^6.6.0",
9999
"eslint-plugin-react": "^7.35.0",
100100
"eslint-plugin-react-hooks": "^4.6.2",
@@ -106,10 +106,10 @@
106106
"jest-environment-jsdom": "~29.7.0",
107107
"jwt-simple": "^0.5.6",
108108
"os-browserify": "^0.3.0",
109-
"prettier": "^3.4.2",
109+
"prettier": "^3.5.1",
110110
"process": "^0.11.10",
111111
"react-app-rewired": "^2.2.1",
112-
"react-error-overlay": "^6.0.11",
112+
"react-error-overlay": "^6.1.0",
113113
"react-scripts": "^5.0.1",
114114
"read-excel-file": "^5.8.6",
115115
"redux-devtools-extension": "^2.13.9",

src/AppRoutes.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,17 @@ const AppRoutes = () => {
7474
),
7575
{
7676
basename: process.env.PUBLIC_URL ?? '',
77+
future: {
78+
v7_fetcherPersist: true,
79+
v7_normalizeFormMethod: true,
80+
v7_relativeSplatPath: true,
81+
v7_skipActionErrorRevalidation: true,
82+
v7_startTransition: true,
83+
},
7784
}
7885
);
7986

80-
return <RouterProvider router={router} />;
87+
return <RouterProvider router={router} future={{ v7_startTransition: true }} />;
8188
};
8289

8390
export default AppRoutes;

0 commit comments

Comments
 (0)