@embroider/compat 3.5.7-unstable.3b061c2 → 3.5.7-unstable.52687d4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.5.7-unstable.3b061c2",
+  "version": "3.5.7-unstable.52687d4",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -45,7 +45,6 @@
     "broccoli-source": "^3.0.1",
     "chalk": "^4.1.1",
     "debug": "^4.3.2",
-    "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^2.1.1",
     "fs-extra": "^9.1.0",
     "fs-tree-diff": "^2.0.1",
@@ -53,6 +52,7 @@
     "lodash": "^4.17.21",
     "pkg-up": "^3.1.0",
     "resolve": "^1.20.0",
+    "resolve.exports": "^2.0.2",
     "resolve-package-path": "^4.0.1",
     "semver": "^7.3.5",
     "symlink-or-copy": "^1.3.1",
@@ -60,7 +60,7 @@
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
     "yargs": "^17.0.1",
-    "@embroider/macros": "1.16.6-unstable.3b061c2"
+    "@embroider/macros": "1.16.6-unstable.52687d4"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.3",
@@ -83,12 +83,12 @@
     "ember-engines": "^0.8.19",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5",
-    "@embroider/core": "^3.4.15-unstable.3b061c2",
+    "@embroider/core": "^3.4.15-unstable.52687d4",
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0"
   },
   "peerDependencies": {
-    "@embroider/core": "^3.4.15-unstable.3b061c2"
+    "@embroider/core": "^3.4.15-unstable.52687d4"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/audit/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":";;;;;;AAIA,4BAaC;AASD,oCAEC;AA5BD,kDAA0B;AAE1B,iDAAsC;AAE/B,KAAK,UAAU,QAAQ,CAAC,OAA0B;IACvD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,6CAA6C,EAAE;QACxE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE;YACH,WAAW,EAAE,MAAM;SACpB;KACF,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,UAAU,CAClB,GAAG,eAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,qDAAqD,MAAM,CAAC,MAAM,EAAE,CAC7G,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAa,UAAW,SAAQ,KAAK;IAEnC,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAC;QAFrB,iBAAY,GAAG,IAAI,CAAC;IAGpB,CAAC;CACF;AALD,gCAKC;AAED,SAAgB,YAAY,CAAC,GAAQ;IACnC,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,YAAoB,EACpB,IAAqD;IAOrD,IAAI,GAAmD,CAAC;IACxD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE,CAAC;QACd,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,KAAK,GAAG,IAAA,qBAAK,EAAC,YAAY,EAAE;QAC9B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;QAClC,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,cAAc,GAAa,EAAE,CAAC;IAClC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE;YACrC,OAAO,CAAC;gBACN,QAAQ;gBACR,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjC,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import chalk from 'chalk';\nimport type { AuditBuildOptions } from '../audit';\nimport { spawn } from 'child_process';\n\nexport async function buildApp(options: AuditBuildOptions): Promise<void> {\n  let result = await execute(`node node_modules/ember-cli/bin/ember build`, {\n    pwd: options.app,\n    env: {\n      STAGE2_ONLY: 'true',\n    },\n  });\n\n  if (result.exitCode !== 0) {\n    throw new BuildError(\n      `${chalk.yellow('Unable to begin audit')} because the build failed. Build output follows:\\n${result.output}`\n    );\n  }\n}\n\nexport class BuildError extends Error {\n  isBuildError = true;\n  constructor(buildOutput: string) {\n    super(buildOutput);\n  }\n}\n\nexport function isBuildError(err: any): err is BuildError {\n  return err?.isBuildError;\n}\n\nasync function execute(\n  shellCommand: string,\n  opts?: { env?: Record<string, string>; pwd?: string }\n): Promise<{\n  exitCode: number;\n  stderr: string;\n  stdout: string;\n  output: string;\n}> {\n  let env: Record<string, string | undefined> | undefined;\n  if (opts?.env) {\n    env = { ...process.env, ...opts.env };\n  }\n  let child = spawn(shellCommand, {\n    stdio: ['inherit', 'pipe', 'pipe'],\n    cwd: opts?.pwd,\n    shell: true,\n    env,\n  });\n  let stderrBuffer: string[] = [];\n  let stdoutBuffer: string[] = [];\n  let combinedBuffer: string[] = [];\n  child.stderr.on('data', data => {\n    stderrBuffer.push(data);\n    combinedBuffer.push(data);\n  });\n  child.stdout.on('data', data => {\n    stdoutBuffer.push(data);\n    combinedBuffer.push(data);\n  });\n  return new Promise(resolve => {\n    child.on('close', (exitCode: number) => {\n      resolve({\n        exitCode,\n        get stdout() {\n          return stdoutBuffer.join('');\n        },\n        get stderr() {\n          return stderrBuffer.join('');\n        },\n        get output() {\n          return combinedBuffer.join('');\n        },\n      });\n    });\n  });\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":";;;;;;AAIA,4BAaC;AASD,oCAEC;AA5BD,kDAA0B;AAE1B,iDAAsC;AAE/B,KAAK,UAAU,QAAQ,CAAC,OAA0B;IACvD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,6CAA6C,EAAE;QACxE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE;YACH,WAAW,EAAE,MAAM;SACpB;KACF,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,UAAU,CAClB,GAAG,eAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,qDAAqD,MAAM,CAAC,MAAM,EAAE,CAC7G,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAa,UAAW,SAAQ,KAAK;IAEnC,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAC;QAFrB,iBAAY,GAAG,IAAI,CAAC;IAGpB,CAAC;CACF;AALD,gCAKC;AAED,SAAgB,YAAY,CAAC,GAAQ;IACnC,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,YAAoB,EACpB,IAAqD;IAOrD,IAAI,GAAmD,CAAC;IACxD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE,CAAC;QACd,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,KAAK,GAAG,IAAA,qBAAK,EAAC,YAAY,EAAE;QAC9B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;QAClC,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,cAAc,GAAa,EAAE,CAAC;IAClC,KAAK,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC9B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC9B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE;YACrC,OAAO,CAAC;gBACN,QAAQ;gBACR,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjC,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import chalk from 'chalk';\nimport type { AuditBuildOptions } from '../audit';\nimport { spawn } from 'child_process';\n\nexport async function buildApp(options: AuditBuildOptions): Promise<void> {\n  let result = await execute(`node node_modules/ember-cli/bin/ember build`, {\n    pwd: options.app,\n    env: {\n      STAGE2_ONLY: 'true',\n    },\n  });\n\n  if (result.exitCode !== 0) {\n    throw new BuildError(\n      `${chalk.yellow('Unable to begin audit')} because the build failed. Build output follows:\\n${result.output}`\n    );\n  }\n}\n\nexport class BuildError extends Error {\n  isBuildError = true;\n  constructor(buildOutput: string) {\n    super(buildOutput);\n  }\n}\n\nexport function isBuildError(err: any): err is BuildError {\n  return err?.isBuildError;\n}\n\nasync function execute(\n  shellCommand: string,\n  opts?: { env?: Record<string, string>; pwd?: string }\n): Promise<{\n  exitCode: number;\n  stderr: string;\n  stdout: string;\n  output: string;\n}> {\n  let env: Record<string, string | undefined> | undefined;\n  if (opts?.env) {\n    env = { ...process.env, ...opts.env };\n  }\n  let child = spawn(shellCommand, {\n    stdio: ['inherit', 'pipe', 'pipe'],\n    cwd: opts?.pwd,\n    shell: true,\n    env,\n  });\n  let stderrBuffer: string[] = [];\n  let stdoutBuffer: string[] = [];\n  let combinedBuffer: string[] = [];\n  child.stderr!.on('data', data => {\n    stderrBuffer.push(data);\n    combinedBuffer.push(data);\n  });\n  child.stdout!.on('data', data => {\n    stdoutBuffer.push(data);\n    combinedBuffer.push(data);\n  });\n  return new Promise(resolve => {\n    child.on('close', (exitCode: number) => {\n      resolve({\n        exitCode,\n        get stdout() {\n          return stdoutBuffer.join('');\n        },\n        get stderr() {\n          return stderrBuffer.join('');\n        },\n        get output() {\n          return combinedBuffer.join('');\n        },\n      });\n    });\n  });\n}\n"]}

package/src/babel-plugin-adjust-imports.js

@@ -71,7 +71,7 @@ function applyRules(t, path, rules, adder, config, filename) {
     if (rules.dependsOnComponents) {
         for (let dasherizedName of rules.dependsOnComponents) {
             if (lookup.owningEngine) {
-                path.node.body.unshift(amdDefine(t, adder, path, `#embroider_compat/components/${dasherizedName}`, `${lookup.owningEngine.packageName}/components/${dasherizedName}`));
+                path.node.body.unshift(amdDefine(t, adder, path, `@embroider/virtual/components/${dasherizedName}`, `${lookup.owningEngine.packageName}/components/${dasherizedName}`));
             }
         }
     }

package/src/babel-plugin-adjust-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-adjust-imports.js","sourceRoot":"","sources":["babel-plugin-adjust-imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'path';\nimport type { NodePath } from '@babel/traverse';\nimport type * as Babel from '@babel/core';\nimport type { types as t } from '@babel/core';\nimport { ImportUtil } from 'babel-import-util';\nimport { readJSONSync } from 'fs-extra';\nimport type { CompatResolverOptions } from './resolver-transform';\nimport type { Package } from '@embroider/core';\nimport { cleanUrl, locateEmbroiderWorkingDir, packageName, Resolver, unrelativize } from '@embroider/core';\nimport { snippetToDasherizedName } from './dasherize-component-name';\nimport type { ActivePackageRules, ComponentRules, ModuleRules, TemplateRules } from './dependency-rules';\nimport { appTreeRulesDir } from './dependency-rules';\n\nexport type Options = { appRoot: string };\n\ninterface State {\n  opts: Options;\n}\n\ntype BabelTypes = typeof t;\n\ninterface ExtraImports {\n  [key: string]: {\n    dependsOnComponents?: string[]; // these are already standardized in dasherized form\n    dependsOnModules?: string[];\n  };\n}\n\ntype InternalConfig = {\n  resolverOptions: CompatResolverOptions;\n  resolver: Resolver;\n\n  // rule-based extra dependencies, indexed by filename\n  extraImports: ExtraImports;\n\n  // rule-based extra dependencies, indexed by classical component name\n  componentExtraImports: ExtraImports;\n};\n\nexport default function main(babel: typeof Babel) {\n  let t = babel.types;\n  let cached: InternalConfig | undefined;\n  function getConfig(appRoot: string) {\n    if (cached) {\n      return cached;\n    }\n    let resolverOptions: CompatResolverOptions = readJSONSync(\n      join(locateEmbroiderWorkingDir(appRoot), 'resolver.json')\n    );\n    let resolver = new Resolver(resolverOptions);\n    cached = {\n      resolverOptions,\n      resolver,\n      extraImports: preprocessExtraImports(resolverOptions, resolver),\n      componentExtraImports: preprocessComponentExtraImports(resolverOptions),\n    };\n    return cached;\n  }\n\n  return {\n    visitor: {\n      Program: {\n        enter(path: NodePath<t.Program>, state: State) {\n          addExtraImports(t, path, getConfig(state.opts.appRoot));\n        },\n      },\n    },\n  };\n}\n\n(main as any).baseDir = function () {\n  return join(__dirname, '..');\n};\n\nfunction addExtraImports(t: BabelTypes, path: NodePath<t.Program>, config: InternalConfig) {\n  let filename: string = cleanUrl((path.hub as any).file.opts.filename);\n  let entry = config.extraImports[filename];\n  let adder = new ImportUtil(t, path);\n  if (entry) {\n    applyRules(t, path, entry, adder, config, filename);\n  }\n\n  let componentName = config.resolver.reverseComponentLookup(filename);\n  if (componentName) {\n    let rules = config.componentExtraImports[componentName];\n    if (rules) {\n      applyRules(t, path, rules, adder, config, filename);\n    }\n  }\n}\n\nfunction applyRules(\n  t: BabelTypes,\n  path: NodePath<t.Program>,\n  rules: ExtraImports[string],\n  adder: ImportUtil,\n  config: InternalConfig,\n  filename: string\n) {\n  let lookup = lazyPackageLookup(config, filename);\n  if (rules.dependsOnModules) {\n    for (let target of rules.dependsOnModules) {\n      if (lookup.owningPackage) {\n        let runtimeName: string;\n        if (packageName(target)) {\n          runtimeName = target;\n        } else {\n          runtimeName = unrelativize(lookup.owningPackage, target, filename);\n        }\n        path.node.body.unshift(amdDefine(t, adder, path, target, runtimeName));\n      }\n    }\n  }\n  if (rules.dependsOnComponents) {\n    for (let dasherizedName of rules.dependsOnComponents) {\n      if (lookup.owningEngine) {\n        path.node.body.unshift(\n          amdDefine(\n            t,\n            adder,\n            path,\n            `#embroider_compat/components/${dasherizedName}`,\n            `${lookup.owningEngine.packageName}/components/${dasherizedName}`\n          )\n        );\n      }\n    }\n  }\n}\n\nfunction amdDefine(t: BabelTypes, adder: ImportUtil, path: NodePath<t.Program>, target: string, runtimeName: string) {\n  let value = t.callExpression(adder.import(path, '@embroider/macros', 'importSync'), [t.stringLiteral(target)]);\n  return t.expressionStatement(\n    t.callExpression(t.memberExpression(t.identifier('window'), t.identifier('define')), [\n      t.stringLiteral(runtimeName),\n      t.functionExpression(null, [], t.blockStatement([t.returnStatement(value)])),\n    ])\n  );\n}\n\nfunction preprocessExtraImports(config: CompatResolverOptions, resolver: Resolver): ExtraImports {\n  let extraImports: ExtraImports = {};\n  for (let rule of config.activePackageRules) {\n    if (rule.addonModules) {\n      for (let [filename, moduleRules] of Object.entries(rule.addonModules)) {\n        for (let root of rule.roots) {\n          expandDependsOnRules(root, filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.appModules) {\n      for (let [filename, moduleRules] of Object.entries(rule.appModules)) {\n        for (let root of rule.roots) {\n          // in general v2 addons can keep their app tree stuff in other places\n          // than \"_app_\" and we would need to check their package.json to see.\n          // But this code is only for applying packageRules to auto-upgraded v1\n          // addons, and those we always organize with their treeForApp output\n          // in _app_.\n          expandDependsOnRules(appTreeRulesDir(root, resolver), filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.addonTemplates) {\n      for (let [filename, moduleRules] of Object.entries(rule.addonTemplates)) {\n        for (let root of rule.roots) {\n          expandInvokesRules(root, filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.appTemplates) {\n      for (let [filename, moduleRules] of Object.entries(rule.appTemplates)) {\n        for (let root of rule.roots) {\n          expandInvokesRules(appTreeRulesDir(root, resolver), filename, moduleRules, extraImports);\n        }\n      }\n    }\n  }\n  return extraImports;\n}\n\nfunction lazyPackageLookup(config: InternalConfig, filename: string) {\n  let owningPackage: { result: Package | undefined } | undefined;\n  let owningEngine: { result: ReturnType<Resolver['owningEngine']> | undefined } | undefined;\n  return {\n    get owningPackage() {\n      if (!owningPackage) {\n        owningPackage = { result: config.resolver.packageCache.ownerOfFile(filename) };\n      }\n      return owningPackage.result;\n    },\n    get owningEngine() {\n      if (!owningEngine) {\n        owningEngine = { result: undefined };\n        let p = this.owningPackage;\n        if (p) {\n          owningEngine.result = config.resolver.owningEngine(p);\n        }\n      }\n      return owningEngine.result;\n    },\n  };\n}\n\nfunction preprocessComponentExtraImports(config: CompatResolverOptions): ExtraImports {\n  let extraImports: ExtraImports = {};\n  for (let rule of config.activePackageRules) {\n    if (rule.components) {\n      for (let [componentName, rules] of Object.entries(rule.components)) {\n        if (rules.invokes) {\n          extraImports[dasherizeComponent(componentName, rule)] = {\n            dependsOnComponents: Object.values(rules.invokes)\n              .flat()\n              .map(c => dasherizeComponent(c, rules)),\n          };\n        }\n      }\n    }\n  }\n  return extraImports;\n}\n\nfunction dasherizeComponent(\n  componentSnippet: string,\n  rules: ModuleRules | ComponentRules | ActivePackageRules\n): string {\n  let d = snippetToDasherizedName(componentSnippet);\n  if (!d) {\n    throw new Error(\n      `unable to parse component snippet \"${componentSnippet}\" from rule ${JSON.stringify(rules, null, 2)}`\n    );\n  }\n  return d;\n}\n\nfunction expandDependsOnRules(\n  root: string,\n  filename: string,\n  rules: ModuleRules,\n  extraImports: InternalConfig['extraImports']\n) {\n  if (rules.dependsOnModules || rules.dependsOnComponents) {\n    let entry: InternalConfig['extraImports'][string] = {};\n    if (rules.dependsOnModules) {\n      entry.dependsOnModules = rules.dependsOnModules;\n    }\n    if (rules.dependsOnComponents) {\n      entry.dependsOnComponents = rules.dependsOnComponents.map(c => dasherizeComponent(c, rules));\n    }\n    extraImports[join(root, filename)] = entry;\n  }\n}\n\nfunction expandInvokesRules(\n  root: string,\n  filename: string,\n  rules: TemplateRules,\n  extraImports: InternalConfig['extraImports']\n) {\n  if (rules.invokes) {\n    let dependsOnComponents: string[] = [];\n    for (let componentList of Object.values(rules.invokes)) {\n      for (let component of componentList) {\n        let d = snippetToDasherizedName(component);\n        if (!d) {\n          throw new Error(\n            `unable to parse component snippet \"${component}\" from rule ${JSON.stringify(rules, null, 2)}`\n          );\n        }\n        dependsOnComponents.push(d);\n      }\n    }\n    extraImports[join(root, filename)] = { dependsOnComponents };\n  }\n}\n"]}
+{"version":3,"file":"babel-plugin-adjust-imports.js","sourceRoot":"","sources":["babel-plugin-adjust-imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'path';\nimport type { NodePath } from '@babel/traverse';\nimport type * as Babel from '@babel/core';\nimport type { types as t } from '@babel/core';\nimport { ImportUtil } from 'babel-import-util';\nimport { readJSONSync } from 'fs-extra';\nimport type { CompatResolverOptions } from './resolver-transform';\nimport type { Package } from '@embroider/core';\nimport { cleanUrl, locateEmbroiderWorkingDir, packageName, Resolver, unrelativize } from '@embroider/core';\nimport { snippetToDasherizedName } from './dasherize-component-name';\nimport type { ActivePackageRules, ComponentRules, ModuleRules, TemplateRules } from './dependency-rules';\nimport { appTreeRulesDir } from './dependency-rules';\n\nexport type Options = { appRoot: string };\n\ninterface State {\n  opts: Options;\n}\n\ntype BabelTypes = typeof t;\n\ninterface ExtraImports {\n  [key: string]: {\n    dependsOnComponents?: string[]; // these are already standardized in dasherized form\n    dependsOnModules?: string[];\n  };\n}\n\ntype InternalConfig = {\n  resolverOptions: CompatResolverOptions;\n  resolver: Resolver;\n\n  // rule-based extra dependencies, indexed by filename\n  extraImports: ExtraImports;\n\n  // rule-based extra dependencies, indexed by classical component name\n  componentExtraImports: ExtraImports;\n};\n\nexport default function main(babel: typeof Babel) {\n  let t = babel.types;\n  let cached: InternalConfig | undefined;\n  function getConfig(appRoot: string) {\n    if (cached) {\n      return cached;\n    }\n    let resolverOptions: CompatResolverOptions = readJSONSync(\n      join(locateEmbroiderWorkingDir(appRoot), 'resolver.json')\n    );\n    let resolver = new Resolver(resolverOptions);\n    cached = {\n      resolverOptions,\n      resolver,\n      extraImports: preprocessExtraImports(resolverOptions, resolver),\n      componentExtraImports: preprocessComponentExtraImports(resolverOptions),\n    };\n    return cached;\n  }\n\n  return {\n    visitor: {\n      Program: {\n        enter(path: NodePath<t.Program>, state: State) {\n          addExtraImports(t, path, getConfig(state.opts.appRoot));\n        },\n      },\n    },\n  };\n}\n\n(main as any).baseDir = function () {\n  return join(__dirname, '..');\n};\n\nfunction addExtraImports(t: BabelTypes, path: NodePath<t.Program>, config: InternalConfig) {\n  let filename: string = cleanUrl((path.hub as any).file.opts.filename);\n  let entry = config.extraImports[filename];\n  let adder = new ImportUtil(t, path);\n  if (entry) {\n    applyRules(t, path, entry, adder, config, filename);\n  }\n\n  let componentName = config.resolver.reverseComponentLookup(filename);\n  if (componentName) {\n    let rules = config.componentExtraImports[componentName];\n    if (rules) {\n      applyRules(t, path, rules, adder, config, filename);\n    }\n  }\n}\n\nfunction applyRules(\n  t: BabelTypes,\n  path: NodePath<t.Program>,\n  rules: ExtraImports[string],\n  adder: ImportUtil,\n  config: InternalConfig,\n  filename: string\n) {\n  let lookup = lazyPackageLookup(config, filename);\n  if (rules.dependsOnModules) {\n    for (let target of rules.dependsOnModules) {\n      if (lookup.owningPackage) {\n        let runtimeName: string;\n        if (packageName(target)) {\n          runtimeName = target;\n        } else {\n          runtimeName = unrelativize(lookup.owningPackage, target, filename);\n        }\n        path.node.body.unshift(amdDefine(t, adder, path, target, runtimeName));\n      }\n    }\n  }\n  if (rules.dependsOnComponents) {\n    for (let dasherizedName of rules.dependsOnComponents) {\n      if (lookup.owningEngine) {\n        path.node.body.unshift(\n          amdDefine(\n            t,\n            adder,\n            path,\n            `@embroider/virtual/components/${dasherizedName}`,\n            `${lookup.owningEngine.packageName}/components/${dasherizedName}`\n          )\n        );\n      }\n    }\n  }\n}\n\nfunction amdDefine(t: BabelTypes, adder: ImportUtil, path: NodePath<t.Program>, target: string, runtimeName: string) {\n  let value = t.callExpression(adder.import(path, '@embroider/macros', 'importSync'), [t.stringLiteral(target)]);\n  return t.expressionStatement(\n    t.callExpression(t.memberExpression(t.identifier('window'), t.identifier('define')), [\n      t.stringLiteral(runtimeName),\n      t.functionExpression(null, [], t.blockStatement([t.returnStatement(value)])),\n    ])\n  );\n}\n\nfunction preprocessExtraImports(config: CompatResolverOptions, resolver: Resolver): ExtraImports {\n  let extraImports: ExtraImports = {};\n  for (let rule of config.activePackageRules) {\n    if (rule.addonModules) {\n      for (let [filename, moduleRules] of Object.entries(rule.addonModules)) {\n        for (let root of rule.roots) {\n          expandDependsOnRules(root, filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.appModules) {\n      for (let [filename, moduleRules] of Object.entries(rule.appModules)) {\n        for (let root of rule.roots) {\n          // in general v2 addons can keep their app tree stuff in other places\n          // than \"_app_\" and we would need to check their package.json to see.\n          // But this code is only for applying packageRules to auto-upgraded v1\n          // addons, and those we always organize with their treeForApp output\n          // in _app_.\n          expandDependsOnRules(appTreeRulesDir(root, resolver), filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.addonTemplates) {\n      for (let [filename, moduleRules] of Object.entries(rule.addonTemplates)) {\n        for (let root of rule.roots) {\n          expandInvokesRules(root, filename, moduleRules, extraImports);\n        }\n      }\n    }\n    if (rule.appTemplates) {\n      for (let [filename, moduleRules] of Object.entries(rule.appTemplates)) {\n        for (let root of rule.roots) {\n          expandInvokesRules(appTreeRulesDir(root, resolver), filename, moduleRules, extraImports);\n        }\n      }\n    }\n  }\n  return extraImports;\n}\n\nfunction lazyPackageLookup(config: InternalConfig, filename: string) {\n  let owningPackage: { result: Package | undefined } | undefined;\n  let owningEngine: { result: ReturnType<Resolver['owningEngine']> | undefined } | undefined;\n  return {\n    get owningPackage() {\n      if (!owningPackage) {\n        owningPackage = { result: config.resolver.packageCache.ownerOfFile(filename) };\n      }\n      return owningPackage.result;\n    },\n    get owningEngine() {\n      if (!owningEngine) {\n        owningEngine = { result: undefined };\n        let p = this.owningPackage;\n        if (p) {\n          owningEngine.result = config.resolver.owningEngine(p);\n        }\n      }\n      return owningEngine.result;\n    },\n  };\n}\n\nfunction preprocessComponentExtraImports(config: CompatResolverOptions): ExtraImports {\n  let extraImports: ExtraImports = {};\n  for (let rule of config.activePackageRules) {\n    if (rule.components) {\n      for (let [componentName, rules] of Object.entries(rule.components)) {\n        if (rules.invokes) {\n          extraImports[dasherizeComponent(componentName, rule)] = {\n            dependsOnComponents: Object.values(rules.invokes)\n              .flat()\n              .map(c => dasherizeComponent(c, rules)),\n          };\n        }\n      }\n    }\n  }\n  return extraImports;\n}\n\nfunction dasherizeComponent(\n  componentSnippet: string,\n  rules: ModuleRules | ComponentRules | ActivePackageRules\n): string {\n  let d = snippetToDasherizedName(componentSnippet);\n  if (!d) {\n    throw new Error(\n      `unable to parse component snippet \"${componentSnippet}\" from rule ${JSON.stringify(rules, null, 2)}`\n    );\n  }\n  return d;\n}\n\nfunction expandDependsOnRules(\n  root: string,\n  filename: string,\n  rules: ModuleRules,\n  extraImports: InternalConfig['extraImports']\n) {\n  if (rules.dependsOnModules || rules.dependsOnComponents) {\n    let entry: InternalConfig['extraImports'][string] = {};\n    if (rules.dependsOnModules) {\n      entry.dependsOnModules = rules.dependsOnModules;\n    }\n    if (rules.dependsOnComponents) {\n      entry.dependsOnComponents = rules.dependsOnComponents.map(c => dasherizeComponent(c, rules));\n    }\n    extraImports[join(root, filename)] = entry;\n  }\n}\n\nfunction expandInvokesRules(\n  root: string,\n  filename: string,\n  rules: TemplateRules,\n  extraImports: InternalConfig['extraImports']\n) {\n  if (rules.invokes) {\n    let dependsOnComponents: string[] = [];\n    for (let componentList of Object.values(rules.invokes)) {\n      for (let component of componentList) {\n        let d = snippetToDasherizedName(component);\n        if (!d) {\n          throw new Error(\n            `unable to parse component snippet \"${component}\" from rule ${JSON.stringify(rules, null, 2)}`\n          );\n        }\n        dependsOnComponents.push(d);\n      }\n    }\n    extraImports[join(root, filename)] = { dependsOnComponents };\n  }\n}\n"]}

package/src/compat-adapters/ember-resolver.d.ts

@@ -0,0 +1,4 @@
+import V1Addon from '../v1-addon';
+export default class extends V1Addon {
+    get packageMeta(): Partial<import("@embroider/core").AddonMeta>;
+}

package/src/compat-adapters/ember-resolver.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const v1_addon_1 = __importDefault(require("../v1-addon"));
+class default_1 extends v1_addon_1.default {
+    get packageMeta() {
+        let meta = super.packageMeta;
+        if (meta['implicit-modules']) {
+            // ember-resolver has a vestigial empty file here that existed due to
+            // babel-plugin-debug-macros behavior. But ember-resolver no longer uses
+            // babel-plugin-debug-macros. And the empty file makes vite's CJS interop
+            // get confused and produce a runtime crash.
+            meta['implicit-modules'] = meta['implicit-modules'].filter(m => m !== './features');
+        }
+        return meta;
+    }
+}
+exports.default = default_1;
+//# sourceMappingURL=ember-resolver.js.map

package/src/compat-adapters/ember-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember-resolver.js","sourceRoot":"","sources":["ember-resolver.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAElC,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;QAC7B,IAAI,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC7B,qEAAqE;YACrE,wEAAwE;YACxE,yEAAyE;YACzE,4CAA4C;YAC5C,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAZD,4BAYC","sourcesContent":["import V1Addon from '../v1-addon';\n\nexport default class extends V1Addon {\n  get packageMeta() {\n    let meta = super.packageMeta;\n    if (meta['implicit-modules']) {\n      // ember-resolver has a vestigial empty file here that existed due to\n      // babel-plugin-debug-macros behavior. But ember-resolver no longer uses\n      // babel-plugin-debug-macros. And the empty file makes vite's CJS interop\n      // get confused and produce a runtime crash.\n      meta['implicit-modules'] = meta['implicit-modules'].filter(m => m !== './features');\n    }\n    return meta;\n  }\n}\n"]}

package/src/compat-app-builder.d.ts

@@ -1,12 +1,9 @@
-import type { Node as BroccoliNode } from 'broccoli-node-api';
-import type { OutputPaths } from '@embroider/core';
 import type Options from './options';
 import type ContentForConfig from './content-for-config';
 import type { V1Config } from './v1-config';
 import type { Package } from '@embroider/core';
 import type CompatApp from './compat-app';
 export declare class CompatAppBuilder {
-    private root;
     private origAppPackage;
     private appPackageWithMovedDeps;
     private options;
@@ -15,32 +12,22 @@ export declare class CompatAppBuilder {
     private contentForTree;
     private synthVendor;
     private synthStyles;
-    constructor(root: string, origAppPackage: Package, appPackageWithMovedDeps: Package, options: Required<Options>, compatApp: CompatApp, configTree: V1Config, contentForTree: ContentForConfig, synthVendor: Package, synthStyles: Package);
-    private fastbootJSSrcDir;
+    constructor(origAppPackage: Package, appPackageWithMovedDeps: Package, options: Required<Options>, compatApp: CompatApp, configTree: V1Config, contentForTree: ContentForConfig, synthVendor: Package, synthStyles: Package);
     private activeAddonChildren;
     private get allActiveAddons();
     private isActiveAddon;
     private orderAddons;
     private resolvableExtensions;
-    private addEmberEntrypoints;
     private modulePrefix;
     private podModulePrefix;
-    private rootURL;
     private activeRules;
     private resolverConfig;
-    private get resolvableExtensionsPattern();
     private babelConfig;
     private findActiveAddons;
     private partitionEngines;
-    private get activeFastboot();
     private emberVersion;
-    private get fastbootConfig();
     private engines;
-    private updateAppJS;
-    private get staticAppPathsPattern();
-    private firstBuild;
-    build(inputPaths: OutputPaths<TreeNames>): Promise<void>;
-    private combinePackageJSON;
+    build(): Promise<void>;
     private etcOptions;
     private get portableHints();
     private addBabelConfig;
@@ -50,10 +37,3 @@ export declare class CompatAppBuilder {
     private addMacrosConfig;
     private outputAppBootError;
 }
-interface TreeNames {
-    appJS: BroccoliNode;
-    htmlTree: BroccoliNode;
-    publicTree: BroccoliNode | undefined;
-    configTree: BroccoliNode;
-}
-export {};

package/src/compat-app-builder.js

@@ -14,25 +14,20 @@ const core_1 = require("@embroider/core");
 const path_1 = require("path");
 const dependency_rules_1 = require("./dependency-rules");
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
-const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const bind_decorator_1 = __importDefault(require("bind-decorator"));
 const fs_extra_1 = require("fs-extra");
 const portable_babel_config_1 = require("@embroider/core/src/portable-babel-config");
-const app_files_1 = require("@embroider/core/src/app-files");
 const portable_1 = require("@embroider/core/src/portable");
 const typescript_memoize_1 = require("typescript-memoize");
 const path_2 = require("path");
 const resolve_1 = __importDefault(require("resolve"));
 const fs_extra_2 = require("fs-extra");
 const node_1 = require("@embroider/macros/src/node");
-const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
-const sync_dir_1 = require("./sync-dir");
 // This exists during the actual broccoli build step. As opposed to CompatApp,
 // which also exists during pipeline-construction time.
 class CompatAppBuilder {
-    constructor(root, origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, contentForTree, synthVendor, synthStyles) {
-        this.root = root;
+    constructor(origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, contentForTree, synthVendor, synthStyles) {
         this.origAppPackage = origAppPackage;
         this.appPackageWithMovedDeps = appPackageWithMovedDeps;
         this.options = options;
@@ -41,13 +36,6 @@ class CompatAppBuilder {
         this.contentForTree = contentForTree;
         this.synthVendor = synthVendor;
         this.synthStyles = synthStyles;
-        this.firstBuild = true;
-    }
-    fastbootJSSrcDir() {
-        let target = (0, path_2.join)(this.compatApp.root, 'fastboot');
-        if ((0, fs_extra_2.pathExistsSync)(target)) {
-            return target;
-        }
     }
     activeAddonChildren(pkg) {
         let result = pkg.dependencies.filter(this.isActiveAddon).filter(
@@ -90,26 +78,13 @@ class CompatAppBuilder {
         return depAIdx - depBIdx;
     }
     resolvableExtensions() {
-        // webpack's default is ['.wasm', '.mjs', '.js', '.json']. Keeping that
-        // subset in that order is sensible, since many third-party libraries will
-        // expect it to work that way.
-        //
-        // For TS, we defer to ember-cli-babel, and the setting for
-        // "enableTypescriptTransform" can be set with and without
-        // ember-cli-typescript
-        return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js', '.gjs', '.gts'];
-    }
-    addEmberEntrypoints(htmlTreePath) {
-        let classicEntrypoints = ['index.html', 'tests/index.html'];
-        if (!this.compatApp.shouldBuildTests) {
-            classicEntrypoints.pop();
+        let fromEnv = process.env.EMBROIDER_RESOLVABLE_EXTENSIONS;
+        if (fromEnv) {
+            return fromEnv.split(',');
         }
-        for (let entrypoint of classicEntrypoints) {
-            let sourcePath = (0, path_2.join)(htmlTreePath, entrypoint);
-            let rewrittenAppPath = (0, path_2.join)(this.root, entrypoint);
-            (0, fs_extra_1.writeFileSync)(rewrittenAppPath, (0, fs_extra_1.readFileSync)(sourcePath));
+        else {
+            return ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];
         }
-        return classicEntrypoints;
     }
     modulePrefix() {
         return this.configTree.readConfig().modulePrefix;
@@ -117,12 +92,9 @@ class CompatAppBuilder {
     podModulePrefix() {
         return this.configTree.readConfig().podModulePrefix;
     }
-    rootURL() {
-        return this.configTree.readConfig().rootURL;
-    }
     activeRules() {
         return (0, dependency_rules_1.activePackageRules)(this.options.packageRules.concat(defaultAddonPackageRules()), [
-            { name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.root },
+            { name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.origAppPackage.root },
             ...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),
         ]);
     }
@@ -141,13 +113,12 @@ class CompatAppBuilder {
             renamePackages,
             resolvableExtensions: this.resolvableExtensions(),
             appRoot: this.origAppPackage.root,
-            engines: engines.map((appFiles, index) => ({
-                packageName: appFiles.engine.package.name,
-                // first engine is the app, which has been relocated to this.root
+            engines: engines.map(engine => ({
+                packageName: engine.package.name,
                 // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks
-                root: (0, fs_extra_1.realpathSync)(index === 0 ? this.root : appFiles.engine.package.root),
-                fastbootFiles: appFiles.fastbootFiles,
-                activeAddons: [...appFiles.engine.addons]
+                root: (0, fs_extra_1.realpathSync)(engine.package.root),
+                fastbootFiles: {},
+                activeAddons: [...engine.addons]
                     .map(([addon, canResolveFromFile]) => ({
                     name: addon.name,
                     root: addon.root,
@@ -157,7 +128,7 @@ class CompatAppBuilder {
                     // that the last one wins. Our resolver's order is the order to
                     // search, so first one wins.
                     .reverse(),
-                isLazy: appFiles.engine.package.isLazyEngine(),
+                isLazy: engine.package.isLazyEngine(),
             })),
             amdCompatibility: this.options.amdCompatibility,
             // this is the additional stufff that @embroider/compat adds on top to do
@@ -172,9 +143,6 @@ class CompatAppBuilder {
         };
         return config;
     }
-    get resolvableExtensionsPattern() {
-        return (0, core_1.extensionsPattern)(this.resolvableExtensions());
-    }
     async babelConfig(resolverConfig) {
         let babel = (0, cloneDeep_1.default)(this.compatApp.babelConfig());
         if (!babel.plugins) {
@@ -236,7 +204,7 @@ class CompatAppBuilder {
             require.resolve('@babel/plugin-transform-runtime'),
             { absoluteRuntime: __dirname, useESModules: true, regenerator: false },
         ]);
-        const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.root }, this.portableHints);
+        const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.origAppPackage.root }, this.portableHints);
         addCachablePlugin(portable.config);
         return portable;
     }
@@ -249,16 +217,7 @@ class CompatAppBuilder {
             if (!child.isEngine()) {
                 this.findActiveAddons(child, engine, true);
             }
-            let canResolveFrom;
-            if (pkg === this.appPackageWithMovedDeps) {
-                // we want canResolveFrom to always be a rewritten package path, and our
-                // app's package is not rewritten yet here.
-                canResolveFrom = (0, path_1.resolve)(this.root, 'package.json');
-            }
-            else {
-                // whereas our addons are already moved
-                canResolveFrom = (0, path_1.resolve)(pkg.root, 'package.json');
-            }
+            let canResolveFrom = (0, path_1.resolve)(pkg.root, 'package.json');
             engine.addons.set(child, canResolveFrom);
         }
         // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)
@@ -294,7 +253,7 @@ class CompatAppBuilder {
                         addons: new Map(),
                         isApp: !current,
                         modulePrefix: addon.name,
-                        appRelativePath: (0, core_1.explicitRelative)(this.root, addon.root),
+                        appRelativePath: (0, core_1.explicitRelative)(this.origAppPackage.root, addon.root),
                     });
                 }
             }
@@ -302,9 +261,6 @@ class CompatAppBuilder {
         }
         return done;
     }
-    get activeFastboot() {
-        return this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-cli-fastboot');
-    }
     emberVersion() {
         let pkg = this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-source');
         if (!pkg) {
@@ -312,96 +268,14 @@ class CompatAppBuilder {
         }
         return pkg.version;
     }
-    get fastbootConfig() {
-        if (this.activeFastboot) {
-            // this is relying on work done in stage1 by @embroider/compat/src/compat-adapters/ember-cli-fastboot.ts
-            let packageJSON = (0, fs_extra_1.readJSONSync)((0, path_2.join)(this.activeFastboot.root, '_fastboot_', 'package.json'));
-            let { extraAppFiles, extraVendorFiles } = packageJSON['embroider-fastboot'];
-            delete packageJSON['embroider-fastboot'];
-            extraVendorFiles.push('assets/embroider_macros_fastboot_init.js');
-            return { packageJSON, extraAppFiles, extraVendorFiles };
-        }
-    }
-    updateAppJS(appJSPath) {
-        var _a;
-        if (!this.engines) {
-            this.engines = this.partitionEngines().map(engine => {
-                if (engine.isApp) {
-                    // this is the app. We have more to do for the app than for other
-                    // engines.
-                    let fastbootSync;
-                    if (this.activeFastboot) {
-                        let fastbootDir = this.fastbootJSSrcDir();
-                        if (fastbootDir) {
-                            fastbootSync = new sync_dir_1.SyncDir(fastbootDir, (0, path_1.resolve)(this.root, '_fastboot_'));
-                        }
-                    }
-                    return {
-                        engine,
-                        appSync: new sync_dir_1.SyncDir(appJSPath, this.root),
-                        fastbootSync,
-                    };
-                }
-                else {
-                    // this is not the app, so it's some other engine. Engines are already
-                    // built by stage1 like all other addons, so we only need to observe
-                    // their files, not doing any actual copying or building.
-                    return {
-                        engine,
-                        appSync: new sync_dir_1.SyncDir(engine.package.root, undefined),
-                        // AFAIK, we've never supported a fastboot overlay directory in an
-                        // engine. But if we do need that, it would go here.
-                        fastbootSync: undefined,
-                    };
-                }
-            });
-        }
-        for (let engine of this.engines) {
-            engine.appSync.update();
-            (_a = engine.fastbootSync) === null || _a === void 0 ? void 0 : _a.update();
-        }
-        return this.engines.map(({ engine, appSync, fastbootSync }) => {
-            var _a;
-            return new app_files_1.AppFiles(engine, appSync.files, (_a = fastbootSync === null || fastbootSync === void 0 ? void 0 : fastbootSync.files) !== null && _a !== void 0 ? _a : new Set(), this.resolvableExtensionsPattern, this.staticAppPathsPattern, this.podModulePrefix());
-        });
-    }
-    get staticAppPathsPattern() {
-        if (this.options.staticAppPaths.length > 0) {
-            return new RegExp('^(?:' + this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
-        }
-    }
-    async build(inputPaths) {
+    async build() {
         // on the first build, we lock down the macros config. on subsequent builds,
         // this doesn't do anything anyway because it's idempotent.
         this.compatApp.macrosConfig.finalize();
-        // on first build, clear the output directory completely
-        if (this.firstBuild) {
-            (0, fs_extra_1.rmSync)(this.root, { recursive: true, force: true });
-            this.firstBuild = false;
-        }
-        let appFiles = this.updateAppJS(inputPaths.appJS);
-        let assetPaths = this.addEmberEntrypoints(inputPaths.htmlTree);
-        if (this.activeFastboot) {
-            // when using fastboot, our own package.json needs to be in the output so fastboot can read it.
-            assetPaths.push('package.json');
+        if (!this.engines) {
+            this.engines = this.partitionEngines();
         }
-        let meta = {
-            type: 'app',
-            version: 2,
-            assets: assetPaths,
-            babel: {
-                filename: '_babel_config_.js',
-                isParallelSafe: true, // TODO
-                majorVersion: this.compatApp.babelMajorVersion(),
-                fileFilter: '_babel_filter_.js',
-            },
-            'root-url': this.rootURL(),
-        };
-        // all compat apps are auto-upgraded, there's no v2 app format here
-        meta['auto-upgraded'] = true;
-        let pkg = this.combinePackageJSON(meta);
-        (0, fs_extra_1.writeFileSync)((0, path_2.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
-        let resolverConfig = this.resolverConfig(appFiles);
+        let resolverConfig = this.resolverConfig(this.engines);
         let config = this.configTree.readConfig();
         let contentForConfig = this.contentForTree.readContents();
         this.addResolverConfig(resolverConfig);
@@ -412,17 +286,6 @@ class CompatAppBuilder {
         this.addBabelConfig(babelConfig);
         this.addMacrosConfig(this.compatApp.macrosConfig.babelPluginConfig()[0]);
     }
-    combinePackageJSON(meta) {
-        let pkgLayers = [this.origAppPackage.packageJSON];
-        let fastbootConfig = this.fastbootConfig;
-        if (fastbootConfig) {
-            // fastboot-specific package.json output is allowed to add to our original package.json
-            pkgLayers.push(fastbootConfig.packageJSON);
-        }
-        // but our own new v2 app metadata takes precedence over both
-        pkgLayers.push({ 'ember-addon': meta });
-        return combinePackageJSON(...pkgLayers);
-    }
     async etcOptions(resolverConfig) {
         let transforms = this.compatApp.htmlbarsPlugins;
         let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
@@ -441,9 +304,9 @@ class CompatAppBuilder {
             transforms.push([require.resolve('./resolver-transform'), opts]);
         }
         let resolver = new core_1.Resolver(resolverConfig);
-        let resolution = await resolver.nodeResolve('ember-source/vendor/ember/ember-template-compiler', (0, path_1.resolve)(this.root, 'package.json'));
+        let resolution = await resolver.nodeResolve('ember-source/vendor/ember/ember-template-compiler', (0, path_1.resolve)(this.origAppPackage.root, 'package.json'));
         if (resolution.type !== 'real') {
-            throw new Error(`bug: unable to resolve ember-template-compiler from ${this.root}`);
+            throw new Error(`bug: unable to resolve ember-template-compiler from ${this.origAppPackage.root}`);
         }
         return {
             transforms,
@@ -499,7 +362,7 @@ class CompatAppBuilder {
           The following code is included via content-for 'config-module':
 
           ${configModule}
-          
+
           1. If you want to keep the same behavior, add it to the app/environment.js.
           2. Once app/environment.js has the content you need, remove the present error by setting "useAddonConfigModule" to false in the build options.
         `);
@@ -547,9 +410,6 @@ class CompatAppBuilder {
     }
 }
 exports.CompatAppBuilder = CompatAppBuilder;
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "fastbootJSSrcDir", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "allActiveAddons", null);
@@ -562,21 +422,9 @@ __decorate([
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "activeRules", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "resolvableExtensionsPattern", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "babelConfig", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "activeFastboot", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "fastbootConfig", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "staticAppPathsPattern", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "portableHints", null);
@@ -595,16 +443,6 @@ const babelFilterTemplate = (0, core_1.jsHandlebarsCompile)(`
 const { babelFilter } = require(${JSON.stringify(require.resolve('@embroider/core'))});
 module.exports = babelFilter({{json-stringify skipBabel}}, "{{js-string-escape appRoot}}");
 `);
-function combinePackageJSON(...layers) {
-    function custom(objValue, srcValue, key, _object, _source, stack) {
-        if (key === 'keywords' && stack.size === 0) {
-            if (Array.isArray(objValue)) {
-                return objValue.concat(srcValue);
-            }
-        }
-    }
-    return (0, mergeWith_1.default)({}, ...layers, custom);
-}
 function addCachablePlugin(babelConfig) {
     if (Array.isArray(babelConfig.plugins) && babelConfig.plugins.length > 0) {
         const plugins = Object.create(null);