From e6b1b4e0cfce3454959fa373d40112e81b312301 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 27 Nov 2019 12:06:33 -0600 Subject: [PATCH 1/8] dep updates --- package.json | 20 ++++++++--------- yarn.lock | 63 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 5e697997ff9..0ce5c32186d 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,8 +155,8 @@ "prompt": "^1.0.0", "prop-types": "^15.6.0", "raw-loader": "^0.5.1", - "react": "^16.8.0", - "react-dom": "^16.8.0", + "react": "^16.12.0", + "react-dom": "^16.12.0", "react-redux": "^5.0.6", "react-router": "^3.2.0", "react-router-redux": "^4.0.8", @@ -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/yarn.lock b/yarn.lock index d1aeedaf53d..f611a445f8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1305,32 +1305,32 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.8.2": - version "16.8.2" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.2.tgz#9bd7d33f908b243ff0692846ef36c81d4941ad12" - integrity sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw== +"@types/react-dom@^16.9.4": + version "16.9.4" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df" + integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw== dependencies: "@types/react" "*" -"@types/react-is@~16.3.0": - version "16.3.1" - resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.3.1.tgz#f3e1dee9d0eb58c049825540cb061b5588022a9e" - integrity sha512-evXsFH7q8C1nGUq7XDm+IHqErVsNatfpB+fkmnhQHt1HxZV7VvFkuEmSV/xNHZrf2au91KsinMmUmFBbtAL1bQ== +"@types/react-is@^16.7.1": + version "16.7.1" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539" + integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ== dependencies: "@types/react" "*" -"@types/react-virtualized@^9.18.6": - version "9.18.6" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.6.tgz#d5c559bd003a6c58ba9e20d6cda0dde0342f59af" - integrity sha512-fxZ3IXT+lnWwtu8F6+6tLKyeIUnJflGNfchrdyBEvBn8mI4bI5ZKyOuorvI6XQNr74wwyJjKbM+zFy6LjN3uWw== +"@types/react-virtualized@^9.18.7": + version "9.21.5" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.5.tgz#8b849c7c3c92c7b28b29bc75602c067a912310c6" + integrity sha512-oCoGJzkW90YQkvXwvtkCBDN0TTYvaQs217TJDOh+VipzJ9iiHD/NpD0ILvB844+ewf3/4xYOI5Oj5kj5m6J/4w== dependencies: "@types/prop-types" "*" "@types/react" "*" -"@types/react@*", "@types/react@^16.8.4": - version "16.8.4" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.4.tgz#134307f5266e866d5e7c25e47f31f9abd5b2ea34" - integrity sha512-Mpz1NNMJvrjf0GcDqiK8+YeOydXfD8Mgag3UtqQ5lXYTsMnOiHcKmO48LiSWMb1rSHB9MV/jlgyNzeAVxWMZRQ== +"@types/react@*", "@types/react@^16.9.11": + version "16.9.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.13.tgz#b3ea5dd443f4a680599e2abba8cc66f5e1ce0059" + integrity sha512-LikzRslbiufJYHyzbHSW0GrAiff8QYLMBFeZmSxzCYGXKxi8m/1PHX+rsVOwhr7mJNq+VIu2Dhf7U6mjFERK6w== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -11958,7 +11958,17 @@ react-docgen@^4.1.0: node-dir "^0.1.10" recast "^0.17.3" -react-dom@^16.8.0, react-dom@^16.8.3: +react-dom@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" + integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.18.0" + +react-dom@^16.8.3: version "16.8.6" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA== @@ -12100,7 +12110,16 @@ react-virtualized@^9.21.2: prop-types "^15.6.0" react-lifecycles-compat "^3.0.4" -react@^16.8.0, react@^16.8.3: +react@^16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" + integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + +react@^16.8.3: version "16.8.6" resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== @@ -13023,6 +13042,14 @@ scheduler@^0.13.3, scheduler@^0.13.6: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" + integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" From 121ce0ff8723a6cc79e2fc3877c608c285b4edd1 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 27 Nov 2019 12:06:44 -0600 Subject: [PATCH 2/8] ts updates --- src/components/button/button.tsx | 2 +- src/components/button/button_icon/button_icon.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 = ({