From b63ea324e714364702d93ab3aeefc5afb27fb96b Mon Sep 17 00:00:00 2001 From: MO Date: Tue, 11 Feb 2020 14:00:23 +0800 Subject: [PATCH 1/4] fix: search for browserslist if esmodules is falsy closes #11123 --- packages/babel-helper-compilation-targets/src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/babel-helper-compilation-targets/src/index.js b/packages/babel-helper-compilation-targets/src/index.js index 747eb431211c..6947c500d401 100644 --- a/packages/babel-helper-compilation-targets/src/index.js +++ b/packages/babel-helper-compilation-targets/src/index.js @@ -189,7 +189,8 @@ export default function getTargets( // Parse browsers target via browserslist const browsersquery = validateBrowsers(targets.browsers); - const hasTargets = Object.keys(targets).length > 0; + const hasTargets = targets.esmodules || + Object.keys(targets).filter(value => value !== TargetNames.esmodules).length > 0; const shouldParseBrowsers = !!targets.browsers; const shouldSearchForConfig = !options.ignoreBrowserslistConfig && !hasTargets; From 96d49f422d67ff3dab41a6f7b61ae766eab7e57a Mon Sep 17 00:00:00 2001 From: MO Date: Fri, 14 Feb 2020 11:35:35 +0800 Subject: [PATCH 2/4] fix: delete falsy targets.esmodules --- packages/babel-helper-compilation-targets/src/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/babel-helper-compilation-targets/src/index.js b/packages/babel-helper-compilation-targets/src/index.js index 6947c500d401..ab834bde7820 100644 --- a/packages/babel-helper-compilation-targets/src/index.js +++ b/packages/babel-helper-compilation-targets/src/index.js @@ -184,13 +184,15 @@ export default function getTargets( targets.browsers = Object.keys(supportsESModules) .map(browser => `${browser} ${supportsESModules[browser]}`) .join(", "); + } else { + // remove falsy esmodules to fix `hasTargets` below + delete targets.esmodules } // Parse browsers target via browserslist const browsersquery = validateBrowsers(targets.browsers); - const hasTargets = targets.esmodules || - Object.keys(targets).filter(value => value !== TargetNames.esmodules).length > 0; + const hasTargets = Object.keys(targets).length > 0; const shouldParseBrowsers = !!targets.browsers; const shouldSearchForConfig = !options.ignoreBrowserslistConfig && !hasTargets; From e8f579b121ebb336876d065a0aeaa50771094137 Mon Sep 17 00:00:00 2001 From: MO Date: Fri, 14 Feb 2020 11:45:34 +0800 Subject: [PATCH 3/4] style: fix code style --- packages/babel-helper-compilation-targets/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-helper-compilation-targets/src/index.js b/packages/babel-helper-compilation-targets/src/index.js index ab834bde7820..2c1ba0a5dde9 100644 --- a/packages/babel-helper-compilation-targets/src/index.js +++ b/packages/babel-helper-compilation-targets/src/index.js @@ -186,7 +186,7 @@ export default function getTargets( .join(", "); } else { // remove falsy esmodules to fix `hasTargets` below - delete targets.esmodules + delete targets.esmodules; } // Parse browsers target via browserslist From 2c05472b645b64d98209c505c0792bc3b3c572d5 Mon Sep 17 00:00:00 2001 From: MO Date: Mon, 24 Feb 2020 08:21:10 +0800 Subject: [PATCH 4/4] fix: remove esmodules after being consumed --- packages/babel-helper-compilation-targets/src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/babel-helper-compilation-targets/src/index.js b/packages/babel-helper-compilation-targets/src/index.js index 2c1ba0a5dde9..1eca5be3eff9 100644 --- a/packages/babel-helper-compilation-targets/src/index.js +++ b/packages/babel-helper-compilation-targets/src/index.js @@ -184,11 +184,11 @@ export default function getTargets( targets.browsers = Object.keys(supportsESModules) .map(browser => `${browser} ${supportsESModules[browser]}`) .join(", "); - } else { - // remove falsy esmodules to fix `hasTargets` below - delete targets.esmodules; } + // Remove esmodules after being consumed to fix `hasTargets` below + delete targets.esmodules; + // Parse browsers target via browserslist const browsersquery = validateBrowsers(targets.browsers);