From 5c367bf3cdf0997485252bcdd2ccdde12bca568e Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 5 Dec 2019 12:01:06 -0600 Subject: [PATCH] Upgrade React to v16.12.0 (#2571) * dep updates * ts updates * more dep updates * simplify resolutions * CL * CL * CL * CL --- CHANGELOG.md | 11 +- package.json | 24 +-- src/components/button/button.tsx | 2 +- .../button/button_icon/button_icon.tsx | 2 +- yarn.lock | 140 +++++++----------- 5 files changed, 76 insertions(+), 103 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f8dd9e7f4f..2c04b6792f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ ## [`master`](https://github.com/elastic/eui/tree/master) -No public interface changes since `16.2.1`. +**Breaking changes** + +- Moved any shared component-level Sass variables and mixins into the `global_styling` directory ([#2551](https://github.com/elastic/eui/pull/2551)) +- Reworked `euiPanel()` mixin to require the entirety of a selector (i.e. require the '.' in addition to the string) ([#2551](https://github.com/elastic/eui/pull/2551)) +- Updated React peerDependencies to version 16.12 ([#2571](https://github.com/elastic/eui/pull/2571)) ## [`16.2.1`](https://github.com/elastic/eui/tree/v16.2.1) @@ -23,11 +27,6 @@ No public interface changes since `16.2.1`. - Fixed `EuiSwitch` clicking on disabled label ([#2575](https://github.com/elastic/eui/pull/2575)) - Fixed `EuiComboBox` options list closing when clicking outside the component after scrolling ([#2589](https://github.com/elastic/eui/pull/2589)) -**Breaking Changes** - -- Moved any shared component-level Sass variables and mixins into the `global_styling` directory ([#2551](https://github.com/elastic/eui/pull/2551)) -- Reworked `euiPanel()` mixin to require the entirety of a selector (i.e. require the '.' in addition to the string) ([#2551](https://github.com/elastic/eui/pull/2551)) - ## [`16.1.0`](https://github.com/elastic/eui/tree/v16.1.0) - Updated compressed styles for `EuiButtonGroup` to include a background color ([#2568](https://github.com/elastic/eui/pull/2568)) diff --git a/package.json b/package.json index 41d69447faa..875352da6fa 100644 --- a/package.json +++ b/package.json @@ -81,10 +81,10 @@ "@types/classnames": "^2.2.6", "@types/enzyme": "^3.1.13", "@types/jest": "^24.0.6", - "@types/react": "^16.8.4", - "@types/react-dom": "^16.8.2", - "@types/react-is": "~16.3.0", - "@types/react-virtualized": "^9.18.6", + "@types/react": "^16.9.11", + "@types/react-dom": "^16.9.4", + "@types/react-is": "^16.7.1", + "@types/react-virtualized": "^9.18.7", "@types/resize-observer-browser": "^0.1.1", "@types/tabbable": "^3.1.0", "@types/uuid": "^3.4.4", @@ -155,10 +155,10 @@ "prompt": "^1.0.0", "prop-types": "^15.6.0", "raw-loader": "^0.5.1", - "react": "^16.8.0", - "react-dom": "^16.8.0", - "react-redux": "^5.0.6", - "react-router": "^3.2.0", + "react": "^16.12.0", + "react-dom": "^16.12.0", + "react-redux": "^5.1.2", + "react-router": "^3.2.5", "react-router-redux": "^4.0.8", "react-test-renderer": "^16.2.0", "redux": "^3.7.2", @@ -192,12 +192,12 @@ }, "peerDependencies": { "@elastic/datemath": "^5.0.2", - "@types/react": "^16.8.0", - "@types/react-dom": "^16.8.2", + "@types/react": "^16.9.11", + "@types/react-dom": "^16.9.4", "moment": "^2.13.0", "prop-types": "^15.5.0", - "react": "^16.8", - "react-dom": "^16.8", + "react": "^16.12", + "react-dom": "^16.12", "typescript": "^3.5.3" } } diff --git a/src/components/button/button.tsx b/src/components/button/button.tsx index ff77079e055..9d0faa2f92d 100644 --- a/src/components/button/button.tsx +++ b/src/components/button/button.tsx @@ -181,7 +181,7 @@ export const EuiButton: FunctionComponent = ({