@embroider/compat 3.8.1 → 4.0.0-alpha.1

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = main;
 const path_1 = require("path");
 const babel_import_util_1 = require("babel-import-util");
-const fs_extra_1 = require("fs-extra");
 const core_1 = require("@embroider/core");
 const dasherize_component_name_1 = require("./dasherize-component-name");
 const dependency_rules_1 = require("./dependency-rules");
@@ -14,13 +13,11 @@ function main(babel) {
         if (cached) {
             return cached;
         }
-        let resolverOptions = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(appRoot), 'resolver.json'));
-        let resolver = new core_1.Resolver(resolverOptions);
+        let loader = new core_1.ResolverLoader(appRoot);
         cached = {
-            resolverOptions,
-            resolver,
-            extraImports: preprocessExtraImports(resolverOptions, resolver),
-            componentExtraImports: preprocessComponentExtraImports(resolverOptions),
+            loader,
+            extraImports: preprocessExtraImports(loader),
+            componentExtraImports: preprocessComponentExtraImports(loader),
         };
         return cached;
     }
@@ -38,13 +35,13 @@ main.baseDir = function () {
     return (0, path_1.join)(__dirname, '..');
 };
 function addExtraImports(t, path, config) {
-    let filename = path.hub.file.opts.filename;
+    let filename = (0, core_1.cleanUrl)(path.hub.file.opts.filename);
     let entry = config.extraImports[filename];
     let adder = new babel_import_util_1.ImportUtil(t, path);
     if (entry) {
         applyRules(t, path, entry, adder, config, filename);
     }
-    let componentName = config.resolver.reverseComponentLookup(filename);
+    let componentName = config.loader.resolver.reverseComponentLookup(filename);
     if (componentName) {
         let rules = config.componentExtraImports[componentName];
         if (rules) {
@@ -71,7 +68,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}`));
             }
         }
     }
@@ -83,9 +80,11 @@ function amdDefine(t, adder, path, target, runtimeName) {
         t.functionExpression(null, [], t.blockStatement([t.returnStatement(value)])),
     ]));
 }
-function preprocessExtraImports(config, resolver) {
+function preprocessExtraImports(loader) {
+    var _a;
     let extraImports = {};
-    for (let rule of config.activePackageRules) {
+    let config = loader.resolver.options;
+    for (let rule of (_a = config.activePackageRules) !== null && _a !== void 0 ? _a : []) {
         if (rule.addonModules) {
             for (let [filename, moduleRules] of Object.entries(rule.addonModules)) {
                 for (let root of rule.roots) {
@@ -101,7 +100,7 @@ function preprocessExtraImports(config, resolver) {
                     // But this code is only for applying packageRules to auto-upgraded v1
                     // addons, and those we always organize with their treeForApp output
                     // in _app_.
-                    expandDependsOnRules((0, dependency_rules_1.appTreeRulesDir)(root, resolver), filename, moduleRules, extraImports);
+                    expandDependsOnRules((0, dependency_rules_1.appTreeRulesDir)(root, loader.resolver), filename, moduleRules, extraImports);
                 }
             }
         }
@@ -115,7 +114,7 @@ function preprocessExtraImports(config, resolver) {
         if (rule.appTemplates) {
             for (let [filename, moduleRules] of Object.entries(rule.appTemplates)) {
                 for (let root of rule.roots) {
-                    expandInvokesRules((0, dependency_rules_1.appTreeRulesDir)(root, resolver), filename, moduleRules, extraImports);
+                    expandInvokesRules((0, dependency_rules_1.appTreeRulesDir)(root, loader.resolver), filename, moduleRules, extraImports);
                 }
             }
         }
@@ -128,7 +127,7 @@ function lazyPackageLookup(config, filename) {
     return {
         get owningPackage() {
             if (!owningPackage) {
-                owningPackage = { result: config.resolver.packageCache.ownerOfFile(filename) };
+                owningPackage = { result: config.loader.resolver.packageCache.ownerOfFile(filename) };
             }
             return owningPackage.result;
         },
@@ -137,16 +136,18 @@ function lazyPackageLookup(config, filename) {
                 owningEngine = { result: undefined };
                 let p = this.owningPackage;
                 if (p) {
-                    owningEngine.result = config.resolver.owningEngine(p);
+                    owningEngine.result = config.loader.resolver.owningEngine(p);
                 }
             }
             return owningEngine.result;
         },
     };
 }
-function preprocessComponentExtraImports(config) {
+function preprocessComponentExtraImports(loader) {
+    var _a;
     let extraImports = {};
-    for (let rule of config.activePackageRules) {
+    let config = loader.resolver.options;
+    for (let rule of (_a = config.activePackageRules) !== null && _a !== void 0 ? _a : []) {
         if (rule.components) {
             for (let [componentName, rules] of Object.entries(rule.components)) {
                 if (rules.invokes) {

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 { 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 = (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":";;AAqCA,uBA0BC;AA/DD,+BAA4B;AAI5B,yDAA+C;AAG/C,0CAAqG;AACrG,yEAAqE;AAErE,yDAAqD;AA2BrD,SAAwB,IAAI,CAAC,KAAmB;IAC9C,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;IACpB,IAAI,MAAkC,CAAC;IACvC,SAAS,SAAS,CAAC,OAAe;QAChC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,CAAC;QAEzC,MAAM,GAAG;YACP,MAAM;YACN,YAAY,EAAE,sBAAsB,CAAC,MAAM,CAAC;YAC5C,qBAAqB,EAAE,+BAA+B,CAAC,MAAM,CAAC;SAC/D,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,OAAO,EAAE;YACP,OAAO,EAAE;gBACP,KAAK,CAAC,IAAyB,EAAE,KAAY;oBAC3C,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC1D,CAAC;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAEA,IAAY,CAAC,OAAO,GAAG;IACtB,OAAO,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,SAAS,eAAe,CAAC,CAAa,EAAE,IAAyB,EAAE,MAAsB;IACvF,IAAI,QAAQ,GAAW,IAAA,eAAQ,EAAE,IAAI,CAAC,GAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtE,IAAI,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,KAAK,GAAG,IAAI,8BAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,EAAE,CAAC;QACV,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAC5E,IAAI,aAAa,EAAE,CAAC;QAClB,IAAI,KAAK,GAAG,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QACxD,IAAI,KAAK,EAAE,CAAC;YACV,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CACjB,CAAa,EACb,IAAyB,EACzB,KAA2B,EAC3B,KAAiB,EACjB,MAAsB,EACtB,QAAgB;IAEhB,IAAI,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC3B,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACzB,IAAI,WAAmB,CAAC;gBACxB,IAAI,IAAA,kBAAW,EAAC,MAAM,CAAC,EAAE,CAAC;oBACxB,WAAW,GAAG,MAAM,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACN,WAAW,GAAG,IAAA,mBAAY,EAAC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACrE,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAC9B,KAAK,IAAI,cAAc,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YACrD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CACpB,SAAS,CACP,CAAC,EACD,KAAK,EACL,IAAI,EACJ,iCAAiC,cAAc,EAAE,EACjD,GAAG,MAAM,CAAC,YAAY,CAAC,WAAW,eAAe,cAAc,EAAE,CAClE,CACF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,CAAa,EAAE,KAAiB,EAAE,IAAyB,EAAE,MAAc,EAAE,WAAmB;IACjH,IAAI,KAAK,GAAG,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/G,OAAO,CAAC,CAAC,mBAAmB,CAC1B,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE;QACnF,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC;QAC5B,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAC7E,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAsB;;IACpD,IAAI,YAAY,GAAiB,EAAE,CAAC;IACpC,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAgC,CAAC;IAC9D,KAAK,IAAI,IAAI,IAAI,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,KAAK,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACtE,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC5B,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpE,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC5B,qEAAqE;oBACrE,qEAAqE;oBACrE,sEAAsE;oBACtE,oEAAoE;oBACpE,YAAY;oBACZ,oBAAoB,CAAC,IAAA,kCAAe,EAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;gBACpG,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;gBACxE,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC5B,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,KAAK,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACtE,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC5B,kBAAkB,CAAC,IAAA,kCAAe,EAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;gBAClG,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAsB,EAAE,QAAgB;IACjE,IAAI,aAA0D,CAAC;IAC/D,IAAI,YAAsF,CAAC;IAC3F,OAAO;QACL,IAAI,aAAa;YACf,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,aAAa,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxF,CAAC;YACD,OAAO,aAAa,CAAC,MAAM,CAAC;QAC9B,CAAC;QACD,IAAI,YAAY;YACd,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;gBACrC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC3B,IAAI,CAAC,EAAE,CAAC;oBACN,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,OAAO,YAAY,CAAC,MAAM,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CAAC,MAAsB;;IAC7D,IAAI,YAAY,GAAiB,EAAE,CAAC;IACpC,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAgC,CAAC;IAC9D,KAAK,IAAI,IAAI,IAAI,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBAClB,YAAY,CAAC,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,GAAG;wBACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;6BAC9C,IAAI,EAAE;6BACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;qBAC1C,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,kBAAkB,CACzB,gBAAwB,EACxB,KAAwD;IAExD,IAAI,CAAC,GAAG,IAAA,kDAAuB,EAAC,gBAAgB,CAAC,CAAC;IAClD,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CACb,sCAAsC,gBAAgB,eAAe,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CACtG,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAY,EACZ,QAAgB,EAChB,KAAkB,EAClB,YAA4C;IAE5C,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;QACxD,IAAI,KAAK,GAA2C,EAAE,CAAC;QACvD,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC3B,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAClD,CAAC;QACD,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC9B,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/F,CAAC;QACD,YAAY,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,KAAK,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAY,EACZ,QAAgB,EAChB,KAAoB,EACpB,YAA4C;IAE5C,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,mBAAmB,GAAa,EAAE,CAAC;QACvC,KAAK,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACvD,KAAK,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;gBACpC,IAAI,CAAC,GAAG,IAAA,kDAAuB,EAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,CAAC,CAAC,EAAE,CAAC;oBACP,MAAM,IAAI,KAAK,CACb,sCAAsC,SAAS,eAAe,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAC/F,CAAC;gBACJ,CAAC;gBACD,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,YAAY,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,mBAAmB,EAAE,CAAC;IAC/D,CAAC;AACH,CAAC","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 type { CompatResolverOptions } from './resolver-transform';\nimport type { Package } from '@embroider/core';\nimport { cleanUrl, packageName, type Resolver, ResolverLoader, 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  loader: ResolverLoader;\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 loader = new ResolverLoader(appRoot);\n\n    cached = {\n      loader,\n      extraImports: preprocessExtraImports(loader),\n      componentExtraImports: preprocessComponentExtraImports(loader),\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.loader.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(loader: ResolverLoader): ExtraImports {\n  let extraImports: ExtraImports = {};\n  let config = loader.resolver.options as CompatResolverOptions;\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, loader.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, loader.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.loader.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.loader.resolver.owningEngine(p);\n        }\n      }\n      return owningEngine.result;\n    },\n  };\n}\n\nfunction preprocessComponentExtraImports(loader: ResolverLoader): ExtraImports {\n  let extraImports: ExtraImports = {};\n  let config = loader.resolver.options as CompatResolverOptions;\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/babel.d.ts

@@ -0,0 +1,17 @@
+import type { PluginItem } from '@babel/core';
+import type { Transform } from 'babel-plugin-ember-template-compilation';
+export interface CompatBabelState {
+    plugins: PluginItem[];
+    templateTransforms: Transform[];
+    babelMacros: PluginItem[];
+    templateMacros: Transform[];
+}
+export declare function pluginsFromV1Addons(): PluginItem[];
+export declare function transformsFromV1Addons(): Transform[];
+export declare function looseModeSupport(): Transform;
+export declare function templateMacros(): Transform[];
+export declare function babelMacros(): PluginItem[];
+export declare function oldDebugMacros(): PluginItem[];
+export declare function templateColocation(): PluginItem;
+export declare function babelCompatSupport(): PluginItem[];
+export declare function templateCompatSupport(): Transform[];

package/src/babel.js

@@ -0,0 +1,146 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pluginsFromV1Addons = pluginsFromV1Addons;
+exports.transformsFromV1Addons = transformsFromV1Addons;
+exports.looseModeSupport = looseModeSupport;
+exports.templateMacros = templateMacros;
+exports.babelMacros = babelMacros;
+exports.oldDebugMacros = oldDebugMacros;
+exports.templateColocation = templateColocation;
+exports.babelCompatSupport = babelCompatSupport;
+exports.templateCompatSupport = templateCompatSupport;
+const fs_1 = require("fs");
+const core_1 = require("@embroider/core");
+const path_1 = require("path");
+const macros_config_1 = __importDefault(require("@embroider/macros/src/macros-config"));
+function loadCompatConfig() {
+    let compatFile = (0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(process.cwd()), '_babel_compat_.js');
+    if ((0, fs_1.existsSync)(compatFile)) {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        return require(compatFile);
+    }
+    let macros = macros_config_1.default.for({}, process.cwd());
+    let { plugins: templateMacros, setConfig } = macros_config_1.default.transforms();
+    setConfig(macros);
+    if (process.env.NODE_ENV === 'development') {
+        macros.enablePackageDevelopment(process.cwd());
+        macros.enableRuntimeMode();
+    }
+    macros.finalize();
+    return {
+        plugins: [],
+        templateTransforms: [],
+        babelMacros: macros.babelPluginConfig(),
+        templateMacros: templateMacros,
+    };
+}
+const resolverLoader = new core_1.ResolverLoader(process.cwd());
+function pluginsFromV1Addons() {
+    let config = loadCompatConfig();
+    return config.plugins;
+}
+function transformsFromV1Addons() {
+    let config = loadCompatConfig();
+    return config.templateTransforms;
+}
+function looseModeSupport() {
+    const { resolver } = resolverLoader;
+    let opts = {
+        appRoot: resolver.options.appRoot,
+        emberVersion: resolver.options.emberVersion,
+    };
+    return [require.resolve('./resolver-transform'), opts];
+}
+function templateMacros() {
+    let config = loadCompatConfig();
+    return config.templateMacros;
+}
+function babelMacros() {
+    let config = loadCompatConfig();
+    return config.babelMacros;
+}
+function oldDebugMacros() {
+    let debugMacros = require.resolve('babel-plugin-debug-macros');
+    return [
+        [
+            debugMacros,
+            {
+                flags: [
+                    {
+                        source: '@glimmer/env',
+                        flags: {
+                            DEBUG: true,
+                            CI: false,
+                        },
+                    },
+                ],
+                debugTools: {
+                    isDebug: true,
+                    source: '@ember/debug',
+                    assertPredicateIndex: 1,
+                },
+                externalizeHelpers: {
+                    module: '@ember/debug',
+                },
+            },
+            '@ember/debug stripping',
+        ],
+        [
+            debugMacros,
+            {
+                externalizeHelpers: {
+                    module: '@ember/application/deprecations',
+                },
+                debugTools: {
+                    isDebug: true,
+                    source: '@ember/application/deprecations',
+                    assertPredicateIndex: 1,
+                },
+            },
+            '@ember/application/deprecations stripping',
+        ],
+    ];
+}
+function templateColocation() {
+    let colocationOptions = {
+        appRoot: resolverLoader.resolver.options.appRoot,
+        // This extra weirdness is a compromise in favor of build performance.
+        //
+        // 1. When auto-upgrading an addon from v1 to v2, we definitely want to
+        //    run any custom AST transforms in stage1.
+        //
+        // 2. In general case, AST transforms are allowed to manipulate Javascript
+        //    scope. This means that running transforms -- even when we're doing
+        //    source-to-source compilation that emits handlebars and not wire
+        //    format -- implies changing .hbs files into .js files.
+        //
+        // 3. So stage1 may need to rewrite .hbs to .hbs.js (to avoid colliding
+        //    with an existing co-located .js file).
+        //
+        // 4. But stage1 doesn't necessarily want to run babel over the
+        //    corresponding JS file. Most of the time, that's just an
+        //    unnecessarily expensive second parse. (We only run it in stage1 to
+        //    eliminate an addon's custom babel plugins, and many addons don't
+        //    have any.)
+        //
+        // 5. Therefore, the work of template-colocation gets defered until here,
+        //    and it may see co-located templates named `.hbs.js` instead of the
+        //    usual `.hbs.
+        templateExtensions: ['.hbs', '.hbs.js'],
+        // All of the above only applies to auto-upgraded packages that were
+        // authored in v1. V2 packages don't get any of this complexity, they're
+        // supposed to take care of colocating their own templates explicitly.
+        packageGuard: true,
+    };
+    return [core_1.templateColocationPluginPath, colocationOptions];
+}
+function babelCompatSupport() {
+    return [...babelMacros(), ...oldDebugMacros(), templateColocation(), ...pluginsFromV1Addons()];
+}
+function templateCompatSupport() {
+    return [...transformsFromV1Addons(), ...templateMacros(), looseModeSupport()];
+}
+//# sourceMappingURL=babel.js.map

