From b784c81aeb460d3769744ab97d761ab6fee88021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Tue, 23 Mar 2021 15:02:07 -0400 Subject: [PATCH] Do not bail on `SHOW_CONFIG_FOR` matches (#12954) Co-authored-by: Babel Bot --- .../out-files/test.js | 1 + .../stdout.txt | 1 + .../out-files/test.js | 1 + .../env - SHOW_CONFIG_FOR with multiple files/stdout.txt | 1 + .../babel/env - SHOW_CONFIG_FOR-windows/out-files/lib/foo.js | 1 + .../fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt | 3 ++- .../babel/env - SHOW_CONFIG_FOR/in-files/my-extended.js | 1 - .../in-files/node_modules/@foo/babel-preset-1/index.js | 3 +-- .../in-files/node_modules/@foo/babel-preset-2/index.js | 3 +-- .../in-files/node_modules/@foo/babel-preset-3/index.js | 3 +-- .../in-files/node_modules/@foo/babel-preset-4/index.js | 3 +-- .../test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt | 3 ++- packages/babel-core/src/config/config-chain.js | 4 ++-- 13 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/out-files/lib/foo.js diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/out-files/test.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/out-files/test.js index 3918c74e44..c0b5366258 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/out-files/test.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/out-files/test.js @@ -1 +1,2 @@ "use strict"; +"use strict"; diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt index b9a7167fab..1ffde6ad0e 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt @@ -29,3 +29,4 @@ programmatic options from @babel/cli }, "filename": "src//foo.js" } +-----End Babel configs----- diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/out-files/test.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/out-files/test.js index 3918c74e44..c0b5366258 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/out-files/test.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/out-files/test.js @@ -1 +1,2 @@ "use strict"; +"use strict"; diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/stdout.txt b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/stdout.txt index 1a70215b9c..ca930019bc 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/stdout.txt +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/stdout.txt @@ -29,3 +29,4 @@ programmatic options from @babel/cli }, "filename": "src/foo.js" } +-----End Babel configs----- diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/out-files/lib/foo.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/out-files/lib/foo.js new file mode 100644 index 0000000000..3918c74e44 --- /dev/null +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/out-files/lib/foo.js @@ -0,0 +1 @@ +"use strict"; diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt index 3a3d6a02c7..66baf4549d 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt @@ -29,4 +29,5 @@ programmatic options from @babel/cli }, "filename": "src//foo.js" } -Successfully compiled 1 file with Babel (123ms). +-----End Babel configs----- +Successfully compiled 2 files with Babel (123ms). diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/my-extended.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/my-extended.js index 31ef7c081c..7ea67a6646 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/my-extended.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/my-extended.js @@ -11,7 +11,6 @@ module.exports = { "@foo/babel-preset-1", [ { - name: "@foo/inline-babel-preset-1", plugins: [ { name: "@foo/inline-babel-plugin-1", diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js index 1eff8b4a82..11530b1384 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js @@ -1,4 +1,3 @@ module.exports = (api) => ({ - name: "@foo/" + __dirname, - plugins: ["@foo/" + __dirname.replace("preset", "plugin")] + plugins: ["@foo/babel-plugin-1"] }) diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js index 1eff8b4a82..8d8b2044c2 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js @@ -1,4 +1,3 @@ module.exports = (api) => ({ - name: "@foo/" + __dirname, - plugins: ["@foo/" + __dirname.replace("preset", "plugin")] + plugins: ["@foo/babel-plugin-2"] }) diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js index 1eff8b4a82..2632fdee7b 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js @@ -1,4 +1,3 @@ module.exports = (api) => ({ - name: "@foo/" + __dirname, - plugins: ["@foo/" + __dirname.replace("preset", "plugin")] + plugins: ["@foo/babel-plugin-3"] }) diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js index 1eff8b4a82..88bac2d15b 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js @@ -1,4 +1,3 @@ module.exports = (api) => ({ - name: "@foo/" + __dirname, - plugins: ["@foo/" + __dirname.replace("preset", "plugin")] + plugins: ["@foo/babel-plugin-4"] }) diff --git a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt index fed8218c93..2e0d19c80e 100644 --- a/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt +++ b/packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt @@ -39,7 +39,6 @@ config /my-extended.js .overrides[0].env["test"] "@foo/babel-preset-1", [ { - "name": "@foo/inline-babel-preset-1", "plugins": [ { "name": "@foo/inline-babel-plugin-1", @@ -125,3 +124,5 @@ programmatic options from @babel/cli }, "filename": "./src/index.js" } +-----End Babel configs----- +"use strict"; diff --git a/packages/babel-core/src/config/config-chain.js b/packages/babel-core/src/config/config-chain.js index 79a3d51785..d51a210269 100644 --- a/packages/babel-core/src/config/config-chain.js +++ b/packages/babel-core/src/config/config-chain.js @@ -261,9 +261,9 @@ export function* buildRootChain( // print config by the order of ascending priority [configReport, babelRcReport, programmaticReport] .filter(x => !!x) - .join("\n\n"), + .join("\n\n") + + "\n-----End Babel configs-----", ); - return null; } // Insert file chain in front so programmatic options have priority // over configuration file chain items.