@embroider/core 2.1.0 → 2.1.1-unstable.73213f2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "2.1.0",
+  "version": "2.1.1-unstable.73213f2a",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -26,10 +26,9 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/runtime": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.10.0",
-    "@embroider/shared-internals": "2.0.0",
+    "@embroider/macros": "1.10.0-unstable.73213f2a",
+    "@embroider/shared-internals": "2.0.0-unstable.73213f2a",
     "assert-never": "^1.2.1",
-    "babel-import-util": "^1.1.0",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",

package/src/app-files.d.ts

@@ -1,5 +1,5 @@
 import { Package, AddonPackage } from '@embroider/shared-internals';
-import AppDiffer from './app-differ';
+import type AppDiffer from './app-differ';
 export interface RouteFiles {
     route?: string;
     template?: string;

package/src/app-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAW3B,MAAa,QAAQ;IAUnB,YAAY,SAAoB,EAAE,oBAA4B,EAAE,eAAwB;QACtF,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,aAAa,GAAa,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;QACxC,KAAK,IAAI,YAAY,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE;YAC/C,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC5C,SAAS;aACV;YAED,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACjC,oEAAoE;gBACpE,4DAA4D;gBAC5D,SAAS;aACV;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACrC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACzB,SAAS;aACV;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;gBAC1C,uEAAuE;gBACvE,qEAAqE;gBACrE,mEAAmE;gBACnE,8CAA8C;gBAC9C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;oBAC5E,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBAC/B;gBACD,SAAS;aACV;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;gBACpD,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9B,SAAS;aACV;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC3B,SAAS;aACV;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACzC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC7B,SAAS;aACV;YAED,IACE,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC;gBACzC,CAAC,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,EAC1F;gBACA,SAAS;aACV;YAED,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,cAAc,GAAwB,IAAI,GAAG,EAAE,CAAC;QACpD,KAAK,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE;YACtD,IAAI,UAAU,EAAE;gBACd,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aAC9C;SACF;QACD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;IACjD,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,IAAI,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC5D,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAwC,CAAC;QACtE,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE;YACrB,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACT,MAAM,GAAG,KAAK,CAAC;aAChB;iBAAM;gBACL,IAAI,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACpC,MAAM,GAAG,QAAQ,CAAC;aACnB;SACF;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,mBAAmB,CAAC,YAAoB,EAAE,eAAuB;QACvE,IAAI,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9D,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAChE,OAAO,KAAK,CAAC;SACd;QACD,IAAI,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,8DAA8D;QAC9D,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,OAAO,EAAE;gBAC7B,OAAO,KAAK,CAAC;aACd;SACF;QAED,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACT,MAAM,GAAG,KAAK,CAAC;aAChB;iBAAM;gBACL,IAAI,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACpC,MAAM,GAAG,QAAQ,CAAC;aACnB;SACF;QACD,MAAM,CAAC,IAA2C,CAAC,GAAG,YAAY,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA5ID,4BA4IC","sourcesContent":["import { sep } from 'path';\nimport { Package, AddonPackage } from '@embroider/shared-internals';\nimport AppDiffer from './app-differ';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly tests: ReadonlyArray<string>;\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly relocatedFiles: Map<string, string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n\n  constructor(appDiffer: AppDiffer, resolvableExtensions: RegExp, podModulePrefix?: string) {\n    let tests: string[] = [];\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n    for (let relativePath of appDiffer.files.keys()) {\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        continue;\n      }\n\n      if (relativePath.startsWith('tests/')) {\n        tests.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are resolvable, but not when they're used via co-location.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        if (!relativePath.endsWith('.hbs') || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        this.handleClassicRouteFile(relativePath) ||\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix))\n      ) {\n        continue;\n      }\n\n      otherAppFiles.push(relativePath);\n    }\n    this.tests = tests;\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n\n    let relocatedFiles: Map<string, string> = new Map();\n    for (let [relativePath, owningPath] of appDiffer.files) {\n      if (owningPath) {\n        relocatedFiles.set(relativePath, owningPath);\n      }\n    }\n    this.relocatedFiles = relocatedFiles;\n    this.isFastbootOnly = appDiffer.isFastbootOnly;\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface EngineSummary {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine\n  addons: Set<AddonPackage>;\n  // the parent engine, if any\n  parent: EngineSummary | undefined;\n  // where the engine's own V2 code comes from\n  sourcePath: string;\n  // where the engine gets built into, combining its own code with all its\n  // addons\n  destPath: string;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // this is destPath but relative to the app itself\n  appRelativePath: string;\n}\n\nexport interface Engine extends EngineSummary {\n  appFiles: AppFiles;\n}\n"]}
+{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":"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","sourcesContent":["import { sep } from 'path';\nimport { Package, AddonPackage } from '@embroider/shared-internals';\nimport type AppDiffer from './app-differ';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly tests: ReadonlyArray<string>;\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly relocatedFiles: Map<string, string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n\n  constructor(appDiffer: AppDiffer, resolvableExtensions: RegExp, podModulePrefix?: string) {\n    let tests: string[] = [];\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n    for (let relativePath of appDiffer.files.keys()) {\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        continue;\n      }\n\n      if (relativePath.startsWith('tests/')) {\n        tests.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are resolvable, but not when they're used via co-location.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        if (!relativePath.endsWith('.hbs') || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        this.handleClassicRouteFile(relativePath) ||\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix))\n      ) {\n        continue;\n      }\n\n      otherAppFiles.push(relativePath);\n    }\n    this.tests = tests;\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n\n    let relocatedFiles: Map<string, string> = new Map();\n    for (let [relativePath, owningPath] of appDiffer.files) {\n      if (owningPath) {\n        relocatedFiles.set(relativePath, owningPath);\n      }\n    }\n    this.relocatedFiles = relocatedFiles;\n    this.isFastbootOnly = appDiffer.isFastbootOnly;\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface EngineSummary {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine\n  addons: Set<AddonPackage>;\n  // the parent engine, if any\n  parent: EngineSummary | undefined;\n  // where the engine's own V2 code comes from\n  sourcePath: string;\n  // where the engine gets built into, combining its own code with all its\n  // addons\n  destPath: string;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // this is destPath but relative to the app itself\n  appRelativePath: string;\n}\n\nexport interface Engine extends EngineSummary {\n  appFiles: AppFiles;\n}\n"]}

package/src/app.d.ts

@@ -3,11 +3,12 @@ import { OutputPaths } from './wait-for-trees';
 import { Asset } from './asset';
 import Options from './options';
 import { MacrosConfig } from '@embroider/macros/src/node';
-import { TransformOptions } from '@babel/core';
-import { Options as AdjustImportsOptions } from './babel-plugin-adjust-imports';
+import { PluginItem, TransformOptions } from '@babel/core';
+import { Options as ResolverConfig } from './module-resolver';
+import { Engine } from './app-files';
 import type { Transform } from 'babel-plugin-ember-template-compilation';
 export declare type EmberENV = unknown;
-export interface AppAdapter<TreeNames> {
+export interface AppAdapter<TreeNames, SpecificResolverConfig extends ResolverConfig = ResolverConfig> {
     readonly allActiveAddons: AddonPackage[];
     activeAddonChildren(pkg: Package): AddonPackage[];
     appJSSrcDir(treePaths: OutputPaths<TreeNames>): string;
@@ -21,9 +22,10 @@ export interface AppAdapter<TreeNames> {
     podModulePrefix(): string | undefined;
     rootURL(): string;
     templateCompilerPath(): string;
-    resolverTransform(): Transform | undefined;
-    adjustImportsOptions(): AdjustImportsOptions;
-    adjustImportsOptionsPath(): string;
+    hbsTransforms(resolverConfig: SpecificResolverConfig): Transform[];
+    jsPlugins(resolverConfig: SpecificResolverConfig): PluginItem[];
+    resolverConfig(engines: Engine[]): SpecificResolverConfig;
+    resolvableExtensions(): string[];
     htmlbarsPlugins(): Transform[];
     babelConfig(): TransformOptions;
     babelMajorVersion(): 7;
@@ -52,7 +54,6 @@ export declare class AppBuilder<TreeNames> {
     private impliedAddonAssets;
     private babelParserConfig;
     private babelConfig;
-    private adjustImportsPlugin;
     private insertEmberApp;
     private implicitScriptsAsset;
     private implicitStylesAsset;
@@ -78,6 +79,7 @@ export declare class AppBuilder<TreeNames> {
     private etcOptions;
     private get portableHints();
     private addBabelConfig;
+    private addResolverConfig;
     private shouldSplitRoute;
     private splitRoute;
     private topAppJSAsset;

package/src/app.js

@@ -145,7 +145,7 @@ class AppBuilder {
         }
     }
     get resolvableExtensionsPattern() {
-        return (0, shared_internals_1.extensionsPattern)(this.adapter.adjustImportsOptions().resolvableExtensions);
+        return (0, shared_internals_1.extensionsPattern)(this.adapter.resolvableExtensions());
     }
     impliedAssets(type, engine, emberENV) {
         let result = this.impliedAddonAssets(type, engine).map((sourcePath) => {
@@ -238,7 +238,7 @@ class AppBuilder {
         babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
         return babel;
     }
-    babelConfig(appFiles) {
+    babelConfig(resolverConfig) {
         let babel = (0, cloneDeep_1.default)(this.adapter.babelConfig());
         if (!babel.plugins) {
             babel.plugins = [];
@@ -248,7 +248,7 @@ class AppBuilder {
         babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
         // https://github.com/webpack/webpack/issues/12154
         babel.plugins.push(require.resolve('./rename-require-plugin'));
-        babel.plugins.push([require.resolve('babel-plugin-ember-template-compilation'), this.etcOptions()]);
+        babel.plugins.push([require.resolve('babel-plugin-ember-template-compilation'), this.etcOptions(resolverConfig)]);
         // this is @embroider/macros configured for full stage3 resolution
         babel.plugins.push(...this.macrosConfig.babelPluginConfig());
         let colocationOptions = {
@@ -285,7 +285,9 @@ class AppBuilder {
             require.resolve('@embroider/shared-internals/src/template-colocation-plugin'),
             colocationOptions,
         ]);
-        babel.plugins.push(this.adjustImportsPlugin(appFiles));
+        for (let p of this.adapter.jsPlugins(resolverConfig)) {
+            babel.plugins.push(p);
+        }
         // we can use globally shared babel runtime by default
         babel.plugins.push([
             require.resolve('@babel/plugin-transform-runtime'),
@@ -295,23 +297,6 @@ class AppBuilder {
         addCachablePlugin(portable.config);
         return portable;
     }
-    adjustImportsPlugin(engines) {
-        let relocatedFiles = {};
-        for (let { destPath, appFiles } of engines) {
-            for (let [relativePath, originalPath] of appFiles.relocatedFiles) {
-                relocatedFiles[(0, path_1.join)(destPath, relativePath)] = originalPath;
-            }
-        }
-        let relocatedFilesPath = (0, path_1.join)(this.root, '_relocated_files.json');
-        (0, fs_extra_1.writeFileSync)(relocatedFilesPath, JSON.stringify({ relocatedFiles }));
-        return [
-            require.resolve('./babel-plugin-adjust-imports'),
-            {
-                adjustImportsOptionsPath: this.adapter.adjustImportsOptionsPath(),
-                relocatedFilesPath,
-            },
-        ];
-    }
     insertEmberApp(asset, appFiles, prepared, emberENV) {
         let html = asset.html;
         if (this.fastbootConfig) {
@@ -508,9 +493,10 @@ class AppBuilder {
             .reverse()
             .forEach(a => a.differ.update());
         return this.appDiffers.map(a => {
-            return Object.assign({}, a.engine, {
+            return {
+                ...a.engine,
                 appFiles: new app_files_1.AppFiles(a.differ, this.resolvableExtensionsPattern, this.adapter.podModulePrefix()),
-            });
+            };
         });
     }
     prepareAsset(asset, appFiles, prepared, emberENV) {
@@ -684,8 +670,6 @@ class AppBuilder {
         let emberENV = this.adapter.emberENV();
         let assets = this.gatherAssets(inputPaths);
         let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
-        let babelConfig = this.babelConfig(appFiles);
-        this.addBabelConfig(babelConfig);
         let assetPaths = assets.map(asset => asset.relativePath);
         if (this.activeFastboot) {
             // when using fastboot, our own package.json needs to be in the output so fastboot can read it.
@@ -705,11 +689,10 @@ class AppBuilder {
             assets: assetPaths,
             babel: {
                 filename: '_babel_config_.js',
-                isParallelSafe: babelConfig.isParallelSafe,
+                isParallelSafe: true,
                 majorVersion: this.adapter.babelMajorVersion(),
                 fileFilter: '_babel_filter_.js',
             },
-            'resolvable-extensions': this.adapter.adjustImportsOptions().resolvableExtensions,
             'root-url': this.adapter.rootURL(),
         };
         if (!this.adapter.strictV2Format()) {
@@ -717,6 +700,10 @@ class AppBuilder {
         }
         let pkg = this.combinePackageJSON(meta);
         (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
+        let resolverConfig = this.adapter.resolverConfig(appFiles);
+        this.addResolverConfig(resolverConfig);
+        let babelConfig = this.babelConfig(resolverConfig);
+        this.addBabelConfig(babelConfig);
     }
     combinePackageJSON(meta) {
         let pkgLayers = [this.app.packageJSON];
@@ -729,16 +716,15 @@ class AppBuilder {
         pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
         return combinePackageJSON(...pkgLayers);
     }
-    etcOptions() {
+    etcOptions(resolverConfig) {
         let transforms = this.adapter.htmlbarsPlugins();
         let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
         setConfig(this.macrosConfig);
         for (let macroPlugin of macroPlugins) {
             transforms.push(macroPlugin);
         }
-        let transform = this.adapter.resolverTransform();
-        if (transform) {
-            transforms.push(transform);
+        for (let t of this.adapter.hbsTransforms(resolverConfig)) {
+            transforms.push(t);
         }
         return {
             transforms,
@@ -770,6 +756,9 @@ class AppBuilder {
         (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, '_babel_config_.js'), `module.exports = ${JSON.stringify(pconfig.config, null, 2)}`, 'utf8');
         (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, '_babel_filter_.js'), babelFilterTemplate({ skipBabel: this.options.skipBabel, appRoot: this.root }), 'utf8');
     }
+    addResolverConfig(config) {
+        (0, fs_extra_1.outputJSONSync)((0, path_1.join)(this.root, '.embroider', 'resolver.json'), config);
+    }
     shouldSplitRoute(routeName) {
         return (!this.options.splitAtRoutes ||
             this.options.splitAtRoutes.find(pattern => {