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.

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

feat: update react & react-dom to v17 #190

Merged
merged 14 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13,341 changes: 6,275 additions & 7,066 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
},
"dependencies": {
"@edx/brand": "npm:@edx/brand-edx.org@^2.0.3",
"@edx/frontend-component-footer": "^12.0.0",
"@edx/frontend-component-header": "^4.2.2",
"@edx/frontend-platform": "^4.1.0",
"@edx/paragon": "^20.30.0",
"@edx/frontend-component-footer": "12.1.0",
"@edx/frontend-component-header": "4.3.0",
"@edx/frontend-platform": "4.6.0",
"@edx/paragon": "^20.44.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
Expand All @@ -53,12 +53,12 @@
"moment": "^2.29.3",
"prop-types": "15.8.1",
"query-string": "7.1.3",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-intl": "^5.20.9",
"react-pdf": "^5.5.0",
"react-redux": "^7.2.4",
"react-redux": "^7.2.9",
"react-router": "5.3.4",
"react-router-dom": "5.3.4",
"react-router-redux": "^5.0.0-alpha.9",
Expand All @@ -77,16 +77,16 @@
"@edx/frontend-build": "^12.7.0",
"@edx/reactifex": "^2.1.1",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "12.1.5",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"axios-mock-adapter": "^1.20.0",
"enzyme-adapter-react-16": "^1.15.6",
"fetch-mock": "^9.11.0",
"husky": "^7.0.0",
"identity-obj-proxy": "^3.0.0",
"jest": "29.6.1",
"jest-expect-message": "^1.0.2",
"react-dev-utils": "^12.0.1",
"react-test-renderer": "^16.14.0",
"react-test-renderer": "^17.0.2",
"reactifex": "1.1.1",
"redux-mock-store": "^1.5.4",
"semantic-release": "^19.0.3"
Expand Down
2 changes: 1 addition & 1 deletion src/data/redux/thunkActions/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StrictDict } from 'utils';

// eslint-disable-next-line import/no-cycle
import { selectors, actions } from 'data/redux';
import { locationId } from 'data/constants/app';

Expand Down
1 change: 1 addition & 0 deletions src/data/redux/thunkActions/download.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as zip from '@zip.js/zip.js';
import FileSaver from 'file-saver';

import { RequestKeys } from 'data/constants/requests';
// eslint-disable-next-line import/no-cycle
import { selectors } from 'data/redux';
import { locationId } from 'data/constants/app';
import api from 'data/services/lms/api';
Expand Down
2 changes: 1 addition & 1 deletion src/data/redux/thunkActions/grading.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StrictDict } from 'utils';

// eslint-disable-next-line import/no-cycle
import { actions, selectors } from 'data/redux';
import { RequestKeys, ErrorStatuses } from 'data/constants/requests';

Expand Down
2 changes: 1 addition & 1 deletion src/data/redux/thunkActions/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StrictDict } from 'utils';

// eslint-disable-next-line import/no-cycle
import app from './app';
import download from './download';
import grading from './grading';
Expand Down
1 change: 1 addition & 0 deletions src/data/redux/thunkActions/requests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { StrictDict } from 'utils';

import { RequestKeys } from 'data/constants/requests';
// eslint-disable-next-line import/no-cycle
import { actions } from 'data/redux';
import api from 'data/services/lms/api';

Expand Down
2 changes: 1 addition & 1 deletion src/setupTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '@testing-library/jest-dom';
import '@testing-library/jest-dom/extend-expect';

import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';

Enzyme.configure({ adapter: new Adapter() });

Expand Down