@embroider/compat 3.1.5 → 3.1.6-unstable.0e00f2b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.1.5",
+  "version": "3.1.6-unstable.0e00f2b",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -19,6 +19,9 @@
   "bin": {
     "embroider-compat-audit": "./src/audit-cli.js"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/core": "^7.14.5",
@@ -27,11 +30,12 @@
     "@babel/preset-env": "^7.14.5",
     "@babel/runtime": "^7.18.6",
     "@babel/traverse": "^7.14.5",
+    "@embroider/macros": "1.12.4-unstable.0e00f2b",
     "@types/babel__code-frame": "^7.0.2",
     "@types/yargs": "^17.0.3",
     "assert-never": "^1.1.0",
-    "babel-import-util": "^1.1.0",
-    "babel-plugin-ember-template-compilation": "^2.0.0",
+    "babel-import-util": "^2.0.0",
+    "babel-plugin-ember-template-compilation": "^2.1.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
     "bind-decorator": "^1.0.11",
@@ -59,11 +63,13 @@
     "tree-sync": "^2.1.0",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "yargs": "^17.0.1",
-    "@embroider/macros": "1.12.3"
+    "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@glimmer/syntax": "^0.84.2",
+    "@embroider/core": "3.1.4-unstable.0e00f2b",
+    "@embroider/sample-transforms": "workspace:*",
+    "@embroider/test-support": "workspace:*",
+    "@glimmer/syntax": "^0.84.3",
     "@glint/template": "^1.0.0",
     "@types/babel__core": "^7.1.14",
     "@types/babel__generator": "^7.6.2",
@@ -82,20 +88,15 @@
     "code-equality-assertions": "^0.9.0",
     "ember-engines": "^0.8.19",
     "scenario-tester": "^2.1.2",
-    "typescript": "^5.1.6",
-    "@embroider/sample-transforms": "0.0.0",
-    "@embroider/test-support": "0.36.0"
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
-    "@embroider/core": "^3.1.3"
+    "@embroider/core": "3.1.4-unstable.0e00f2b"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },
   "volta": {
     "extends": "../../package.json"
-  },
-  "scripts": {
-    "test": "jest"
   }
-}
+}

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

