Merge pull request #2247 from embroider-build/remove-skip-babel

throw an error if anyone sets skipBabel
embroider-build · Feb 11, 2025 · 4ec69ae · 4ec69ae
2 parents 9410ffb + fc3dcff
commit 4ec69ae
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 55 deletions.
diff --git a/packages/compat/src/options.ts b/packages/compat/src/options.ts
@@ -138,6 +138,12 @@ export function optionsWithDefaults(options?: Options): CompatOptionsType {
     );
   }
 
+  if ((options as any)?.skipBabel !== undefined) {
+    throw new Error(
+      `You have set 'skipBabel' on your Embroider options. This setting has been removed and you can now configure your babel ignores directly in the babel config in your repo https://babeljs.io/docs/options#ignore`
+    );
+  }
+
   return Object.assign({}, defaults, options);
 }
 

diff --git a/tests/addon-template/ember-cli-build.js b/tests/addon-template/ember-cli-build.js
@@ -15,11 +15,5 @@ module.exports = function (defaults) {
   */
 
   const { maybeEmbroider } = require('@embroider/test-setup');
-  return maybeEmbroider(app, {
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
-  });
+  return maybeEmbroider(app);
 };
diff --git a/tests/fixtures/blacklisted-addon-build-options/ember-cli-build.js b/tests/fixtures/blacklisted-addon-build-options/ember-cli-build.js
@@ -10,12 +10,5 @@ module.exports = function (defaults) {
     },
   });
 
-  return maybeEmbroider(app, {
-
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
-  });
+  return maybeEmbroider(app);
 };
diff --git a/tests/fixtures/macro-sample-addon/ember-cli-build.js b/tests/fixtures/macro-sample-addon/ember-cli-build.js
@@ -18,10 +18,5 @@ module.exports = function(defaults) {
   return maybeEmbroider(app, {
     useAddonAppBoot: false,
     useAddonConfigModule: false,
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
   });
 };
diff --git a/tests/scenarios/compat-addon-classic-features-test.ts b/tests/scenarios/compat-addon-classic-features-test.ts
@@ -52,11 +52,6 @@ appScenarios
 
           return maybeEmbroider(app, {
             availableContentForTypes: ['custom'],
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

diff --git a/tests/scenarios/compat-exclude-dot-files-test.ts b/tests/scenarios/compat-exclude-dot-files-test.ts
@@ -23,11 +23,6 @@ appScenarios
 
         return maybeEmbroider(app, {
           staticAddonTrees: false,
-          skipBabel: [
-            {
-              package: 'qunit',
-            },
-          ],
         });
       };
       `,

diff --git a/tests/scenarios/router-test.ts b/tests/scenarios/router-test.ts
@@ -36,11 +36,6 @@ function setupScenario(project: Project) {
             staticAddonTrees: true,
             staticInvokables: true,
             splitAtRoutes: ['split-me'],
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

diff --git a/tests/scenarios/stage1-test.ts b/tests/scenarios/stage1-test.ts
@@ -30,11 +30,6 @@ appScenarios
             staticComponents: false,
             staticHelpers: false,
             staticModifiers: false,
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

diff --git a/tests/scenarios/static-app-test.ts b/tests/scenarios/static-app-test.ts
@@ -390,7 +390,6 @@ wideAppScenarios
                 },
               },
             ],
-            skipBabel: [{ package: 'qunit' }, { package: 'macro-decorators' }],
           });
         };
 

diff --git a/tests/ts-app-template-classic/ember-cli-build.js b/tests/ts-app-template-classic/ember-cli-build.js
@@ -8,11 +8,5 @@ module.exports = function (defaults) {
     'ember-cli-babel': { enableTypeScriptTransform: true },
   });
 
-  return maybeEmbroider(app, {
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
-  });
+  return maybeEmbroider(app);
 };
diff --git a/tests/ts-app-template/ember-cli-build.js b/tests/ts-app-template/ember-cli-build.js
@@ -8,11 +8,5 @@ module.exports = function (defaults) {
     'ember-cli-babel': { enableTypeScriptTransform: true },
   });
 
-  return maybeEmbroider(app, {
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
-  });
+  return maybeEmbroider(app);
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -390,7 +390,6 @@ wideAppScenarios @@
                     },
                   },
                 ],
-                skipBabel: [{ package: 'qunit' }, { package: 'macro-decorators' }],
               });
             };
@@ Expand Down @@