Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade EUI to v88.3.0 #166676

Merged
merged 18 commits into from Sep 20, 2023
Merged

Upgrade EUI to v88.3.0 #166676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4df9088
Upgrade EUI to v.88.3.0 . Update webpack.config to handle ES modules …
breehall Sep 12, 2023
1597988
[i18n] Update i18n tokens for EUI v.88.3.0
breehall Sep 12, 2023
882a2e3
[EuiAccordion] Update snapshots for tests capturing EuiAccordion as i…
breehall Sep 13, 2023
2c82f59
[EuiAccordion] Update reference to EuiAccordion's buttonIcon class as…
breehall Sep 13, 2023
159ba28
Merge branch 'main' into eui/88.3.0
kibanamachine Sep 13, 2023
cbf4406
[EuiAccordion] Remove unnecessary custom CSS in favor of a prop
cee-chen Sep 13, 2023
7a4ef14
[EuiAccordion] Update more references to renamed arrow class
cee-chen Sep 13, 2023
bb2d2f0
Add rule to Security Cypress Webpack config to allow optional chainin…
breehall Sep 13, 2023
27fe841
Updating changes made by kbn bootstrap
breehall Sep 13, 2023
d779250
Merge branch 'main' of github.com:breehall/kibana into eui/88.3.0
breehall Sep 14, 2023
ac66ef8
Merge branch 'main' into eui/88.3.0
jbudz Sep 18, 2023
3c4b9e2
Update storybook webpack config
cee-chen Sep 18, 2023
42aaf43
Merge branch 'main' into eui/88.3.0
cee-chen Sep 18, 2023
984486e
Pin `@hello-pangea/dnd` to 16.2.0
cee-chen Sep 19, 2023
da760a4
Merge remote-tracking branch 'upstream/main' into eui/88.3.0
cee-chen Sep 19, 2023
f0c5f35
Merge branch 'main' into eui/88.3.0
cee-chen Sep 19, 2023
197b8b1
Fix `@hello-pangea/dnd` type error
cee-chen Sep 19, 2023
48879ce
Restore removed `test/interpreter_functional/snapshots/session` files
cee-chen Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -77,6 +77,7 @@
"yarn": "^1.22.19"
},
"resolutions": {
"**/@hello-pangea/dnd": "16.2.0",
Copy link
Member Author

@cee-chen cee-chen Sep 19, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tkajtoch @breehall

I don't love this but I don't see an easy way around this. We were able to update Kibana's base webpack config and Cypress webpack config to use the optional chaining babel plugin on the distributed dnd dependency, but Storybook just won't take my updated rule no matter what I try.

I think it's related to this issue: storybookjs/storybook#14292 and the fact that Kibana is still on Webpack v4. I don't think we can upgrade Kibana past 16.2.0 until it's on Webpack v5.

Edit: I tried the linked issue's suggestion of pinning acorn to 8.x, which fixed Storybook but unfortunately broke Kibana's build script. So we're stuck with pinning @hello-pangea/dnd until Kibana is on Webpack v5 I think.

"**/@types/node": "18.17.1",
"**/@typescript-eslint/utils": "5.62.0",
"**/chokidar": "^3.5.3",
Expand Down Expand Up @@ -125,7 +126,7 @@
"@hapi/hoek": "^9.2.1",
"@hapi/inert": "^6.0.4",
"@hapi/wreck": "^17.1.0",
"@hello-pangea/dnd": "^16.3.0",
"@hello-pangea/dnd": "16.2.0",
"@juggle/resize-observer": "^3.4.0",
"@kbn/aad-fixtures-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/aad",
"@kbn/ace": "link:packages/kbn-ace",
Expand Down
13 changes: 0 additions & 13 deletions packages/kbn-cypress-config/index.ts
View file
Open in desktop
Expand Up @@ -40,19 +40,6 @@ export function defineCypressConfig(options?: Cypress.ConfigOptions<any>) {
},
},
},
// @hello-pangea/dnd emits optional chaining that confuses webpack.
// We need to transform it using babel before going further
{
test: /@hello-pangea\/dnd\/dist\/dnd(\.esm)?\.js$/,
use: [
{
loader: 'babel-loader',
options: {
plugins: [require.resolve('@babel/plugin-proposal-optional-chaining')],
},
},
],
},
],
},
},
Expand Down
13 changes: 0 additions & 13 deletions packages/kbn-storybook/src/webpack.config.ts
View file
Open in desktop
Expand Up @@ -123,19 +123,6 @@ export default ({ config: storybookConfig }: { config: Configuration }) => {
},
],
},
// @hello-pangea/dnd emits optional chaining that confuses webpack.
// We need to transform it using babel before going further
{
test: /@hello-pangea\/dnd\/dist\/dnd\.esm\.js$/,
use: [
{
loader: 'babel-loader',
options: {
plugins: [require.resolve('@babel/plugin-proposal-optional-chaining')],
},
},
],
},
],
},
plugins: [new IgnoreNotFoundExportPlugin()],
Expand Down
13 changes: 0 additions & 13 deletions packages/kbn-ui-shared-deps-npm/webpack.config.js
View file
Open in desktop
Expand Up @@ -143,19 +143,6 @@ module.exports = (_, argv) => {
},
],
},
// @hello-pangea/dnd emits optional chaining that confuses webpack.
// We need to transform it using babel before going further
{
test: /@hello-pangea\/dnd\/dist\/dnd(\.esm)?\.js$/,
use: [
{
loader: 'babel-loader',
options: {
plugins: [require.resolve('@babel/plugin-proposal-optional-chaining')],
},
},
],
},
{
test: /\.css$/,
use: [MiniCssExtractPlugin.loader, 'css-loader'],
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -1209,7 +1209,7 @@
pirates "^4.0.5"
source-map-support "^0.5.16"

"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
version "7.22.10"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
Expand All @@ -1223,6 +1223,13 @@
dependencies:
regenerator-runtime "^0.13.11"

"@babel/runtime@^7.19.4":
version "7.22.11"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.11.tgz#7a9ba3bbe406ad6f9e8dd4da2ece453eb23a77a4"
integrity sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==
dependencies:
regenerator-runtime "^0.14.0"

"@babel/template@^7.12.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
Expand Down Expand Up @@ -2542,17 +2549,17 @@
"@hapi/bourne" "2.x.x"
"@hapi/hoek" "9.x.x"

"@hello-pangea/dnd@^16.3.0":
version "16.3.0"
resolved "https://registry.yarnpkg.com/@hello-pangea/dnd/-/dnd-16.3.0.tgz#3776212f812df4e8e69c42831ec8ab7ff3a087d6"
integrity sha512-RYQ/K8shtJoyNPvFWz0gfXIK7HF3P3mL9UZFGMuHB0ljRSXVgMjVFI/FxcZmakMzw6tO7NflWLriwTNBow/4vw==
"@hello-pangea/dnd@16.2.0", "@hello-pangea/dnd@^16.3.0":
version "16.2.0"
resolved "https://registry.yarnpkg.com/@hello-pangea/dnd/-/dnd-16.2.0.tgz#58cbadeb56f8c7a381da696bb7aa3bfbb87876ec"
integrity sha512-inACvMcvvLr34CG0P6+G/3bprVKhwswxjcsFUSJ+fpOGjhvDj9caiA9X3clby0lgJ6/ILIJjyedHZYECB7GAgA==
dependencies:
"@babel/runtime" "^7.22.5"
"@babel/runtime" "^7.19.4"
css-box-model "^1.2.1"
memoize-one "^6.0.0"
raf-schd "^4.0.3"
react-redux "^8.1.1"
redux "^4.2.1"
react-redux "^8.0.4"
redux "^4.2.0"
use-memo-one "^1.1.3"

"@humanwhocodes/config-array@^0.11.10":
Expand Down Expand Up @@ -25508,7 +25515,7 @@ react-redux@^7.1.0, react-redux@^7.2.8:
prop-types "^15.7.2"
react-is "^17.0.2"

react-redux@^8.1.1:
react-redux@^8.0.4:
version "8.1.2"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.1.2.tgz#9076bbc6b60f746659ad6d51cb05de9c5e1e9188"
integrity sha512-xJKYI189VwfsFc4CJvHqHlDrzyFTY/3vZACbE+rr/zQ34Xx1wQfB4OTOSeOSNrF6BDVe8OOdxIrAnMGXA3ggfw==
Expand Down Expand Up @@ -26034,13 +26041,6 @@ redux@^4.0.0, redux@^4.0.4, redux@^4.1.2, redux@^4.2.0:
dependencies:
"@babel/runtime" "^7.9.2"

redux@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
dependencies:
"@babel/runtime" "^7.9.2"

refractor@^3.2.0, refractor@^3.5.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a"
Expand Down