Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions packages/kbn-ui-shared-deps-npm/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ NPM_MODULE_EXTRA_FILES = [

RUNTIME_DEPS = [
"//packages/elastic-datemath",
"//packages/kbn-utils",
"@npm//@babel/runtime",
"@npm//@elastic/charts",
"@npm//@elastic/eui",
Expand Down Expand Up @@ -61,6 +60,7 @@ RUNTIME_DEPS = [
"@npm//rxjs",
"@npm//styled-components",
"@npm//symbol-observable",
"@npm//tslib",
"@npm//url-loader",
"@npm//val-loader",
"@npm//whatwg-fetch",
Expand All @@ -71,8 +71,6 @@ WEBPACK_DEPS = [
]

TYPES_DEPS = [
"//packages/elastic-datemath",
"//packages/kbn-utils",
"@npm//@elastic/charts",
"@npm//@elastic/eui",
"@npm//@elastic/numeral",
Expand Down
5 changes: 2 additions & 3 deletions packages/kbn-ui-shared-deps-npm/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, '..', '..');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would love if we didn't need to reimplement this anyplace we use it, maybe in the future we could make a dev-path-constants package or something to encapsulate this very unlikely to change state?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

👍 yeah I like the idea! My effort here was only try to decouple @kbn/utils from the @kbn/ui-shared-deps-npm


module.exports = (_, argv) => {
const outputPath = argv.outputPath ? Path.resolve(argv.outputPath) : UiSharedDepsNpm.distDir;

Expand All @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions packages/kbn-ui-shared-deps-src/.babelrc

This file was deleted.

3 changes: 0 additions & 3 deletions packages/kbn-ui-shared-deps-src/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ RUNTIME_DEPS = [
"//packages/kbn-monaco",
"//packages/kbn-std",
"//packages/kbn-ui-shared-deps-npm",
"//packages/kbn-utils",
]

TYPES_DEPS = [
Expand All @@ -50,9 +49,7 @@ TYPES_DEPS = [
"//packages/kbn-monaco",
"//packages/kbn-std",
"//packages/kbn-ui-shared-deps-npm",
"//packages/kbn-utils",
"@npm//@elastic/eui",
"@npm//resize-observer-polyfill",
"@npm//webpack",
]

Expand Down
3 changes: 2 additions & 1 deletion packages/kbn-ui-shared-deps-src/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down