From e86e3123977564a6a6a1e4a580c5a72e7c9d3a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopycin=CC=81ski?= Date: Mon, 16 Dec 2019 11:50:29 +0100 Subject: [PATCH 1/2] Update babel-typescript config --- packages/kbn-babel-preset/common_preset.js | 19 +++---------- packages/kbn-babel-preset/package.json | 7 ++--- packages/kbn-pm/package.json | 2 +- renovate.json5 | 2 ++ src/dev/renovate/package_groups.ts | 2 +- yarn.lock | 33 +++++++++++++++++----- 6 files changed, 37 insertions(+), 28 deletions(-) diff --git a/packages/kbn-babel-preset/common_preset.js b/packages/kbn-babel-preset/common_preset.js index 0de9318ea0c27..ea099aeda7408 100644 --- a/packages/kbn-babel-preset/common_preset.js +++ b/packages/kbn-babel-preset/common_preset.js @@ -37,20 +37,9 @@ const plugins = [ ]; module.exports = { - presets: [require.resolve('@babel/preset-typescript'), require.resolve('@babel/preset-react')], - plugins, - overrides: [ - { - // Babel 7 don't support the namespace feature on typescript code. - // With namespaces only used for type declarations, we can securely - // strip them off for babel on x-pack infra/siem plugins - // - // See https://github.com/babel/babel/issues/8244#issuecomment-466548733 - test: [ - /x-pack[\/\\]legacy[\/\\]plugins[\/\\]infra[\/\\].*[\/\\]graphql/, - /x-pack[\/\\]legacy[\/\\]plugins[\/\\]siem[\/\\].*[\/\\]graphql/, - ], - plugins: [[require.resolve('babel-plugin-typescript-strip-namespaces')]], - }, + presets: [ + [require.resolve('@babel/preset-typescript'), { allowNamespaces: true }], + require.resolve('@babel/preset-react'), ], + plugins, }; diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json index 7c461fa146e8a..d617c287b4f89 100644 --- a/packages/kbn-babel-preset/package.json +++ b/packages/kbn-babel-preset/package.json @@ -10,12 +10,11 @@ "@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/plugin-transform-modules-commonjs": "^7.7.5", "@babel/preset-env": "^7.7.6", - "@babel/preset-react": "^7.0.0", - "@babel/preset-typescript": "^7.3.3", + "@babel/preset-react": "^7.7.4", + "@babel/preset-typescript": "^7.7.4", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-filter-imports": "^4.0.0", "babel-plugin-styled-components": "^1.10.6", - "babel-plugin-transform-define": "^2.0.0", - "babel-plugin-typescript-strip-namespaces": "^1.1.1" + "babel-plugin-transform-define": "^2.0.0" } } diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json index b53414518d853..bd25363fccd80 100644 --- a/packages/kbn-pm/package.json +++ b/packages/kbn-pm/package.json @@ -14,7 +14,7 @@ "@babel/plugin-proposal-class-properties": "^7.7.4", "@babel/plugin-proposal-object-rest-spread": "^7.7.4", "@babel/preset-env": "^7.7.6", - "@babel/preset-typescript": "^7.3.3", + "@babel/preset-typescript": "^7.7.4", "@types/cmd-shim": "^2.0.0", "@types/cpy": "^5.1.0", "@types/dedent": "^0.7.0", diff --git a/renovate.json5 b/renovate.json5 index 49474b28e7908..235ec397be2e6 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -62,6 +62,8 @@ packageNames: [ 'core-js', '@types/core-js', + '@babel/preset-typescript', + '@types/babel__preset-typescript', ], }, { diff --git a/src/dev/renovate/package_groups.ts b/src/dev/renovate/package_groups.ts index fd637409e433a..8091a757974cf 100644 --- a/src/dev/renovate/package_groups.ts +++ b/src/dev/renovate/package_groups.ts @@ -78,7 +78,7 @@ export const RENOVATE_PACKAGE_GROUPS: PackageGroup[] = [ { name: 'babel', packageWords: ['babel'], - packageNames: ['core-js'], + packageNames: ['core-js', '@babel/preset-typescript'], }, { diff --git a/yarn.lock b/yarn.lock index 7ef965ce9b37b..8d1b7bd7d0e3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -799,6 +799,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b" + integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-arrow-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" @@ -1421,6 +1428,15 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-typescript" "^7.2.0" +"@babel/plugin-transform-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636" + integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.7.4" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-typescript" "^7.7.4" + "@babel/plugin-transform-unicode-regex@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" @@ -1626,7 +1642,7 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" -"@babel/preset-react@^7.7.0": +"@babel/preset-react@^7.7.0", "@babel/preset-react@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707" integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g== @@ -1637,7 +1653,7 @@ "@babel/plugin-transform-react-jsx-self" "^7.7.4" "@babel/plugin-transform-react-jsx-source" "^7.7.4" -"@babel/preset-typescript@7.3.3", "@babel/preset-typescript@^7.3.3": +"@babel/preset-typescript@7.3.3": version "7.3.3" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a" integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg== @@ -1645,6 +1661,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-transform-typescript" "^7.3.2" +"@babel/preset-typescript@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a" + integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-typescript" "^7.7.4" + "@babel/register@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128" @@ -7016,11 +7040,6 @@ babel-plugin-transform-undefined-to-void@^6.9.4: resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280" integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA= -babel-plugin-typescript-strip-namespaces@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-typescript-strip-namespaces/-/babel-plugin-typescript-strip-namespaces-1.1.1.tgz#160433b17e424b57cf72e3b4d8f08195ad28d7fd" - integrity sha512-dVB9caEANbEVwUylL8g3lsYU5JjaXE2KNIVLib3KVcGJF32QunxvQqP6kf+lzW/fyDed/zWD/e/hdyimyc/79Q== - babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" From ece2404f46426906106a2e89168b58e78000b511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopycin=CC=81ski?= Date: Mon, 16 Dec 2019 11:57:47 +0100 Subject: [PATCH 2/2] Add @babel/preset-react --- renovate.json5 | 2 ++ src/dev/renovate/package_groups.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 235ec397be2e6..ecc9b3b2ceb62 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -62,6 +62,8 @@ packageNames: [ 'core-js', '@types/core-js', + '@babel/preset-react', + '@types/babel__preset-react', '@babel/preset-typescript', '@types/babel__preset-typescript', ], diff --git a/src/dev/renovate/package_groups.ts b/src/dev/renovate/package_groups.ts index 8091a757974cf..1bc65fd149f47 100644 --- a/src/dev/renovate/package_groups.ts +++ b/src/dev/renovate/package_groups.ts @@ -78,7 +78,7 @@ export const RENOVATE_PACKAGE_GROUPS: PackageGroup[] = [ { name: 'babel', packageWords: ['babel'], - packageNames: ['core-js', '@babel/preset-typescript'], + packageNames: ['core-js', '@babel/preset-react', '@babel/preset-typescript'], }, {