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

frontend: upgrade to react 17 #1401

Merged
merged 17 commits into from
May 25, 2021
Merged

frontend: upgrade to react 17 #1401

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7de586f
upgrade to react 17
danielhochman May 5, 2021
4a3d4c4
enzyme adapter
danielhochman May 5, 2021
31dfcc5
update snap
danielhochman May 5, 2021
cd756d6
upgrade mui core and fix popper
danielhochman May 6, 2021
afb9e80
update peer packages
dschaller May 18, 2021
bc5f236
remove DOM restriction
dschaller May 18, 2021
17cdead
update tests
dschaller May 18, 2021
b4c6a77
Merge branch 'main' into react-17
dschaller May 18, 2021
9b63bb1
fix redis experimentation test import
dschaller May 18, 2021
35216b3
update react in redis experimentation
dschaller May 18, 2021
eed063c
lint fixes to tools
dschaller May 18, 2021
82d7798
Merge branch 'main' into react-17
dschaller May 18, 2021
441d44e
Merge branch 'main' into react-17
dschaller May 18, 2021
f8ce2b5
Merge branch 'main' of github.com:lyft/clutch into react-17
danielhochman May 25, 2021
afb801c
lock
danielhochman May 25, 2021
c857adc
Merge branch 'react-17' of github.com:lyft/clutch into react-17
danielhochman May 25, 2021
9e119f5
lock
danielhochman May 25, 2021
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
4 changes: 2 additions & 2 deletions examples/amiibo/frontend/workflows/amiibo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"dependencies": {
"@clutch/wizard": "^0.1.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@clutch/tools": "^0.1.0"
Expand Down
8 changes: 4 additions & 4 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@material-ui/core": "^4.11.0",
"@material-ui/core": "^4.11.4",
"@storybook/addon-a11y": "^6.2.9",
"@storybook/addon-actions": "^6.1.15",
"@storybook/addon-essentials": "^6.1.15",
Expand All @@ -77,9 +77,9 @@
"lerna": "^4.0.0",
"license-checker": "^25.0.1",
"prettier": "^2.2.1",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-is": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-scripts": "^4.0.1",
"sort-package-json": "^1.48.1",
"typescript": "^4.2.3",
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"dependencies": {
"@clutch-sh/core": "^1.0.0-beta",
"react": "^16.8.0",
"react": "^17.0.2",
"react-app-rewired": "^2.1.8",
"react-dom": "^16.8.0"
"react-dom": "^17.0.2"
},
"devDependencies": {
"@clutch-sh/tools": "^1.0.0-beta",
Expand Down
14 changes: 7 additions & 7 deletions frontend/packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@
"@emotion/styled": "^11.0.0",
"@hookform/devtools": "^2.2.1",
"@hookform/resolvers": "2.0.0-beta.3",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.43",
"@material-ui/styles": "^4.10.0",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"@material-ui/styles": "^4.11.4",
"axios": "^0.21.1",
"history": "^5.0.0",
"js-cookie": "^2.2.1",
"jwt-decode": "^3.0.0",
"lodash": "^4.17.15",
"material-table": "1.69.2",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^6.11.0",
"react-is": "^16.8.0",
"react-is": "^17.0.2",
"react-router": "^6.0.0-beta",
"react-router-dom": "^6.0.0-beta",
"superstruct": "~0.15.0",
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/core/src/tests/__snapshots__/not-found.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ exports[`Not Found component renders correctly 1`] = `
<WithStyles(ForwardRef(Grid)) item={true} className=\\"css-sm4uoy\\">
<ForwardRef(Grid) classes={{...}} item={true} className=\\"css-sm4uoy\\">
<div className=\\"MuiGrid-root css-sm4uoy MuiGrid-item\\">
<ForwardRef fontSize=\\"inherit\\">
<ForwardRef(ThumbDownIcon) fontSize=\\"inherit\\">
<WithStyles(ForwardRef(SvgIcon)) fontSize=\\"inherit\\">
<ForwardRef(SvgIcon) classes={{...}} fontSize=\\"inherit\\">
<svg className=\\"MuiSvgIcon-root MuiSvgIcon-fontSizeInherit\\" focusable=\\"false\\" viewBox=\\"0 0 24 24\\" color={[undefined]} aria-hidden={true} role={[undefined]}>
<path d=\\"M15 3H6c-.83 0-1.54.5-1.84 1.22l-3.02 7.05c-.09.23-.14.47-.14.73v2c0 1.1.9 2 2 2h6.31l-.95 4.57-.03.32c0 .41.17.79.44 1.06L9.83 23l6.59-6.59c.36-.36.58-.86.58-1.41V5c0-1.1-.9-2-2-2zm4 0v12h4V3h-4z\\" />
</svg>
</ForwardRef(SvgIcon)>
</WithStyles(ForwardRef(SvgIcon))>
</ForwardRef>
</ForwardRef(ThumbDownIcon)>
</div>
</ForwardRef(Grid)>
</WithStyles(ForwardRef(Grid))>
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/data-layout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"dependencies": {
"@clutch-sh/core": "^1.0.0-beta",
"lodash": "^4.17.15",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-thunk-reducer": "^0.2.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/tools/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
roots: ["./src"],
collectCoverageFrom: [ "src/*.*sx"],
collectCoverageFrom: ["src/*.*sx"],
coverageDirectory: "/tmp",
coverageReporters: ["text", "cobertura"],
coverageThreshold: {
Expand Down
6 changes: 3 additions & 3 deletions frontend/packages/tools/jest.setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
import Enzyme from "enzyme";
import Adapter from "enzyme-adapter-react-16";

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

HTMLCanvasElement.prototype.getContext = () => {
HTMLCanvasElement.prototype.getContext = () => {
// return whatever getContext has to return
};
};
12 changes: 6 additions & 6 deletions frontend/packages/tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"@types/enzyme": "^3.10.8",
"@types/jest": "^26.0.22",
"@types/mocha": "^8.2.2",
"@types/node": "^14.14.37",
"@types/react": "^17.0.1",
"@types/react-dom": "^17.0.0",
"@types/node": "^15.0.2",
"@types/react": "^17.0.5",
"@types/react-dom": "^17.0.3",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^26.6.0",
"babel-plugin-module-resolver": "^4.0.0",
"cypress": "7.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"esbuild": "^0.12.0",
"eslint": "^7.24.0",
"eslint-config-airbnb": "^18.2.1",
Expand All @@ -49,8 +49,8 @@
"eslint-plugin-simple-import-sort": "^7.0.0",
"jest": "^24.9.0",
"prettier": "^2.2.1",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "^4.0.1",
"typescript": "^4.2.3"
},
Expand Down
10 changes: 5 additions & 5 deletions frontend/packages/wizard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"@clutch-sh/data-layout": "^1.0.0-beta",
"@emotion/react": "^11.0.0",
"@emotion/styled": "^11.0.0",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "^4.11.2",
"clsx": "^1.1.1",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-is": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-router": "^6.0.0-beta",
"react-router-dom": "^6.0.0-beta"
},
Expand Down
8 changes: 4 additions & 4 deletions frontend/workflows/ec2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"@clutch-sh/core": "^1.0.0-beta",
"@clutch-sh/data-layout": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"@material-ui/core": "^4.11.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-is": "^16.8.0",
"@material-ui/core": "^4.11.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"yup": "^0.32.8"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions frontend/workflows/envoy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"@clutch-sh/data-layout": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@material-ui/core": "^4.11.0",
"@material-ui/core": "^4.11.4",
"@nivo/core": "0.69.0",
"@nivo/pie": "0.69.0",
"lodash": "^4.17.15",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-is": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"yup": "^0.32.8"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions frontend/workflows/experimentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"@clutch-sh/core": "^1.0.0-beta",
"@clutch-sh/data-layout": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@material-ui/core": "^4.11.0",
"@material-ui/core": "^4.11.4",
"history": "^5.0.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react-is": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-router-dom": "^6.0.0-beta",
"yup": "^0.32.8"
},
Expand Down
4 changes: 2 additions & 2 deletions frontend/workflows/k8s/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@clutch-sh/data-layout": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"lodash": "4.17.21",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"yup": "^0.32.8"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions frontend/workflows/kinesis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"@clutch-sh/data-layout": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@material-ui/core": "^4.11.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"@material-ui/core": "^4.11.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^6.11.0",
"react-is": "^16.8.0"
"react-is": "^17.0.2"
},
"devDependencies": {
"@clutch-sh/tools": "^1.0.0-beta"
Expand Down
8 changes: 4 additions & 4 deletions frontend/workflows/redisexperimentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"@clutch-sh/experimentation": "^1.0.0-beta",
"@clutch-sh/wizard": "^1.0.0-beta",
"@hookform/resolvers": "2.0.0-beta.3",
"@material-ui/core": "^4.11.0",
"@material-ui/core": "^4.11.4",
"history": "^5.0.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^6.11.0",
"react-is": "^16.8.0",
"react-is": "^17.0.2",
"react-router-dom": "^6.0.0-beta",
"yup": "^0.32.8"
},
Expand Down
4 changes: 1 addition & 3 deletions frontend/workflows/redisexperimentation/src/tests/start-experiment.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import { configure, shallow } from "enzyme";
import Adapter from "enzyme-adapter-react-16";
import { shallow } from "enzyme";

import StartRedisExperiment from "../start-experiment";

Expand All @@ -11,7 +10,6 @@ jest.mock("react-router-dom", () => {
};
});

configure({ adapter: new Adapter() });
describe("Start Experiment Run workflow", () => {
let component;

Expand Down
6 changes: 3 additions & 3 deletions frontend/workflows/serverexperimentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"@clutch-sh/wizard": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@hookform/resolvers": "2.0.0-beta.3",
"@material-ui/core": "^4.11.0",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"@material-ui/core": "^4.11.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^6.11.0",
"react-router-dom": "^6.0.0-beta",
"yup": "^0.32.8"
Expand Down
10 changes: 5 additions & 5 deletions frontend/workflows/sourcecontrol/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"@clutch-sh/wizard": "^1.0.0-beta",
"@emotion/styled": "^11.0.0",
"@hookform/resolvers": "2.0.0-beta.3",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"react": "^16.8.0",
"react-dom": "^16.8.0",
"@material-ui/core": "^4.11.4",
"@material-ui/icons": "^4.11.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-hook-form": "^6.11.0",
"react-is": "^16.8.0",
"react-is": "^17.0.2",
"yup": "^0.32.8"
},
"devDependencies": {
Expand Down
Loading