Skip to content

Commit 60dde93

Browse files
committed
Merge branch 'master' of github.com:elastic/kibana into implement/kbn-optimizer-auto-transpile
# Conflicts: # yarn.lock
2 parents 6079712 + 1841495 commit 60dde93

File tree

39 files changed

+3035
-3201
lines changed

39 files changed

+3035
-3201
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
]
116116
},
117117
"dependencies": {
118-
"@babel/core": "^7.11.1",
118+
"@babel/core": "^7.11.6",
119119
"@elastic/datemath": "5.0.3",
120120
"@elastic/elasticsearch": "7.9.1",
121121
"@elastic/eui": "29.0.0",
@@ -150,7 +150,7 @@
150150
"angular-sanitize": "^1.8.0",
151151
"bluebird": "3.5.5",
152152
"boom": "^7.2.0",
153-
"chalk": "^2.4.2",
153+
"chalk": "^4.1.0",
154154
"check-disk-space": "^2.1.0",
155155
"chokidar": "^3.4.2",
156156
"color": "1.0.3",
@@ -179,7 +179,7 @@
179179
"inert": "^5.1.0",
180180
"inline-style": "^2.0.0",
181181
"joi": "^13.5.2",
182-
"js-yaml": "3.13.1",
182+
"js-yaml": "^3.14.0",
183183
"json-stable-stringify": "^1.0.1",
184184
"json-stringify-safe": "5.0.1",
185185
"lodash": "^4.17.20",
@@ -259,7 +259,7 @@
259259
"@types/angular": "^1.6.56",
260260
"@types/angular-mocks": "^1.7.0",
261261
"@types/archiver": "^3.1.0",
262-
"@types/babel__core": "^7.1.2",
262+
"@types/babel__core": "^7.1.10",
263263
"@types/bluebird": "^3.1.1",
264264
"@types/boom": "^7.2.0",
265265
"@types/chance": "^1.0.0",
@@ -329,7 +329,7 @@
329329
"@types/selenium-webdriver": "^4.0.9",
330330
"@types/semver": "^5.5.0",
331331
"@types/sinon": "^7.0.13",
332-
"@types/strip-ansi": "^3.0.0",
332+
"@types/strip-ansi": "^5.2.1",
333333
"@types/styled-components": "^5.1.0",
334334
"@types/supertest": "^2.0.5",
335335
"@types/supertest-as-promised": "^2.0.38",
@@ -341,7 +341,7 @@
341341
"@types/uuid": "^3.4.4",
342342
"@types/vinyl": "^2.0.4",
343343
"@types/vinyl-fs": "^2.4.11",
344-
"@types/webpack": "^4.41.21",
344+
"@types/webpack": "^4.41.3",
345345
"@types/webpack-env": "^1.15.2",
346346
"@types/zen-observable": "^0.8.0",
347347
"@typescript-eslint/eslint-plugin": "^3.10.0",
@@ -468,10 +468,10 @@
468468
"selenium-webdriver": "^4.0.0-alpha.7",
469469
"simple-git": "1.116.0",
470470
"sinon": "^7.4.2",
471-
"strip-ansi": "^3.0.1",
471+
"strip-ansi": "^6.0.0",
472472
"supertest": "^3.1.0",
473473
"supertest-as-promised": "^4.0.2",
474-
"tape": "^4.13.0",
474+
"tape": "^5.0.1",
475475
"topojson-client": "3.0.0",
476476
"tree-kill": "^1.2.2",
477477
"typescript": "4.0.2",

packages/kbn-apm-config-loader/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"dependencies": {
1414
"@elastic/safer-lodash-set": "0.0.0",
1515
"@kbn/utils": "1.0.0",
16-
"js-yaml": "3.13.1",
16+
"js-yaml": "^3.14.0",
1717
"lodash": "^4.17.20"
1818
},
1919
"devDependencies": {
2020
"typescript": "4.0.2",
21-
"tsd": "^0.7.4"
21+
"tsd": "^0.13.1"
2222
}
2323
}

packages/kbn-babel-preset/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"babel-plugin-add-module-exports": "^1.0.2",
1616
"babel-plugin-styled-components": "^1.10.7",
1717
"babel-plugin-transform-define": "^1.3.1",
18+
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
1819
"react-is": "^16.8.0",
1920
"styled-components": "^5.1.0"
2021
}

packages/kbn-babel-preset/webpack_preset.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,18 @@ module.exports = () => {
4040
},
4141
],
4242
],
43+
env: {
44+
production: {
45+
plugins: [
46+
[
47+
require.resolve('babel-plugin-transform-react-remove-prop-types'),
48+
{
49+
mode: 'remove',
50+
removeImport: true,
51+
},
52+
],
53+
],
54+
},
55+
},
4356
};
4457
};

packages/kbn-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@kbn/logging": "1.0.0",
1717
"@kbn/std": "1.0.0",
1818
"@kbn/utility-types": "1.0.0",
19-
"js-yaml": "3.13.1",
19+
"js-yaml": "^3.14.0",
2020
"load-json-file": "^6.2.0",
2121
"lodash": "^4.17.20",
2222
"moment": "^2.24.0",

packages/kbn-dev-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"kbn:watch": "yarn build --watch"
1111
},
1212
"dependencies": {
13-
"@babel/core": "^7.11.1",
13+
"@babel/core": "^7.11.6",
1414
"@kbn/utils": "1.0.0",
1515
"axios": "^0.19.2",
1616
"chalk": "^4.1.0",

packages/kbn-es/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"kbn:watch": "node scripts/build --watch"
1010
},
1111
"dependencies": {
12-
"@elastic/elasticsearch": "7.9.0-rc.1",
12+
"@elastic/elasticsearch": "7.9.1",
1313
"@kbn/dev-utils": "1.0.0",
1414
"abort-controller": "^3.0.0",
1515
"chalk": "^4.1.0",

packages/kbn-i18n/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@babel/cli": "^7.10.5",
16-
"@babel/core": "^7.11.1",
16+
"@babel/core": "^7.11.6",
1717
"@kbn/babel-preset": "1.0.0",
1818
"@kbn/dev-utils": "1.0.0",
1919
"@types/intl-relativeformat": "^2.1.0",

packages/kbn-interpreter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"devDependencies": {
1818
"@babel/cli": "^7.10.5",
19-
"@babel/core": "^7.11.1",
19+
"@babel/core": "^7.11.6",
2020
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
2121
"@babel/plugin-transform-runtime": "^7.11.0",
2222
"@kbn/babel-preset": "1.0.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
200200
loader: 'babel-loader',
201201
options: {
202202
babelrc: false,
203+
envName: worker.dist ? 'production' : 'development',
203204
presets: IS_CODE_COVERAGE
204205
? [ISTANBUL_PRESET_PATH, BABEL_PRESET_PATH]
205206
: [BABEL_PRESET_PATH],

0 commit comments

Comments
 (0)