Remove skipBabel option

packages/compat/src/compat-app-builder.ts

@@ -4,7 +4,6 @@ import {
   explicitRelative,
   extensionsPattern,
   warn,
-  jsHandlebarsCompile,
   templateColocationPluginPath,
   cacheBustingPluginVersion,
   cacheBustingPluginPath,
@@ -581,11 +580,6 @@ export class CompatAppBuilder {
       `module.exports = ${JSON.stringify(pconfig.config, null, 2)}`,
       'utf8'
     );
-    writeFileSync(
-      join(locateEmbroiderWorkingDir(this.compatApp.root), '_babel_filter_.js'),
-      babelFilterTemplate({ skipBabel: this.options.skipBabel, appRoot: this.origAppPackage.root }),
-      'utf8'
-    );
   }
 
   private addResolverConfig(config: CompatResolverOptions) {
@@ -656,11 +650,6 @@ function defaultAddonPackageRules(): PackageRules[] {
     .reduce((a, b) => a.concat(b), []);
 }
 
-const babelFilterTemplate = jsHandlebarsCompile(`
-const { babelFilter } = require(${JSON.stringify(require.resolve('@embroider/core'))});
-module.exports = babelFilter({{json-stringify skipBabel}}, "{{js-string-escape appRoot}}");
-`) as (params: { skipBabel: Options['skipBabel']; appRoot: string }) => string;
-
 function combinePackageJSON(...layers: object[]) {
   function custom(objValue: any, srcValue: any, key: string, _object: any, _source: any, stack: { size: number }) {
     if (key === 'keywords' && stack.size === 0) {

packages/core/src/options.ts

@@ -59,14 +59,6 @@ export default interface Options {
   // route templates, and controllers which are governed by splitAtRoutes).
   staticAppPaths?: string[];
 
-  // By default, all modules that get imported into the app go through Babel, so
-  // that all code will conform with your Babel targets. This option allows you
-  // to turn Babel off for a particular package. You might need this to work
-  // around a transpiler bug or you might use this as a build-performance
-  // optimization if you've manually verified that a particular package doesn't
-  // need transpilation to be safe in your target browsers.
-  skipBabel?: { package: string; semverRange?: string }[];
-
   // This is a performance optimization that can help you avoid the "Your build
   // is slower because some babel plugins are non-serializable" penalty. If you
   // provide the locations of known non-serializable objects, we can discover
@@ -131,7 +123,6 @@ export function optionsWithDefaults(options?: Options): Required<Options> {
     staticComponents: false,
     splitAtRoutes: [],
     staticAppPaths: [],
-    skipBabel: [],
     pluginHints: [],
     amdCompatibility: 'cjs' as const,
   };

packages/shared-internals/src/index.ts

@@ -12,7 +12,6 @@ export { default as Package, V2AddonPackage as AddonPackage, V2AppPackage as App
 export { default as PackageCache } from './package-cache';
 export type { RewrittenPackageIndex } from './rewritten-package-cache';
 export { RewrittenPackageCache } from './rewritten-package-cache';
-export { default as babelFilter } from './babel-filter';
 export { default as packageName } from './package-name';
 export { default as tmpdir } from './tmpdir';
 export * from './ember-cli-models';

test-packages/support/transpiler.ts

@@ -6,15 +6,13 @@ import type { BoundExpectFile } from './file-assertions';
 import type { AppMeta } from '../../packages/core/src/index';
 import { hbsToJS, locateEmbroiderWorkingDir, RewrittenPackageCache } from '../../packages/core/src/index';
 import { Memoize } from 'typescript-memoize';
-import { getRewrittenLocation } from './rewritten-path';
 
 export class Transpiler {
   private appOutputPath: string;
   constructor(private appDir: string) {
     let packageCache = RewrittenPackageCache.shared('embroider', appDir);
     this.appOutputPath = packageCache.maybeMoved(packageCache.get(appDir)).root;
     this.transpile = this.transpile.bind(this);
-    this.shouldTranspile = this.shouldTranspile.bind(this);
   }
 
   transpile(contents: string, fileAssert: BoundExpectFile): string {
@@ -33,15 +31,6 @@ export class Transpiler {
     }
   }
 
-  shouldTranspile(relativePath: string) {
-    // Depending on how the app builds, the babel filter is not at the same location
-    let embroiderLocation = join(locateEmbroiderWorkingDir(this.appDir), '_babel_filter_.js');
-    let shouldTranspile = existsSync(embroiderLocation)
-      ? require(embroiderLocation)
-      : require(join(this.appOutputPath, '_babel_filter_'));
-    return shouldTranspile(join(this.appDir, getRewrittenLocation(this.appDir, relativePath))) as boolean;
-  }
-
   @Memoize()
   private get pkgJSON() {
     return readJSONSync(join(this.appOutputPath, 'package.json'));

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);
 };

tests/app-template/ember-cli-build.js

@@ -6,11 +6,5 @@ const { maybeEmbroider } = require('@embroider/test-setup');
 module.exports = function (defaults) {
   let app = new EmberApp(defaults, {});
 
-  return maybeEmbroider(app, {
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
-  });
+  return maybeEmbroider(app);
 };

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);
 };

tests/fixtures/macro-sample-addon/ember-cli-build.js

@@ -17,10 +17,5 @@ module.exports = function(defaults) {
 
   return maybeEmbroider(app, {
     useAddonAppBoot: false,
-    skipBabel: [
-      {
-        package: 'qunit',
-      },
-    ],
   });
 };

tests/scenarios/compat-addon-classic-features-test.ts

@@ -52,11 +52,6 @@ appScenarios
 
           return maybeEmbroider(app, {
             availableContentForTypes: ['custom'],
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

tests/scenarios/compat-exclude-dot-files-test.ts

@@ -23,11 +23,6 @@ appScenarios
 
         return maybeEmbroider(app, {
           staticAddonTrees: false,
-          skipBabel: [
-            {
-              package: 'qunit',
-            },
-          ],
         });
       };
       `,

tests/scenarios/compat-plugin-hints-test.ts

@@ -31,11 +31,6 @@ appScenarios
         });
 
         return maybeEmbroider(app, {
-          skipBabel: [
-            {
-              package: 'qunit',
-            },
-          ],
           pluginHints: [
             {
               resolve: ["${__filename.replace(/\\/g, '/').replace(/\.ts$/, '.js')}"],

tests/scenarios/compat-renaming-test.ts

@@ -24,11 +24,6 @@ appScenarios
         return maybeEmbroider(app, {
           staticAddonTrees: false,
           staticComponents: false,
-          skipBabel: [
-            {
-              package: 'qunit',
-            },
-          ],
           // TODO remove this when we virtualise the entrypoint
           amdCompatibility: {
             es: [

tests/scenarios/compat-resolver-test.ts

@@ -120,9 +120,6 @@ Scenarios.fromProject(() => new Project())
                 [require.resolve('@embroider/compat/src/babel-plugin-adjust-imports'), { appRoot: app.dir }],
               ])}
             }`,
-            'node_modules/.embroider/_babel_filter.js': `
-              module.exports = function(filename) { return true }
-            `,
             'node_modules/.embroider/resolver.json': JSON.stringify(resolverOptions),
           });
         };

tests/scenarios/compat-stage2-test.ts

@@ -331,19 +331,6 @@ stage2Scenarios
       amdCompatibility: {
         es: [['not-a-resolvable-package', ['default']]],
       },
-      skipBabel: [
-        {
-          package: 'babel-filter-test1',
-        },
-        {
-          package: 'babel-filter-test2',
-          semverRange: '^4.0.0',
-        },
-        {
-          package: 'babel-filter-test3',
-          semverRange: '^2.0.0',
-        },
-      ],
       staticAppPaths: ['static-dir', 'top-level-static.js'],
       packageRules: [
         {
@@ -404,11 +391,6 @@ stage2Scenarios
           });
 
           return prebuild(app, {
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
             ...opts
           });
         };
@@ -780,26 +762,6 @@ stage2Scenarios
         assertFile.matches(/return require\(['"]some-package['"]\)/, 'should find plain cjs require');
       });
 
-      test('transpilation runs for ember addons', async function (assert) {
-        assert.ok(build.shouldTranspile('node_modules/my-addon/components/has-relative-template.js'));
-      });
-
-      test('transpilation is skipped when package matches skipBabel', async function (assert) {
-        assert.ok(!build.shouldTranspile('node_modules/babel-filter-test1/index.js'));
-      });
-
-      test('transpilation is skipped when package and version match skipBabel', async function (assert) {
-        assert.ok(!build.shouldTranspile('node_modules/babel-filter-test2/index.js'));
-      });
-
-      test('transpilation runs when package version does not match skipBabel', async function (assert) {
-        assert.ok(build.shouldTranspile('node_modules/babel-filter-test3/index.js'));
-      });
-
-      test('transpilation runs for non-ember package that is not explicitly skipped', async function (assert) {
-        assert.ok(build.shouldTranspile('node_modules/babel-filter-test4/index.js'));
-      });
-
       test(`app's babel plugins ran`, async function () {
         let assertFile = expectFile('custom-babel-needed.js').transform(build.transpile);
         assertFile.matches(/console\.log\(['"]embroider-sample-transforms-result['"]\)/);

tests/scenarios/core-resolver-test.ts

@@ -142,9 +142,6 @@ Scenarios.fromProject(() => new Project())
               plugins: []
             }
             `,
-            'node_modules/.embroider/_babel_filter.js': `
-              module.exports = function(filename) { return true }
-            `,
             'node_modules/.embroider/resolver.json': JSON.stringify(resolverOptions),
             'node_modules/my-addon/package.json': addonPackageJSON('my-addon', opts?.addonMeta),
           });

tests/scenarios/router-test.ts

@@ -38,11 +38,6 @@ function setupScenario(project: Project) {
             staticHelpers: true,
             staticModifiers: true,
             splitAtRoutes: ['split-me'],
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

tests/scenarios/stage1-test.ts

@@ -30,11 +30,6 @@ appScenarios
             staticComponents: false,
             staticHelpers: false,
             staticModifiers: false,
-            skipBabel: [
-              {
-                package: 'qunit',
-              },
-            ],
           });
         };
       `,

tests/scenarios/static-app-test.ts

@@ -396,10 +396,6 @@ appScenarios
                 },
               },
             ],
-            skipBabel: [
-              { package: 'qunit' },
-              { package: 'macro-decorators' },
-            ],
           });
         };
       `,

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);
 };

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);
 };