@embroider/compat 4.1.18 → 4.1.20

package/dist/src/addon-dependency-rules/ember-basic-dropdown.js

@@ -3,11 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 let rulesForV1 = {
     package: 'ember-basic-dropdown',
     semverRange: '1.x',
-    addonModules: {
-        'components/basic-dropdown.js': {
-            dependsOnComponents: ['{{basic-dropdown/trigger}}', '{{basic-dropdown/content}}'],
-        },
-    },
     components: {
         '{{basic-dropdown}}': {
             layout: {
@@ -20,11 +15,6 @@ let rulesForV1 = {
 let rulesForV2 = {
     package: 'ember-basic-dropdown',
     semverRange: '>=2.0.0 <=3.0.18',
-    addonModules: {
-        'components/basic-dropdown.js': {
-            dependsOnComponents: ['{{basic-dropdown-trigger}}', '{{basic-dropdown-content}}'],
-        },
-    },
     components: {
         '{{basic-dropdown}}': {
             layout: {

package/dist/src/addon-dependency-rules/ember-basic-dropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-basic-dropdown.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-basic-dropdown.ts"],"names":[],"mappings":";;AAEA,IAAI,UAAU,GAAiB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,KAAK;IAClB,YAAY,EAAE;QACZ,8BAA8B,EAAE;YAC9B,mBAAmB,EAAE,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;SAClF;KACF;IACD,UAAU,EAAE;QACV,oBAAoB,EAAE;YACpB,MAAM,EAAE;gBACN,SAAS,EAAE,yCAAyC;aACrD;YACD,yBAAyB,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;SACpE;KACF;CACF,CAAC;AAEF,IAAI,UAAU,GAAiB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,kBAAkB;IAC/B,YAAY,EAAE;QACZ,8BAA8B,EAAE;YAC9B,mBAAmB,EAAE,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;SAClF;KACF;IACD,UAAU,EAAE;QACV,oBAAoB,EAAE;YACpB,MAAM,EAAE;gBACN,SAAS,EAAE,yCAAyC;aACrD;YACD,yBAAyB,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;SACpE;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rulesForV1: PackageRules = {\n  package: 'ember-basic-dropdown',\n  semverRange: '1.x',\n  addonModules: {\n    'components/basic-dropdown.js': {\n      dependsOnComponents: ['{{basic-dropdown/trigger}}', '{{basic-dropdown/content}}'],\n    },\n  },\n  components: {\n    '{{basic-dropdown}}': {\n      layout: {\n        addonPath: 'templates/components/basic-dropdown.hbs',\n      },\n      acceptsComponentArguments: ['triggerComponent', 'contentComponent'],\n    },\n  },\n};\n\nlet rulesForV2: PackageRules = {\n  package: 'ember-basic-dropdown',\n  semverRange: '>=2.0.0 <=3.0.18',\n  addonModules: {\n    'components/basic-dropdown.js': {\n      dependsOnComponents: ['{{basic-dropdown-trigger}}', '{{basic-dropdown-content}}'],\n    },\n  },\n  components: {\n    '{{basic-dropdown}}': {\n      layout: {\n        addonPath: 'templates/components/basic-dropdown.hbs',\n      },\n      acceptsComponentArguments: ['triggerComponent', 'contentComponent'],\n    },\n  },\n};\n\nexport default [rulesForV1, rulesForV2];\n"]}
+{"version":3,"file":"ember-basic-dropdown.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-basic-dropdown.ts"],"names":[],"mappings":";;AAEA,IAAI,UAAU,GAAiB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE;QACV,oBAAoB,EAAE;YACpB,MAAM,EAAE;gBACN,SAAS,EAAE,yCAAyC;aACrD;YACD,yBAAyB,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;SACpE;KACF;CACF,CAAC;AAEF,IAAI,UAAU,GAAiB;IAC7B,OAAO,EAAE,sBAAsB;IAC/B,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE;QACV,oBAAoB,EAAE;YACpB,MAAM,EAAE;gBACN,SAAS,EAAE,yCAAyC;aACrD;YACD,yBAAyB,EAAE,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;SACpE;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rulesForV1: PackageRules = {\n  package: 'ember-basic-dropdown',\n  semverRange: '1.x',\n  components: {\n    '{{basic-dropdown}}': {\n      layout: {\n        addonPath: 'templates/components/basic-dropdown.hbs',\n      },\n      acceptsComponentArguments: ['triggerComponent', 'contentComponent'],\n    },\n  },\n};\n\nlet rulesForV2: PackageRules = {\n  package: 'ember-basic-dropdown',\n  semverRange: '>=2.0.0 <=3.0.18',\n  components: {\n    '{{basic-dropdown}}': {\n      layout: {\n        addonPath: 'templates/components/basic-dropdown.hbs',\n      },\n      acceptsComponentArguments: ['triggerComponent', 'contentComponent'],\n    },\n  },\n};\n\nexport default [rulesForV1, rulesForV2];\n"]}

package/dist/src/addon-dependency-rules/ember-power-select-typeahead.js

@@ -2,14 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 let rules = {
     package: 'ember-power-select-typeahead',
-    addonModules: {
-        './components/power-select-typeahead.js': {
-            dependsOnComponents: ['{{power-select-typeahead/trigger}}'],
-        },
-        './components/power-select-multiple.js': {
-            dependsOnComponents: ['{{power-select-multiple/trigger}}'],
-        },
-    },
     components: {
         '{{power-select-typeahead}}': {
             layout: {

package/dist/src/addon-dependency-rules/ember-power-select-typeahead.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-power-select-typeahead.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select-typeahead.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAiB;IACxB,OAAO,EAAE,8BAA8B;IACvC,YAAY,EAAE;QACZ,wCAAwC,EAAE;YACxC,mBAAmB,EAAE,CAAC,oCAAoC,CAAC;SAC5D;QACD,uCAAuC,EAAE;YACvC,mBAAmB,EAAE,CAAC,mCAAmC,CAAC;SAC3D;KACF;IACD,UAAU,EAAE;QACV,4BAA4B,EAAE;YAC5B,MAAM,EAAE;gBACN,SAAS,EAAE,iDAAiD;aAC7D;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,KAAK,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rules: PackageRules = {\n  package: 'ember-power-select-typeahead',\n  addonModules: {\n    './components/power-select-typeahead.js': {\n      dependsOnComponents: ['{{power-select-typeahead/trigger}}'],\n    },\n    './components/power-select-multiple.js': {\n      dependsOnComponents: ['{{power-select-multiple/trigger}}'],\n    },\n  },\n  components: {\n    '{{power-select-typeahead}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-typeahead.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n  },\n};\n\nexport default [rules];\n"]}
+{"version":3,"file":"ember-power-select-typeahead.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select-typeahead.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAiB;IACxB,OAAO,EAAE,8BAA8B;IACvC,UAAU,EAAE;QACV,4BAA4B,EAAE;YAC5B,MAAM,EAAE;gBACN,SAAS,EAAE,iDAAiD;aAC7D;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,KAAK,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rules: PackageRules = {\n  package: 'ember-power-select-typeahead',\n  components: {\n    '{{power-select-typeahead}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-typeahead.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n  },\n};\n\nexport default [rules];\n"]}

package/dist/src/addon-dependency-rules/ember-power-select-with-create.js

@@ -12,11 +12,6 @@ const rules = [
                 },
             },
         },
-        addonModules: {
-            'components/power-select-with-create.js': {
-                dependsOnComponents: ['<PowerSelect/>', '<PowerSelectWithCreate::SuggestedOption/>'],
-            },
-        },
     },
 ];
 exports.default = rules;

package/dist/src/addon-dependency-rules/ember-power-select-with-create.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-power-select-with-create.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select-with-create.ts"],"names":[],"mappings":";;AAEA,MAAM,KAAK,GAAmB;IAC5B;QACE,OAAO,EAAE,gCAAgC;QACzC,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE;YACV,0BAA0B,EAAE;gBAC1B,yBAAyB,EAAE,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;gBACnF,MAAM,EAAE;oBACN,SAAS,EAAE,mDAAmD;iBAC/D;aACF;SACF;QACD,YAAY,EAAE;YACZ,wCAAwC,EAAE;gBACxC,mBAAmB,EAAE,CAAC,gBAAgB,EAAE,2CAA2C,CAAC;aACrF;SACF;KACF;CACF,CAAC;AAEF,kBAAe,KAAK,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nconst rules: PackageRules[] = [\n  {\n    package: 'ember-power-select-with-create',\n    semverRange: '<3.0.0',\n    components: {\n      '<PowerSelectWithCreate/>': {\n        acceptsComponentArguments: ['powerSelectComponentName', 'suggestedOptionComponent'],\n        layout: {\n          addonPath: 'templates/components/power-select-with-create.hbs',\n        },\n      },\n    },\n    addonModules: {\n      'components/power-select-with-create.js': {\n        dependsOnComponents: ['<PowerSelect/>', '<PowerSelectWithCreate::SuggestedOption/>'],\n      },\n    },\n  },\n];\n\nexport default rules;\n"]}
+{"version":3,"file":"ember-power-select-with-create.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select-with-create.ts"],"names":[],"mappings":";;AAEA,MAAM,KAAK,GAAmB;IAC5B;QACE,OAAO,EAAE,gCAAgC;QACzC,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE;YACV,0BAA0B,EAAE;gBAC1B,yBAAyB,EAAE,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;gBACnF,MAAM,EAAE;oBACN,SAAS,EAAE,mDAAmD;iBAC/D;aACF;SACF;KACF;CACF,CAAC;AAEF,kBAAe,KAAK,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nconst rules: PackageRules[] = [\n  {\n    package: 'ember-power-select-with-create',\n    semverRange: '<3.0.0',\n    components: {\n      '<PowerSelectWithCreate/>': {\n        acceptsComponentArguments: ['powerSelectComponentName', 'suggestedOptionComponent'],\n        layout: {\n          addonPath: 'templates/components/power-select-with-create.hbs',\n        },\n      },\n    },\n  },\n];\n\nexport default rules;\n"]}

package/dist/src/addon-dependency-rules/ember-power-select.js

@@ -3,21 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 let rules = {
     package: 'ember-power-select',
     semverRange: '< 5.0.1',
-    addonModules: {
-        './components/power-select.js': {
-            dependsOnComponents: [
-                '{{power-select/before-options}}',
-                '{{power-select/options}}',
-                '{{power-select/power-select-group}}',
-                '{{power-select/trigger}}',
-                '{{power-select/search-message}}',
-                '{{power-select/placeholder}}',
-            ],
-        },
-        './components/power-select-multiple.js': {
-            dependsOnComponents: ['{{power-select-multiple/trigger}}'],
-        },
-    },
     components: {
         '{{power-select}}': {
             layout: {

package/dist/src/addon-dependency-rules/ember-power-select.js.map

@@ -1 +1 @@
-{"version":3,"file":"ember-power-select.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAiB;IACxB,OAAO,EAAE,oBAAoB;IAC7B,WAAW,EAAE,SAAS;IACtB,YAAY,EAAE;QACZ,8BAA8B,EAAE;YAC9B,mBAAmB,EAAE;gBACnB,iCAAiC;gBACjC,0BAA0B;gBAC1B,qCAAqC;gBACrC,0BAA0B;gBAC1B,iCAAiC;gBACjC,8BAA8B;aAC/B;SACF;QACD,uCAAuC,EAAE;YACvC,mBAAmB,EAAE,CAAC,mCAAmC,CAAC;SAC3D;KACF;IACD,UAAU,EAAE;QACV,kBAAkB,EAAE;YAClB,MAAM,EAAE;gBACN,SAAS,EAAE,uCAAuC;aACnD;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;QACD,2BAA2B,EAAE;YAC3B,MAAM,EAAE;gBACN,SAAS,EAAE,gDAAgD;aAC5D;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,gBAAgB;gBAChB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;QACD,0BAA0B,EAAE;YAC1B,MAAM,EAAE;gBACN,SAAS,EAAE,+CAA+C;aAC3D;YACD,yBAAyB,EAAE,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;SAC7E;QACD,0BAA0B,EAAE;YAC1B,MAAM,EAAE;gBACN,SAAS,EAAE,+CAA+C;aAC3D;YACD,yBAAyB,EAAE,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SAClE;QACD,mCAAmC,EAAE;YACnC,MAAM,EAAE;gBACN,SAAS,EAAE,wDAAwD;aACpE;YACD,yBAAyB,EAAE,CAAC,uBAAuB,CAAC;SACrD;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,KAAK,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rules: PackageRules = {\n  package: 'ember-power-select',\n  semverRange: '< 5.0.1',\n  addonModules: {\n    './components/power-select.js': {\n      dependsOnComponents: [\n        '{{power-select/before-options}}',\n        '{{power-select/options}}',\n        '{{power-select/power-select-group}}',\n        '{{power-select/trigger}}',\n        '{{power-select/search-message}}',\n        '{{power-select/placeholder}}',\n      ],\n    },\n    './components/power-select-multiple.js': {\n      dependsOnComponents: ['{{power-select-multiple/trigger}}'],\n    },\n  },\n  components: {\n    '{{power-select}}': {\n      layout: {\n        addonPath: 'templates/components/power-select.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n    '{{power-select-multiple}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-multiple.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'groupComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n    '{{power-select/trigger}}': {\n      layout: {\n        addonPath: 'templates/components/power-select/trigger.hbs',\n      },\n      acceptsComponentArguments: ['selectedItemComponent', 'placeholderComponent'],\n    },\n    '{{power-select/options}}': {\n      layout: {\n        addonPath: 'templates/components/power-select/options.hbs',\n      },\n      acceptsComponentArguments: ['groupComponent', 'optionsComponent'],\n    },\n    '{{power-select-multiple/trigger}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-multiple/trigger.hbs',\n      },\n      acceptsComponentArguments: ['selectedItemComponent'],\n    },\n  },\n};\n\nexport default [rules];\n"]}
+{"version":3,"file":"ember-power-select.js","sourceRoot":"","sources":["../../../src/addon-dependency-rules/ember-power-select.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAiB;IACxB,OAAO,EAAE,oBAAoB;IAC7B,WAAW,EAAE,SAAS;IACtB,UAAU,EAAE;QACV,kBAAkB,EAAE;YAClB,MAAM,EAAE;gBACN,SAAS,EAAE,uCAAuC;aACnD;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;QACD,2BAA2B,EAAE;YAC3B,MAAM,EAAE;gBACN,SAAS,EAAE,gDAAgD;aAC5D;YACD,yBAAyB,EAAE;gBACzB,uBAAuB;gBACvB,wBAAwB;gBACxB,gBAAgB;gBAChB,kBAAkB;gBAClB,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,kBAAkB;aACnB;SACF;QACD,0BAA0B,EAAE;YAC1B,MAAM,EAAE;gBACN,SAAS,EAAE,+CAA+C;aAC3D;YACD,yBAAyB,EAAE,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;SAC7E;QACD,0BAA0B,EAAE;YAC1B,MAAM,EAAE;gBACN,SAAS,EAAE,+CAA+C;aAC3D;YACD,yBAAyB,EAAE,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SAClE;QACD,mCAAmC,EAAE;YACnC,MAAM,EAAE;gBACN,SAAS,EAAE,wDAAwD;aACpE;YACD,yBAAyB,EAAE,CAAC,uBAAuB,CAAC;SACrD;KACF;CACF,CAAC;AAEF,kBAAe,CAAC,KAAK,CAAC,CAAC","sourcesContent":["import type { PackageRules } from '..';\n\nlet rules: PackageRules = {\n  package: 'ember-power-select',\n  semverRange: '< 5.0.1',\n  components: {\n    '{{power-select}}': {\n      layout: {\n        addonPath: 'templates/components/power-select.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n    '{{power-select-multiple}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-multiple.hbs',\n      },\n      acceptsComponentArguments: [\n        'afterOptionsComponent',\n        'beforeOptionsComponent',\n        'groupComponent',\n        'optionsComponent',\n        'placeholderComponent',\n        'searchMessageComponent',\n        'selectedItemComponent',\n        'triggerComponent',\n      ],\n    },\n    '{{power-select/trigger}}': {\n      layout: {\n        addonPath: 'templates/components/power-select/trigger.hbs',\n      },\n      acceptsComponentArguments: ['selectedItemComponent', 'placeholderComponent'],\n    },\n    '{{power-select/options}}': {\n      layout: {\n        addonPath: 'templates/components/power-select/options.hbs',\n      },\n      acceptsComponentArguments: ['groupComponent', 'optionsComponent'],\n    },\n    '{{power-select-multiple/trigger}}': {\n      layout: {\n        addonPath: 'templates/components/power-select-multiple/trigger.hbs',\n      },\n      acceptsComponentArguments: ['selectedItemComponent'],\n    },\n  },\n};\n\nexport default [rules];\n"]}

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

@@ -33,7 +33,8 @@ function buildCompatAddon(originalPackage, v1Cache) {
     if (needsSmooshing) {
         let trees = oldPackages.map(pkg => pkg.v2Tree).reverse();
         let smoosher = new smoosh_package_json_1.default(trees, { annotation: originalPackage.name });
-        return (0, broccoli_merge_trees_1.default)([...trees, smoosher], { overwrite: true });
+        let finalTrees = trees.concat(smoosher);
+        return (0, broccoli_merge_trees_1.default)(finalTrees, { overwrite: true });
     }
     else {
         return oldPackages[0].v2Tree;

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

@@ -1 +1 @@
-{"version":3,"file":"build-compat-addon.js","sourceRoot":"","sources":["../../src/build-compat-addon.ts"],"names":[],"mappings":";;;;;AAOA,mCAoCC;AAzCD,gFAAsD;AACtD,gFAAsD;AAEtD,8EAAoD;AAEpD,SAAwB,gBAAgB,CAAC,eAAwB,EAAE,OAAwB;IACzF,IAAI,eAAe,CAAC,SAAS,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,uEAAuE,eAAe,CAAC,IAAI,OAAO,eAAe,CAAC,IAAI,gBAAgB,CACvI,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1D,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,sEAAsE;QACtE,2EAA2E;QAC3E,+BAA+B;QAC/B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,yEAAyE;QACzE,4EAA4E;QAC5E,kCAAkC;QAClC,EAAE;QACF,yEAAyE;QACzE,gEAAgE;QAChE,0EAA0E;QAC1E,2BAA2B;QAC3B,OAAO,IAAI,4BAAgB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,IAAI,cAAc,EAAE,CAAC;QACnB,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;IACvE,CAAC;SAAM,CAAC;QACN,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/B,CAAC;AACH,CAAC","sourcesContent":["import type V1InstanceCache from './v1-instance-cache';\nimport type { Package } from '@embroider/core';\nimport SmooshPackageJSON from './smoosh-package-json';\nimport broccoliMergeTrees from 'broccoli-merge-trees';\nimport type { 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"]}
+{"version":3,"file":"build-compat-addon.js","sourceRoot":"","sources":["../../src/build-compat-addon.ts"],"names":[],"mappings":";;;;;AAOA,mCAqCC;AA1CD,gFAAsD;AACtD,gFAAsD;AAEtD,8EAAoD;AAEpD,SAAwB,gBAAgB,CAAC,eAAwB,EAAE,OAAwB;IACzF,IAAI,eAAe,CAAC,SAAS,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,uEAAuE,eAAe,CAAC,IAAI,OAAO,eAAe,CAAC,IAAI,gBAAgB,CACvI,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAE1D,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,sEAAsE;QACtE,2EAA2E;QAC3E,+BAA+B;QAC/B,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,yEAAyE;QACzE,4EAA4E;QAC5E,kCAAkC;QAClC,EAAE;QACF,yEAAyE;QACzE,gEAAgE;QAChE,0EAA0E;QAC1E,2BAA2B;QAC3B,OAAO,IAAI,4BAAgB,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,IAAI,cAAc,EAAE,CAAC;QACnB,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,IAAI,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,IAAA,8BAAkB,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC;SAAM,CAAC;QACN,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/B,CAAC;AACH,CAAC","sourcesContent":["import type V1InstanceCache from './v1-instance-cache';\nimport type { Package } from '@embroider/core';\nimport SmooshPackageJSON from './smoosh-package-json';\nimport broccoliMergeTrees from 'broccoli-merge-trees';\nimport type { 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    let finalTrees = trees.concat(smoosher);\n    return broccoliMergeTrees(finalTrees, { overwrite: true });\n  } else {\n    return oldPackages[0].v2Tree;\n  }\n}\n"]}

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

@@ -426,7 +426,8 @@ function moveObjectSpecifiersToMetal() {
                      * I need to use getAllPRevSiblings and getAllNextSiblings here because I need the siblings
                      * to be paths and path.container only holds nodes (for some strange reason).
                      */
-                    const objectimport = [...path.getAllPrevSiblings(), ...path.getAllNextSiblings()].find(p => p.node.type === 'ImportDeclaration' && p.node.source.value === '@ember/object');
+                    const searchObjects = Array.from(path.getAllPrevSiblings()).concat(Array.from(path.getAllNextSiblings()));
+                    const objectimport = searchObjects.find(p => p.node.type === 'ImportDeclaration' && p.node.source.value === '@ember/object');
                     path.node.specifiers.push(...objectimport.node.specifiers);
                     objectimport.remove();
                     done = true;

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

@@ -1 +1 @@
-{"version":3,"file":"ember-source.js","sourceRoot":"","sources":["../../../src/compat-adapters/ember-source.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DAAkC;AAClC,sEAA0C;AAC1C,gFAA8C;AAC9C,iEAAuC;AACvC,uCAAiF;AACjF,+BAAqC;AACrC,2DAA6C;AAC7C,mCAAmC;AACnC,sCAAwC;AAGxC,sEAAqC;AAErC,2BAAgC;AAEhC,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;IAED,oCAAoC;IACpC,wEAAwE;IACxE,6EAA6E;IAC7E,qEAAqE;IACrE,2EAA2E;IAC3E,yEAAyE;IACzE,6BAA6B;IAC7B,EAAE;IACF,2EAA2E;IAC3E,oEAAoE;IACpE,uEAAuE;IACvE,4EAA4E;IAC5E,2CAA2C;IAE3C,IAAY,oBAAoB;QAC9B,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,OAAO,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,IAAI,IAAI,IAAI,IAAA,sBAAW,EAAC,OAAO,CAAC,EAAE,CAAC;YACtC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpB,KAAK,IAAI,SAAS,IAAI,IAAA,sBAAW,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;oBACpF,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC9B,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnD,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,cAAc;;QAChB,IAAI,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC;QAEhC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC3C,mEAAmE;YACnE,iEAAiE;YACjE,0EAA0E;YAC1E,iCAAiC;YAC1B,MAAA,IAAI,CAAC,YAAY,+CAAG,IAAI,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,gDAAgD;QAChD,OAAO,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,eAAe,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnG,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,6EAA6E;IACrE,eAAe;QACrB,IAAI,QAAQ,GAAG,IAAA,yBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE;YACxC,MAAM,EAAE,eAAe;SACxB,CAAC,CAAC;QAEH,IAAI,KAAK,GAAW;YAClB,QAAQ;YACR,IAAA,yBAAW,EAAC,IAAI,CAAC,QAAQ,EAAE;gBACzB,MAAM,EAAE,mBAAmB;gBAC3B,UAAU,EAAE,IAAI;aACjB,CAAC;SACH,CAAC;QAEF,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,kCAAkC,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACzG,kEAAkE;YAClE,6DAA6D;YAC7D,sEAAsE;YACtE,SAAS;YACT,KAAK,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,IAAA,8BAAU,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,6EAA6E;IAC7E,8EAA8E;IAC9E,gDAAgD;IAChD,EAAE;IACF,4EAA4E;IAC5E,6EAA6E;IAC7E,WAAW;IACH,gBAAgB;QACtB,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,EAAE;YACvE,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;YAClD,IAAA,yBAAc,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1D,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;YAC1D,IAAA,yBAAc,EAAC,IAAA,WAAI,EAAC,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC;QAE7B,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClD,0EAA0E;QAC1E,qEAAqE;QACrE,wEAAwE;QACxE,iDAAiD;QACjD,IAAI,CAAC,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAC1F,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,CAAC;YACrC,CAAC;YACD,IAAI,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7ID,4BA6IC;AA1HC;IADC,IAAA,4BAAO,GAAE;qDAqBT;AAwGH,MAAM,YAAa,SAAQ,yBAAM;IAC/B,KAAK;QACH,IAAI,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;QACtF,IAAI,SAAS,GAAG,IAAA,gBAAS,EAAC,QAAQ,EAAE;YAClC,OAAO,EAAE,CAAC,YAAY,CAAC;YACvB,UAAU,EAAE,KAAK;SAClB,CAAE,CAAC,IAAK,CAAC;QACV,IAAA,yBAAc,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACnF,CAAC;CACF;AAED,MAAM,cAAe,SAAQ,yBAAM;IACjC,KAAK;QACH,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,KAAmB;YAC3E,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAE3B,SAAS,YAAY;gBACnB,OAAO,CAAC,CAAC,gBAAgB,CAAC;oBACxB,CAAC,CAAC,YAAY,CACZ,KAAK,EACL,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EACvB,EAAE,EACF,CAAC,CAAC,cAAc,CAAC;wBACf,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;qBAC3F,CAAC,CACH;oBACD,CAAC,CAAC,YAAY,CACZ,KAAK,EACL,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EACtB,EAAE,EACF,CAAC,CAAC,cAAc,CAAC;wBACf,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;qBAC1F,CAAC,CACH;oBACD,CAAC,CAAC,YAAY,CACZ,KAAK,EACL,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EACxB,EAAE,EAEF,CAAC,CAAC,cAAc,CAAC;wBACf,CAAC,CAAC,eAAe,CACf,CAAC,CAAC,iBAAiB,CACjB,IAAI,EACJ,CAAC,CAAC,wBAAwB,CACxB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EACzE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,CACL,EACD,CAAC,CAAC,wBAAwB,CACxB,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EACvE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,CACL,CACF,CACF;qBACF,CAAC,CACH;iBACF,CAAC,CAAC;YACL,CAAC;YAED,OAAO;gBACL,OAAO,EAAE;oBACP,cAAc,CAAC,IAA0C;wBACvD,IACE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;4BACtC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC;4BACxE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe;4BAC/C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,eAAe,EAChD,CAAC;4BACD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;wBACrD,CAAC;oBACH,CAAC;oBACD,iBAAiB,CAAC,IAA6C;wBAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;4BACzC,IAAI,CAAC,WAAW,CACd,CAAC,CAAC,iBAAiB,CACjB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAC5E,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,CAC/B,CACF,CAAC;wBACJ,CAAC;oBACH,CAAC;oBACD,mBAAmB,CAAC,IAA+C;wBACjE,IACE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY;4BAClD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,KAAK,cAAc;4BACpD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAK,CAAC,IAAI,KAAK,kBAAkB,EAC3D,CAAC;4BACD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;4BAC9C,MAAM,MAAM,GAAI,WAAW,CAAC,IAAsC,CAAC,UAAU,CAAC,IAAI,CAChF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,UAAU,CAC/F,CAAC;4BACD,MAAqC,CAAC,KAAK,GAAG,YAAY,EAAE,CAAC;wBAChE,CAAC;oBACH,CAAC;oBACD,oBAAoB,CAAC,IAAgD;wBACnE,IACE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,kBAAkB;4BAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;4BAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO;4BACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;4BAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,EAC3C,CAAC;4BACD,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,EAAE,CAAC;wBACnC,CAAC;oBACH,CAAC;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,WAAW,CACT,IAAI,EACJ,wBAAwB,EACxB;8BACwB,CACzB,CAAC;QAEF,WAAW,CACT,IAAI,EACJ,sBAAsB,EACtB;;;;;;;;;;;;;;;;;;;;;;;;;EAyBJ,CACG,CAAC;QAEF,WAAW,CACT,IAAI,EACJ,wBAAwB,EACxB;;;;;0CAKoC,CACrC,CAAC;QAEF,WAAW,CACT,IAAI,EACJ,iCAAiC,EACjC;;;;;;;;;iDAS2C,CAC5C,CAAC;IACJ,CAAC;CACF;AAED,MAAM,oBAAqB,SAAQ,yBAAM;IACvC,KAAK;QACH,IAAI,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;QAChG,IAAI,SAAS,GAAG,IAAA,gBAAS,EAAC,QAAQ,EAAE;YAClC,OAAO,EAAE,CAAC,YAAY,CAAC;YACvB,UAAU,EAAE,KAAK;SAClB,CAAE,CAAC,IAAK,CAAC;QACV,IAAA,yBAAc,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC7F,CAAC;CACF;AAED,SAAS,YAAY,CAAC,KAAmB;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;IAE3B,OAAO;QACL,IAAI,EAAE,eAAe,EAAE,eAAe;QACtC,OAAO,EAAE;YACP,OAAO,CAAC,IAAmC;gBACzC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CACpB,CAAC,CAAC,mBAAmB,CACnB,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,EAC5B,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EACrC,CAAC,CAAC,cAAc,CAAC;oBACf,CAAC,CAAC,eAAe,CACf,CAAC,CAAC,cAAc,CACd,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EACvF,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CACxC,CACF;iBACF,CAAC,CACH,CACF,CAAC;YACJ,CAAC;YACD,oBAAoB,CAAC,IAAgD;gBACnE,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAChF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;gBAC3C,CAAC;YACH,CAAC;YAED,eAAe,CAAC,IAA2C;;gBACzD,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,0CAAE,IAAI,MAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACzF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,cAAc,CAAC;gBAC3C,CAAC;YACH,CAAC;YAED,cAAc,CAAC,IAA0C;gBACvD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACpF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,cAAc,CAAC;gBACzC,CAAC;gBACD,IACE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;oBACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB;oBAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe;oBAC/C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,WAAW,EAC5C,CAAC;oBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;YACD,eAAe,CAAC,IAA2C;gBACzD,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACzC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC;YACD,kBAAkB,CAAC,IAA8C;gBAC/D,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC5E,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,kBAAkB,CAAC;oBACvC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,kFAAkF;gBAC3G,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,OAAe,EACf,IAAY,EACZ,iBAAwD;IAExD,qGAAqG;IACrG,IAAI,CAAC,IAAA,eAAU,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO;IACT,CAAC;IACD,IAAI,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IAE1E,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACzF,IAAI,SAAS,GAAG,IAAA,gBAAS,EAAC,QAAQ,EAAE;QAClC,OAAO;QACP,UAAU,EAAE,KAAK;KAClB,CAAE,CAAC,IAAK,CAAC;IACV,IAAA,yBAAc,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,IAAY,EAAE,OAAe;IACjE,IAAA,yBAAc,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,eAAgB,SAAQ,yBAAM;IAClC,KAAK;QACH,KAAK,IAAI,IAAI,IAAI,CAAC,6BAA6B,EAAE,8BAA8B,CAAC,EAAE,CAAC;YACjF,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,2BAA2B,CAAC,CAAC;QACnE,CAAC;QAED,uBAAuB,CAAC,IAAI,EAAE,uBAAuB,EAAE;YACrD,2BAA2B;YAC3B,UAAU,KAAmB;gBAC3B,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;gBAC3B,OAAO;oBACL,OAAO,EAAE;wBACP,sBAAsB,CAAC,IAAkD;;4BACvE,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,KAAK,MAAK,kBAAkB,EAAE,CAAC;gCACnD,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;4BAC/C,CAAC;wBACH,CAAC;qBACF;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QAEH,uBAAuB,CAAC,IAAI,EAAE,yBAAyB,EAAE,UAAU,KAAmB;YACpF,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAE3B,OAAO;gBACL,OAAO,EAAE;oBACP,cAAc,CAAC,IAA0C;wBACvD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;4BAC9F,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;wBACnD,CAAC;oBACH,CAAC;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,uBAAuB,CAAC,IAAI,EAAE,uBAAuB,EAAE,UAAU,KAAmB;YAClF,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAE3B,OAAO;gBACL,OAAO,EAAE;oBACP,iBAAiB,CAAC,IAA6C;wBAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,cAAc,EAAE,CAAC;4BAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;4BACxD,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBAC/E,CAAC;wBAED,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,2BAA2B,EAAE,CAAC;4BAC3D,IAAI,CAAC,WAAW,CACd,CAAC,CAAC,iBAAiB,CACjB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAC3E,CAAC,CAAC,aAAa,CAAC,qDAAqD,CAAC,CACvE,CACF,CAAC;wBACJ,CAAC;oBACH,CAAC;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAA,yBAAc,EACZ,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,EAAE,sBAAsB,CAAC,EAChD,6CAA6C,EAC7C,MAAM,CACP,CAAC;QAEF,uBAAuB,CAAC,IAAI,EAAE,kCAAkC,EAAE,UAAU,KAAmB;YAC7F,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAE3B,OAAO;gBACL,OAAO,EAAE;oBACP,mBAAmB,CAAC,IAA+C;;wBACjE,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,EAAE,0CAAE,IAAI,MAAK,qBAAqB,EAAE,CAAC;4BACjD,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;wBACjD,CAAC;oBACH,CAAC;oBACD,WAAW,CAAC,IAAuC;wBACjD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;4BACrF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;wBACpC,CAAC;oBACH,CAAC;oBACD,cAAc,CAAC,IAA0C;wBACvD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;4BACnF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;wBACtC,CAAC;oBACH,CAAC;oBACD,iBAAiB,CAAC,IAA6C;wBAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,gBAAgB,EAAE,CAAC;4BAChD,IAAI,CAAC,MAAM,EAAE,CAAC;wBAChB,CAAC;oBACH,CAAC;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,2BAA2B;IAClC,IAAI,IAAI,GAAG,KAAK,CAAC;IAEjB,OAAO;QACL,OAAO,EAAE;YACP,iBAAiB,CAAC,IAA6C;gBAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,yBAAyB,EAAE,CAAC;oBACzD,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO;oBACT,CAAC;oBAED;;;uBAGG;oBACH,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CACpF,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,eAAe,CACzC,CAAC;oBAE7C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,YAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAC5D,YAAY,CAAC,MAAM,EAAE,CAAC;oBAEtB,IAAI,GAAG,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAmB;IACvC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC;IACpB,OAAO;QACL,OAAO,EAAE;YACP,OAAO,CAAC,IAAmC;gBACzC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CACpB,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CACvG,CAAC;YACJ,CAAC;YACD,iBAAiB,EAAE;gBACjB,KAAK,CAAC,IAA6C,EAAE,KAAiC;oBACpF,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;wBAC/C,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,KAA8C,EAAE,KAAiC;oBACpF,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;gBAC9B,CAAC;aACF;YACD,eAAe,CAAC,IAA2C,EAAE,KAAiC;gBAC5F,IAAI,IAAI,GAAG,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC9F,IAAI,KAAK,CAAC,aAAa,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;oBAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC","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 type { Node } from 'broccoli-node-api';\nimport { existsSync } from 'fs';\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  // versions of ember-source prior to\n  // https://github.com/emberjs/ember.js/pull/20675 ship dist/packages and\n  // dist/dependencies separately and the imports between them are package-name\n  // imports. Since many of the dependencies are also true package.json\n  // dependencies (in order to get typescript types), and our module-resolver\n  // prioritizes true dependencies, it's necessary to detect and remove the\n  // package.json dependencies.\n  //\n  // After the above linked change, ember-source ships only dist/packages and\n  // the inter-package imports are all relative. Some of the things in\n  // dist/packages are still the rolled-in dependencies, but now that the\n  // imports are all relative we need no special handling for them (beyond the\n  // normal v2 addon renamed-modules support.\n  @Memoize()\n  private get includedDependencies() {\n    let result: string[] = [];\n    let depsDir = resolve(this.root, 'dist', 'dependencies');\n    if (!existsSync(depsDir)) {\n      return result;\n    }\n    for (let name of readdirSync(depsDir)) {\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\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    // we are adding custom implementations of these\n    return treeName === 'treeForAddon' || treeName === 'treeForVendor' || super.customizes(treeName);\n  }\n\n  invokeOriginalTreeFor(name: string) {\n    if (name === 'addon') {\n      return this.customAddonTree();\n    }\n    if (name === 'vendor') {\n      return this.customVendorTree();\n    }\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        allowEmpty: true,\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 ReplaceRequire([new FixStringLoc([packages])]));\n    } else if (satisfies(this.packageJSON.version, '<5.7.0')) {\n      trees.push(new ReplaceRequire([packages]));\n    }\n\n    if (satisfies(this.packageJSON.version, '<5.12.0')) {\n      trees.push(new FixDeprecateFunction([packages]));\n    }\n\n    if (satisfies(this.packageJSON.version, '<5.11.1')) {\n      trees.push(new FixCycleImports([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\n    if (!meta['implicit-modules']) {\n      meta['implicit-modules'] = [];\n    }\n    meta['implicit-modules'].push('./ember/index.js');\n    // before 5.6, Ember uses the AMD loader to decide if it's test-only parts\n    // are present, so we must ensure they're registered. After that it's\n    // enough to evaluate ember-testing, which @embroider/core is hard-coded\n    // to do in the backward-compatible tests bundle.\n    if (!satisfies(this.packageJSON.version, '>= 5.6.0-alpha.0', { includePrerelease: true })) {\n      if (!meta['implicit-test-modules']) {\n        meta['implicit-test-modules'] = [];\n      }\n      meta['implicit-test-modules'].push('./ember-testing/index.js');\n    }\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      configFile: false,\n    })!.code!;\n    outputFileSync(resolve(this.outputPath, 'ember', 'index.js'), outSource, 'utf8');\n  }\n}\n\nclass ReplaceRequire extends Plugin {\n  build() {\n    updateFileWithTransform(this, 'ember/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      function createLoader() {\n        return t.objectExpression([\n          t.objectMethod(\n            'get',\n            t.identifier('require'),\n            [],\n            t.blockStatement([\n              t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('require'))),\n            ])\n          ),\n          t.objectMethod(\n            'get',\n            t.identifier('define'),\n            [],\n            t.blockStatement([\n              t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('define'))),\n            ])\n          ),\n          t.objectMethod(\n            'get',\n            t.identifier('registry'),\n            [],\n\n            t.blockStatement([\n              t.returnStatement(\n                t.logicalExpression(\n                  '??',\n                  t.optionalMemberExpression(\n                    t.memberExpression(t.identifier('globalThis'), t.identifier('requirejs')),\n                    t.identifier('entries'),\n                    false,\n                    true\n                  ),\n                  t.optionalMemberExpression(\n                    t.memberExpression(t.identifier('globalThis'), t.identifier('require')),\n                    t.identifier('entries'),\n                    false,\n                    true\n                  )\n                )\n              ),\n            ])\n          ),\n        ]);\n      }\n\n      return {\n        visitor: {\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (\n              path.node.callee.type === 'Identifier' &&\n              (path.node.callee.name === 'has' || path.node.callee.name === 'require') &&\n              path.node.arguments[0].type === 'StringLiteral' &&\n              path.node.arguments[0].value === 'ember-testing'\n            ) {\n              path.replaceWith(t.identifier('EmberTestingImpl'));\n            }\n          },\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === 'require') {\n              path.replaceWith(\n                t.importDeclaration(\n                  [t.importSpecifier(t.identifier('EmberTestingImpl'), t.identifier('_impl'))],\n                  t.stringLiteral('@ember/test')\n                )\n              );\n            }\n          },\n          VariableDeclaration(path: NodePath<Babel.types.VariableDeclaration>) {\n            if (\n              path.node.declarations[0].id.type === 'Identifier' &&\n              path.node.declarations[0].id.name === 'PartialEmber' &&\n              path.node.declarations[0].init!.type === 'ObjectExpression'\n            ) {\n              const declaration = path.node.declarations[0];\n              const loader = (declaration.init! as Babel.types.ObjectExpression).properties.find(\n                p => (p.type === 'ObjectProperty' && p.key.type === 'Identifier' && p.key.name) === '__loader'\n              );\n              (loader as Babel.types.ObjectProperty).value = createLoader();\n            }\n          },\n          AssignmentExpression(path: NodePath<Babel.types.AssignmentExpression>) {\n            if (\n              path.node.left.type === 'MemberExpression' &&\n              path.node.left.object.type === 'Identifier' &&\n              path.node.left.object.name === 'Ember' &&\n              path.node.left.property.type === 'Identifier' &&\n              path.node.left.property.name === '__loader'\n            ) {\n              path.node.right = createLoader();\n            }\n          },\n        },\n      };\n    });\n\n    replaceFile(\n      this,\n      '@ember/test/adapter.js',\n      `import { Adapter } from 'ember-testing';\n      export default Adapter;`\n    );\n\n    replaceFile(\n      this,\n      '@ember/test/index.js',\n      `export let registerAsyncHelper;\nexport let registerHelper;\nexport let registerWaiter;\nexport let unregisterHelper;\nexport let unregisterWaiter;\nexport let _impl;\n\nlet testingNotAvailableMessage = () => {\n  throw new Error('Attempted to use test utilities, but \\`ember-testing\\` was not included');\n};\n\nregisterAsyncHelper = testingNotAvailableMessage;\nregisterHelper = testingNotAvailableMessage;\nregisterWaiter = testingNotAvailableMessage;\nunregisterHelper = testingNotAvailableMessage;\nunregisterWaiter = testingNotAvailableMessage;\n\nexport function registerTestImplementaiton(impl) {\n  let { Test } = impl;\n  registerAsyncHelper = Test.registerAsyncHelper;\n  registerHelper = Test.registerHelper;\n  registerWaiter = Test.registerWaiter;\n  unregisterHelper = Test.unregisterHelper;\n  unregisterWaiter = Test.unregisterWaiter;\n  _impl = impl;\n}`\n    );\n\n    replaceFile(\n      this,\n      'ember-testing/index.js',\n      `export * from './lib/public-api';\nimport * as EmberTesting from './lib/public-api';\nimport { registerTestImplementaiton } from '@ember/test';\n\n\nregisterTestImplementaiton(EmberTesting);`\n    );\n\n    replaceFile(\n      this,\n      'ember-testing/lib/public-api.js',\n      `\nexport { default as Test } from './test';\nexport { default as Adapter } from './adapters/adapter';\nexport { default as setupForTesting } from './setup_for_testing';\nexport { default as QUnitAdapter } from './adapters/qunit';\n\nimport './ext/application';\nimport './ext/rsvp'; // setup RSVP + run loop integration\nimport './helpers'; // adds helpers to helpers object in Test\nimport './initializers'; // to setup initializer`\n    );\n  }\n}\n\nclass FixDeprecateFunction extends Plugin {\n  build() {\n    let inSource = readFileSync(resolve(this.inputPaths[0], '@ember', 'debug', 'index.js'), 'utf8');\n    let outSource = transform(inSource, {\n      plugins: [fixDeprecate],\n      configFile: false,\n    })!.code!;\n    outputFileSync(resolve(this.outputPath, '@ember', 'debug', 'index.js'), outSource, 'utf8');\n  }\n}\n\nfunction fixDeprecate(babel: typeof Babel) {\n  const { types: t } = babel;\n\n  return {\n    name: 'ast-transform', // not required\n    visitor: {\n      Program(path: NodePath<Babel.types.Program>) {\n        path.node.body.unshift(\n          t.functionDeclaration(\n            t.identifier('newDeprecate'),\n            [t.restElement(t.identifier('rest'))],\n            t.blockStatement([\n              t.returnStatement(\n                t.callExpression(\n                  t.logicalExpression('??', t.identifier('currentDeprecate'), t.identifier('_deprecate')),\n                  [t.spreadElement(t.identifier('rest'))]\n                )\n              ),\n            ])\n          )\n        );\n      },\n      AssignmentExpression(path: NodePath<Babel.types.AssignmentExpression>) {\n        if (path.node.left.type === 'Identifier' && path.node.left.name === 'deprecate') {\n          path.node.left.name = 'currentDeprecate';\n        }\n      },\n\n      ReturnStatement(path: NodePath<Babel.types.ReturnStatement>) {\n        if (path.node.argument?.type === 'Identifier' && path.node.argument.name === 'deprecate') {\n          path.node.argument.name = 'newDeprecate';\n        }\n      },\n\n      CallExpression(path: NodePath<Babel.types.CallExpression>) {\n        if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'deprecate') {\n          path.node.callee.name = 'newDeprecate';\n        }\n        if (\n          path.node.callee.type === 'Identifier' &&\n          path.node.callee.name === 'setDebugFunction' &&\n          path.node.arguments[0].type === 'StringLiteral' &&\n          path.node.arguments[0].value === 'deprecate'\n        ) {\n          path.remove();\n        }\n      },\n      ExportSpecifier(path: NodePath<Babel.types.ExportSpecifier>) {\n        if (path.node.local.name === 'deprecate') {\n          path.node.local = t.identifier('newDeprecate');\n        }\n      },\n      VariableDeclarator(path: NodePath<Babel.types.VariableDeclarator>) {\n        if (path.node.id.type === 'Identifier' && path.node.id.name === 'deprecate') {\n          path.node.id.name = 'currentDeprecate';\n          path.node.init = null; // leave undefined for newDeprecate's (currentDeprecate ?? _deprecated) expression\n        }\n      },\n    },\n  };\n}\n\nfunction updateFileWithTransform(\n  context: Plugin,\n  file: string,\n  transformFunction: Babel.PluginItem | Babel.PluginItem[]\n) {\n  // only update the file if it exists - this helps the codemods to work across many different versions\n  if (!existsSync(resolve(context.inputPaths[0], file))) {\n    return;\n  }\n  let inSource = readFileSync(resolve(context.inputPaths[0], file), 'utf8');\n\n  let plugins = Array.isArray(transformFunction) ? transformFunction : [transformFunction];\n  let outSource = transform(inSource, {\n    plugins,\n    configFile: false,\n  })!.code!;\n  outputFileSync(resolve(context.outputPath, file), outSource, 'utf8');\n}\n\nfunction replaceFile(context: Plugin, file: string, content: string) {\n  outputFileSync(resolve(context.outputPath, file), content, 'utf8');\n}\n\nclass FixCycleImports extends Plugin {\n  build() {\n    for (let file of ['@ember/object/observable.js', '@ember/utils/lib/is_empty.js']) {\n      updateFileWithTransform(this, file, moveObjectSpecifiersToMetal);\n    }\n\n    updateFileWithTransform(this, '@ember/array/index.js', [\n      moveObjectSpecifiersToMetal,\n      function (babel: typeof Babel) {\n        const { types: t } = babel;\n        return {\n          visitor: {\n            ExportNamedDeclaration(path: NodePath<Babel.types.ExportNamedDeclaration>) {\n              if (path.node.source?.value === './lib/make-array') {\n                path.node.source = t.stringLiteral('./make');\n              }\n            },\n          },\n        };\n      },\n    ]);\n\n    updateFileWithTransform(this, '@ember/runloop/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'flushAsyncObservers') {\n              path.node.arguments = [t.identifier('schedule')];\n            }\n          },\n        },\n      };\n    });\n\n    updateFileWithTransform(this, '@ember/object/core.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === '@ember/array') {\n              path.node.source = t.stringLiteral('@ember/array/make');\n              path.node.specifiers = [t.importDefaultSpecifier(t.identifier('makeArray'))];\n            }\n\n            if (path.node.source.value === '@ember/-internals/runtime') {\n              path.replaceWith(\n                t.importDeclaration(\n                  [t.importSpecifier(t.identifier('ActionHandler'), t.identifier('default'))],\n                  t.stringLiteral('@ember/-internals/runtime/lib/mixins/action_handler')\n                )\n              );\n            }\n          },\n        },\n      };\n    });\n\n    outputFileSync(\n      resolve(this.outputPath, '@ember/array/make.js'),\n      `export { default } from './lib/make-array';`,\n      'utf8'\n    );\n\n    updateFileWithTransform(this, '@ember/-internals/metal/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          FunctionDeclaration(path: NodePath<Babel.types.FunctionDeclaration>) {\n            if (path.node.id?.name === 'flushAsyncObservers') {\n              path.node.params = [t.identifier('_schedule')];\n            }\n          },\n          IfStatement(path: NodePath<Babel.types.IfStatement>) {\n            if (path.node.test.type === 'Identifier' && path.node.test.name === 'shouldSchedule') {\n              path.node.test.name = '_schedule';\n            }\n          },\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'schedule') {\n              path.node.callee.name = '_schedule';\n            }\n          },\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === '@ember/runloop') {\n              path.remove();\n            }\n          },\n        },\n      };\n    });\n  }\n}\n\nfunction moveObjectSpecifiersToMetal() {\n  let done = false;\n\n  return {\n    visitor: {\n      ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n        if (path.node.source.value === '@ember/-internals/metal') {\n          if (done) {\n            return;\n          }\n\n          /**\n           * I need to use getAllPRevSiblings and getAllNextSiblings here because I need the siblings\n           * to be paths and path.container only holds nodes (for some strange reason).\n           */\n          const objectimport = [...path.getAllPrevSiblings(), ...path.getAllNextSiblings()].find(\n            p => p.node.type === 'ImportDeclaration' && p.node.source.value === '@ember/object'\n          ) as NodePath<Babel.types.ImportDeclaration>;\n\n          path.node.specifiers.push(...objectimport!.node.specifiers);\n          objectimport.remove();\n\n          done = true;\n        }\n      },\n    },\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"]}
+{"version":3,"file":"ember-source.js","sourceRoot":"","sources":["../../../src/compat-adapters/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 type { Node } from 'broccoli-node-api';\nimport { existsSync } from 'fs';\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  // versions of ember-source prior to\n  // https://github.com/emberjs/ember.js/pull/20675 ship dist/packages and\n  // dist/dependencies separately and the imports between them are package-name\n  // imports. Since many of the dependencies are also true package.json\n  // dependencies (in order to get typescript types), and our module-resolver\n  // prioritizes true dependencies, it's necessary to detect and remove the\n  // package.json dependencies.\n  //\n  // After the above linked change, ember-source ships only dist/packages and\n  // the inter-package imports are all relative. Some of the things in\n  // dist/packages are still the rolled-in dependencies, but now that the\n  // imports are all relative we need no special handling for them (beyond the\n  // normal v2 addon renamed-modules support.\n  @Memoize()\n  private get includedDependencies() {\n    let result: string[] = [];\n    let depsDir = resolve(this.root, 'dist', 'dependencies');\n    if (!existsSync(depsDir)) {\n      return result;\n    }\n    for (let name of readdirSync(depsDir)) {\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\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    // we are adding custom implementations of these\n    return treeName === 'treeForAddon' || treeName === 'treeForVendor' || super.customizes(treeName);\n  }\n\n  invokeOriginalTreeFor(name: string) {\n    if (name === 'addon') {\n      return this.customAddonTree();\n    }\n    if (name === 'vendor') {\n      return this.customVendorTree();\n    }\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        allowEmpty: true,\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 ReplaceRequire([new FixStringLoc([packages])]));\n    } else if (satisfies(this.packageJSON.version, '<5.7.0')) {\n      trees.push(new ReplaceRequire([packages]));\n    }\n\n    if (satisfies(this.packageJSON.version, '<5.12.0')) {\n      trees.push(new FixDeprecateFunction([packages]));\n    }\n\n    if (satisfies(this.packageJSON.version, '<5.11.1')) {\n      trees.push(new FixCycleImports([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\n    if (!meta['implicit-modules']) {\n      meta['implicit-modules'] = [];\n    }\n    meta['implicit-modules'].push('./ember/index.js');\n    // before 5.6, Ember uses the AMD loader to decide if it's test-only parts\n    // are present, so we must ensure they're registered. After that it's\n    // enough to evaluate ember-testing, which @embroider/core is hard-coded\n    // to do in the backward-compatible tests bundle.\n    if (!satisfies(this.packageJSON.version, '>= 5.6.0-alpha.0', { includePrerelease: true })) {\n      if (!meta['implicit-test-modules']) {\n        meta['implicit-test-modules'] = [];\n      }\n      meta['implicit-test-modules'].push('./ember-testing/index.js');\n    }\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      configFile: false,\n    })!.code!;\n    outputFileSync(resolve(this.outputPath, 'ember', 'index.js'), outSource, 'utf8');\n  }\n}\n\nclass ReplaceRequire extends Plugin {\n  build() {\n    updateFileWithTransform(this, 'ember/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      function createLoader() {\n        return t.objectExpression([\n          t.objectMethod(\n            'get',\n            t.identifier('require'),\n            [],\n            t.blockStatement([\n              t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('require'))),\n            ])\n          ),\n          t.objectMethod(\n            'get',\n            t.identifier('define'),\n            [],\n            t.blockStatement([\n              t.returnStatement(t.memberExpression(t.identifier('globalThis'), t.identifier('define'))),\n            ])\n          ),\n          t.objectMethod(\n            'get',\n            t.identifier('registry'),\n            [],\n\n            t.blockStatement([\n              t.returnStatement(\n                t.logicalExpression(\n                  '??',\n                  t.optionalMemberExpression(\n                    t.memberExpression(t.identifier('globalThis'), t.identifier('requirejs')),\n                    t.identifier('entries'),\n                    false,\n                    true\n                  ),\n                  t.optionalMemberExpression(\n                    t.memberExpression(t.identifier('globalThis'), t.identifier('require')),\n                    t.identifier('entries'),\n                    false,\n                    true\n                  )\n                )\n              ),\n            ])\n          ),\n        ]);\n      }\n\n      return {\n        visitor: {\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (\n              path.node.callee.type === 'Identifier' &&\n              (path.node.callee.name === 'has' || path.node.callee.name === 'require') &&\n              path.node.arguments[0].type === 'StringLiteral' &&\n              path.node.arguments[0].value === 'ember-testing'\n            ) {\n              path.replaceWith(t.identifier('EmberTestingImpl'));\n            }\n          },\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === 'require') {\n              path.replaceWith(\n                t.importDeclaration(\n                  [t.importSpecifier(t.identifier('EmberTestingImpl'), t.identifier('_impl'))],\n                  t.stringLiteral('@ember/test')\n                )\n              );\n            }\n          },\n          VariableDeclaration(path: NodePath<Babel.types.VariableDeclaration>) {\n            if (\n              path.node.declarations[0].id.type === 'Identifier' &&\n              path.node.declarations[0].id.name === 'PartialEmber' &&\n              path.node.declarations[0].init!.type === 'ObjectExpression'\n            ) {\n              const declaration = path.node.declarations[0];\n              const loader = (declaration.init! as Babel.types.ObjectExpression).properties.find(\n                p => (p.type === 'ObjectProperty' && p.key.type === 'Identifier' && p.key.name) === '__loader'\n              );\n              (loader as Babel.types.ObjectProperty).value = createLoader();\n            }\n          },\n          AssignmentExpression(path: NodePath<Babel.types.AssignmentExpression>) {\n            if (\n              path.node.left.type === 'MemberExpression' &&\n              path.node.left.object.type === 'Identifier' &&\n              path.node.left.object.name === 'Ember' &&\n              path.node.left.property.type === 'Identifier' &&\n              path.node.left.property.name === '__loader'\n            ) {\n              path.node.right = createLoader();\n            }\n          },\n        },\n      };\n    });\n\n    replaceFile(\n      this,\n      '@ember/test/adapter.js',\n      `import { Adapter } from 'ember-testing';\n      export default Adapter;`\n    );\n\n    replaceFile(\n      this,\n      '@ember/test/index.js',\n      `export let registerAsyncHelper;\nexport let registerHelper;\nexport let registerWaiter;\nexport let unregisterHelper;\nexport let unregisterWaiter;\nexport let _impl;\n\nlet testingNotAvailableMessage = () => {\n  throw new Error('Attempted to use test utilities, but \\`ember-testing\\` was not included');\n};\n\nregisterAsyncHelper = testingNotAvailableMessage;\nregisterHelper = testingNotAvailableMessage;\nregisterWaiter = testingNotAvailableMessage;\nunregisterHelper = testingNotAvailableMessage;\nunregisterWaiter = testingNotAvailableMessage;\n\nexport function registerTestImplementaiton(impl) {\n  let { Test } = impl;\n  registerAsyncHelper = Test.registerAsyncHelper;\n  registerHelper = Test.registerHelper;\n  registerWaiter = Test.registerWaiter;\n  unregisterHelper = Test.unregisterHelper;\n  unregisterWaiter = Test.unregisterWaiter;\n  _impl = impl;\n}`\n    );\n\n    replaceFile(\n      this,\n      'ember-testing/index.js',\n      `export * from './lib/public-api';\nimport * as EmberTesting from './lib/public-api';\nimport { registerTestImplementaiton } from '@ember/test';\n\n\nregisterTestImplementaiton(EmberTesting);`\n    );\n\n    replaceFile(\n      this,\n      'ember-testing/lib/public-api.js',\n      `\nexport { default as Test } from './test';\nexport { default as Adapter } from './adapters/adapter';\nexport { default as setupForTesting } from './setup_for_testing';\nexport { default as QUnitAdapter } from './adapters/qunit';\n\nimport './ext/application';\nimport './ext/rsvp'; // setup RSVP + run loop integration\nimport './helpers'; // adds helpers to helpers object in Test\nimport './initializers'; // to setup initializer`\n    );\n  }\n}\n\nclass FixDeprecateFunction extends Plugin {\n  build() {\n    let inSource = readFileSync(resolve(this.inputPaths[0], '@ember', 'debug', 'index.js'), 'utf8');\n    let outSource = transform(inSource, {\n      plugins: [fixDeprecate],\n      configFile: false,\n    })!.code!;\n    outputFileSync(resolve(this.outputPath, '@ember', 'debug', 'index.js'), outSource, 'utf8');\n  }\n}\n\nfunction fixDeprecate(babel: typeof Babel) {\n  const { types: t } = babel;\n\n  return {\n    name: 'ast-transform', // not required\n    visitor: {\n      Program(path: NodePath<Babel.types.Program>) {\n        path.node.body.unshift(\n          t.functionDeclaration(\n            t.identifier('newDeprecate'),\n            [t.restElement(t.identifier('rest'))],\n            t.blockStatement([\n              t.returnStatement(\n                t.callExpression(\n                  t.logicalExpression('??', t.identifier('currentDeprecate'), t.identifier('_deprecate')),\n                  [t.spreadElement(t.identifier('rest'))]\n                )\n              ),\n            ])\n          )\n        );\n      },\n      AssignmentExpression(path: NodePath<Babel.types.AssignmentExpression>) {\n        if (path.node.left.type === 'Identifier' && path.node.left.name === 'deprecate') {\n          path.node.left.name = 'currentDeprecate';\n        }\n      },\n\n      ReturnStatement(path: NodePath<Babel.types.ReturnStatement>) {\n        if (path.node.argument?.type === 'Identifier' && path.node.argument.name === 'deprecate') {\n          path.node.argument.name = 'newDeprecate';\n        }\n      },\n\n      CallExpression(path: NodePath<Babel.types.CallExpression>) {\n        if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'deprecate') {\n          path.node.callee.name = 'newDeprecate';\n        }\n        if (\n          path.node.callee.type === 'Identifier' &&\n          path.node.callee.name === 'setDebugFunction' &&\n          path.node.arguments[0].type === 'StringLiteral' &&\n          path.node.arguments[0].value === 'deprecate'\n        ) {\n          path.remove();\n        }\n      },\n      ExportSpecifier(path: NodePath<Babel.types.ExportSpecifier>) {\n        if (path.node.local.name === 'deprecate') {\n          path.node.local = t.identifier('newDeprecate');\n        }\n      },\n      VariableDeclarator(path: NodePath<Babel.types.VariableDeclarator>) {\n        if (path.node.id.type === 'Identifier' && path.node.id.name === 'deprecate') {\n          path.node.id.name = 'currentDeprecate';\n          path.node.init = null; // leave undefined for newDeprecate's (currentDeprecate ?? _deprecated) expression\n        }\n      },\n    },\n  };\n}\n\nfunction updateFileWithTransform(\n  context: Plugin,\n  file: string,\n  transformFunction: Babel.PluginItem | Babel.PluginItem[]\n) {\n  // only update the file if it exists - this helps the codemods to work across many different versions\n  if (!existsSync(resolve(context.inputPaths[0], file))) {\n    return;\n  }\n  let inSource = readFileSync(resolve(context.inputPaths[0], file), 'utf8');\n\n  let plugins = Array.isArray(transformFunction) ? transformFunction : [transformFunction];\n  let outSource = transform(inSource, {\n    plugins,\n    configFile: false,\n  })!.code!;\n  outputFileSync(resolve(context.outputPath, file), outSource, 'utf8');\n}\n\nfunction replaceFile(context: Plugin, file: string, content: string) {\n  outputFileSync(resolve(context.outputPath, file), content, 'utf8');\n}\n\nclass FixCycleImports extends Plugin {\n  build() {\n    for (let file of ['@ember/object/observable.js', '@ember/utils/lib/is_empty.js']) {\n      updateFileWithTransform(this, file, moveObjectSpecifiersToMetal);\n    }\n\n    updateFileWithTransform(this, '@ember/array/index.js', [\n      moveObjectSpecifiersToMetal,\n      function (babel: typeof Babel) {\n        const { types: t } = babel;\n        return {\n          visitor: {\n            ExportNamedDeclaration(path: NodePath<Babel.types.ExportNamedDeclaration>) {\n              if (path.node.source?.value === './lib/make-array') {\n                path.node.source = t.stringLiteral('./make');\n              }\n            },\n          },\n        };\n      },\n    ]);\n\n    updateFileWithTransform(this, '@ember/runloop/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'flushAsyncObservers') {\n              path.node.arguments = [t.identifier('schedule')];\n            }\n          },\n        },\n      };\n    });\n\n    updateFileWithTransform(this, '@ember/object/core.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === '@ember/array') {\n              path.node.source = t.stringLiteral('@ember/array/make');\n              path.node.specifiers = [t.importDefaultSpecifier(t.identifier('makeArray'))];\n            }\n\n            if (path.node.source.value === '@ember/-internals/runtime') {\n              path.replaceWith(\n                t.importDeclaration(\n                  [t.importSpecifier(t.identifier('ActionHandler'), t.identifier('default'))],\n                  t.stringLiteral('@ember/-internals/runtime/lib/mixins/action_handler')\n                )\n              );\n            }\n          },\n        },\n      };\n    });\n\n    outputFileSync(\n      resolve(this.outputPath, '@ember/array/make.js'),\n      `export { default } from './lib/make-array';`,\n      'utf8'\n    );\n\n    updateFileWithTransform(this, '@ember/-internals/metal/index.js', function (babel: typeof Babel) {\n      const { types: t } = babel;\n\n      return {\n        visitor: {\n          FunctionDeclaration(path: NodePath<Babel.types.FunctionDeclaration>) {\n            if (path.node.id?.name === 'flushAsyncObservers') {\n              path.node.params = [t.identifier('_schedule')];\n            }\n          },\n          IfStatement(path: NodePath<Babel.types.IfStatement>) {\n            if (path.node.test.type === 'Identifier' && path.node.test.name === 'shouldSchedule') {\n              path.node.test.name = '_schedule';\n            }\n          },\n          CallExpression(path: NodePath<Babel.types.CallExpression>) {\n            if (path.node.callee.type === 'Identifier' && path.node.callee.name === 'schedule') {\n              path.node.callee.name = '_schedule';\n            }\n          },\n          ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n            if (path.node.source.value === '@ember/runloop') {\n              path.remove();\n            }\n          },\n        },\n      };\n    });\n  }\n}\n\nfunction moveObjectSpecifiersToMetal() {\n  let done = false;\n\n  return {\n    visitor: {\n      ImportDeclaration(path: NodePath<Babel.types.ImportDeclaration>) {\n        if (path.node.source.value === '@ember/-internals/metal') {\n          if (done) {\n            return;\n          }\n\n          /**\n           * I need to use getAllPRevSiblings and getAllNextSiblings here because I need the siblings\n           * to be paths and path.container only holds nodes (for some strange reason).\n           */\n          const searchObjects = Array.from(path.getAllPrevSiblings()).concat(Array.from(path.getAllNextSiblings()));\n          const objectimport = searchObjects.find(\n            p => p.node.type === 'ImportDeclaration' && p.node.source.value === '@ember/object'\n          ) as NodePath<Babel.types.ImportDeclaration>;\n\n          path.node.specifiers.push(...objectimport!.node.specifiers);\n          objectimport.remove();\n\n          done = true;\n        }\n      },\n    },\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/dist/src/dependency-rules.d.ts

@@ -5,12 +5,6 @@ export interface PackageRules {
     components?: {
         [key: string]: ComponentRules;
     };
-    addonModules?: {
-        [filename: string]: ModuleRules;
-    };
-    appModules?: {
-        [filename: string]: ModuleRules;
-    };
     addonTemplates?: {
         [filename: string]: TemplateRules;
     };
@@ -43,10 +37,6 @@ export interface ComponentRules extends TemplateRules {
     };
     safeToIgnore?: boolean;
 }
-export interface ModuleRules {
-    dependsOnComponents?: ComponentSnippet[];
-    dependsOnModules?: string[];
-}
 export type ArgumentMapping = string | {
     name: string;
     becomes: string;

package/dist/src/dependency-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-rules.js","sourceRoot":"","sources":["../../src/dependency-rules.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport { getOrCreate } from '@embroider/core';\nimport { resolve as pathResolve, dirname } from 'path';\nimport { satisfies } from 'semver';\nimport { resolve as resolveExports } from 'resolve.exports';\n\nexport interface PackageRules {\n  // This whole set of rules will only apply when the given addon package\n  // matching the given semver range is present and active.\n  package: string;\n  semverRange?: string;\n\n  components?: {\n    // I would prefer to write the key type here as `ComponentSnippet` to aid\n    // documentation, but Typescript won't allow it. See ComponentSnippet below.\n    [key: string]: ComponentRules;\n  };\n\n  addonModules?: {\n    // `filename` is relative to your package root, and it assumes v2 package\n    // format. Like \"templates/components/foo.hbs\".\n    [filename: string]: ModuleRules;\n  };\n\n  appModules?: {\n    // `filename` is relative to the app's root, and it assumes v2 package\n    // format. Like \"templates/components/foo.hbs\".\n    [filename: string]: ModuleRules;\n  };\n\n  addonTemplates?: {\n    // `filename` is relative to your package root, and it assumes v2 package\n    // format. Like \"templates/foo.hbs\".\n    [filename: string]: TemplateRules;\n  };\n\n  appTemplates?: {\n    // `filename` is relative to the app's root, and it assumes v2 package\n    // format. Like \"templates/foo.hbs\".\n    [filename: string]: TemplateRules;\n  };\n}\n\nexport interface ActivePackageRules extends PackageRules {\n  // the location(s) of active packages that match this rule.\n  roots: string[];\n}\n\nexport interface TemplateRules {\n  // Tells embroider which list of components may be needed for a given path.\n  // For example, if your template says `{{component this.panel}}` and you know\n  // that `this.panel` can be either \"light-panel\" or \"dark-panel\", you would\n  // say: `invokes: { \"this.panel\": [\"<LightPanel/>\", \"<DarkPanel/>\"] }`\n  invokes?: {\n    [path: string]: ComponentSnippet[];\n  };\n\n  // Embroider will complain if you try to use staticHelper and/or\n  // staticComponents and you have ambiguous forms that might be a component or\n  // a helper or just some data that is being rendered. For example, if a\n  // template says `{{something}}`, we can't tell if that is `<Something />` or\n  // `{{ (something) }}` or `{{this.something}}`.\n  disambiguate?: {\n    [dasherizedName: string]: 'component' | 'helper' | 'data';\n  };\n}\n\nexport interface ComponentRules extends TemplateRules {\n  // This declares that our component yields other components that are safe to\n  // invoke with the {{component}} helper.\n  //\n  // The array corresponds to your yielded positional arguments. Any value that\n  // is true is considered a safe component. Any value can be a hash in which\n  // individual keys that are true are considered safe components.\n  //\n  //  Examples:\n  //\n  //    If you do: {{yield (component \"x\") }}\n  //    Then say: yieldsSafeComponents: [true]\n  //\n  //    If you do: {{yield (hash x=(component \"x\") y=(component \"y\")) }}\n  //    Then say: yieldsSafeComponents: [{x: true, y: true}]\n  //\n  yieldsSafeComponents?: (boolean | { [name: string]: boolean })[];\n\n  // This declares that our component yields some of its arguments unchanged.\n  //\n  // The array corresponds to your yielded positional arguments. Each value can\n  // be:\n  //   false, meaning this yielded value is not one of our arguments\n  //   a string, meaning this yielded value is our argument with that name\n  //   or a POJO, whose individual properties are string naming which arguments\n  //     from whence they came.\n  //\n  // Examples:\n  //\n  //    If you do: {{yield @foo}}\n  //    Then say: yieldsArguments: ['foo']\n  //\n  //    If you do: {{yield (hash x=@foo) }}\n  //    Then say: yieldsArguments: [{ x: 'foo' }]\n  yieldsArguments?: (string | { [name: string]: string })[];\n\n  // This declares that our component accepts arguments that will be invoked\n  // with the {{component}} helper. This silences warnings in the places where\n  // we consume them, while introducing warnings in the places where people are\n  // passing them to us (if they are doing so in a way that is too dynamic to\n  // analyze).\n  //\n  // If you use this, you may also need to set `layout`, see below.\n  acceptsComponentArguments?: ArgumentMapping[];\n\n  // If you want to use `acceptsComponentArguments` on a component that\n  // customies its own `layout` (which is most addon-provided components), you\n  // need to tell us here how to find its template by setting either `addonPath`\n  // or `appPath`.\n  layout?: {\n    // This is a path relative to the addon root, assuming V2 format.\n    addonPath?: string;\n    // This is the path relative to the app root, assuming V2 format.\n    appPath?: string;\n  };\n\n  // An unresolvable component is usually a build error (when your app has the\n  // staticComponent Option enabled). But you can tell Embroider to ignore it by\n  // setting this.\n  safeToIgnore?: boolean;\n}\n\nexport interface ModuleRules {\n  // We will resolve these components into the corresponding JS and HBS files\n  // and generate imports such that this module depends on them.\n  dependsOnComponents?: ComponentSnippet[];\n\n  // This adds new imports to our module, as if they were really there. Helpful\n  // for working around addons that depend on things but don't say so.\n  dependsOnModules?: string[];\n}\n\n// The bare \"string\" short form implies that `becomes` is the same as `name`.\nexport type ArgumentMapping =\n  | string\n  | {\n      // the name of the argument you accept\n      name: string;\n      // the name its consumed as in your template\n      becomes: string;\n    };\n\n// A component snippet is a string containing valid HBS that is a single\n// component invocation. We use it to refer to components in a way that doesn't\n// require any new syntax or rules, and that's necessarily supported by whatever\n// build-time template resolver is in use.\n//\n// Examples of valid ComponentSnippets:\n//\n//    \"{{my-component}}\"\n//    \"{{my-component/foo}}\"\n//    \"<MyComponent />\"\n//    \"{{component 'my-component'}}\"\n//\ntype ComponentSnippet = string;\n\nexport interface PreprocessedComponentRule {\n  yieldsSafeComponents: Required<ComponentRules>['yieldsSafeComponents'];\n  yieldsArguments: Required<ComponentRules>['yieldsArguments'];\n  argumentsAreComponents: string[];\n  safeToIgnore: boolean;\n  safeInteriorPaths: string[];\n  disambiguate: Record<string, 'component' | 'helper' | 'data'>;\n  invokes: Required<ComponentRules>['invokes'];\n}\n\n// take a component rule from the authoring format to a format more optimized\n// for consumption in the resolver\nexport function preprocessComponentRule(componentRules: ComponentRules): PreprocessedComponentRule {\n  let argumentsAreComponents = [];\n  let safeInteriorPaths = [];\n  if (componentRules.acceptsComponentArguments) {\n    for (let entry of componentRules.acceptsComponentArguments) {\n      let name, interior;\n      if (typeof entry === 'string') {\n        name = interior = entry;\n      } else {\n        name = entry.name;\n        interior = entry.becomes;\n      }\n      if (name.startsWith('@')) {\n        name = name.slice(1);\n      }\n      argumentsAreComponents.push(name);\n      safeInteriorPaths.push(interior);\n      safeInteriorPaths.push('this.' + interior);\n      safeInteriorPaths.push('@' + name);\n    }\n  }\n  if (componentRules.invokes) {\n    for (let [path] of Object.entries(componentRules.invokes)) {\n      safeInteriorPaths.push(path);\n    }\n  }\n  return {\n    safeInteriorPaths,\n    safeToIgnore: Boolean(componentRules.safeToIgnore),\n    argumentsAreComponents,\n    yieldsSafeComponents: componentRules.yieldsSafeComponents || [],\n    yieldsArguments: componentRules.yieldsArguments || [],\n    disambiguate: componentRules?.disambiguate ?? {},\n    invokes: componentRules?.invokes ?? {},\n  };\n}\n\nexport function activePackageRules(\n  packageRules: PackageRules[],\n  activePackages: { name: string; root: string; version: string }[]\n): ActivePackageRules[] {\n  // rule order implies precedence. The first rule that matches a given package\n  // applies to that package, and no other rule does.\n  let rootsPerRule = new Map();\n  for (let pkg of activePackages) {\n    for (let rule of packageRules) {\n      if (rule.package === pkg.name && (!rule.semverRange || satisfies(pkg.version, rule.semverRange))) {\n        let roots = getOrCreate(rootsPerRule, rule, () => []);\n        roots.push(pkg.root);\n        break;\n      }\n    }\n  }\n  let output = [];\n  for (let [rule, roots] of rootsPerRule) {\n    output.push(Object.assign({ roots }, rule));\n  }\n  return output;\n}\n\nexport function appTreeRulesDir(root: string, resolver: Resolver) {\n  let pkg = resolver.packageCache.ownerOfFile(root);\n  if (pkg) {\n    if (pkg.isV2Addon()) {\n      // in general v2 addons can keep their app tree stuff in other places than\n      // \"_app_\" and we would need to check their package.json to see. But this code\n      // is only for applying packageRules to auto-upgraded v1 addons and apps, and\n      // those we always organize predictably.\n      return pathResolve(root, '_app_');\n    } else {\n      // this is an app\n      let matched = resolveExports(pkg.packageJSON, './index.js');\n      if (matched) {\n        return dirname(pathResolve(root, matched[0]));\n      }\n    }\n  }\n  return root;\n}\n"]}
+{"version":3,"file":"dependency-rules.js","sourceRoot":"","sources":["../../src/dependency-rules.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport { getOrCreate } from '@embroider/core';\nimport { resolve as pathResolve, dirname } from 'path';\nimport { satisfies } from 'semver';\nimport { resolve as resolveExports } from 'resolve.exports';\n\nexport interface PackageRules {\n  // This whole set of rules will only apply when the given addon package\n  // matching the given semver range is present and active.\n  package: string;\n  semverRange?: string;\n\n  components?: {\n    // I would prefer to write the key type here as `ComponentSnippet` to aid\n    // documentation, but Typescript won't allow it. See ComponentSnippet below.\n    [key: string]: ComponentRules;\n  };\n\n  addonTemplates?: {\n    // `filename` is relative to your package root, and it assumes v2 package\n    // format. Like \"templates/foo.hbs\".\n    [filename: string]: TemplateRules;\n  };\n\n  appTemplates?: {\n    // `filename` is relative to the app's root, and it assumes v2 package\n    // format. Like \"templates/foo.hbs\".\n    [filename: string]: TemplateRules;\n  };\n}\n\nexport interface ActivePackageRules extends PackageRules {\n  // the location(s) of active packages that match this rule.\n  roots: string[];\n}\n\nexport interface TemplateRules {\n  // Tells embroider which list of components may be needed for a given path.\n  // For example, if your template says `{{component this.panel}}` and you know\n  // that `this.panel` can be either \"light-panel\" or \"dark-panel\", you would\n  // say: `invokes: { \"this.panel\": [\"<LightPanel/>\", \"<DarkPanel/>\"] }`\n  invokes?: {\n    [path: string]: ComponentSnippet[];\n  };\n\n  // Embroider will complain if you try to use staticHelper and/or\n  // staticComponents and you have ambiguous forms that might be a component or\n  // a helper or just some data that is being rendered. For example, if a\n  // template says `{{something}}`, we can't tell if that is `<Something />` or\n  // `{{ (something) }}` or `{{this.something}}`.\n  disambiguate?: {\n    [dasherizedName: string]: 'component' | 'helper' | 'data';\n  };\n}\n\nexport interface ComponentRules extends TemplateRules {\n  // This declares that our component yields other components that are safe to\n  // invoke with the {{component}} helper.\n  //\n  // The array corresponds to your yielded positional arguments. Any value that\n  // is true is considered a safe component. Any value can be a hash in which\n  // individual keys that are true are considered safe components.\n  //\n  //  Examples:\n  //\n  //    If you do: {{yield (component \"x\") }}\n  //    Then say: yieldsSafeComponents: [true]\n  //\n  //    If you do: {{yield (hash x=(component \"x\") y=(component \"y\")) }}\n  //    Then say: yieldsSafeComponents: [{x: true, y: true}]\n  //\n  yieldsSafeComponents?: (boolean | { [name: string]: boolean })[];\n\n  // This declares that our component yields some of its arguments unchanged.\n  //\n  // The array corresponds to your yielded positional arguments. Each value can\n  // be:\n  //   false, meaning this yielded value is not one of our arguments\n  //   a string, meaning this yielded value is our argument with that name\n  //   or a POJO, whose individual properties are string naming which arguments\n  //     from whence they came.\n  //\n  // Examples:\n  //\n  //    If you do: {{yield @foo}}\n  //    Then say: yieldsArguments: ['foo']\n  //\n  //    If you do: {{yield (hash x=@foo) }}\n  //    Then say: yieldsArguments: [{ x: 'foo' }]\n  yieldsArguments?: (string | { [name: string]: string })[];\n\n  // This declares that our component accepts arguments that will be invoked\n  // with the {{component}} helper. This silences warnings in the places where\n  // we consume them, while introducing warnings in the places where people are\n  // passing them to us (if they are doing so in a way that is too dynamic to\n  // analyze).\n  //\n  // If you use this, you may also need to set `layout`, see below.\n  acceptsComponentArguments?: ArgumentMapping[];\n\n  // If you want to use `acceptsComponentArguments` on a component that\n  // customies its own `layout` (which is most addon-provided components), you\n  // need to tell us here how to find its template by setting either `addonPath`\n  // or `appPath`.\n  layout?: {\n    // This is a path relative to the addon root, assuming V2 format.\n    addonPath?: string;\n    // This is the path relative to the app root, assuming V2 format.\n    appPath?: string;\n  };\n\n  // An unresolvable component is usually a build error (when your app has the\n  // staticComponent Option enabled). But you can tell Embroider to ignore it by\n  // setting this.\n  safeToIgnore?: boolean;\n}\n\n// The bare \"string\" short form implies that `becomes` is the same as `name`.\nexport type ArgumentMapping =\n  | string\n  | {\n      // the name of the argument you accept\n      name: string;\n      // the name its consumed as in your template\n      becomes: string;\n    };\n\n// A component snippet is a string containing valid HBS that is a single\n// component invocation. We use it to refer to components in a way that doesn't\n// require any new syntax or rules, and that's necessarily supported by whatever\n// build-time template resolver is in use.\n//\n// Examples of valid ComponentSnippets:\n//\n//    \"{{my-component}}\"\n//    \"{{my-component/foo}}\"\n//    \"<MyComponent />\"\n//    \"{{component 'my-component'}}\"\n//\ntype ComponentSnippet = string;\n\nexport interface PreprocessedComponentRule {\n  yieldsSafeComponents: Required<ComponentRules>['yieldsSafeComponents'];\n  yieldsArguments: Required<ComponentRules>['yieldsArguments'];\n  argumentsAreComponents: string[];\n  safeToIgnore: boolean;\n  safeInteriorPaths: string[];\n  disambiguate: Record<string, 'component' | 'helper' | 'data'>;\n  invokes: Required<ComponentRules>['invokes'];\n}\n\n// take a component rule from the authoring format to a format more optimized\n// for consumption in the resolver\nexport function preprocessComponentRule(componentRules: ComponentRules): PreprocessedComponentRule {\n  let argumentsAreComponents = [];\n  let safeInteriorPaths = [];\n  if (componentRules.acceptsComponentArguments) {\n    for (let entry of componentRules.acceptsComponentArguments) {\n      let name, interior;\n      if (typeof entry === 'string') {\n        name = interior = entry;\n      } else {\n        name = entry.name;\n        interior = entry.becomes;\n      }\n      if (name.startsWith('@')) {\n        name = name.slice(1);\n      }\n      argumentsAreComponents.push(name);\n      safeInteriorPaths.push(interior);\n      safeInteriorPaths.push('this.' + interior);\n      safeInteriorPaths.push('@' + name);\n    }\n  }\n  if (componentRules.invokes) {\n    for (let [path] of Object.entries(componentRules.invokes)) {\n      safeInteriorPaths.push(path);\n    }\n  }\n  return {\n    safeInteriorPaths,\n    safeToIgnore: Boolean(componentRules.safeToIgnore),\n    argumentsAreComponents,\n    yieldsSafeComponents: componentRules.yieldsSafeComponents || [],\n    yieldsArguments: componentRules.yieldsArguments || [],\n    disambiguate: componentRules?.disambiguate ?? {},\n    invokes: componentRules?.invokes ?? {},\n  };\n}\n\nexport function activePackageRules(\n  packageRules: PackageRules[],\n  activePackages: { name: string; root: string; version: string }[]\n): ActivePackageRules[] {\n  // rule order implies precedence. The first rule that matches a given package\n  // applies to that package, and no other rule does.\n  let rootsPerRule = new Map();\n  for (let pkg of activePackages) {\n    for (let rule of packageRules) {\n      if (rule.package === pkg.name && (!rule.semverRange || satisfies(pkg.version, rule.semverRange))) {\n        let roots = getOrCreate(rootsPerRule, rule, () => []);\n        roots.push(pkg.root);\n        break;\n      }\n    }\n  }\n  let output = [];\n  for (let [rule, roots] of rootsPerRule) {\n    output.push(Object.assign({ roots }, rule));\n  }\n  return output;\n}\n\nexport function appTreeRulesDir(root: string, resolver: Resolver) {\n  let pkg = resolver.packageCache.ownerOfFile(root);\n  if (pkg) {\n    if (pkg.isV2Addon()) {\n      // in general v2 addons can keep their app tree stuff in other places than\n      // \"_app_\" and we would need to check their package.json to see. But this code\n      // is only for applying packageRules to auto-upgraded v1 addons and apps, and\n      // those we always organize predictably.\n      return pathResolve(root, '_app_');\n    } else {\n      // this is an app\n      let matched = resolveExports(pkg.packageJSON, './index.js');\n      if (matched) {\n        return dirname(pathResolve(root, matched[0]));\n      }\n    }\n  }\n  return root;\n}\n"]}

package/dist/src/index.d.ts

@@ -3,5 +3,5 @@ export { default as Addons } from './compat-addons';
 export { default as Options, recommendedOptions } from './options';
 export { default as V1Addon } from './v1-addon';
 export { prebuild, compatBuild, PipelineOptions } from './default-pipeline';
-export { PackageRules, ModuleRules } from './dependency-rules';
+export { PackageRules } from './dependency-rules';
 export type { Options as ResolverTransformOptions } from './resolver-transform';

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAArC,kHAAA,OAAO,OAAO;AACvB,iDAAoD;AAA3C,wHAAA,OAAO,OAAU;AAC1B,qCAAmE;AAAtC,6GAAA,kBAAkB,OAAA;AAC/C,uCAAgD;AAAvC,oHAAA,OAAO,OAAW;AAC3B,uDAA4E;AAAnE,4GAAA,QAAQ,OAAA;AAAE,+GAAA,WAAW,OAAA","sourcesContent":["export { default as App } from './compat-app';\nexport { default as Addons } from './compat-addons';\nexport { default as Options, recommendedOptions } from './options';\nexport { default as V1Addon } from './v1-addon';\nexport { prebuild, compatBuild, PipelineOptions } from './default-pipeline';\nexport { PackageRules, ModuleRules } from './dependency-rules';\nexport type { Options as ResolverTransformOptions } from './resolver-transform';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAArC,kHAAA,OAAO,OAAO;AACvB,iDAAoD;AAA3C,wHAAA,OAAO,OAAU;AAC1B,qCAAmE;AAAtC,6GAAA,kBAAkB,OAAA;AAC/C,uCAAgD;AAAvC,oHAAA,OAAO,OAAW;AAC3B,uDAA4E;AAAnE,4GAAA,QAAQ,OAAA;AAAE,+GAAA,WAAW,OAAA","sourcesContent":["export { default as App } from './compat-app';\nexport { default as Addons } from './compat-addons';\nexport { default as Options, recommendedOptions } from './options';\nexport { default as V1Addon } from './v1-addon';\nexport { prebuild, compatBuild, PipelineOptions } from './default-pipeline';\nexport { PackageRules } from './dependency-rules';\nexport type { Options as ResolverTransformOptions } from './resolver-transform';\n"]}

package/dist/src/merges.d.ts

@@ -1,2 +1,2 @@
-export declare function mergeWithAppend(dest: object, ...srcs: object[]): any;
-export declare function mergeWithUniq(dest: object, ...srcs: object[]): any;
+export declare function mergeWithAppend(dest: object, srcs: object[]): object;
+export declare function mergeWithUniq(dest: object, srcs: object[]): object;

package/dist/src/merges.js

@@ -7,11 +7,17 @@ exports.mergeWithAppend = mergeWithAppend;
 exports.mergeWithUniq = mergeWithUniq;
 const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
-function mergeWithAppend(dest, ...srcs) {
-    return (0, mergeWith_1.default)(dest, ...srcs, appendArrays);
+function mergeWithAppend(dest, srcs) {
+    for (const src of srcs) {
+        (0, mergeWith_1.default)(dest, src, appendArrays);
+    }
+    return dest;
 }
-function mergeWithUniq(dest, ...srcs) {
-    return (0, mergeWith_1.default)(dest, ...srcs, appendArraysUniq);
+function mergeWithUniq(dest, srcs) {
+    for (const src of srcs) {
+        (0, mergeWith_1.default)(dest, src, appendArraysUniq);
+    }
+    return dest;
 }
 function appendArrays(objValue, srcValue) {
     if (Array.isArray(objValue)) {

package/dist/src/merges.js.map

@@ -1 +1 @@
-{"version":3,"file":"merges.js","sourceRoot":"","sources":["../../src/merges.ts"],"names":[],"mappings":";;;;;AAGA,0CAEC;AAED,sCAEC;AATD,iEAAyC;AACzC,uDAA+B;AAE/B,SAAgB,eAAe,CAAC,IAAY,EAAE,GAAG,IAAc;IAC7D,OAAO,IAAA,mBAAS,EAAC,IAAI,EAAE,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC;AAChD,CAAC;AAED,SAAgB,aAAa,CAAC,IAAY,EAAE,GAAG,IAAc;IAC3D,OAAO,IAAA,mBAAS,EAAC,IAAI,EAAE,GAAG,IAAI,EAAE,gBAAgB,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,YAAY,CAAC,QAAa,EAAE,QAAa;IAChD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAa,EAAE,QAAa;IACpD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAA,cAAI,EAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzC,CAAC;AACH,CAAC","sourcesContent":["import mergeWith from 'lodash/mergeWith';\nimport uniq from 'lodash/uniq';\n\nexport function mergeWithAppend(dest: object, ...srcs: object[]) {\n  return mergeWith(dest, ...srcs, appendArrays);\n}\n\nexport function mergeWithUniq(dest: object, ...srcs: object[]) {\n  return mergeWith(dest, ...srcs, appendArraysUniq);\n}\n\nfunction appendArrays(objValue: any, srcValue: any) {\n  if (Array.isArray(objValue)) {\n    return objValue.concat(srcValue);\n  }\n}\n\nfunction appendArraysUniq(objValue: any, srcValue: any) {\n  if (Array.isArray(objValue)) {\n    return uniq(objValue.concat(srcValue));\n  }\n}\n"]}
+{"version":3,"file":"merges.js","sourceRoot":"","sources":["../../src/merges.ts"],"names":[],"mappings":";;;;;AAGA,0CAKC;AAED,sCAKC;AAfD,iEAAyC;AACzC,uDAA+B;AAE/B,SAAgB,eAAe,CAAC,IAAY,EAAE,IAAc;IAC1D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAA,mBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,aAAa,CAAC,IAAY,EAAE,IAAc;IACxD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAA,mBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,QAAa,EAAE,QAAa;IAChD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAa,EAAE,QAAa;IACpD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAA,cAAI,EAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzC,CAAC;AACH,CAAC","sourcesContent":["import mergeWith from 'lodash/mergeWith';\nimport uniq from 'lodash/uniq';\n\nexport function mergeWithAppend(dest: object, srcs: object[]) {\n  for (const src of srcs) {\n    mergeWith(dest, src, appendArrays);\n  }\n  return dest;\n}\n\nexport function mergeWithUniq(dest: object, srcs: object[]) {\n  for (const src of srcs) {\n    mergeWith(dest, src, appendArraysUniq);\n  }\n  return dest;\n}\n\nfunction appendArrays(objValue: any, srcValue: any) {\n  if (Array.isArray(objValue)) {\n    return objValue.concat(srcValue);\n  }\n}\n\nfunction appendArraysUniq(objValue: any, srcValue: any) {\n  if (Array.isArray(objValue)) {\n    return uniq(objValue.concat(srcValue));\n  }\n}\n"]}

package/dist/src/module-visitor.js

@@ -241,7 +241,7 @@ class ModuleVisitor {
         let parsedResult = {
             ...result,
             type: 'parsed',
-            resolutions: (0, fromPairs_1.default)([...module.resolved].map(([source, target]) => [
+            resolutions: (0, fromPairs_1.default)(Array.from(module.resolved).map(([source, target]) => [
                 source,
                 isResolutionFailure(target) ? null : (0, core_1.explicitRelative)(this.base, target),
             ])),