From cb439b80dec299614bcbfa6166951f1e9e56eff0 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 1 Apr 2024 08:43:13 -0700 Subject: [PATCH 1/2] Upgrade EUI to v93.5.2 --- package.json | 2 +- src/dev/license_checker/config.ts | 2 +- yarn.lock | 28 ++++++++++++++++++---------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 1628778cbe832..aec2f59e98147 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@elastic/ecs": "^8.11.1", "@elastic/elasticsearch": "^8.12.2", "@elastic/ems-client": "8.5.1", - "@elastic/eui": "93.5.1", + "@elastic/eui": "93.5.2", "@elastic/filesaver": "1.1.2", "@elastic/node-crypto": "1.2.1", "@elastic/numeral": "^2.5.1", diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 97358bb006ed4..27fd83d736b31 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -86,7 +86,7 @@ export const LICENSE_OVERRIDES = { 'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint '@elastic/ems-client@8.5.1': ['Elastic License 2.0'], - '@elastic/eui@93.5.1': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@93.5.2': ['SSPL-1.0 OR Elastic License 2.0'], 'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry 'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary '@bufbuild/protobuf@1.2.1': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) diff --git a/yarn.lock b/yarn.lock index e919f6749b997..e7f8586e9a3ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1746,10 +1746,10 @@ resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314" integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ== -"@elastic/eui@93.5.1": - version "93.5.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-93.5.1.tgz#e663017052a1461ec0c67e825f1d7c1346f3c3ee" - integrity sha512-40zFwuYakCDxzEDnh2ePgUh4KVfmy8p6sXc8FFES07zoboRt82YxQxwmgouqu02TZHaXir1bXSpmEyXe4T7CMg== +"@elastic/eui@93.5.2": + version "93.5.2" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-93.5.2.tgz#42bb985a960a7b2d46fe7e25846a476d30900b71" + integrity sha512-/1k7k7xYMPj9AM0OTgMilvKI6IdnVOPyQ7YQwE57NKrmBYfj9H91AKQNZ+rXze7QuuuFi73dUMSfbeE9ncqGZA== dependencies: "@hello-pangea/dnd" "^16.3.0" "@types/lodash" "^4.14.202" @@ -1767,8 +1767,8 @@ react-focus-on "^3.9.1" react-is "^17.0.2" react-remove-scroll-bar "^2.3.4" - react-virtualized-auto-sizer "^1.0.20" - react-window "^1.8.9" + react-virtualized-auto-sizer "^1.0.24" + react-window "^1.8.10" refractor "^3.6.0" rehype-raw "^5.1.0" rehype-react "^6.2.1" @@ -26173,10 +26173,10 @@ react-use@^15.3.8: ts-easing "^0.2.0" tslib "^2.0.0" -react-virtualized-auto-sizer@^1.0.20: - version "1.0.20" - resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.20.tgz#d9a907253a7c221c52fa57dc775a6ef40c182645" - integrity sha512-OdIyHwj4S4wyhbKHOKM1wLSj/UDXm839Z3Cvfg2a9j+He6yDa6i5p0qQvEiCnyQlGO/HyfSnigQwuxvYalaAXA== +react-virtualized-auto-sizer@^1.0.24: + version "1.0.24" + resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz#3ebdc92f4b05ad65693b3cc8e7d8dd54924c0227" + integrity sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg== react-virtualized@^9.22.5: version "9.22.5" @@ -26190,6 +26190,14 @@ react-virtualized@^9.22.5: prop-types "^15.7.2" react-lifecycles-compat "^3.0.4" +react-window@^1.8.10: + version "1.8.10" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.10.tgz#9e6b08548316814b443f7002b1cf8fd3a1bdde03" + integrity sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one ">=3.1.1 <6" + react-window@^1.8.9: version "1.8.9" resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.9.tgz#24bc346be73d0468cdf91998aac94e32bc7fa6a8" From 27093626b71ebad6cf88e6d1b13b1f84e8d92f8c Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 1 Apr 2024 08:46:50 -0700 Subject: [PATCH 2/2] Upgrade `react-window` to match EUI --- package.json | 4 ++-- yarn.lock | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index aec2f59e98147..acd2f530a9de4 100644 --- a/package.json +++ b/package.json @@ -1103,7 +1103,7 @@ "react-syntax-highlighter": "^15.3.1", "react-use": "^15.3.8", "react-virtualized": "^9.22.5", - "react-window": "^1.8.9", + "react-window": "^1.8.10", "reduce-reducers": "^1.0.4", "redux": "^4.2.1", "redux-actions": "^2.6.5", @@ -1490,7 +1490,7 @@ "@types/react-syntax-highlighter": "^15.4.0", "@types/react-test-renderer": "^17.0.2", "@types/react-virtualized": "^9.21.22", - "@types/react-window": "^1.8.5", + "@types/react-window": "^1.8.8", "@types/redux-actions": "^2.6.1", "@types/resolve": "^1.20.1", "@types/seedrandom": ">=2.0.0 <4.0.0", diff --git a/yarn.lock b/yarn.lock index e7f8586e9a3ca..5fdede7d8e075 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10349,13 +10349,6 @@ "@types/prop-types" "*" "@types/react" "*" -"@types/react-window@^1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz#285fcc5cea703eef78d90f499e1457e9b5c02fc1" - integrity sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw== - dependencies: - "@types/react" "*" - "@types/react-window@^1.8.8": version "1.8.8" resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.8.tgz#c20645414d142364fbe735818e1c1e0a145696e3" @@ -26198,14 +26191,6 @@ react-window@^1.8.10: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react-window@^1.8.9: - version "1.8.9" - resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.9.tgz#24bc346be73d0468cdf91998aac94e32bc7fa6a8" - integrity sha512-+Eqx/fj1Aa5WnhRfj9dJg4VYATGwIUP2ItwItiJ6zboKWA6EX3lYDAXfGF2hyNqplEprhbtjbipiADEcwQ823Q== - dependencies: - "@babel/runtime" "^7.0.0" - memoize-one ">=3.1.1 <6" - "react@^17.0.0 || ^18.2.0": version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"