Skip to content

Commit

Permalink
feat: update react & react-dom to v17 (#882)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mashal-m committed Aug 23, 2023
1 parent ca17123 commit 92095ef
Show file tree
Hide file tree
Showing 12 changed files with 3,453 additions and 6,269 deletions.
9,669 changes: 3,445 additions & 6,224 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"license": "AGPL-3.0",
"dependencies": {
"@edx/brand": "npm:@edx/brand-openedx@1.2.0",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^6.0.0",
"@edx/frontend-platform": "^4.2.0",
"@edx/paragon": "^20.20.0",
"@edx/frontend-component-footer": "npm:@edx/frontend-component-footer-edx@^6.2.0",
"@edx/frontend-platform": "^4.6.0",
"@edx/paragon": "^20.44.0",
"@edx/tinymce-language-selector": "1.1.0",
"@fortawesome/free-regular-svg-icons": "6.1.1",
"@fortawesome/free-solid-svg-icons": "6.1.1",
"@fortawesome/react-fontawesome": "0.1.18",
"@tinymce/tinymce-react": "3.8.4",
"@tinymce/tinymce-react": "3.14.0",
"classnames": "2.3.2",
"connected-react-router": "6.9.3",
"core-js": "3.30.2",
Expand All @@ -43,11 +43,11 @@
"postcss": "8.4.27",
"prop-types": "15.8.1",
"query-string": "7.1.3",
"react": "16.14.0",
"react": "^17.0.2",
"react-autosuggest": "10.1.0",
"react-beautiful-dnd": "13.1.1",
"react-copy-to-clipboard": "5.1.0",
"react-dom": "16.14.0",
"react-dom": "^17.0.2",
"react-helmet": "6.1.0",
"react-redux": "7.2.9",
"react-router": "5.3.4",
Expand All @@ -66,10 +66,10 @@
"@edx/browserslist-config": "^1.2.0",
"@edx/frontend-build": "^12.7.0",
"@edx/stylelint-config-edx": "^2.3.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"axios": "0.27.2",
"axios-mock-adapter": "1.21.5",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.7",
"enzyme-to-json": "3.6.2",
"gh-pages": "3.2.3",
"husky": "7.0.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ exports[`CreateCoursePage renders page correctly with course create error 1`] =
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -327,7 +326,6 @@ exports[`CreateCoursePage renders page correctly with no publisherUserInfo 1`] =
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand All @@ -337,7 +335,6 @@ exports[`CreateCoursePage renders page correctly with no publisherUserInfo 1`] =
as={
Object {
"$$typeof": Symbol(react.forward_ref),
"displayName": "DivStyledAsH4",
"render": [Function],
}
}
Expand Down Expand Up @@ -429,7 +426,6 @@ exports[`CreateCoursePage renders page correctly with org error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@ exports[`CreateCourseRunPage renders html correctly when error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ exports[`EditCoursePage renders html correctly 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -287,7 +286,6 @@ exports[`EditCoursePage renders page correctly with courseInfo 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -810,7 +808,6 @@ exports[`EditCoursePage renders page correctly with courseInfo and courseOptions
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -1702,7 +1699,6 @@ exports[`EditCoursePage renders page correctly with courseInfo error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -1841,7 +1837,6 @@ exports[`EditCoursePage renders page correctly with courseInfo error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -1926,7 +1921,6 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -2886,7 +2880,6 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -3041,7 +3034,6 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -3126,7 +3118,6 @@ exports[`EditCoursePage renders page correctly with courseOptions 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -3690,7 +3681,6 @@ exports[`EditCoursePage renders page correctly with courseOptions error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -3833,7 +3823,6 @@ exports[`EditCoursePage renders page correctly with courseOptions error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -3914,7 +3903,6 @@ exports[`EditCoursePage renders page correctly with courseRunOptions 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -4173,7 +4161,6 @@ exports[`EditCoursePage renders page correctly with courseRunOptions error 1`] =
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -4316,7 +4303,6 @@ exports[`EditCoursePage renders page correctly with courseRunOptions error 1`] =
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -4348,7 +4334,6 @@ exports[`EditCoursePage renders page correctly with no courseInfo 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand All @@ -4358,7 +4343,6 @@ exports[`EditCoursePage renders page correctly with no courseInfo 1`] = `
as={
Object {
"$$typeof": Symbol(react.forward_ref),
"displayName": "DivStyledAsH4",
"render": [Function],
}
}
Expand Down Expand Up @@ -4391,7 +4375,6 @@ exports[`EditCoursePage renders page correctly with no courseOptions 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand All @@ -4401,7 +4384,6 @@ exports[`EditCoursePage renders page correctly with no courseOptions 1`] = `
as={
Object {
"$$typeof": Symbol(react.forward_ref),
"displayName": "DivStyledAsH4",
"render": [Function],
}
}
Expand Down Expand Up @@ -4434,7 +4416,6 @@ exports[`EditCoursePage renders page correctly with no courseRunOptions 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand All @@ -4444,7 +4425,6 @@ exports[`EditCoursePage renders page correctly with no courseRunOptions 1`] = `
as={
Object {
"$$typeof": Symbol(react.forward_ref),
"displayName": "DivStyledAsH4",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ exports[`Transcript Language renders correctly with an error after failed submis
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/components/Header/__snapshots__/Header.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ exports[`Header renders the correct header 1`] = `
variant="tertiary"
>
<ForwardRef
active={false}
aria-expanded={false}
aria-haspopup={true}
className="btn-avatar pgn__avatar-button-avatar pgn__avatar-button-avatar-md dropdown-toggle"
Expand Down Expand Up @@ -447,7 +446,6 @@ exports[`Header renders the header correctly when toggling is allowed, and dark
variant="tertiary"
>
<ForwardRef
active={false}
aria-expanded={false}
aria-haspopup={true}
className="btn-avatar pgn__avatar-button-avatar pgn__avatar-button-avatar-md dropdown-toggle"
Expand Down Expand Up @@ -706,7 +704,6 @@ exports[`Header renders the header correctly when users pass a querystring param
variant="tertiary"
>
<ForwardRef
active={false}
aria-expanded={false}
aria-haspopup={true}
className="btn-avatar pgn__avatar-button-avatar pgn__avatar-button-avatar-md dropdown-toggle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exports[`ImageUpload shows an image upload and an error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ exports[`ListField - Collaborators renders correctly with an error after failed
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -317,7 +316,6 @@ exports[`ListField - Staffers renders correctly with an error after failed submi
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ exports[`StafferPage renders html correctly when given a referrer 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down Expand Up @@ -272,7 +271,6 @@ exports[`StafferPage renders page correctly with no stafferInfo 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand All @@ -282,7 +280,6 @@ exports[`StafferPage renders page correctly with no stafferInfo 1`] = `
as={
Object {
"$$typeof": Symbol(react.forward_ref),
"displayName": "DivStyledAsH4",
"render": [Function],
}
}
Expand Down Expand Up @@ -381,7 +378,6 @@ exports[`StafferPage renders page correctly with staffer info error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ exports[`CourseTable shows an error 1`] = `
"timeout": 300,
"unmountOnExit": false,
},
"displayName": "Fade",
"render": [Function],
}
}
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 'regenerator-runtime/runtime';
import axios from 'axios';
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { getAuthenticatedHttpClient, getAuthenticatedUser } from '@edx/frontend-platform/auth';

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

0 comments on commit 92095ef

Please sign in to comment.