package/src/babel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"babel.js","sourceRoot":"","sources":["babel.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PluginItem } from '@babel/core';\nimport { existsSync } from 'fs';\nimport {\n  locateEmbroiderWorkingDir,\n  ResolverLoader,\n  templateColocationPluginPath,\n  type TemplateColocationPluginOptions,\n} from '@embroider/core';\nimport { join } from 'path';\nimport type { Transform } from 'babel-plugin-ember-template-compilation';\nimport type { Options as ResolverTransformOptions } from './resolver-transform';\nimport MacrosConfig from '@embroider/macros/src/macros-config';\n\nexport interface CompatBabelState {\n  plugins: PluginItem[];\n  templateTransforms: Transform[];\n  babelMacros: PluginItem[];\n  templateMacros: Transform[];\n}\n\nfunction loadCompatConfig(): CompatBabelState {\n  let compatFile = join(locateEmbroiderWorkingDir(process.cwd()), '_babel_compat_.js');\n  if (existsSync(compatFile)) {\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return require(compatFile);\n  }\n  let macros = MacrosConfig.for({}, process.cwd());\n  let { plugins: templateMacros, setConfig } = MacrosConfig.transforms();\n  setConfig(macros);\n  if (process.env.NODE_ENV === 'development') {\n    macros.enablePackageDevelopment(process.cwd());\n    macros.enableRuntimeMode();\n  }\n  macros.finalize();\n  return {\n    plugins: [],\n    templateTransforms: [],\n    babelMacros: macros.babelPluginConfig(),\n    templateMacros: templateMacros as any,\n  };\n}\n\nconst resolverLoader = new ResolverLoader(process.cwd());\n\nexport function pluginsFromV1Addons() {\n  let config = loadCompatConfig();\n  return config.plugins;\n}\n\nexport function transformsFromV1Addons() {\n  let config = loadCompatConfig();\n  return config.templateTransforms;\n}\n\nexport function looseModeSupport(): Transform {\n  const { resolver } = resolverLoader;\n  let opts: ResolverTransformOptions = {\n    appRoot: resolver.options.appRoot,\n    emberVersion: resolver.options.emberVersion,\n  };\n  return [require.resolve('./resolver-transform'), opts];\n}\n\nexport function templateMacros() {\n  let config = loadCompatConfig();\n  return config.templateMacros;\n}\n\nexport function babelMacros() {\n  let config = loadCompatConfig();\n  return config.babelMacros;\n}\n\nexport function oldDebugMacros(): PluginItem[] {\n  let debugMacros = require.resolve('babel-plugin-debug-macros');\n  return [\n    [\n      debugMacros,\n      {\n        flags: [\n          {\n            source: '@glimmer/env',\n            flags: {\n              DEBUG: true,\n              CI: false,\n            },\n          },\n        ],\n        debugTools: {\n          isDebug: true,\n          source: '@ember/debug',\n          assertPredicateIndex: 1,\n        },\n        externalizeHelpers: {\n          module: '@ember/debug',\n        },\n      },\n      '@ember/debug stripping',\n    ],\n    [\n      debugMacros,\n      {\n        externalizeHelpers: {\n          module: '@ember/application/deprecations',\n        },\n        debugTools: {\n          isDebug: true,\n          source: '@ember/application/deprecations',\n          assertPredicateIndex: 1,\n        },\n      },\n      '@ember/application/deprecations stripping',\n    ],\n  ];\n}\n\nexport function templateColocation(): PluginItem {\n  let colocationOptions: TemplateColocationPluginOptions = {\n    appRoot: resolverLoader.resolver.options.appRoot,\n\n    // This extra weirdness is a compromise in favor of build performance.\n    //\n    // 1. When auto-upgrading an addon from v1 to v2, we definitely want to\n    //    run any custom AST transforms in stage1.\n    //\n    // 2. In general case, AST transforms are allowed to manipulate Javascript\n    //    scope. This means that running transforms -- even when we're doing\n    //    source-to-source compilation that emits handlebars and not wire\n    //    format -- implies changing .hbs files into .js files.\n    //\n    // 3. So stage1 may need to rewrite .hbs to .hbs.js (to avoid colliding\n    //    with an existing co-located .js file).\n    //\n    // 4. But stage1 doesn't necessarily want to run babel over the\n    //    corresponding JS file. Most of the time, that's just an\n    //    unnecessarily expensive second parse. (We only run it in stage1 to\n    //    eliminate an addon's custom babel plugins, and many addons don't\n    //    have any.)\n    //\n    // 5. Therefore, the work of template-colocation gets defered until here,\n    //    and it may see co-located templates named `.hbs.js` instead of the\n    //    usual `.hbs.\n    templateExtensions: ['.hbs', '.hbs.js'],\n\n    // All of the above only applies to auto-upgraded packages that were\n    // authored in v1. V2 packages don't get any of this complexity, they're\n    // supposed to take care of colocating their own templates explicitly.\n    packageGuard: true,\n  };\n  return [templateColocationPluginPath, colocationOptions];\n}\n\nexport function babelCompatSupport(): PluginItem[] {\n  return [...babelMacros(), ...oldDebugMacros(), templateColocation(), ...pluginsFromV1Addons()];\n}\n\nexport function templateCompatSupport(): Transform[] {\n  return [...transformsFromV1Addons(), ...templateMacros(), looseModeSupport()];\n}\n"]}

