From d94412cc1469d88f26c25aaa3d08fc5ca1865eb8 Mon Sep 17 00:00:00 2001 From: maggieneterval Date: Fri, 12 Apr 2019 15:50:37 -0400 Subject: [PATCH] chore: upgrade to react 16.8 --- .../core/src/overrideRegistry/Overridable.tsx | 4 +- package.json | 8 +-- yarn.lock | 55 ++++++++++++------- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx b/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx index 87ef9e106b1..94e4f6fbecc 100644 --- a/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx +++ b/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx @@ -179,7 +179,9 @@ export function overridableComponent

) as T; + const forwardRef = (React.forwardRef((props, ref) => ( + + )) as unknown) as T; // Copy static properties Object.getOwnPropertyNames(OriginalComponent) diff --git a/package.json b/package.json index e8668c00858..bee7edaf5cb 100644 --- a/package.json +++ b/package.json @@ -71,11 +71,11 @@ "n3-charts": "^2.0.18", "ngimport": "^0.6.0", "prop-types": "15.6.1", - "react": "16.6.0", + "react": "16.8.0", "react-ace": "^6.1.4", "react-bootstrap": "^0.32.1", "react-bootstrap-typeahead": "^3.2.4", - "react-dom": "16.6.0", + "react-dom": "16.8.0", "react-ga": "^2.4.1", "react-redux": "^5.0.7", "react-select": "^1.2.1", @@ -113,10 +113,10 @@ "@types/minimist": "^1.2.0", "@types/node": "7.0.5", "@types/prop-types": "^15.5.2", - "@types/react": "^16.4.18", + "@types/react": "^16.7.0", "@types/react-bootstrap": "^0.32.5", "@types/react-bootstrap-typeahead": "^3.2.1", - "@types/react-dom": "^16.0.5", + "@types/react-dom": "^16.7.0", "@types/react-select": "^1.2.3", "@types/react-sortable-hoc": "^0.6.2", "@types/react-virtualized": "9.7.12", diff --git a/yarn.lock b/yarn.lock index 4f6db1ffd0e..e7c71960336 100644 --- a/yarn.lock +++ b/yarn.lock @@ -567,12 +567,11 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.0.5": - version "16.0.5" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.5.tgz#a757457662e3819409229e8f86795ff37b371f96" - integrity sha512-ony2hEYlGXCLWNAWWgbsHR7qVvDbeMRFc5b43+7dhj3n+zXzxz81HV9Yjpc3JD8vLCiwYoSLqFCI6bD0+0zG2Q== +"@types/react-dom@^16.7.0": + version "16.8.4" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.4.tgz#7fb7ba368857c7aa0f4e4511c4710ca2c5a12a88" + integrity sha512-eIRpEW73DCzPIMaNBDP5pPIpK1KXyZwNgfxiVagb5iGiz6da+9A5hslSX6GAQKdO7SayVCS/Fr2kjqprgAvkfA== dependencies: - "@types/node" "*" "@types/react" "*" "@types/react-select@*", "@types/react-select@^1.2.3": @@ -627,10 +626,10 @@ resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9" integrity sha512-OZi2OPNI1DGwnC3Fgbr1CcYfOD6V0pbv+aehXdvuFE+L+sipWjividsasuqFW/G0CZrZ81Ao+9IzjvkRDWCE9Q== -"@types/react@^16.4.18": - version "16.4.18" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.18.tgz#2e28a2e7f92d3fa7d6a65f2b73275c3e3138a13d" - integrity sha512-eFzJKEg6pdeaukVLVZ8Xb79CTl/ysX+ExmOfAAqcFlCCK5TgFDD9kWR0S18sglQ3EmM8U+80enjUqbfnUyqpdA== +"@types/react@^16.7.0": + version "16.8.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.13.tgz#a82b15aad9ab91c40edca0d6889b7745ae24f053" + integrity sha512-otJ4ntMuHGrvm67CdDJMAls4WqotmAmW0g3HmWi9LCjSWXrxoXY/nHXrtmMfvPEEmGFNm6NdgMsJmnfH820Qaw== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -11762,15 +11761,15 @@ react-dom@16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react-dom@16.6.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.6.0.tgz#6375b8391e019a632a89a0988bce85f0cc87a92f" - integrity sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w== +react-dom@16.8.0: + version "16.8.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.0.tgz#18f28d4be3571ed206672a267c66dd083145a9c4" + integrity sha512-dBzoAGYZpW9Yggp+CzBPC7q1HmWSeRc93DWrwbskmG1eHJWznZB/p0l/Sm+69leIGUS91AXPB/qB3WcPnKx8Sw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.10.0" + scheduler "^0.13.0" react-dom@^0.14.8: version "0.14.9" @@ -11958,15 +11957,15 @@ react@16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" -react@16.6.0, "react@^15.6.2 || ^16.0": - version "16.6.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.6.0.tgz#b34761cfaf3e30f5508bc732fb4736730b7da246" - integrity sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q== +react@16.8.0: + version "16.8.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.0.tgz#8533f0e4af818f448a276eae71681d09e8dd970a" + integrity sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.10.0" + scheduler "^0.13.0" react@^0.14.8: version "0.14.9" @@ -11976,6 +11975,16 @@ react@^0.14.8: envify "^3.0.0" fbjs "^0.6.1" +"react@^15.6.2 || ^16.0": + version "16.6.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.6.0.tgz#b34761cfaf3e30f5508bc732fb4736730b7da246" + integrity sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.10.0" + read-package-json@^2.0.2: version "2.0.13" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a" @@ -12881,6 +12890,14 @@ scheduler@^0.10.0: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.13.0: + version "0.13.6" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" + integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ== + 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"