Skip to content
This repository has been archived by the owner on Apr 11, 2023. It is now read-only.

Kiali-1814 Revert typescript and react-script-ts upgrade #766

Merged
merged 1 commit into from
Oct 23, 2018
Merged

Kiali-1814 Revert typescript and react-script-ts upgrade #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"react-redux": "5.0.7",
"react-resize-detector": "3.0.1",
"react-router-dom": "4.3.1",
"react-scripts-ts": "3.1.0",
"react-scripts-ts": "2.15.1",
"redux": "4.0.0",
"redux-mock-store": "1.5.3",
"redux-persist": "5.10.0",
Expand All @@ -110,7 +110,7 @@
"babel-core": "6.26.3",
"coveralls": "3.0.2",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"enzyme-adapter-react-16": "1.6.0",
"express": "4.16.3",
"http-proxy-middleware": "0.19.0",
"husky": "0.14.3",
Expand All @@ -124,6 +124,9 @@
"tslint-no-circular-imports": "0.5.0",
"typescript": "3.1.3"
},
"resolutions": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding this to prevent yarn from pulling in multiple versions of @types/react

"@types/react": "16.4.17"
},
"engines": {
"node": ">=8.0.0 ",
"npm": ">=5.0.0 ",
Expand All @@ -136,4 +139,4 @@
"bootstrap": "node_modules/bootstrap-sass/assets/stylesheets",
"fontAwesome": "node_modules/font-awesome-sass/assets/stylesheets"
}
}
}
44 changes: 44 additions & 0 deletions src/components/Details/__tests__/__snapshots__/DetailObject.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -2434,6 +2435,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down Expand Up @@ -2469,6 +2480,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -3794,6 +3806,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down Expand Up @@ -3824,6 +3846,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -6227,6 +6250,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down Expand Up @@ -6264,6 +6297,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -8845,6 +8879,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down
11 changes: 11 additions & 0 deletions src/components/GraphFilter/__tests__/__snapshots__/GraphLegend.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand All @@ -22,6 +23,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down
33 changes: 33 additions & 0 deletions src/components/Health/__tests__/__snapshots__/HealthDetails.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -229,6 +230,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down Expand Up @@ -307,6 +318,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -464,6 +476,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down Expand Up @@ -541,6 +563,7 @@ ShallowWrapper {
"batchedUpdates": [Function],
"getNode": [Function],
"render": [Function],
"simulateError": [Function],
"simulateEvent": [Function],
"unmount": [Function],
},
Expand Down Expand Up @@ -698,6 +721,16 @@ ShallowWrapper {
"adapter": ReactSixteenAdapter {
"options": Object {
"enableComponentDidUpdateOnSetState": true,
"lifecycles": Object {
"componentDidUpdate": Object {
"onSetState": true,
},
"getDerivedStateFromProps": true,
"getSnapshotBeforeUpdate": true,
"setState": Object {
"skipsComponentDidUpdateOnNullish": true,
},
},
},
},
},
Expand Down
Loading