package/src/compat-adapters/@ember-data/store.d.ts

@@ -1,5 +1 @@
-import type { AddonMeta } from '@embroider/core';
-import { EmberDataBase } from '../ember-data';
-export default class EmberDataStore extends EmberDataBase {
-    get packageMeta(): Partial<AddonMeta>;
-}
+export { EmberDataBase as default } from '../ember-data';

package/src/compat-adapters/@ember-data/store.js

@@ -1,18 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ember_data_1 = require("../ember-data");
-class EmberDataStore extends ember_data_1.EmberDataBase {
-    get packageMeta() {
-        var _a;
-        let meta = super.packageMeta;
-        // this is here because the compat-adapter for @ember-data/debug adds this
-        // to externals because it has an undeclared peerDep on us, and thus might
-        // resolve totally incorrect copies. By making it external we leave it up to
-        // runtime, where we will find this implicit-module for the actual copy of
-        // @ember-data/store that is active in app.
-        meta['implicit-modules'] = [...((_a = meta['implicit-modules']) !== null && _a !== void 0 ? _a : []), './index.js'];
-        return meta;
-    }
-}
-exports.default = EmberDataStore;
+exports.default = void 0;
+var ember_data_1 = require("../ember-data");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return ember_data_1.EmberDataBase; } });
 //# sourceMappingURL=store.js.map

