Skip to content

Commit af37301

Browse files
spalgerspalger
committed
Merge branch 'master' of github.com:elastic/kibana into remove/babel-register-production
# Conflicts: # packages/kbn-babel-preset/package.json
2 parents 6ac27c8 + e5d8d49 commit af37301

27 files changed

Lines changed: 2687 additions & 2698 deletions

File tree

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"angular-sanitize": "^1.8.0",
149149
"bluebird": "3.5.5",
150150
"boom": "^7.2.0",
151-
"chalk": "^2.4.2",
151+
"chalk": "^4.1.0",
152152
"check-disk-space": "^2.1.0",
153153
"chokidar": "^3.4.2",
154154
"color": "1.0.3",
@@ -332,7 +332,7 @@
332332
"@types/selenium-webdriver": "^4.0.9",
333333
"@types/semver": "^5.5.0",
334334
"@types/sinon": "^7.0.13",
335-
"@types/strip-ansi": "^3.0.0",
335+
"@types/strip-ansi": "^5.2.1",
336336
"@types/styled-components": "^5.1.0",
337337
"@types/supertest": "^2.0.5",
338338
"@types/supertest-as-promised": "^2.0.38",
@@ -344,7 +344,7 @@
344344
"@types/uuid": "^3.4.4",
345345
"@types/vinyl": "^2.0.4",
346346
"@types/vinyl-fs": "^2.4.11",
347-
"@types/webpack": "^4.41.21",
347+
"@types/webpack": "^4.41.3",
348348
"@types/webpack-env": "^1.15.2",
349349
"@types/zen-observable": "^0.8.0",
350350
"@typescript-eslint/eslint-plugin": "^3.10.0",
@@ -471,10 +471,10 @@
471471
"selenium-webdriver": "^4.0.0-alpha.7",
472472
"simple-git": "1.116.0",
473473
"sinon": "^7.4.2",
474-
"strip-ansi": "^3.0.1",
474+
"strip-ansi": "^6.0.0",
475475
"supertest": "^3.1.0",
476476
"supertest-as-promised": "^4.0.2",
477-
"tape": "^4.13.0",
477+
"tape": "^5.0.1",
478478
"topojson-client": "3.0.0",
479479
"tree-kill": "^1.2.2",
480480
"typescript": "4.0.2",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
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
@@ -14,6 +14,7 @@
1414
"@babel/preset-typescript": "^7.10.4",
1515
"babel-plugin-add-module-exports": "^1.0.2",
1616
"babel-plugin-styled-components": "^1.10.7",
17+
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
1718
"react-is": "^16.8.0",
1819
"styled-components": "^5.1.0"
1920
}

‎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-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-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],

‎packages/kbn-plugin-helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"del": "^5.1.0",
1919
"execa": "^4.0.2",
2020
"gulp-zip": "^5.0.2",
21-
"inquirer": "^1.2.2",
21+
"inquirer": "^7.3.3",
2222
"load-json-file": "^6.2.0",
2323
"vinyl-fs": "^3.0.3"
2424
},

0 commit comments

Comments
 (0)