Do not bail on SHOW_CONFIG_FOR matches (#12954)

Co-authored-by: Babel Bot <babel-bot@users.noreply.github.com>
babel · Mar 23, 2021 · b784c81 · b784c81
1 parent b360d8d
commit b784c81
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 13 deletions.
diff --git a/...i/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/out-files/test.js b/...i/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/...abel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt b/...abel-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/...babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/out-files/test.js b/...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
@@ -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
@@ -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
@@ -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
@@ -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/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js b/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-1/index.js
diff --git a/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js b/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-2/index.js
diff --git a/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js b/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-3/index.js
diff --git a/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js b/...t/fixtures/babel/env - SHOW_CONFIG_FOR/in-files/node_modules/@foo/babel-preset-4/index.js
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
@@ -39,7 +39,6 @@ config <CWD>/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
@@ -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.