package/src/compat-adapters/@ember-data/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["store.ts"],"names":[],"mappings":";;AACA,8CAA8C;AAE9C,MAAqB,cAAe,SAAQ,0BAAa;IACvD,IAAI,WAAW;;QACb,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;QAE7B,0EAA0E;QAC1E,0EAA0E;QAC1E,4EAA4E;QAC5E,0EAA0E;QAC1E,2CAA2C;QAC3C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,kBAAkB,CAAC,mCAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QAE/E,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAbD,iCAaC","sourcesContent":["import type { AddonMeta } from '@embroider/core';\nimport { EmberDataBase } from '../ember-data';\n\nexport default class EmberDataStore extends EmberDataBase {\n  get packageMeta(): Partial<AddonMeta> {\n    let meta = super.packageMeta;\n\n    // this is here because the compat-adapter for @ember-data/debug adds this\n    // to externals because it has an undeclared peerDep on us, and thus might\n    // resolve totally incorrect copies. By making it external we leave it up to\n    // runtime, where we will find this implicit-module for the actual copy of\n    // @ember-data/store that is active in app.\n    meta['implicit-modules'] = [...(meta['implicit-modules'] ?? []), './index.js'];\n\n    return meta;\n  }\n}\n"]}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["store.ts"],"names":[],"mappings":";;;AAAA,4CAAyD;AAAhD,qGAAA,aAAa,OAAW","sourcesContent":["export { EmberDataBase as default } from '../ember-data';\n"]}