@@ -128,7 +128,7 @@ function lazyPackageLookup(config, filename) {
     return {
         get owningPackage() {
             if (!owningPackage) {
-                owningPackage = { result: config.resolver.owningPackage(filename) };
+                owningPackage = { result: config.resolver.packageCache.ownerOfFile(filename) };
             }
             return owningPackage.result;
         },

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 { CompatResolverOptions } from './resolver-transform';\nimport { locateEmbroiderWorkingDir, Package, packageName, Resolver, unrelativize } from '@embroider/core';\nimport { snippetToDasherizedName } from './dasherize-component-name';\nimport { ActivePackageRules, appTreeRulesDir, ComponentRules, ModuleRules, TemplateRules } 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 = (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.owningPackage(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 { CompatResolverOptions } from './resolver-transform';\nimport { locateEmbroiderWorkingDir, Package, packageName, Resolver, unrelativize } from '@embroider/core';\nimport { snippetToDasherizedName } from './dasherize-component-name';\nimport { ActivePackageRules, appTreeRulesDir, ComponentRules, ModuleRules, TemplateRules } 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 = (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"]}

package/src/build-compat-addon.js

@@ -5,16 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const smoosh_package_json_1 = __importDefault(require("./smoosh-package-json"));
 const broccoli_merge_trees_1 = __importDefault(require("broccoli-merge-trees"));
-const broccoli_funnel_1 = __importDefault(require("broccoli-funnel"));
-const broccoli_source_1 = require("broccoli-source");
 const empty_package_tree_1 = __importDefault(require("./empty-package-tree"));
 function buildCompatAddon(originalPackage, v1Cache) {
     if (originalPackage.isV2Addon()) {
-        // this case is needed when a native-v2 addon depends on a
-        // non-native-v2 addon. (The non-native one will get rewritten and
-        // therefore moved, so to continue depending on it the native one needs to
-        // move too.)
-        return withoutNodeModules(originalPackage);
+        throw new Error(`bug in @embroider/compat. We should not see any v2 addons here, but ${originalPackage.name} as ${originalPackage.root} is a v2 addon`);
     }
     let oldPackages = v1Cache.getAddons(originalPackage.root);
     if (oldPackages.length > 1) {
@@ -45,10 +39,4 @@ function buildCompatAddon(originalPackage, v1Cache) {
     }
 }
 exports.default = buildCompatAddon;
-function withoutNodeModules(originalPackage) {
-    let Klass = originalPackage.mayRebuild ? broccoli_source_1.WatchedDir : broccoli_source_1.UnwatchedDir;
-    return (0, broccoli_funnel_1.default)(new Klass(originalPackage.root), {
-        exclude: ['node_modules', '*/node_modules'],
-    });
-}
 //# sourceMappingURL=build-compat-addon.js.map

package/src/build-compat-addon.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-compat-addon.js","sourceRoot":"","sources":["build-compat-addon.ts"],"names":[],"mappings":";;;;;AAEA,gFAAsD;AACtD,gFAAsD;AAEtD,sEAA0C;AAC1C,qDAA2D;AAC3D,8EAAoD;AAEpD,SAAwB,gBAAgB,CAAC,eAAwB,EAAE,OAAwB;IACzF,IAAI,eAAe,CAAC,SAAS,EAAE,EAAE;QAC/B,0DAA0D;QAC1D,kEAAkE;QAClE,0EAA0E;QAC1E,aAAa;QACb,OAAO,kBAAkB,CAAC,eAAe,CAAC,CAAC;KAC5C;IAED,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1D,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,sEAAsE;QACtE,2EAA2E;QAC3E,+BAA+B;QAC/B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,yEAAyE;QACzE,4EAA4E;QAC5E,kCAAkC;QAClC,EAAE;QACF,yEAAyE;QACzE,gEAAgE;QAChE,0EAA0E;QAC1E,2BAA2B;QAC3B,OAAO,IAAI,4BAAgB,CAAC,eAAe,CAAC,CAAC;KAC9C;IAED,IAAI,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,IAAI,cAAc,EAAE;QAClB,IAAI,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;QACzD,IAAI,QAAQ,GAAG,IAAI,6BAAiB,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,OAAO,IAAA,8BAAkB,EAAC,CAAC,GAAG,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtE;SAAM;QACL,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;KAC9B;AACH,CAAC;AAtCD,mCAsCC;AAED,SAAS,kBAAkB,CAAC,eAAwB;IAClD,IAAI,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,4BAAU,CAAC,CAAC,CAAC,8BAAY,CAAC;IACnE,OAAO,IAAA,yBAAW,EAAC,IAAI,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAClD,OAAO,EAAE,CAAC,cAAc,EAAE,gBAAgB,CAAC;KAC5C,CAAC,CAAC;AACL,CAAC","sourcesContent":["import V1InstanceCache from './v1-instance-cache';\nimport { Package } from '@embroider/core';\nimport SmooshPackageJSON from './smoosh-package-json';\nimport broccoliMergeTrees from 'broccoli-merge-trees';\nimport { Node } from 'broccoli-node-api';\nimport buildFunnel from 'broccoli-funnel';\nimport { UnwatchedDir, WatchedDir } from 'broccoli-source';\nimport EmptyPackageTree from './empty-package-tree';\n\nexport default function buildCompatAddon(originalPackage: Package, v1Cache: V1InstanceCache): Node {\n  if (originalPackage.isV2Addon()) {\n    // this case is needed when a native-v2 addon depends on a\n    // non-native-v2 addon. (The non-native one will get rewritten and\n    // therefore moved, so to continue depending on it the native one needs to\n    // move too.)\n    return withoutNodeModules(originalPackage);\n  }\n\n  let oldPackages = v1Cache.getAddons(originalPackage.root);\n\n  if (oldPackages.length > 1) {\n    // extensibility hook that allows a compat adapter to optimize its own\n    // smooshing. We do it early so that if it reduces all the way to zero, the\n    // next check will handle that.\n    oldPackages = oldPackages[0].reduceInstances(oldPackages);\n  }\n\n  if (oldPackages.length === 0) {\n    // this happens when the v1 addon wasn't actually getting instantiated at\n    // all, which can happen if the app uses `addons.blacklist` or another addon\n    // uses `shouldIncludeChildAddon`.\n    //\n    // we still keep a place for this addon in the rewritten addon workspace,\n    // because that whole process only depends on looking at all the\n    // package.json files on disk -- it can't know which ones are going to end\n    // up unused at this point.\n    return new EmptyPackageTree(originalPackage);\n  }\n\n  let needsSmooshing = oldPackages.length > 1 && oldPackages[0].hasAnyTrees();\n  if (needsSmooshing) {\n    let trees = oldPackages.map(pkg => pkg.v2Tree).reverse();\n    let smoosher = new SmooshPackageJSON(trees, { annotation: originalPackage.name });\n    return broccoliMergeTrees([...trees, smoosher], { overwrite: true });\n  } else {\n    return oldPackages[0].v2Tree;\n  }\n}\n\nfunction withoutNodeModules(originalPackage: Package): Node {\n  let Klass = originalPackage.mayRebuild ? WatchedDir : UnwatchedDir;\n  return buildFunnel(new Klass(originalPackage.root), {\n    exclude: ['node_modules', '*/node_modules'],\n  });\n}\n"]}
+{"version":3,"file":"build-compat-addon.js","sourceRoot":"","sources":["build-compat-addon.ts"],"names":[],"mappings":";;;;;AAEA,gFAAsD;AACtD,gFAAsD;AAEtD,8EAAoD;AAEpD,SAAwB,gBAAgB,CAAC,eAAwB,EAAE,OAAwB;IACzF,IAAI,eAAe,CAAC,SAAS,EAAE,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,uEAAuE,eAAe,CAAC,IAAI,OAAO,eAAe,CAAC,IAAI,gBAAgB,CACvI,CAAC;KACH;IAED,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1D,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,sEAAsE;QACtE,2EAA2E;QAC3E,+BAA+B;QAC/B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,yEAAyE;QACzE,4EAA4E;QAC5E,kCAAkC;QAClC,EAAE;QACF,yEAAyE;QACzE,gEAAgE;QAChE,0EAA0E;QAC1E,2BAA2B;QAC3B,OAAO,IAAI,4BAAgB,CAAC,eAAe,CAAC,CAAC;KAC9C;IAED,IAAI,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,IAAI,cAAc,EAAE;QAClB,IAAI,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;QACzD,IAAI,QAAQ,GAAG,IAAI,6BAAiB,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,OAAO,IAAA,8BAAkB,EAAC,CAAC,GAAG,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACtE;SAAM;QACL,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;KAC9B;AACH,CAAC;AApCD,mCAoCC","sourcesContent":["import V1InstanceCache from './v1-instance-cache';\nimport { Package } from '@embroider/core';\nimport SmooshPackageJSON from './smoosh-package-json';\nimport broccoliMergeTrees from 'broccoli-merge-trees';\nimport { Node } from 'broccoli-node-api';\nimport EmptyPackageTree from './empty-package-tree';\n\nexport default function buildCompatAddon(originalPackage: Package, v1Cache: V1InstanceCache): Node {\n  if (originalPackage.isV2Addon()) {\n    throw new Error(\n      `bug in @embroider/compat. We should not see any v2 addons here, but ${originalPackage.name} as ${originalPackage.root} is a v2 addon`\n    );\n  }\n\n  let oldPackages = v1Cache.getAddons(originalPackage.root);\n\n  if (oldPackages.length > 1) {\n    // extensibility hook that allows a compat adapter to optimize its own\n    // smooshing. We do it early so that if it reduces all the way to zero, the\n    // next check will handle that.\n    oldPackages = oldPackages[0].reduceInstances(oldPackages);\n  }\n\n  if (oldPackages.length === 0) {\n    // this happens when the v1 addon wasn't actually getting instantiated at\n    // all, which can happen if the app uses `addons.blacklist` or another addon\n    // uses `shouldIncludeChildAddon`.\n    //\n    // we still keep a place for this addon in the rewritten addon workspace,\n    // because that whole process only depends on looking at all the\n    // package.json files on disk -- it can't know which ones are going to end\n    // up unused at this point.\n    return new EmptyPackageTree(originalPackage);\n  }\n\n  let needsSmooshing = oldPackages.length > 1 && oldPackages[0].hasAnyTrees();\n  if (needsSmooshing) {\n    let trees = oldPackages.map(pkg => pkg.v2Tree).reverse();\n    let smoosher = new SmooshPackageJSON(trees, { annotation: originalPackage.name });\n    return broccoliMergeTrees([...trees, smoosher], { overwrite: true });\n  } else {\n    return oldPackages[0].v2Tree;\n  }\n}\n"]}

package/src/compat-adapters/ember-scroll-modifiers.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-scroll-modifiers.js

@@ -0,0 +1,23 @@
+"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;
+        // observer-manager is injected with the undocumented package@service syntax without being app re-exported
+        // this makes sure that the service is always re-exported and injectable even when built with staticAddonTrees=true
+        if (meta['implicit-modules'] &&
+            !meta['implicit-modules'].find(implicitModule => implicitModule === './services/observer-manager.js')) {
+            meta['implicit-modules'].push('./services/observer-manager.js');
+        }
+        else if (!meta['implicit-modules']) {
+            meta['implicit-modules'] = ['./services/observer-manager.js'];
+        }
+        return meta;
+    }
+}
+exports.default = default_1;
+//# sourceMappingURL=ember-scroll-modifiers.js.map

package/src/compat-adapters/ember-scroll-modifiers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember-scroll-modifiers.js","sourceRoot":"","sources":["ember-scroll-modifiers.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAElC,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;QAC7B,0GAA0G;QAC1G,mHAAmH;QACnH,IACE,IAAI,CAAC,kBAAkB,CAAC;YACxB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,KAAK,gCAAgC,CAAC,EACrG;YACA,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;SACjE;aAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;SAC/D;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAfD,4BAeC","sourcesContent":["import V1Addon from '../v1-addon';\n\nexport default class extends V1Addon {\n  get packageMeta() {\n    let meta = super.packageMeta;\n    // observer-manager is injected with the undocumented package@service syntax without being app re-exported\n    // this makes sure that the service is always re-exported and injectable even when built with staticAddonTrees=true\n    if (\n      meta['implicit-modules'] &&\n      !meta['implicit-modules'].find(implicitModule => implicitModule === './services/observer-manager.js')\n    ) {\n      meta['implicit-modules'].push('./services/observer-manager.js');\n    } else if (!meta['implicit-modules']) {\n      meta['implicit-modules'] = ['./services/observer-manager.js'];\n    }\n    return meta;\n  }\n}\n"]}

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

@@ -1,4 +1,14 @@
 import V1Addon from '../v1-addon';
 export default class extends V1Addon {
     get v2Tree(): Node;
+    private get useStaticEmber();
+    private get includedDependencies();
+    get newPackageJSON(): import("@embroider/core").PackageInfo;
+    customizes(treeName: string): boolean;
+    invokeOriginalTreeFor(name: string, opts?: {
+        neuterPreprocessors: boolean;
+    }): any;
+    private customAddonTree;
+    private customVendorTree;
+    get packageMeta(): Partial<import("@embroider/core").AddonMeta>;
 }

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

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,10 +12,161 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const v1_addon_1 = __importDefault(require("../v1-addon"));
 const broccoli_funnel_1 = __importDefault(require("broccoli-funnel"));
 const broccoli_merge_trees_1 = __importDefault(require("broccoli-merge-trees"));
+const add_to_tree_1 = __importDefault(require("../add-to-tree"));
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const typescript_memoize_1 = require("typescript-memoize");
+const semver_1 = require("semver");
+const core_1 = require("@babel/core");
+const broccoli_plugin_1 = __importDefault(require("broccoli-plugin"));
 class default_1 extends v1_addon_1.default {
     get v2Tree() {
         return (0, broccoli_merge_trees_1.default)([super.v2Tree, (0, broccoli_funnel_1.default)(this.rootTree, { include: ['dist/ember-template-compiler.js'] })]);
     }
+    get useStaticEmber() {
+        return this.app.options.staticEmberSource;
+    }
+    // ember-source inlines a whole bunch of dependencies into itself
+    get includedDependencies() {
+        let result = [];
+        for (let name of (0, fs_extra_1.readdirSync)((0, path_1.resolve)(this.root, 'dist', 'dependencies'))) {
+            if (name[0] === '@') {
+                for (let innerName of (0, fs_extra_1.readdirSync)((0, path_1.resolve)(this.root, 'dist', 'dependencies', name))) {
+                    if (innerName.endsWith('.js')) {
+                        result.push(name + '/' + innerName.slice(0, -3));
+                    }
+                }
+            }
+            else {
+                if (name.endsWith('.js')) {
+                    result.push(name.slice(0, -3));
+                }
+            }
+        }
+        return result;
+    }
+    get newPackageJSON() {
+        var _a;
+        let json = super.newPackageJSON;
+        if (this.useStaticEmber) {
+            for (let name of this.includedDependencies) {
+                // weirdly, many of the inlined dependency are still listed as real
+                // dependencies too. If we don't delete them here, they will take
+                // precedence over the inlined ones, because the embroider module-resolver
+                // tries to prioritize real deps.
+                (_a = json.dependencies) === null || _a === void 0 ? true : delete _a[name];
+            }
+        }
+        return json;
+    }
+    customizes(treeName) {
+        if (this.useStaticEmber) {
+            // we are adding custom implementations of these
+            return treeName === 'treeForAddon' || treeName === 'treeForVendor' || super.customizes(treeName);
+        }
+        else {
+            return super.customizes(treeName);
+        }
+    }
+    invokeOriginalTreeFor(name, opts = { neuterPreprocessors: false }) {
+        if (this.useStaticEmber) {
+            if (name === 'addon') {
+                return this.customAddonTree();
+            }
+            if (name === 'vendor') {
+                return this.customVendorTree();
+            }
+        }
+        return super.invokeOriginalTreeFor(name, opts);
+    }
+    // Our addon tree is all of the "packages" we share. @embroider/compat already
+    // supports that pattern of emitting modules into other package's namespaces.
+    customAddonTree() {
+        let packages = (0, broccoli_funnel_1.default)(this.rootTree, {
+            srcDir: 'dist/packages',
+        });
+        let trees = [
+            packages,
+            (0, broccoli_funnel_1.default)(this.rootTree, {
+                srcDir: 'dist/dependencies',
+            }),
+        ];
+        if ((0, semver_1.satisfies)(this.packageJSON.version, '>= 4.0.0-alpha.0 <4.10.0-alpha.0', { includePrerelease: true })) {
+            // import { loc } from '@ember/string' was removed in 4.0. but the
+            // top-level `ember` package tries to import it until 4.10. A
+            // spec-compliant ES modules implementation will treat this as a parse
+            // error.
+            trees.push(new FixStringLoc([packages]));
+        }
+        return (0, broccoli_merge_trees_1.default)(trees, { overwrite: true });
+    }
+    // We're zeroing out these files in vendor rather than deleting them, because
+    // we can't easily intercept the `app.import` that presumably exists for them,
+    // so rather than error they will just be empty.
+    //
+    // The reason we're zeroing these out is that we're going to consume all our
+    // modules directly out of treeForAddon instead, as real modules that webpack
+    // can see.
+    customVendorTree() {
+        return new add_to_tree_1.default(this.addonInstance._treeFor('vendor'), outputPath => {
+            (0, fs_extra_1.unlinkSync)((0, path_1.join)(outputPath, 'ember', 'ember.js'));
+            (0, fs_extra_1.outputFileSync)((0, path_1.join)(outputPath, 'ember', 'ember.js'), '');
+            (0, fs_extra_1.unlinkSync)((0, path_1.join)(outputPath, 'ember', 'ember-testing.js'));
+            (0, fs_extra_1.outputFileSync)((0, path_1.join)(outputPath, 'ember', 'ember-testing.js'), '');
+        });
+    }
+    get packageMeta() {
+        let meta = super.packageMeta;
+        if (this.useStaticEmber) {
+            if (!meta['implicit-modules']) {
+                meta['implicit-modules'] = [];
+            }
+            meta['implicit-modules'].push('./ember/index.js');
+            if (!meta['implicit-test-modules']) {
+                meta['implicit-test-modules'] = [];
+            }
+            meta['implicit-test-modules'].push('./ember-testing/index.js');
+        }
+        return meta;
+    }
 }
 exports.default = default_1;
+__decorate([
+    (0, typescript_memoize_1.Memoize)()
+], default_1.prototype, "includedDependencies", null);
+class FixStringLoc extends broccoli_plugin_1.default {
+    build() {
+        let inSource = (0, fs_extra_1.readFileSync)((0, path_1.resolve)(this.inputPaths[0], 'ember', 'index.js'), 'utf8');
+        let outSource = (0, core_1.transform)(inSource, {
+            plugins: [fixStringLoc],
+        }).code;
+        (0, fs_extra_1.outputFileSync)((0, path_1.resolve)(this.outputPath, 'ember', 'index.js'), outSource, 'utf8');
+    }
+}
+function fixStringLoc(babel) {
+    let t = babel.types;
+    return {
+        visitor: {
+            Program(path) {
+                path.node.body.unshift(t.variableDeclaration('const', [t.variableDeclarator(t.identifier('loc'), t.identifier('undefined'))]));
+            },
+            ImportDeclaration: {
+                enter(path, state) {
+                    if (path.node.source.value === '@ember/string') {
+                        state.inEmberString = true;
+                    }
+                },
+                exit(_path, state) {
+                    state.inEmberString = false;
+                },
+            },
+            ImportSpecifier(path, state) {
+                let name = 'value' in path.node.imported ? path.node.imported.value : path.node.imported.name;
+                if (state.inEmberString && name === 'loc') {
+                    path.remove();
+                }
+            },
+        },
+    };
+}
 //# sourceMappingURL=ember-source.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ember-source.js","sourceRoot":"","sources":["ember-source.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAClC,sEAA0C;AAC1C,gFAA8C;AAE9C,eAAqB,SAAQ,kBAAO;IAClC,IAAI,MAAM;QACR,OAAO,IAAA,8BAAU,EAAC,CAAC,KAAK,CAAC,MAAM,EAAE,IAAA,yBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,iCAAiC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;CACF;AAJD,4BAIC","sourcesContent":["import V1Addon from '../v1-addon';\nimport buildFunnel from 'broccoli-funnel';\nimport mergeTrees from 'broccoli-merge-trees';\n\nexport default class extends V1Addon {\n  get v2Tree() {\n    return mergeTrees([super.v2Tree, buildFunnel(this.rootTree, { include: ['dist/ember-template-compiler.js'] })]);\n  }\n}\n"]}
+{"version":3,"file":"ember-source.js","sourceRoot":"","sources":["ember-source.ts"],"names":[],"mappings":"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","sourcesContent":["import V1Addon from '../v1-addon';\nimport buildFunnel from 'broccoli-funnel';\nimport mergeTrees from 'broccoli-merge-trees';\nimport AddToTree from '../add-to-tree';\nimport { outputFileSync, readFileSync, readdirSync, unlinkSync } from 'fs-extra';\nimport { join, resolve } from 'path';\nimport { Memoize } from 'typescript-memoize';\nimport { satisfies } from 'semver';\nimport { transform } from '@babel/core';\nimport type * as Babel from '@babel/core';\nimport type { NodePath } from '@babel/traverse';\nimport Plugin from 'broccoli-plugin';\nimport { Node } from 'broccoli-node-api';\n\nexport default class extends V1Addon {\n  get v2Tree() {\n    return mergeTrees([super.v2Tree, buildFunnel(this.rootTree, { include: ['dist/ember-template-compiler.js'] })]);\n  }\n\n  private get useStaticEmber(): boolean {\n    return this.app.options.staticEmberSource;\n  }\n\n  // ember-source inlines a whole bunch of dependencies into itself\n  @Memoize()\n  private get includedDependencies() {\n    let result: string[] = [];\n    for (let name of readdirSync(resolve(this.root, 'dist', 'dependencies'))) {\n      if (name[0] === '@') {\n        for (let innerName of readdirSync(resolve(this.root, 'dist', 'dependencies', name))) {\n          if (innerName.endsWith('.js')) {\n            result.push(name + '/' + innerName.slice(0, -3));\n          }\n        }\n      } else {\n        if (name.endsWith('.js')) {\n          result.push(name.slice(0, -3));\n        }\n      }\n    }\n    return result;\n  }\n\n  get newPackageJSON() {\n    let json = super.newPackageJSON;\n    if (this.useStaticEmber) {\n      for (let name of this.includedDependencies) {\n        // weirdly, many of the inlined dependency are still listed as real\n        // dependencies too. If we don't delete them here, they will take\n        // precedence over the inlined ones, because the embroider module-resolver\n        // tries to prioritize real deps.\n        delete json.dependencies?.[name];\n      }\n    }\n    return json;\n  }\n\n  customizes(treeName: string) {\n    if (this.useStaticEmber) {\n      // we are adding custom implementations of these\n      return treeName === 'treeForAddon' || treeName === 'treeForVendor' || super.customizes(treeName);\n    } else {\n      return super.customizes(treeName);\n    }\n  }\n\n  invokeOriginalTreeFor(name: string, opts: { neuterPreprocessors: boolean } = { neuterPreprocessors: false }) {\n    if (this.useStaticEmber) {\n      if (name === 'addon') {\n        return this.customAddonTree();\n      }\n      if (name === 'vendor') {\n        return this.customVendorTree();\n      }\n    }\n    return super.invokeOriginalTreeFor(name, opts);\n  }\n\n  // Our addon tree is all of the \"packages\" we share. @embroider/compat already\n  // supports that pattern of emitting modules into other package's namespaces.\n  private customAddonTree() {\n    let packages = buildFunnel(this.rootTree, {\n      srcDir: 'dist/packages',\n    });\n\n    let trees: Node[] = [\n      packages,\n      buildFunnel(this.rootTree, {\n        srcDir: 'dist/dependencies',\n      }),\n    ];\n\n    if (satisfies(this.packageJSON.version, '>= 4.0.0-alpha.0 <4.10.0-alpha.0', { includePrerelease: true })) {\n      // import { loc } from '@ember/string' was removed in 4.0. but the\n      // top-level `ember` package tries to import it until 4.10. A\n      // spec-compliant ES modules implementation will treat this as a parse\n      // error.\n      trees.push(new FixStringLoc([packages]));\n    }\n\n    return mergeTrees(trees, { overwrite: true });\n  }\n\n  // We're zeroing out these files in vendor rather than deleting them, because\n  // we can't easily intercept the `app.import` that presumably exists for them,\n  // so rather than error they will just be empty.\n  //\n  // The reason we're zeroing these out is that we're going to consume all our\n  // modules directly out of treeForAddon instead, as real modules that webpack\n  // can see.\n  private customVendorTree() {\n    return new AddToTree(this.addonInstance._treeFor('vendor'), outputPath => {\n      unlinkSync(join(outputPath, 'ember', 'ember.js'));\n      outputFileSync(join(outputPath, 'ember', 'ember.js'), '');\n      unlinkSync(join(outputPath, 'ember', 'ember-testing.js'));\n      outputFileSync(join(outputPath, 'ember', 'ember-testing.js'), '');\n    });\n  }\n\n  get packageMeta() {\n    let meta = super.packageMeta;\n    if (this.useStaticEmber) {\n      if (!meta['implicit-modules']) {\n        meta['implicit-modules'] = [];\n      }\n      meta['implicit-modules'].push('./ember/index.js');\n\n      if (!meta['implicit-test-modules']) {\n        meta['implicit-test-modules'] = [];\n      }\n      meta['implicit-test-modules'].push('./ember-testing/index.js');\n    }\n    return meta;\n  }\n}\n\nclass FixStringLoc extends Plugin {\n  build() {\n    let inSource = readFileSync(resolve(this.inputPaths[0], 'ember', 'index.js'), 'utf8');\n    let outSource = transform(inSource, {\n      plugins: [fixStringLoc],\n    })!.code!;\n    outputFileSync(resolve(this.outputPath, 'ember', 'index.js'), outSource, 'utf8');\n  }\n}\n\nfunction fixStringLoc(babel: typeof Babel) {\n  let t = babel.types;\n  return {\n    visitor: {\n      Program(path: NodePath<Babel.types.Program>) {\n        path.node.body.unshift(\n          t.variableDeclaration('const', [t.variableDeclarator(t.identifier('loc'), t.identifier('undefined'))])\n        );\n      },\n      ImportDeclaration: {\n        enter(path: NodePath<Babel.types.ImportDeclaration>, state: { inEmberString: boolean }) {\n          if (path.node.source.value === '@ember/string') {\n            state.inEmberString = true;\n          }\n        },\n        exit(_path: NodePath<Babel.types.ImportDeclaration>, state: { inEmberString: boolean }) {\n          state.inEmberString = false;\n        },\n      },\n      ImportSpecifier(path: NodePath<Babel.types.ImportSpecifier>, state: { inEmberString: boolean }) {\n        let name = 'value' in path.node.imported ? path.node.imported.value : path.node.imported.name;\n        if (state.inEmberString && name === 'loc') {\n          path.remove();\n        }\n      },\n    },\n  };\n}\n"]}

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

@@ -70,7 +70,6 @@ export declare class CompatAppBuilder {
     private importPaths;
     private routeEntrypoint;
     private testJSEntrypoint;
-    private gatherImplicitModules;
 }
 interface TreeNames {
     appJS: BroccoliNode;

package/src/compat-app-builder.js

@@ -133,9 +133,9 @@ class CompatAppBuilder {
         let result = pkg.dependencies.filter(this.isActiveAddon).filter(
         // When looking for child addons, we want to ignore 'peerDependencies' of
         // a given package, to align with how ember-cli resolves addons. So here
-        // we only include dependencies that definitely appear in one of the other
-        // sections.
-        addon => { var _a, _b; return ((_a = pkg.packageJSON.dependencies) === null || _a === void 0 ? void 0 : _a[addon.name]) || ((_b = pkg.packageJSON.devDependencies) === null || _b === void 0 ? void 0 : _b[addon.name]); });
+        // we only include dependencies that are definitely active due to one of
+        // the other sections.
+        addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies');
         if (pkg === this.appPackageWithMovedDeps) {
             let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon);
             result = [...result, ...extras];
@@ -264,6 +264,7 @@ class CompatAppBuilder {
                     // search, so first one wins.
                     .reverse(),
             })),
+            amdCompatibility: this.options.amdCompatibility,
             // this is the additional stufff that @embroider/compat adds on top to do
             // global template resolving
             modulePrefix: this.modulePrefix(),
@@ -595,11 +596,11 @@ class CompatAppBuilder {
             return { packageJSON, extraAppFiles, extraVendorFiles };
         }
     }
-    updateAppJS(inputPaths) {
+    updateAppJS(appJSPath) {
         var _a;
         if (!this.engines) {
-            this.engines = this.partitionEngines(inputPaths.appJS).map(engine => {
-                if (engine.sourcePath === inputPaths.appJS) {
+            this.engines = this.partitionEngines(appJSPath).map(engine => {
+                if (engine.sourcePath === appJSPath) {
                     // this is the app. We have more to do for the app than for other
                     // engines.
                     let fastbootSync;
@@ -611,7 +612,7 @@ class CompatAppBuilder {
                     }
                     return {
                         engine,
-                        appSync: new sync_dir_1.SyncDir(inputPaths.appJS, this.root),
+                        appSync: new sync_dir_1.SyncDir(appJSPath, this.root),
                         fastbootSync,
                     };
                 }
@@ -803,7 +804,7 @@ class CompatAppBuilder {
             (0, fs_extra_1.rmSync)(this.root, { recursive: true, force: true });
             this.firstBuild = false;
         }
-        let appFiles = this.updateAppJS(inputPaths);
+        let appFiles = this.updateAppJS(inputPaths.appJS);
         let emberENV = this.configTree.readConfig().EmberENV;
         let assets = this.gatherAssets(inputPaths);
         let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
@@ -1060,7 +1061,7 @@ class CompatAppBuilder {
         let fastbootOnlyAmdModules = fastboot.map(file => this.importPaths(appFiles, file));
         // this is a backward-compatibility feature: addons can force inclusion of
         // modules.
-        this.gatherImplicitModules('implicit-modules', appFiles, amdModules);
+        eagerModules.push('./-embroider-implicit-modules.js');
         let params = { amdModules, fastbootOnlyAmdModules, lazyRoutes, lazyEngines, eagerModules, styles };
         if (entryParams) {
             Object.assign(params, entryParams);
@@ -1114,7 +1115,7 @@ class CompatAppBuilder {
         let amdModules = [];
         // this is a backward-compatibility feature: addons can force inclusion of
         // test support modules.
-        this.gatherImplicitModules('implicit-test-modules', engine, amdModules);
+        eagerModules.push('./-embroider-implicit-test-modules.js');
         for (let relativePath of engine.tests) {
             amdModules.push(this.importPaths(engine, relativePath));
         }
@@ -1131,37 +1132,6 @@ class CompatAppBuilder {
         prepared.set(asset.relativePath, asset);
         return asset;
     }
-    gatherImplicitModules(section, { engine }, lazyModules) {
-        for (let addon of engine.addons) {
-            let implicitModules = addon.meta[section];
-            if (implicitModules) {
-                let renamedModules = inverseRenamedModules(addon.meta, this.resolvableExtensionsPattern);
-                for (let name of implicitModules) {
-                    let packageName = addon.name;
-                    if (addon.isV2Addon()) {
-                        let renamedMeta = addon.meta['renamed-packages'];
-                        if (renamedMeta) {
-                            Object.entries(renamedMeta).forEach(([key, value]) => {
-                                if (value === addon.name) {
-                                    packageName = key;
-                                }
-                            });
-                        }
-                    }
-                    let runtime = (0, path_2.join)(packageName, name).replace(this.resolvableExtensionsPattern, '');
-                    let runtimeRenameLookup = runtime.split('\\').join('/');
-                    if (renamedModules && renamedModules[runtimeRenameLookup]) {
-                        runtime = renamedModules[runtimeRenameLookup];
-                    }
-                    runtime = runtime.split(path_2.sep).join('/');
-                    lazyModules.push({
-                        runtime,
-                        buildtime: path_1.posix.join(packageName, name),
-                    });
-                }
-            }
-        }
-    }
 }
 exports.CompatAppBuilder = CompatAppBuilder;
 __decorate([
@@ -1234,6 +1204,10 @@ let d = w.define;
   }
 {{/if}}
 
+{{#each eagerModules as |eagerModule| ~}}
+  i("{{js-string-escape eagerModule}}");
+{{/each}}
+
 {{#each amdModules as |amdModule| ~}}
   d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
 {{/each}}
@@ -1246,9 +1220,6 @@ let d = w.define;
   }
 {{/if}}
 
-{{#each eagerModules as |eagerModule| ~}}
-  i("{{js-string-escape eagerModule}}");
-{{/each}}
 
 {{#if lazyRoutes}}
 w._embroiderRouteBundles_ = [
@@ -1322,19 +1293,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}}");
 `);
-// meta['renamed-modules'] has mapping from classic filename to real filename.
-// This takes that and converts it to the inverst mapping from real import path
-// to classic import path.
-function inverseRenamedModules(meta, extensions) {
-    let renamed = meta['renamed-modules'];
-    if (renamed) {
-        let inverted = {};
-        for (let [classic, real] of Object.entries(renamed)) {
-            inverted[real.replace(extensions, '')] = classic.replace(extensions, '');
-        }
-        return inverted;
-    }
-}
 function combinePackageJSON(...layers) {
     function custom(objValue, srcValue, key, _object, _source, stack) {
         if (key === 'keywords' && stack.size === 0) {