diff --git a/package.json b/package.json index 40a9d52957de7..42978697960c7 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 979605369b25c..99d9198a31ccc 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -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) diff --git a/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js b/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js index 78d6f66bede9c..2ef9bbe9b1e28 100644 --- a/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js +++ b/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js @@ -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; @@ -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 diff --git a/src/platform/packages/private/kbn-ui-shared-deps-src/webpack.config.js b/src/platform/packages/private/kbn-ui-shared-deps-src/webpack.config.js index 045c1c2c6d9ab..3b8f9d001697e 100644 --- a/src/platform/packages/private/kbn-ui-shared-deps-src/webpack.config.js +++ b/src/platform/packages/private/kbn-ui-shared-deps-src/webpack.config.js @@ -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: { @@ -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 diff --git a/yarn.lock b/yarn.lock index ec39d18c41c53..fb4c91fd94db3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"