Fix presets ordering

babel · Oct 7, 2020 · 3285782 · 3285782
1 parent a65b757
commit 3285782
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/packages/babel-core/src/config/full.js b/packages/babel-core/src/config/full.js
@@ -103,10 +103,20 @@ export default gensync<[any], ResolvedConfig | null>(function* loadFullConfig(
         const descriptor = rawPresets[i];
         if (descriptor.options !== false) {
           try {
-            presets.push({
-              preset: yield* loadPresetDescriptor(descriptor, context),
-              pass: descriptor.ownPass ? [] : pluginDescriptorsPass,
-            });
+            // Presets normally run in reverse order, but if they
+            // have their own pass they run after the presets
+            // in the previous pass.
+            if (descriptor.ownPass) {
+              presets.push({
+                preset: yield* loadPresetDescriptor(descriptor, context),
+                pass: [],
+              });
+            } else {
+              presets.unshift({
+                preset: yield* loadPresetDescriptor(descriptor, context),
+                pass: pluginDescriptorsPass,
+              });
+            }
           } catch (e) {
             if (e.code === "BABEL_UNKNOWN_OPTION") {
               checkNoUnwrappedItemOptionPairs(rawPresets, i, "preset", e);
@@ -129,7 +139,7 @@ export default gensync<[any], ResolvedConfig | null>(function* loadFullConfig(
         for (const { preset, pass } of presets) {
           if (!preset) return true;
 
-          pass.unshift(...preset.plugins);
+          pass.push(...preset.plugins);
 
           const ignored = yield* recursePresetDescriptors(preset.presets, pass);
           if (ignored) return true;
@@ -178,6 +188,10 @@ export default gensync<[any], ResolvedConfig | null>(function* loadFullConfig(
     .map(plugins => ({ plugins }));
   opts.passPerPreset = opts.presets.length > 0;
 
+  if (context.filename?.includes("RuntimeErrorContaine")) {
+    console.log(initialPluginsDescriptors.map(p => p.key));
+  }
+
   return {
     options: opts,
     passes: passes,

diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
@@ -423,6 +423,8 @@ describe("api", function () {
         "argone;",
         "five;",
         "six;",
+        "twentyone;",
+        "twentytwo;",
         "three;",
         "four;",
         "nineteen;",

diff --git a/packages/babel-core/test/fixtures/config/complex-plugin-config/.babelrc b/packages/babel-core/test/fixtures/config/complex-plugin-config/.babelrc
@@ -14,6 +14,12 @@
       "./five",
       "./six",
     ],
+    presets: [{
+      plugins: [
+        "./twentyone",
+        "./twentytwo",
+      ]
+    }]
   }, {
     passPerPreset: true,
     presets: [{

diff --git a/packages/babel-core/test/fixtures/config/complex-plugin-config/twentyone.js b/packages/babel-core/test/fixtures/config/complex-plugin-config/twentyone.js
@@ -0,0 +1 @@
+module.exports = require("./plugin")("twentyone");
diff --git a/packages/babel-core/test/fixtures/config/complex-plugin-config/twentytwo.js b/packages/babel-core/test/fixtures/config/complex-plugin-config/twentytwo.js
@@ -0,0 +1 @@
+module.exports = require("./plugin")("twentytwo");