Skip to content

Commit 2af4e9c

Browse files
feat(deps): upgrade to react 18 (#318)
1 parent f5fd08a commit 2af4e9c

File tree

11 files changed

+1441
-986
lines changed

11 files changed

+1441
-986
lines changed

package-lock.json

Lines changed: 1416 additions & 966 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@edx/frontend-lib-special-exams": "^3.4.0",
3939
"@edx/frontend-platform": "8.4.0",
4040
"@edx/openedx-atlas": "^0.7.0",
41-
"@edx/react-unit-test-utils": "^3.0.0",
41+
"@edx/react-unit-test-utils": "^4.0.0",
4242
"@edx/tinymce-language-selector": "1.1.0",
4343
"@fortawesome/fontawesome-svg-core": "1.2.36",
4444
"@fortawesome/free-brands-svg-icons": "5.15.4",
@@ -61,8 +61,8 @@
6161
"pdfjs-dist": "^3.11.174",
6262
"prop-types": "15.8.1",
6363
"query-string": "^8.1.0",
64-
"react": "^17.0.2",
65-
"react-dom": "^17.0.2",
64+
"react": "^18.3.1",
65+
"react-dom": "^18.3.1",
6666
"react-pdf": "^7.4.0",
6767
"react-redux": "7.2.9",
6868
"react-router": "6.30.1",
@@ -76,23 +76,15 @@
7676
},
7777
"devDependencies": {
7878
"@edx/browserslist-config": "^1.1.1",
79-
"@openedx/frontend-build": "14.3.2",
79+
"@openedx/frontend-build": "^14.6.1",
8080
"@edx/reactifex": "^2.1.1",
81-
"@testing-library/dom": "^9.3.3",
82-
"@testing-library/jest-dom": "5.17.0",
83-
"@testing-library/react": "12.1.5",
81+
"@testing-library/dom": "^10.4.0",
82+
"@testing-library/jest-dom": "^6.6.3",
83+
"@testing-library/react": "^16.2.0",
8484
"@testing-library/user-event": "^14.5.1",
8585
"glob": "7.2.3",
8686
"husky": "7.0.4",
8787
"jest": "^29.7.0",
8888
"ts-jest": "^29.4.0"
89-
},
90-
"overrides": {
91-
"@edx/frontend-lib-special-exams": {
92-
"@openedx/paragon": "^23.4.2"
93-
},
94-
"@edx/frontend-platform": {
95-
"@openedx/paragon": "^23.4.2"
96-
}
9789
}
9890
}

src/hooks/actions/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useStartStepAction from './useStartStepAction';
88
import useSubmitAssessmentAction from './useSubmitAssessmentAction';
99
import useSubmitResponseAction from './useSubmitResponseAction';
1010
import useConfirmAction from './useConfirmAction';
11+
// eslint-disable-next-line import/no-cycle
1112
import useCloseModalAction from './useCloseModalAction';
1213

1314
export {

src/hooks/actions/useCloseModalAction.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { useIntl } from '@edx/frontend-platform/i18n';
22
import { assessmentSteps, stepNames } from 'constants/index';
3+
// eslint-disable-next-line import/no-cycle
34
import { useIsRevisit } from 'hooks';
5+
// eslint-disable-next-line import/no-cycle
46
import { useHasSubmitted } from 'hooks/app';
57
import { useViewStep } from 'hooks/routing';
68

src/hooks/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as reduxHooks from 'data/redux/hooks';
2+
// eslint-disable-next-line import/no-cycle
23
import * as lmsActions from 'data/services/lms/hooks/actions';
34
import * as lmsSelectors from 'data/services/lms/hooks/selectors/index';
45

src/hooks/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { stepNames } from 'constants/index';
22

3+
// eslint-disable-next-line import/no-cycle
34
import * as actions from './actions';
45
import * as app from './app';
56
import * as assessment from './assessment';

src/hooks/routing.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useLocation } from 'react-router-dom';
2+
// eslint-disable-next-line import/no-cycle
23
import { useActiveStepName } from 'data/services/lms/hooks/selectors';
34
import { routeSteps } from 'constants/index';
45
import { isXblockStep } from 'utils';

src/hooks/testHooks.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import {
99
} from 'constants/index';
1010
import { progressKeys, defaultViewProgressKeys } from 'constants/mockData';
1111

12+
// eslint-disable-next-line import/no-cycle
1213
import * as reduxHooks from 'data/redux/hooks';
14+
// eslint-disable-next-line import/no-cycle
1315
import { useViewStep } from './routing';
1416

1517
export const {

src/index.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'core-js/stable';
22
import 'regenerator-runtime/runtime';
3-
import ReactDOM from 'react-dom';
3+
import React from 'react';
44

55
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
66
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
@@ -9,6 +9,7 @@ import {
99
APP_INIT_ERROR, APP_READY, subscribe, initialize,
1010
} from '@edx/frontend-platform';
1111
import { AppProvider, ErrorPage } from '@edx/frontend-platform/react';
12+
import { createRoot } from 'react-dom/client';
1213

1314
import store from 'data/store';
1415

@@ -24,20 +25,22 @@ const queryClient = new QueryClient({
2425

2526
subscribe(APP_READY, () => {
2627
const isDev = process.env.NODE_ENV === 'development';
27-
const rootEl = document.getElementById('root');
28-
ReactDOM.render(
28+
const root = createRoot(document.getElementById('root'));
29+
30+
root.render(
2931
<AppProvider store={store}>
3032
<QueryClientProvider client={queryClient}>
3133
<App />
3234
{ isDev && <ReactQueryDevtools /> }
3335
</QueryClientProvider>
3436
</AppProvider>,
35-
rootEl,
3637
);
3738
});
3839

3940
subscribe(APP_INIT_ERROR, (error) => {
40-
ReactDOM.render(<ErrorPage message={error.message} />, document.getElementById('root'));
41+
const root = createRoot(document.getElementById('root'));
42+
43+
root.render(<ErrorPage message={error.message} />);
4144
});
4245

4346
initialize({

src/views/SubmissionView/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Col, Icon, Row } from '@openedx/paragon';
44
import { CheckCircle } from '@openedx/paragon/icons';
55
import { useIntl } from '@edx/frontend-platform/i18n';
66

7+
// eslint-disable-next-line import/no-named-as-default
78
import Rubric from 'components/Rubric';
89
import ModalActions from 'components/ModalActions';
910
import FileUpload from 'components/FileUpload';

0 commit comments

Comments
 (0)