From 91b5fd922a777f371c69aab3806494286f0ac78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Mon, 2 Dec 2019 00:46:13 +0100 Subject: [PATCH 1/3] Do not transpile typeof helper with itself in babel/runtime --- .../package.json | 1 + .../scripts/build-dist.js | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json index f73c1269fcb8..2c7415ae94ad 100644 --- a/packages/babel-plugin-transform-runtime/package.json +++ b/packages/babel-plugin-transform-runtime/package.json @@ -24,6 +24,7 @@ "@babel/core": "^7.7.4", "@babel/helper-plugin-test-runner": "^7.7.4", "@babel/helpers": "^7.7.4", + "@babel/plugin-transform-typeof-symbol": "^7.7.4", "@babel/preset-env": "^7.7.4", "@babel/runtime": "^7.7.4", "@babel/template": "^7.7.4", diff --git a/packages/babel-plugin-transform-runtime/scripts/build-dist.js b/packages/babel-plugin-transform-runtime/scripts/build-dist.js index e36ef0c68b0a..94a9d4e87723 100644 --- a/packages/babel-plugin-transform-runtime/scripts/build-dist.js +++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js @@ -9,6 +9,7 @@ const t = require("@babel/types"); const transformRuntime = require("../"); +const runtimeVersion = require("@babel/runtime/package.json").version; const corejs2Definitions = require("../lib/runtime-corejs2-definitions").default(); const corejs3Definitions = require("../lib/runtime-corejs3-definitions").default(); @@ -150,16 +151,34 @@ function buildHelper( ); tree.body.push(...helper.nodes); + console.log(helperFilename); + return babel.transformFromAst(tree, null, { - presets: [[require("@babel/preset-env"), { modules: false }]], + filename: helperFilename, + presets: [ + [ + "@babel/preset-env", + { modules: false, exclude: ["transform-typeof-symbol"] }, + ], + ], plugins: [ - [transformRuntime, { corejs, useESModules: esm }], + [ + transformRuntime, + { corejs, useESModules: esm, version: runtimeVersion }, + ], buildRuntimeRewritePlugin( runtimeName, path.relative(path.dirname(helperFilename), pkgDirname), helperName ), ], + overrides: [ + { + exclude: /typeof/, + plugins: ["@babel/plugin-transform-typeof-symbol"], + }, + {}, + ], }).code; } From 541d93e1b23ac7052f87feee6989987f065f075b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Mon, 2 Dec 2019 11:50:45 +0100 Subject: [PATCH 2/3] Nits --- packages/babel-plugin-transform-runtime/scripts/build-dist.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/babel-plugin-transform-runtime/scripts/build-dist.js b/packages/babel-plugin-transform-runtime/scripts/build-dist.js index 94a9d4e87723..6610d528f298 100644 --- a/packages/babel-plugin-transform-runtime/scripts/build-dist.js +++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js @@ -158,7 +158,7 @@ function buildHelper( presets: [ [ "@babel/preset-env", - { modules: false, exclude: ["transform-typeof-symbol"] }, + { modules: false, exclude: ["@babel/plugin-transform-typeof-symbol"] }, ], ], plugins: [ @@ -177,7 +177,6 @@ function buildHelper( exclude: /typeof/, plugins: ["@babel/plugin-transform-typeof-symbol"], }, - {}, ], }).code; } From 8c163fa2c9c7aede060203b8e00dc552fd5c4e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Mon, 2 Dec 2019 19:01:25 +0100 Subject: [PATCH 3/3] Remove console.log --- packages/babel-plugin-transform-runtime/scripts/build-dist.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/babel-plugin-transform-runtime/scripts/build-dist.js b/packages/babel-plugin-transform-runtime/scripts/build-dist.js index 6610d528f298..a107bbea1fa2 100644 --- a/packages/babel-plugin-transform-runtime/scripts/build-dist.js +++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js @@ -151,8 +151,6 @@ function buildHelper( ); tree.body.push(...helper.nodes); - console.log(helperFilename); - return babel.transformFromAst(tree, null, { filename: helperFilename, presets: [