From 8a0db9c797fccca8050cd995d2acda6d8cf2abb2 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 8 Oct 2021 03:02:36 +0100 Subject: [PATCH 1/8] chore(NA): remove elastic-datemath from kbn-ui-shared-deps-npm --- packages/kbn-ui-shared-deps-npm/BUILD.bazel | 2 -- packages/kbn-ui-shared-deps-npm/webpack.config.js | 1 - 2 files changed, 3 deletions(-) diff --git a/packages/kbn-ui-shared-deps-npm/BUILD.bazel b/packages/kbn-ui-shared-deps-npm/BUILD.bazel index ae3a6f05d456b..537cde5790f7f 100644 --- a/packages/kbn-ui-shared-deps-npm/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-npm/BUILD.bazel @@ -29,7 +29,6 @@ NPM_MODULE_EXTRA_FILES = [ ] RUNTIME_DEPS = [ - "//packages/elastic-datemath", "//packages/kbn-utils", "@npm//@babel/runtime", "@npm//@elastic/charts", @@ -71,7 +70,6 @@ WEBPACK_DEPS = [ ] TYPES_DEPS = [ - "//packages/elastic-datemath", "//packages/kbn-utils", "@npm//@elastic/charts", "@npm//@elastic/eui", diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js index 6c37e2e9adf9e..f8f694131e9a8 100644 --- a/packages/kbn-ui-shared-deps-npm/webpack.config.js +++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js @@ -40,7 +40,6 @@ module.exports = (_, argv) => { // modules from npm '@elastic/charts', - '@elastic/datemath', '@elastic/eui', '@elastic/eui/dist/eui_charts_theme', '@elastic/eui/lib/services', From f11375856017dbd344925aa350756e5c8a389f38 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 8 Oct 2021 03:26:04 +0100 Subject: [PATCH 2/8] chore(NA): remove @kbn deps on kbn ui shared deps npm --- packages/kbn-ui-shared-deps-npm/BUILD.bazel | 3 +-- packages/kbn-ui-shared-deps-npm/webpack.config.js | 4 ++-- packages/kbn-ui-shared-deps-src/BUILD.bazel | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/kbn-ui-shared-deps-npm/BUILD.bazel b/packages/kbn-ui-shared-deps-npm/BUILD.bazel index 537cde5790f7f..55bd6a9b51f58 100644 --- a/packages/kbn-ui-shared-deps-npm/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-npm/BUILD.bazel @@ -29,7 +29,6 @@ NPM_MODULE_EXTRA_FILES = [ ] RUNTIME_DEPS = [ - "//packages/kbn-utils", "@npm//@babel/runtime", "@npm//@elastic/charts", "@npm//@elastic/eui", @@ -60,6 +59,7 @@ RUNTIME_DEPS = [ "@npm//rxjs", "@npm//styled-components", "@npm//symbol-observable", + "@npm//tslib", "@npm//url-loader", "@npm//val-loader", "@npm//whatwg-fetch", @@ -70,7 +70,6 @@ WEBPACK_DEPS = [ ] TYPES_DEPS = [ - "//packages/kbn-utils", "@npm//@elastic/charts", "@npm//@elastic/eui", "@npm//@elastic/numeral", diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js index f8f694131e9a8..c06ce6704f451 100644 --- a/packages/kbn-ui-shared-deps-npm/webpack.config.js +++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js @@ -11,13 +11,13 @@ const webpack = require('webpack'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const { REPO_ROOT } = require('@kbn/utils'); - const UiSharedDepsNpm = require('./src/index'); const MOMENT_SRC = require.resolve('moment/min/moment-with-locales.js'); const WEBPACK_SRC = require.resolve('webpack'); +const REPO_ROOT = Path.resolve(__dirname, '..', '..'); + module.exports = (_, argv) => { const outputPath = argv.outputPath ? Path.resolve(argv.outputPath) : UiSharedDepsNpm.distDir; diff --git a/packages/kbn-ui-shared-deps-src/BUILD.bazel b/packages/kbn-ui-shared-deps-src/BUILD.bazel index f23c86769fb49..f42d3d862bfcf 100644 --- a/packages/kbn-ui-shared-deps-src/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-src/BUILD.bazel @@ -52,7 +52,6 @@ TYPES_DEPS = [ "//packages/kbn-ui-shared-deps-npm", "//packages/kbn-utils", "@npm//@elastic/eui", - "@npm//resize-observer-polyfill", "@npm//webpack", ] From 5d3050a463a9b7d37179c327e33c965f3e5853de Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 15:55:49 +0100 Subject: [PATCH 3/8] chore(NA): missing peer dep to build kbn ui shared deps npm --- packages/kbn-ui-shared-deps-npm/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kbn-ui-shared-deps-npm/BUILD.bazel b/packages/kbn-ui-shared-deps-npm/BUILD.bazel index 55bd6a9b51f58..2ca08a34d761f 100644 --- a/packages/kbn-ui-shared-deps-npm/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-npm/BUILD.bazel @@ -29,6 +29,7 @@ NPM_MODULE_EXTRA_FILES = [ ] RUNTIME_DEPS = [ + "//packages/elastic-datemath", "@npm//@babel/runtime", "@npm//@elastic/charts", "@npm//@elastic/eui", From f43965ee72288e1059f58b381dc2d815797635c3 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 20:31:44 +0100 Subject: [PATCH 4/8] chore(NA): general improvements for kbn ui shared deps npm --- packages/kbn-ui-shared-deps-npm/webpack.config.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js index c06ce6704f451..d9f6521ee3407 100644 --- a/packages/kbn-ui-shared-deps-npm/webpack.config.js +++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js @@ -144,6 +144,13 @@ module.exports = (_, argv) => { optimization: { minimize: false, noEmitOnErrors: true, + splitChunks: { + chunks: () => false, + cacheGroups: { + default: false, + defaultVendors: false, + }, + }, }, performance: { @@ -154,6 +161,9 @@ module.exports = (_, argv) => { }, plugins: [ + // new webpack.optimize.MinChunkSizePlugin({ + // minChunkSize: 500000, + // }), new CleanWebpackPlugin({ protectWebpackAssets: false, cleanAfterEveryBuildPatterns: [ From a34981cd68999eb3476008b3ed9d6feeeff12d00 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 20:32:53 +0100 Subject: [PATCH 5/8] chore(NA): remove min size chunks plugin --- packages/kbn-ui-shared-deps-npm/webpack.config.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js index d9f6521ee3407..8cdf0609e31ae 100644 --- a/packages/kbn-ui-shared-deps-npm/webpack.config.js +++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js @@ -161,9 +161,6 @@ module.exports = (_, argv) => { }, plugins: [ - // new webpack.optimize.MinChunkSizePlugin({ - // minChunkSize: 500000, - // }), new CleanWebpackPlugin({ protectWebpackAssets: false, cleanAfterEveryBuildPatterns: [ From 509a3af9898e27395b7a93f16815995f647bb00e Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 20:37:40 +0100 Subject: [PATCH 6/8] chore(NA): remove split chunks --- packages/kbn-ui-shared-deps-npm/webpack.config.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js index 8cdf0609e31ae..c06ce6704f451 100644 --- a/packages/kbn-ui-shared-deps-npm/webpack.config.js +++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js @@ -144,13 +144,6 @@ module.exports = (_, argv) => { optimization: { minimize: false, noEmitOnErrors: true, - splitChunks: { - chunks: () => false, - cacheGroups: { - default: false, - defaultVendors: false, - }, - }, }, performance: { From 90e0d91b2c9f7102b79ef106d4ecee6fd92a43ea Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 20:49:35 +0100 Subject: [PATCH 7/8] chore(NA): improve dep declaring on kbn-ui-shared-deps-src --- packages/kbn-ui-shared-deps-src/.babelrc | 3 --- packages/kbn-ui-shared-deps-src/BUILD.bazel | 2 -- packages/kbn-ui-shared-deps-src/src/index.js | 2 +- packages/kbn-ui-shared-deps-src/webpack.config.js | 3 ++- 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 packages/kbn-ui-shared-deps-src/.babelrc diff --git a/packages/kbn-ui-shared-deps-src/.babelrc b/packages/kbn-ui-shared-deps-src/.babelrc deleted file mode 100644 index 7da72d1779128..0000000000000 --- a/packages/kbn-ui-shared-deps-src/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@kbn/babel-preset/node_preset"] -} diff --git a/packages/kbn-ui-shared-deps-src/BUILD.bazel b/packages/kbn-ui-shared-deps-src/BUILD.bazel index f42d3d862bfcf..d1c9115c0515b 100644 --- a/packages/kbn-ui-shared-deps-src/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-src/BUILD.bazel @@ -38,7 +38,6 @@ RUNTIME_DEPS = [ "//packages/kbn-monaco", "//packages/kbn-std", "//packages/kbn-ui-shared-deps-npm", - "//packages/kbn-utils", ] TYPES_DEPS = [ @@ -50,7 +49,6 @@ TYPES_DEPS = [ "//packages/kbn-monaco", "//packages/kbn-std", "//packages/kbn-ui-shared-deps-npm", - "//packages/kbn-utils", "@npm//@elastic/eui", "@npm//webpack", ] diff --git a/packages/kbn-ui-shared-deps-src/src/index.js b/packages/kbn-ui-shared-deps-src/src/index.js index 7433a99b12a99..df83a2d34f76c 100644 --- a/packages/kbn-ui-shared-deps-src/src/index.js +++ b/packages/kbn-ui-shared-deps-src/src/index.js @@ -8,7 +8,7 @@ const Path = require('path'); -/** +/**1 * Absolute path to the distributable directory */ exports.distDir = Path.resolve(__dirname, '../shared_built_assets'); diff --git a/packages/kbn-ui-shared-deps-src/webpack.config.js b/packages/kbn-ui-shared-deps-src/webpack.config.js index 125a3539dd667..ad84c9444fd0f 100644 --- a/packages/kbn-ui-shared-deps-src/webpack.config.js +++ b/packages/kbn-ui-shared-deps-src/webpack.config.js @@ -10,13 +10,14 @@ const Path = require('path'); const webpack = require('webpack'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const { REPO_ROOT } = require('@kbn/utils'); const UiSharedDepsNpm = require('@kbn/ui-shared-deps-npm'); const UiSharedDepsSrc = require('./src'); const MOMENT_SRC = require.resolve('moment/min/moment-with-locales.js'); +const REPO_ROOT = Path.resolve(__dirname, '..', '..'); + module.exports = { node: { child_process: 'empty', From 18eb8e378c1f82a28e4786f831d647f6105aa990 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 Oct 2021 20:51:12 +0100 Subject: [PATCH 8/8] chore(NA): remove typo --- packages/kbn-ui-shared-deps-src/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kbn-ui-shared-deps-src/src/index.js b/packages/kbn-ui-shared-deps-src/src/index.js index df83a2d34f76c..7433a99b12a99 100644 --- a/packages/kbn-ui-shared-deps-src/src/index.js +++ b/packages/kbn-ui-shared-deps-src/src/index.js @@ -8,7 +8,7 @@ const Path = require('path'); -/**1 +/** * Absolute path to the distributable directory */ exports.distDir = Path.resolve(__dirname, '../shared_built_assets');