Skip to content

[8.19] Revert dual EUI versions #249567

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

Merged
delanni merged 2 commits into from
Jan 22, 2026
Merged

[8.19] Revert dual EUI versions #249567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
643c7c8
Revert "[8.19] Add conditional switching between EUI releases (#21981…
delanni Jan 19, 2026
b0a7690
Merge branch '8.19' into revert-dual-eui-versions
delanni Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
"@elastic/elasticsearch": "^8.19.1",
"@elastic/ems-client": "8.6.3",
"@elastic/eui": "104.0.0-amsterdam.1",
"@elastic/eui-amsterdam": "npm:@elastic/eui@104.0.0-amsterdam.1",
"@elastic/filesaver": "1.1.2",
"@elastic/monaco-esql": "^3.1.6",
"@elastic/node-crypto": "^1.2.3",
Expand Down
3 changes: 0 additions & 3 deletions src/dev/license_checker/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ export const LICENSE_OVERRIDES = {
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/ems-client@8.6.3': ['Elastic License 2.0'],
'@elastic/eui@104.0.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'],
'@elastic/eui-amsterdam@104.0.0-amsterdam.1': [
'Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.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@2.5.2': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause)
Expand Down
18 changes: 1 addition & 17 deletions src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ const WEBPACK_SRC = require.resolve('webpack');

const { REPO_ROOT } = require('@kbn/repo-info');

const useEuiAmsterdamRelease = process.env.EUI_AMSTERDAM === 'true';

/** @returns {import('webpack').Configuration} */
module.exports = (_, argv) => {
const outputPath = argv.outputPath ? Path.resolve(argv.outputPath) : UiSharedDepsNpm.distDir;
Expand Down Expand Up @@ -134,21 +132,7 @@ module.exports = (_, argv) => {

resolve: {
alias: {
// @elastic/eui-amsterdam is a package alias defined in Kibana's package.json
// that points to special EUI releases bundled with Amsterdam set as the default theme
// and meant to be used with Kibana 8.x. Kibana 9.0 and later use the Borealis theme
// and should import from the regular @elastic/eui package.
// TODO: Remove when Kibana 8.19 is EOL and Amsterdam backports aren't needed anymore
// https://github.com/elastic/kibana/issues/221593
'@elastic/eui$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es'
: '@elastic/eui/optimize/es',
'@elastic/eui/optimize/es/components/provider/nested$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es/components/provider/nested'
: '@elastic/eui/optimize/es/components/provider/nested',
'@elastic/eui/optimize/es/services/theme/warning$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es/services/theme/warning'
: '@elastic/eui/optimize/es/services/theme/warning',
'@elastic/eui$': '@elastic/eui/optimize/es',
moment: MOMENT_SRC,
// NOTE: Used to include react profiling on bundles
// https://gist.github.com/bvaughn/25e6233aeb1b4f0cdb8d8366e54a3977#webpack-4
Expand Down
21 changes: 4 additions & 17 deletions src/platform/packages/private/kbn-ui-shared-deps-src/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ const MOMENT_SRC = require.resolve('moment/min/moment-with-locales.js');
const DOMPURIFY_SRC = require.resolve('dompurify/dist/purify.js');
const { REPO_ROOT } = require('@kbn/repo-info');

const useEuiAmsterdamRelease = process.env.EUI_AMSTERDAM === 'true';

/** @returns {import('webpack').Configuration} */
module.exports = {
externals: {
Expand Down Expand Up @@ -117,21 +115,10 @@ module.exports = {
mainFields: ['browser', 'module', 'main'],
conditionNames: ['browser', 'module', 'import', 'require', 'default'],
alias: {
// @elastic/eui-amsterdam is a package alias defined in Kibana's package.json
// that points to special EUI releases bundled with Amsterdam set as the default theme
// and meant to be used with Kibana 8.x. Kibana 9.0 and later use the Borealis theme
// and should use the regular @elastic/eui package.
// TODO: Remove when Kibana 8.19 is EOL and Amsterdam backports aren't needed anymore
// https://github.com/elastic/kibana/issues/221593
'@elastic/eui$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es'
: '@elastic/eui/optimize/es',
'@elastic/eui/lib/components/provider/nested$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es/components/provider/nested'
: '@elastic/eui/optimize/es/components/provider/nested',
'@elastic/eui/lib/services/theme/warning$': useEuiAmsterdamRelease
? '@elastic/eui-amsterdam/optimize/es/services/theme/warning'
: '@elastic/eui/optimize/es/services/theme/warning',
'@elastic/eui$': '@elastic/eui/optimize/es',
'@elastic/eui/lib/components/provider/nested$':
'@elastic/eui/optimize/es/components/provider/nested',
'@elastic/eui/lib/services/theme/warning$': '@elastic/eui/optimize/es/services/theme/warning',
moment: MOMENT_SRC,
// NOTE: Used to include react profiling on bundles
// https://gist.github.com/bvaughn/25e6233aeb1b4f0cdb8d8366e54a3977#webpack-4
Expand Down
41 changes: 0 additions & 41 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,47 +2375,6 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/eui-amsterdam@npm:@elastic/eui@104.0.0-amsterdam.1":
version "104.0.0-amsterdam.1"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-104.0.0-amsterdam.1.tgz#3a731f92afa67c6e7c88f2059ea8740243ff7fbd"
integrity sha512-HPDffYvt8reHwXNzORGix/bBJ1aNSHvYKxBaEni0cz1O4oQupdY6A9U2wu571f7O0F4qZdZ+CyfqEtimcDXkjQ==
dependencies:
"@elastic/eui-theme-common" "2.0.0"
"@elastic/prismjs-esql" "^1.1.0"
"@hello-pangea/dnd" "^16.6.0"
"@types/lodash" "^4.14.202"
"@types/numeral" "^2.0.5"
"@types/react-window" "^1.8.8"
"@types/refractor" "^3.4.0"
chroma-js "^2.4.2"
classnames "^2.5.1"
lodash "^4.17.21"
mdast-util-to-hast "^10.2.0"
numeral "^2.0.6"
prop-types "^15.8.1"
react-dropzone "^11.7.1"
react-element-to-jsx-string "^15.0.0"
react-focus-on "^3.9.1"
react-is "^17.0.2"
react-remove-scroll-bar "^2.3.4"
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"
rehype-stringify "^8.0.0"
remark-breaks "^2.0.2"
remark-emoji "^2.1.0"
remark-parse-no-trim "^8.0.4"
remark-rehype "^8.1.0"
tabbable "^5.3.3"
text-diff "^1.0.1"
unified "^9.2.2"
unist-util-visit "^2.0.3"
url-parse "^1.5.10"
uuid "^8.3.0"
vfile "^4.2.1"

"@elastic/eui-theme-common@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@elastic/eui-theme-common/-/eui-theme-common-2.0.0.tgz#248973f7161924943a2d6ad96c2ea82f0ca332f4"
Expand Down