From 434688ee047fd10c0967d6d99a8a6b75a2643cc2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 27 May 2019 12:07:06 +0000 Subject: [PATCH 1/2] fix(deps): update dependency react-select to v3 --- ui/package.json | 2 +- ui/yarn.lock | 226 ++++++++++++++++++++++-------------------------- 2 files changed, 104 insertions(+), 124 deletions(-) diff --git a/ui/package.json b/ui/package.json index f59d1ac01..276bde328 100644 --- a/ui/package.json +++ b/ui/package.json @@ -47,7 +47,7 @@ "react-resize-detector": "4.1.3", "react-reveal": "1.2.2", "react-scripts": "3.0.1", - "react-select": "2.4.4", + "react-select": "3.0.3", "react-tippy": "1.2.3", "react-transition-group": "4.0.1", "react-truncate": "2.4.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 2599d6df4..f7208143a 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -860,7 +860,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== @@ -1053,52 +1053,81 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz#c27b391d8457d1e893f1eddeaf5e5412d12ffbb5" integrity sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA== -"@emotion/babel-utils@^0.6.4": - version "0.6.10" - resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc" - integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow== +"@emotion/cache@^10.0.9": + version "10.0.9" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.9.tgz#e0c7b7a289f7530edcfad4dcf3858bd2e5700a6f" + integrity sha512-f7MblpE2xoimC4fCMZ9pivmsIn7hyWRIvY75owMDi8pdOSeh+w5tH3r4hBJv/LLrwiMM7cTQURqTPcYoL5pWnw== dependencies: - "@emotion/hash" "^0.6.6" - "@emotion/memoize" "^0.6.6" - "@emotion/serialize" "^0.9.1" - convert-source-map "^1.5.1" - find-root "^1.1.0" - source-map "^0.7.2" + "@emotion/sheet" "0.9.2" + "@emotion/stylis" "0.8.3" + "@emotion/utils" "0.11.1" + "@emotion/weak-memoize" "0.2.2" -"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6": - version "0.6.6" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" - integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== - -"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6": - version "0.6.6" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" - integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ== - -"@emotion/serialize@^0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145" - integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ== +"@emotion/core@^10.0.9": + version "10.0.10" + resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.10.tgz#8d3114e5a2f8b178a7067c603a2937516f180b08" + integrity sha512-U1aE2cOWUscjc8ZJ3Cx32udOzLeRoJwGxBH93xQD850oQFpwPKZARzdUtdc9SByUOwzSFYxhDhrpXnV34FJmWg== dependencies: - "@emotion/hash" "^0.6.6" - "@emotion/memoize" "^0.6.6" - "@emotion/unitless" "^0.6.7" - "@emotion/utils" "^0.8.2" + "@emotion/cache" "^10.0.9" + "@emotion/css" "^10.0.9" + "@emotion/serialize" "^0.11.6" + "@emotion/sheet" "0.9.2" + "@emotion/utils" "0.11.1" -"@emotion/stylis@^0.7.0": +"@emotion/css@^10.0.9": + version "10.0.9" + resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.9.tgz#ea0df431965a308f6cb1d61386df8ad61e5befb5" + integrity sha512-jtHhUSWw+L7yxYgNtC+KJ3Ory90/jiAtpG1qT+gTQQ/RR5AMiigs9/lDHu/vnwljaq2S48FoKb/FZZMlJcC4bw== + dependencies: + "@emotion/serialize" "^0.11.6" + "@emotion/utils" "0.11.1" + babel-plugin-emotion "^10.0.9" + +"@emotion/hash@0.7.1": version "0.7.1" - resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5" - integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ== + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53" + integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA== -"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7": - version "0.6.7" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397" - integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg== +"@emotion/memoize@0.7.1": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f" + integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg== -"@emotion/utils@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" - integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== +"@emotion/serialize@^0.11.6": + version "0.11.6" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.6.tgz#78be8b9ee9ff49e0196233ba6ec1c1768ba1e1fc" + integrity sha512-n4zVv2qGLmspF99jaEUwnMV0fnEGsyUMsC/8KZKUSUTZMYljHE+j+B6rSD8PIFtaUIhHaxCG2JawN6L+OgLN0Q== + dependencies: + "@emotion/hash" "0.7.1" + "@emotion/memoize" "0.7.1" + "@emotion/unitless" "0.7.3" + "@emotion/utils" "0.11.1" + csstype "^2.5.7" + +"@emotion/sheet@0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4" + integrity sha512-pVBLzIbC/QCHDKJF2E82V2H/W/B004mDFQZiyo/MSR+VC4pV5JLG0TF/zgQDFvP3fZL/5RTPGEmXlYJBMUuJ+A== + +"@emotion/stylis@0.8.3": + version "0.8.3" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246" + integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q== + +"@emotion/unitless@0.7.3": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f" + integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg== + +"@emotion/utils@0.11.1": + version "0.11.1" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628" + integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg== + +"@emotion/weak-memoize@0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e" + integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA== "@fortawesome/fontawesome-common-types@^0.2.18": version "0.2.18" @@ -2234,23 +2263,21 @@ babel-plugin-dynamic-import-node@2.2.0: dependencies: object.assign "^4.1.0" -babel-plugin-emotion@^9.2.11: - version "9.2.11" - resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728" - integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ== +babel-plugin-emotion@^10.0.9: + version "10.0.9" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.9.tgz#04a0404d5a4084d5296357a393d344c0f8303ae4" + integrity sha512-IfWP12e9/wHtWHxVTzD692Nbcmrmcz2tip7acp6YUqtrP7slAyr5B+69hyZ8jd55GsyNSZwryNnmuDEVe0j+7w== dependencies: "@babel/helper-module-imports" "^7.0.0" - "@emotion/babel-utils" "^0.6.4" - "@emotion/hash" "^0.6.2" - "@emotion/memoize" "^0.6.1" - "@emotion/stylis" "^0.7.0" + "@emotion/hash" "0.7.1" + "@emotion/memoize" "0.7.1" + "@emotion/serialize" "^0.11.6" babel-plugin-macros "^2.0.0" babel-plugin-syntax-jsx "^6.18.0" convert-source-map "^1.5.0" + escape-string-regexp "^1.0.5" find-root "^1.1.0" - mkdirp "^0.5.1" source-map "^0.5.7" - touch "^2.0.1" babel-plugin-istanbul@^5.1.0: version "5.1.4" @@ -3181,7 +3208,7 @@ conventional-commits-parser@^2.1.0: through2 "^2.0.0" trim-off-newlines "^1.0.0" -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -3223,18 +3250,18 @@ copy-to-clipboard@3.2.0: toggle-selection "^1.0.6" core-js-compat@^3.0.0, core-js-compat@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.2.tgz#c29ab9722517094b98622175e2218c3b7398176d" - integrity sha512-X0Ch5f6itrHxhg5HSJucX6nNLNAGr+jq+biBh6nPGc3YAWz2a8p/ZIZY8cUkDzSRNG54omAuu3hoEF8qZbu/6Q== + version "3.1.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.3.tgz#0cc3ba4c7f62928c2837e1cffbe8dc78b4f1ae14" + integrity sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA== dependencies: browserslist "^4.6.0" - core-js-pure "3.1.2" - semver "^6.0.0" + core-js-pure "3.1.3" + semver "^6.1.0" -core-js-pure@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.2.tgz#62fc435f35b7374b9b782013cdcb2f97e9f6dffa" - integrity sha512-5ckIdBF26B3ldK9PM177y2ZcATP2oweam9RskHSoqfZCrJ2As6wVg8zJ1zTriFsZf6clj/N1ThDFRGaomMsh9w== +core-js-pure@3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5" + integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA== core-js@3.0.1: version "3.0.1" @@ -3247,9 +3274,9 @@ core-js@^1.0.0: integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= core-js@^2.4.0, core-js@^2.5.0: - version "2.6.8" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.8.tgz#dc3a1e633a04267944e0cb850d3880f340248139" - integrity sha512-RWlREFU74TEkdXzyl1bka66O3kYp8jeTXrvJZDzVVMH8AiHUSOFpL1yfhQJ+wHocAm1m+4971W1PPzfLuCv1vg== + version "2.6.9" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" + integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3284,19 +3311,6 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" -create-emotion@^9.2.12: - version "9.2.12" - resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f" - integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA== - dependencies: - "@emotion/hash" "^0.6.2" - "@emotion/memoize" "^0.6.1" - "@emotion/stylis" "^0.7.0" - "@emotion/unitless" "^0.6.2" - csstype "^2.5.2" - stylis "^3.5.0" - stylis-rule-sheet "^0.0.10" - create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" @@ -3610,10 +3624,10 @@ cssstyle@^1.0.0, cssstyle@^1.1.1: dependencies: cssom "0.3.x" -csstype@^2.5.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.4.tgz#d585a6062096e324e7187f80e04f92bd0f00e37f" - integrity sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg== +csstype@^2.5.7: + version "2.6.5" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.5.tgz#1cd1dff742ebf4d7c991470ae71e12bb6751e034" + integrity sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA== currently-unhandled@^0.4.1: version "0.4.1" @@ -4049,14 +4063,6 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= -emotion@^9.1.2: - version "9.2.12" - resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9" - integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ== - dependencies: - babel-plugin-emotion "^9.2.11" - create-emotion "^9.2.12" - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -7667,13 +7673,6 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= - dependencies: - abbrev "1" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -9521,13 +9520,16 @@ react-scripts@3.0.1: optionalDependencies: fsevents "2.0.6" -react-select@2.4.4: - version "2.4.4" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.4.4.tgz#ba72468ef1060c7d46fbb862b0748f96491f1f73" - integrity sha512-C4QPLgy9h42J/KkdrpVxNmkY6p4lb49fsrbDk/hRcZpX7JvZPNb6mGj+c5SzyEtBv1DmQ9oPH4NmhAFvCrg8Jw== +react-select@3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.3.tgz#f570b7b00e9b8b5bc938c3c834fdac0240e305d8" + integrity sha512-/WmzNDvATL2mFMLtZYlfUBHzg6YywglkmwJ52TCuvj2ALNu8gRKSlhkivPfKUWxxWKbolVCXSAh+xuwOQZJykg== dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/cache" "^10.0.9" + "@emotion/core" "^10.0.9" + "@emotion/css" "^10.0.9" classnames "^2.2.5" - emotion "^9.1.2" memoize-one "^5.0.0" prop-types "^15.6.0" raf "^3.4.0" @@ -10170,7 +10172,7 @@ semver@6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65" integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ== -semver@6.1.0, semver@^6.0.0: +semver@6.1.0, semver@^6.0.0, semver@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca" integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ== @@ -10458,11 +10460,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - space-separated-tokens@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz#27910835ae00d0adfcdbd0ad7e611fb9544351fa" @@ -10771,16 +10768,6 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylis-rule-sheet@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" - integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw== - -stylis@^3.5.0: - version "3.5.4" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" - integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -11027,13 +11014,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -touch@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164" - integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A== - dependencies: - nopt "~1.0.10" - tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" From 92a7c8c84790b92c78f171523bf81018ea9ac968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Mon, 27 May 2019 15:10:43 +0100 Subject: [PATCH 2/2] fix(ui): migrate to react-select v3 --- .../AlertGroupCollapseConfiguration.js | 4 +- .../AlertGroupCollapseConfiguration.test.js | 6 +- .../AlertGroupSortConfiguration.js | 4 +- .../AlertGroupSortConfiguration.test.js | 8 +- .../MainModal/Configuration/SortLabelName.js | 6 +- ...ertGroupCollapseConfiguration.test.js.snap | 14 +-- .../AlertGroupSortConfiguration.test.js.snap | 14 +-- .../__snapshots__/index.test.js.snap | 28 +++--- .../MainModalContent.test.js.snap | 28 +++--- .../__snapshots__/index.test.js.snap | 90 +++++++++---------- ui/src/Components/MultiSelect/index.js | 6 +- .../__snapshots__/index.test.js.snap | 18 ++-- .../SilenceModal/AlertManagerInput/index.js | 4 +- .../AlertManagerInput/index.test.js | 4 +- .../SilenceMatch/LabelNameInput.test.js | 4 +- .../SilenceMatch/LabelValueInput.test.js | 10 +-- .../__snapshots__/LabelNameInput.test.js.snap | 14 +-- .../LabelValueInput.test.js.snap | 14 +-- 18 files changed, 138 insertions(+), 138 deletions(-) diff --git a/ui/src/Components/MainModal/Configuration/AlertGroupCollapseConfiguration.js b/ui/src/Components/MainModal/Configuration/AlertGroupCollapseConfiguration.js index f5150225a..338343f2c 100644 --- a/ui/src/Components/MainModal/Configuration/AlertGroupCollapseConfiguration.js +++ b/ui/src/Components/MainModal/Configuration/AlertGroupCollapseConfiguration.js @@ -4,7 +4,7 @@ import PropTypes from "prop-types"; import { action } from "mobx"; import { observer } from "mobx-react"; -import ReactSelect from "react-select"; +import Select from "react-select"; import { Settings } from "Stores/Settings"; import { ReactSelectStyles } from "Components/MultiSelect"; @@ -60,7 +60,7 @@ const AlertGroupCollapseConfiguration = observer( Default alert group display - ", () => { it("resets stored config to defaults if it is invalid", done => { settingsStore.alertGroupConfig.config.defaultCollapseState = "foo"; const tree = FakeConfiguration(); - const select = tree.find(".react-select__value-container"); + const select = tree.find("div.react-select__value-container"); expect(select.text()).toBe( settingsStore.alertGroupConfig.options.collapsedOnMobile.label ); @@ -43,7 +43,7 @@ describe("", () => { settingsStore.alertGroupConfig.config.defaultCollapseState = settingsStore.alertGroupConfig.options.expanded.value; const tree = FakeConfiguration(); - const select = tree.find(".react-select__value-container"); + const select = tree.find("div.react-select__value-container"); setTimeout(() => { expect(select.text()).toBe( settingsStore.alertGroupConfig.options.expanded.label @@ -57,7 +57,7 @@ describe("", () => { tree .find("input#react-select-configuration-collapse-input") .simulate("change", { target: { value: " " } }); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(1).simulate("click"); setTimeout(() => { expect(settingsStore.alertGroupConfig.config.defaultCollapseState).toBe( diff --git a/ui/src/Components/MainModal/Configuration/AlertGroupSortConfiguration.js b/ui/src/Components/MainModal/Configuration/AlertGroupSortConfiguration.js index 1a0146271..66bc5dfec 100644 --- a/ui/src/Components/MainModal/Configuration/AlertGroupSortConfiguration.js +++ b/ui/src/Components/MainModal/Configuration/AlertGroupSortConfiguration.js @@ -4,7 +4,7 @@ import PropTypes from "prop-types"; import { action } from "mobx"; import { observer } from "mobx-react"; -import ReactSelect from "react-select"; +import Select from "react-select"; import { Settings } from "Stores/Settings"; import { ReactSelectStyles } from "Components/MultiSelect"; @@ -69,7 +69,7 @@ const AlertGroupSortConfiguration = observer(
- ", () => { it("label select renders suggestions on click", async () => { fetch.mockResponse(JSON.stringify(["alertname", "cluster", "fakeLabel"])); const tree = await ExpandSortLabelSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(3); expect(options.at(0).text()).toBe("alertname"); expect(options.at(1).text()).toBe("cluster"); @@ -135,7 +135,7 @@ describe("", () => { it("label select handles fetch errors", async () => { fetch.mockReject("error"); const tree = await ExpandSortLabelSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(0); }); @@ -143,14 +143,14 @@ describe("", () => { jest.spyOn(console, "error").mockImplementation(() => {}); fetch.mockResponse("invalid JSON"); const tree = await ExpandSortLabelSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(0); }); it("clicking on a label option updates settingsStore", async done => { fetch.mockResponse(JSON.stringify(["alertname", "cluster", "fakeLabel"])); const tree = await ExpandSortLabelSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(1).simulate("click"); setTimeout(() => { expect(settingsStore.gridConfig.config.sortLabel).toBe("cluster"); diff --git a/ui/src/Components/MainModal/Configuration/SortLabelName.js b/ui/src/Components/MainModal/Configuration/SortLabelName.js index dca03f1eb..216de65c8 100644 --- a/ui/src/Components/MainModal/Configuration/SortLabelName.js +++ b/ui/src/Components/MainModal/Configuration/SortLabelName.js @@ -4,7 +4,7 @@ import PropTypes from "prop-types"; import { action, observable } from "mobx"; import { observer } from "mobx-react"; -import CreatableSelect from "react-select/lib/Creatable"; +import Creatable from "react-select/creatable"; import { StaticLabels } from "Common/Query"; import { FormatBackendURI } from "Stores/AlertStore"; @@ -14,7 +14,7 @@ import { ReactSelectStyles } from "Components/MultiSelect"; const valueToOption = v => ({ label: v, value: v }); const SortLabelName = observer( - class SortLabelName extends CreatableSelect { + class SortLabelName extends Creatable { static propTypes = { settingsStore: PropTypes.instanceOf(Settings).isRequired }; @@ -68,7 +68,7 @@ const SortLabelName = observer( const { settingsStore } = this.props; return ( - matches snapshot with default value Default alert group display
-
-
-
-
+
+
+
+
Collapse on mobile
@@ -34,11 +34,11 @@ exports[` matches snapshot with default value
-
- +
+
matches snapshot with default values 1`
-
-
-
-
+
+
+
+
Use defaults from karma config file
@@ -36,11 +36,11 @@ exports[` matches snapshot with default values 1`
-
- +
+
matches snapshot 1`] = ` Default alert group display
-
-
-
-
+
+
+
+
Collapse on mobile
@@ -217,11 +217,11 @@ exports[` matches snapshot 1`] = `
-
- +
+
matches snapshot 1`] = `
-
-
-
-
+
+
+
+
Use defaults from karma config file
@@ -274,11 +274,11 @@ exports[` matches snapshot 1`] = `
-
- +
+
matches snapshot 1`] = ` Default alert group display
-
-
-
-
+
+
+
+
Collapse on mobile
@@ -236,11 +236,11 @@ exports[` matches snapshot 1`] = `
-
- +
+
matches snapshot 1`] = `
-
-
-
-
+
+
+
+
Use defaults from karma config file
@@ -293,11 +293,11 @@ exports[` matches snapshot 1`] = `
-
- +
+
matches snapshot when focused 1`] = ` " -
- +

  @@ -13,9 +13,9 @@ exports[` matches snapshot when focused 1`] = `   0 results available. Select is focused ,type to refine list, press Down to open the menu,

-
-
-
+
+
+
Select...
@@ -38,11 +38,11 @@ exports[` matches snapshot when focused 1`] = `
-
- +
+
matches snapshot when focused 1`] = ` exports[` matches snapshot with a value 1`] = ` " -
-
-
-
+
+
+
+
foo
@@ -89,11 +89,11 @@ exports[` matches snapshot with a value 1`] = `
-
- +
+
matches snapshot with a value 1`] = ` exports[` matches snapshot with defaults 1`] = ` " -
-
-
-
+
+
+
+
Select...
@@ -140,11 +140,11 @@ exports[` matches snapshot with defaults 1`] = `
-
- +
+
matches snapshot with defaults 1`] = ` exports[` matches snapshot with isDisabled=true 1`] = ` " -
-
-
-
+
+
+
+
foo
@@ -192,11 +192,11 @@ exports[` matches snapshot with isDisabled=true 1`] = `
-
- +
+
matches snapshot with isDisabled=true 1`] = ` exports[` matches snapshot with isMulti=true 1`] = ` " -
-
-
-
+
+
+
+
Select...
@@ -243,11 +243,11 @@ exports[` matches snapshot with isMulti=true 1`] = `
-
- +
+
matches snapshot with isMulti=true 1`] = ` exports[` matches snapshot with isMulti=true and a value 1`] = ` " -
-
-
-
+
+
+
+
foo
@@ -308,9 +308,9 @@ exports[` matches snapshot with isMulti=true and a value 1`
-
+
matches snapshot with isMulti=true and a value 1`
- +
@@ -90,12 +90,12 @@ const ReactSelectStyles = { }) }; -class MultiSelect extends CreatableSelect { +class MultiSelect extends Creatable { renderProps = () => ({}); render() { return ( - matches snapshot 1`] = ` " -
-
-
-
+
+
+
+
am1 | am2
@@ -22,7 +22,7 @@ exports[` matches snapshot 1`] = `
-
+
am3
@@ -59,9 +59,9 @@ exports[` matches snapshot 1`] = `
-
+
matches snapshot 1`] = `
- +
", () => { it("renders all 3 suggestions", () => { const tree = ValidateSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(2); expect(options.at(0).text()).toBe("am1 | am2"); expect(options.at(1).text()).toBe("am3"); @@ -134,7 +134,7 @@ describe("", () => { it("clicking on options appends them to silenceFormStore.data.alertmanagers", () => { silenceFormStore.data.alertmanagers = []; const tree = ValidateSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(0).simulate("click"); options.at(1).simulate("click"); expect(silenceFormStore.data.alertmanagers).toHaveLength(2); diff --git a/ui/src/Components/SilenceModal/SilenceMatch/LabelNameInput.test.js b/ui/src/Components/SilenceModal/SilenceMatch/LabelNameInput.test.js index 4b7677456..ad58c2d24 100644 --- a/ui/src/Components/SilenceModal/SilenceMatch/LabelNameInput.test.js +++ b/ui/src/Components/SilenceModal/SilenceMatch/LabelNameInput.test.js @@ -72,7 +72,7 @@ describe("", () => { it("renders suggestions", () => { const tree = ValidateSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(2); expect(options.at(0).text()).toBe("job"); expect(options.at(1).text()).toBe("cluster"); @@ -80,7 +80,7 @@ describe("", () => { it("clicking on options updates the matcher", () => { const tree = ValidateSuggestions(); - const option = tree.find(".react-select__option").at(0); + const option = tree.find("div.react-select__option").at(0); option.simulate("click"); expect(matcher.name).toBe("job"); }); diff --git a/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.test.js b/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.test.js index 00a529816..a0a58797d 100644 --- a/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.test.js +++ b/ui/src/Components/SilenceModal/SilenceMatch/LabelValueInput.test.js @@ -84,7 +84,7 @@ describe("", () => { it("renders suggestions", () => { const tree = ValidateSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); expect(options).toHaveLength(2); expect(options.at(0).text()).toBe("foo"); expect(options.at(1).text()).toBe("bar"); @@ -92,7 +92,7 @@ describe("", () => { it("clicking on options appends them to matcher.values", () => { const tree = ValidateSuggestions(); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(0).simulate("click"); options.at(1).simulate("click"); expect(matcher.values).toHaveLength(2); @@ -103,7 +103,7 @@ describe("", () => { it("selecting one option doesn't force matcher.isRegex=true", () => { const tree = ValidateSuggestions(); expect(matcher.isRegex).toBe(false); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(0).simulate("click"); expect(matcher.isRegex).toBe(false); }); @@ -112,7 +112,7 @@ describe("", () => { matcher.isRegex = true; const tree = ValidateSuggestions(); expect(matcher.isRegex).toBe(true); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(0).simulate("click"); expect(matcher.isRegex).toBe(false); }); @@ -120,7 +120,7 @@ describe("", () => { it("selecting multiple options forces matcher.isRegex=true", () => { const tree = ValidateSuggestions(); expect(matcher.isRegex).toBe(false); - const options = tree.find(".react-select__option"); + const options = tree.find("div.react-select__option"); options.at(0).simulate("click"); options.at(1).simulate("click"); expect(matcher.isRegex).toBe(true); diff --git a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap index 42aa7b30d..f8ad0314e 100644 --- a/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap +++ b/ui/src/Components/SilenceModal/SilenceMatch/__snapshots__/LabelNameInput.test.js.snap @@ -2,10 +2,10 @@ exports[` matches snapshot 1`] = ` " -
-
-
-
+
+
+
+
name
@@ -28,11 +28,11 @@ exports[` matches snapshot 1`] = `
-
- +
+
matches snapshot 1`] = ` " -
-
-
+
+
+
matches snapshot 1`] = `
-
+
Label value
@@ -53,11 +53,11 @@ exports[` matches snapshot 1`] = `
-
- +
+