package/src/compat-adapters/active-model-adapter.d.ts

@@ -1,4 +1,4 @@
 import V1Addon from '../v1-addon';
 export default class extends V1Addon {
-    get packageJSON(): import("@embroider/core").PackageInfo;
+    get packageJSON(): import("@embroider/shared-internals").PackageInfo;
 }

package/src/compat-adapters/ember-asset-loader.d.ts

@@ -1,5 +1,5 @@
 import V1Addon from '../v1-addon';
 export default class extends V1Addon {
     get v2Tree(): import("broccoli-funnel").Funnel;
-    get packageMeta(): Partial<import("@embroider/core").AddonMeta>;
+    get packageMeta(): Partial<import("@embroider/shared-internals").AddonMeta>;
 }

package/src/compat-adapters/ember-cli-addon-docs.d.ts

@@ -1,4 +1,4 @@
 import V1Addon from '../v1-addon';
 export default class extends V1Addon {
-    get packageJSON(): import("@embroider/core").PackageInfo;
+    get packageJSON(): import("@embroider/shared-internals").PackageInfo;
 }

package/src/compat-adapters/ember-cli-fastboot.js

@@ -147,7 +147,6 @@ class RewriteManifest extends broccoli_plugin_1.default {
         // treated as ember code it needs to have v2 addon metadata
         json.keywords = [...((_a = json.keywords) !== null && _a !== void 0 ? _a : []), 'ember-addon'];
         let meta = {
-            type: 'addon',
             version: 2,
             'auto-upgraded': true,
         };

package/src/compat-adapters/ember-cli-fastboot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-cli-fastboot.js","sourceRoot":"","sources":["ember-cli-fastboot.ts"],"names":[],"mappings":"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","sourcesContent":["import V1Addon from '../v1-addon';\nimport Plugin from 'broccoli-plugin';\nimport type { Node } from 'broccoli-node-api';\nimport { readJSONSync, outputJSONSync } from 'fs-extra';\nimport { join } from 'path';\nimport writeFile from 'broccoli-file-creator';\nimport { Memoize } from 'typescript-memoize';\nimport bind from 'bind-decorator';\nimport type { AddonMeta } from '@embroider/core';\n\nexport default class EmberCliFastboot extends V1Addon {\n  customizes(...trees: string[]): boolean {\n    return trees.some(tree => {\n      if (tree === 'treeForPublic') {\n        // This is an optimization. It means we won't bother running\n        // ember-cli-fastboot's custom treeForPublic at all. We don't actually\n        // want *most* of what's in there, because embroider natively\n        // understands how to build each addon's treeForFastboot.\n        //\n        // But we do want *some*, so we handle those specific bits below in\n        // v2Trees.\n        return false;\n      } else {\n        return super.customizes(tree);\n      }\n    });\n  }\n  get v2Trees() {\n    let trees = super.v2Trees;\n\n    // We want to grab the fastboot config and rewrite it. We're going to strip\n    // out the expectedFiles that we know are already accounted for, and we're\n    // going to add app-factory.js which we know is not.\n    trees.push(\n      new RewriteManifest(this.addonInstance._buildFastbootConfigTree(this.rootTree), this.scriptFilter, [\n        'ember-cli-fastboot/app-factory.js',\n      ])\n    );\n\n    // We also still need to emit the fastboot app factory module. This emits\n    // the actual file into our package.\n    trees.push(writeFile('public/app-factory.js', this.appFactoryModule));\n\n    return trees;\n  }\n\n  get packageMeta() {\n    let meta = super.packageMeta;\n    if (!meta['public-assets']) {\n      meta['public-assets'] = {};\n    }\n    // we need to list app-factory.js as a public asset so it will make it's way\n    // into the app's final dist.\n    meta['public-assets']['./public/app-factory.js'] = 'ember-cli-fastboot/app-factory.js';\n    return meta;\n  }\n\n  // these are the default files that ember-cli-fastbot includes in its appFiles\n  // and vendorFiles that we know are already accounted for by the standard\n  // embroider build\n  @Memoize()\n  private expectedFiles(): string[] {\n    let outputPaths = this.addonInstance.app.options.outputPaths;\n    function stripLeadingSlash(filePath: string) {\n      return filePath.replace(/^\\//, '');\n    }\n    let appFilePath = stripLeadingSlash(outputPaths.app.js);\n    let appFastbootFilePath = appFilePath.replace(/\\.js$/, '') + '-fastboot.js';\n    let vendorFilePath = stripLeadingSlash(outputPaths.vendor.js);\n\n    // ember-auto-import emits this into the fastboot manifest. But embroider\n    // subsumes all of ember-auto-import, so we take responsibility for this\n    // stuff directly.\n    let autoImportPath = 'assets/auto-import-fastboot.js';\n\n    // the compat adapter for ember-asset-loader has already removed the code\n    // that reads from this file. And this file fails to get generated because\n    // we don't run ember-asset-loader's \"all\" postprocess tree. So we need to\n    // remove it here so it doesn't try to load.\n    let nodeAssetManifest = 'assets/node-asset-manifest.js';\n\n    return [appFilePath, appFastbootFilePath, vendorFilePath, autoImportPath, nodeAssetManifest];\n  }\n\n  @bind\n  private scriptFilter(file: string): boolean {\n    // we can drop all of engines-dist here because engines are handled natively\n    // by embroider (the engine code is part of the regular module graph)\n    return !this.expectedFiles().includes(file) && !file.startsWith('engines-dist/');\n  }\n\n  @Memoize()\n  private get appFactoryModule() {\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const fastbootAppFactoryModule = require(join(this.root, 'lib/utilities/fastboot-app-factory-module.js'));\n    return fastbootAppFactoryModule(this.addonInstance._name, false);\n  }\n}\n\nclass RewriteManifest extends Plugin {\n  constructor(tree: Node, private scriptFilter: (file: string) => boolean, private extraAppFiles: string[]) {\n    super([tree], {\n      annotation: 'embroider-compat-adapter-ember-cli-fastboot',\n      persistentOutput: true,\n      needsCache: false,\n    });\n  }\n  build() {\n    let json = readJSONSync(join(this.inputPaths[0], 'package.json'));\n\n    let extraAppFiles = (json.fastboot.manifest.appFiles as string[]).filter(this.scriptFilter);\n\n    for (let file of this.extraAppFiles) {\n      extraAppFiles.push(file);\n    }\n\n    let extraVendorFiles = (json.fastboot.manifest.vendorFiles as string[]).filter(this.scriptFilter);\n\n    // we're using our own new style of fastboot manifest that loads everything\n    // via the HTML. HTML is better understood by tools beyond Ember and\n    // Fastboot, so it's more robust to going through third-party bundlers\n    // without breaking. We can get by with only a very small extension over\n    // purely standards-compliant HTML.\n    json.fastboot = {\n      schemaVersion: 5,\n      htmlEntrypoint: 'index.html',\n      moduleWhitelist: json.fastboot.moduleWhitelist,\n      hostWhitelist: json.fastboot.hostWhitelist,\n    };\n\n    // this is a message to Embroider stage2 (in app.ts), because we need it to\n    // arrange the one special extension to HTML that we need: fastboot-only\n    // script tags.\n    //\n    // Fastboot only javascript *modules* don't need any magic, because our\n    // macro system can guard them. That is the preferred way to have\n    // fastboot-only code. But for backward compatibility, we also support\n    // fastboot-only *scripts*, and those do need a bit of magic, in the form of\n    // <fastboot-script> tags.\n    json['embroider-fastboot'] = {\n      extraAppFiles,\n      extraVendorFiles,\n    };\n\n    // because we contain a subdir with its own package.json, that subdir\n    // becomes a \"package\" from emroider's perspective, and if we want it to get\n    // treated as ember code it needs to have v2 addon metadata\n    json.keywords = [...(json.keywords ?? []), 'ember-addon'];\n    let meta: AddonMeta = {\n      type: 'addon',\n      version: 2,\n      'auto-upgraded': true,\n    };\n    json['ember-addon'] = meta;\n\n    outputJSONSync(join(this.outputPath, '_fastboot_', 'package.json'), json, { spaces: 2 });\n  }\n}\n"]}
+{"version":3,"file":"ember-cli-fastboot.js","sourceRoot":"","sources":["ember-cli-fastboot.ts"],"names":[],"mappings":"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","sourcesContent":["import V1Addon from '../v1-addon';\nimport Plugin from 'broccoli-plugin';\nimport type { Node } from 'broccoli-node-api';\nimport { readJSONSync, outputJSONSync } from 'fs-extra';\nimport { join } from 'path';\nimport writeFile from 'broccoli-file-creator';\nimport { Memoize } from 'typescript-memoize';\nimport bind from 'bind-decorator';\nimport type { AddonMeta } from '@embroider/core';\n\nexport default class EmberCliFastboot extends V1Addon {\n  customizes(...trees: string[]): boolean {\n    return trees.some(tree => {\n      if (tree === 'treeForPublic') {\n        // This is an optimization. It means we won't bother running\n        // ember-cli-fastboot's custom treeForPublic at all. We don't actually\n        // want *most* of what's in there, because embroider natively\n        // understands how to build each addon's treeForFastboot.\n        //\n        // But we do want *some*, so we handle those specific bits below in\n        // v2Trees.\n        return false;\n      } else {\n        return super.customizes(tree);\n      }\n    });\n  }\n  get v2Trees() {\n    let trees = super.v2Trees;\n\n    // We want to grab the fastboot config and rewrite it. We're going to strip\n    // out the expectedFiles that we know are already accounted for, and we're\n    // going to add app-factory.js which we know is not.\n    trees.push(\n      new RewriteManifest(this.addonInstance._buildFastbootConfigTree(this.rootTree), this.scriptFilter, [\n        'ember-cli-fastboot/app-factory.js',\n      ])\n    );\n\n    // We also still need to emit the fastboot app factory module. This emits\n    // the actual file into our package.\n    trees.push(writeFile('public/app-factory.js', this.appFactoryModule));\n\n    return trees;\n  }\n\n  get packageMeta() {\n    let meta = super.packageMeta;\n    if (!meta['public-assets']) {\n      meta['public-assets'] = {};\n    }\n    // we need to list app-factory.js as a public asset so it will make it's way\n    // into the app's final dist.\n    meta['public-assets']['./public/app-factory.js'] = 'ember-cli-fastboot/app-factory.js';\n    return meta;\n  }\n\n  // these are the default files that ember-cli-fastbot includes in its appFiles\n  // and vendorFiles that we know are already accounted for by the standard\n  // embroider build\n  @Memoize()\n  private expectedFiles(): string[] {\n    let outputPaths = this.addonInstance.app.options.outputPaths;\n    function stripLeadingSlash(filePath: string) {\n      return filePath.replace(/^\\//, '');\n    }\n    let appFilePath = stripLeadingSlash(outputPaths.app.js);\n    let appFastbootFilePath = appFilePath.replace(/\\.js$/, '') + '-fastboot.js';\n    let vendorFilePath = stripLeadingSlash(outputPaths.vendor.js);\n\n    // ember-auto-import emits this into the fastboot manifest. But embroider\n    // subsumes all of ember-auto-import, so we take responsibility for this\n    // stuff directly.\n    let autoImportPath = 'assets/auto-import-fastboot.js';\n\n    // the compat adapter for ember-asset-loader has already removed the code\n    // that reads from this file. And this file fails to get generated because\n    // we don't run ember-asset-loader's \"all\" postprocess tree. So we need to\n    // remove it here so it doesn't try to load.\n    let nodeAssetManifest = 'assets/node-asset-manifest.js';\n\n    return [appFilePath, appFastbootFilePath, vendorFilePath, autoImportPath, nodeAssetManifest];\n  }\n\n  @bind\n  private scriptFilter(file: string): boolean {\n    // we can drop all of engines-dist here because engines are handled natively\n    // by embroider (the engine code is part of the regular module graph)\n    return !this.expectedFiles().includes(file) && !file.startsWith('engines-dist/');\n  }\n\n  @Memoize()\n  private get appFactoryModule() {\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const fastbootAppFactoryModule = require(join(this.root, 'lib/utilities/fastboot-app-factory-module.js'));\n    return fastbootAppFactoryModule(this.addonInstance._name, false);\n  }\n}\n\nclass RewriteManifest extends Plugin {\n  constructor(tree: Node, private scriptFilter: (file: string) => boolean, private extraAppFiles: string[]) {\n    super([tree], {\n      annotation: 'embroider-compat-adapter-ember-cli-fastboot',\n      persistentOutput: true,\n      needsCache: false,\n    });\n  }\n  build() {\n    let json = readJSONSync(join(this.inputPaths[0], 'package.json'));\n\n    let extraAppFiles = (json.fastboot.manifest.appFiles as string[]).filter(this.scriptFilter);\n\n    for (let file of this.extraAppFiles) {\n      extraAppFiles.push(file);\n    }\n\n    let extraVendorFiles = (json.fastboot.manifest.vendorFiles as string[]).filter(this.scriptFilter);\n\n    // we're using our own new style of fastboot manifest that loads everything\n    // via the HTML. HTML is better understood by tools beyond Ember and\n    // Fastboot, so it's more robust to going through third-party bundlers\n    // without breaking. We can get by with only a very small extension over\n    // purely standards-compliant HTML.\n    json.fastboot = {\n      schemaVersion: 5,\n      htmlEntrypoint: 'index.html',\n      moduleWhitelist: json.fastboot.moduleWhitelist,\n      hostWhitelist: json.fastboot.hostWhitelist,\n    };\n\n    // this is a message to Embroider stage2 (in app.ts), because we need it to\n    // arrange the one special extension to HTML that we need: fastboot-only\n    // script tags.\n    //\n    // Fastboot only javascript *modules* don't need any magic, because our\n    // macro system can guard them. That is the preferred way to have\n    // fastboot-only code. But for backward compatibility, we also support\n    // fastboot-only *scripts*, and those do need a bit of magic, in the form of\n    // <fastboot-script> tags.\n    json['embroider-fastboot'] = {\n      extraAppFiles,\n      extraVendorFiles,\n    };\n\n    // because we contain a subdir with its own package.json, that subdir\n    // becomes a \"package\" from emroider's perspective, and if we want it to get\n    // treated as ember code it needs to have v2 addon metadata\n    json.keywords = [...(json.keywords ?? []), 'ember-addon'];\n    let meta: AddonMeta = {\n      version: 2,\n      'auto-upgraded': true,\n    };\n    json['ember-addon'] = meta;\n\n    outputJSONSync(join(this.outputPath, '_fastboot_', 'package.json'), json, { spaces: 2 });\n  }\n}\n"]}

package/src/compat-adapters/ember-cli-mirage.js

@@ -11,7 +11,6 @@ class default_1 extends v1_addon_1.default {
             return super.packageMeta;
         }
         return {
-            type: 'addon',
             version: 2,
             'auto-upgraded': true,
         };

package/src/compat-adapters/ember-cli-mirage.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-cli-mirage.js","sourceRoot":"","sources":["ember-cli-mirage.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAClC,sEAA0C;AAG1C,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC,WAAW,CAAC;QAC3B,CAAC;QACD,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,CAAC;YACV,eAAe,EAAE,IAAI;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,MAAM;QACR,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QACxB,IAAI,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAA,yBAAW,EAAC,IAAI,EAAE;YACvB,OAAO,EAAE,CAAC,cAAc,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;CACF;AArBD,4BAqBC","sourcesContent":["import V1Addon from '../v1-addon';\nimport buildFunnel from 'broccoli-funnel';\nimport type { AddonMeta } from '@embroider/core';\n\nexport default class extends V1Addon {\n  get packageMeta(): Partial<AddonMeta> {\n    if (this.addonInstance._shouldIncludeFiles()) {\n      return super.packageMeta;\n    }\n    return {\n      type: 'addon',\n      version: 2,\n      'auto-upgraded': true,\n    };\n  }\n\n  get v2Tree() {\n    let tree = super.v2Tree;\n    if (this.addonInstance._shouldIncludeFiles()) {\n      return tree;\n    }\n    return buildFunnel(tree, {\n      include: ['package.json'],\n    });\n  }\n}\n"]}
+{"version":3,"file":"ember-cli-mirage.js","sourceRoot":"","sources":["ember-cli-mirage.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAClC,sEAA0C;AAG1C,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC,WAAW,CAAC;QAC3B,CAAC;QACD,OAAO;YACL,OAAO,EAAE,CAAC;YACV,eAAe,EAAE,IAAI;SACtB,CAAC;IACJ,CAAC;IAED,IAAI,MAAM;QACR,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QACxB,IAAI,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAA,yBAAW,EAAC,IAAI,EAAE;YACvB,OAAO,EAAE,CAAC,cAAc,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;CACF;AApBD,4BAoBC","sourcesContent":["import V1Addon from '../v1-addon';\nimport buildFunnel from 'broccoli-funnel';\nimport type { AddonMeta } from '@embroider/core';\n\nexport default class extends V1Addon {\n  get packageMeta(): Partial<AddonMeta> {\n    if (this.addonInstance._shouldIncludeFiles()) {\n      return super.packageMeta;\n    }\n    return {\n      version: 2,\n      'auto-upgraded': true,\n    };\n  }\n\n  get v2Tree() {\n    let tree = super.v2Tree;\n    if (this.addonInstance._shouldIncludeFiles()) {\n      return tree;\n    }\n    return buildFunnel(tree, {\n      include: ['package.json'],\n    });\n  }\n}\n"]}

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

@@ -1,4 +1,4 @@
 import V1Addon from '../v1-addon';
 export default class extends V1Addon {
-    get packageJSON(): import("@embroider/core").PackageInfo;
+    get packageJSON(): import("@embroider/shared-internals").PackageInfo;
 }

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

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

package/src/compat-adapters/{ember-macro-helpers.js → ember-fetch.js}

@@ -7,12 +7,13 @@ const v1_addon_1 = __importDefault(require("../v1-addon"));
 class default_1 extends v1_addon_1.default {
     get packageMeta() {
         let meta = super.packageMeta;
-        if (!meta.externals) {
-            meta.externals = [];
+        // this file is not accessible from the outside of ember-fetch and is not being used inside ember-fetch so it's dead code
+        // but it is importing `@ember/polyfills` which casues ember-source@5 to crash because it has been removed
+        if (meta['implicit-modules']) {
+            meta['implicit-modules'] = meta['implicit-modules'].filter(mod => mod !== './utils/mung-options-for-fetch');
         }
-        meta.externals.push('./-computed-store');
         return meta;
     }
 }
 exports.default = default_1;
-//# sourceMappingURL=ember-macro-helpers.js.map
+//# sourceMappingURL=ember-fetch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ember-fetch.js","sourceRoot":"","sources":["ember-fetch.ts"],"names":[],"mappings":";;;;;AAAA,2DAAkC;AAGlC,eAAqB,SAAQ,kBAAO;IAClC,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;QAE7B,yHAAyH;QACzH,0GAA0G;QAC1G,IAAI,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,gCAAgC,CAAC,CAAC;QAC9G,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAZD,4BAYC","sourcesContent":["import V1Addon from '../v1-addon';\nimport type { AddonMeta } from '@embroider/core';\n\nexport default class extends V1Addon {\n  get packageMeta(): Partial<AddonMeta> {\n    let meta = super.packageMeta;\n\n    // this file is not accessible from the outside of ember-fetch and is not being used inside ember-fetch so it's dead code\n    // but it is importing `@ember/polyfills` which casues ember-source@5 to crash because it has been removed\n    if (meta['implicit-modules']) {\n      meta['implicit-modules'] = meta['implicit-modules'].filter(mod => mod !== './utils/mung-options-for-fetch');\n    }\n\n    return meta;\n  }\n}\n"]}

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

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

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/shared-internals").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-adapters/ember-scroll-modifiers.d.ts

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