@embroider/compat 1.9.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "1.9.0",
+  "version": "2.0.1",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -20,7 +20,6 @@
     "embroider-compat-audit": "./src/audit-cli.js"
   },
   "scripts": {
-    "prepare": "tsc",
     "test": "jest"
   },
   "dependencies": {
@@ -29,11 +28,11 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.9.0",
-    "@embroider/shared-internals": "1.8.3",
+    "@embroider/macros": "1.10.0",
     "@types/babel__code-frame": "^7.0.2",
     "@types/yargs": "^17.0.3",
     "assert-never": "^1.1.0",
+    "babel-plugin-ember-template-compilation": "^2.0.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
     "bind-decorator": "^1.0.11",
@@ -64,7 +63,7 @@
   "devDependencies": {
     "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0",
-    "@glimmer/syntax": "0.80.0",
+    "@glimmer/syntax": "^0.84.2",
     "@types/babel__core": "^7.1.14",
     "@types/babel__generator": "^7.6.2",
     "@types/babel__template": "^7.4.0",
@@ -77,15 +76,15 @@
     "@types/node": "^15.12.2",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
-    "@types/strip-bom": "^4.0.1",
-    "broccoli-stew": "^3.0.0",
+    "code-equality-assertions": "^0.7.0",
     "ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-engines": "^0.8.19",
+    "scenario-tester": "^2.0.1",
     "typescript": "*"
   },
   "peerDependencies": {
-    "@embroider/core": "^1.8.3"
+    "@embroider/core": "^2.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/compat-adapters/ember-cli-fastboot.d.ts

@@ -1,6 +1,6 @@
 import V1Addon from '../v1-addon';
 import { Node } from 'broccoli-node-api';
-import { AddonMeta } from '@embroider/shared-internals';
+import { AddonMeta } from '@embroider/core';
 export default class EmberCliFastboot extends V1Addon {
     customizes(...trees: string[]): boolean;
     get v2Trees(): Node[];

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

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

package/src/compat-app.js

@@ -25,9 +25,7 @@ const resolve_1 = require("resolve");
 const node_1 = require("@embroider/macros/src/node");
 const bind_decorator_1 = __importDefault(require("bind-decorator"));
 const fs_extra_1 = require("fs-extra");
-const shared_internals_1 = require("@embroider/shared-internals");
-const load_ember_template_compiler_1 = require("@embroider/core/src/load-ember-template-compiler");
-const semver_1 = __importDefault(require("semver"));
+const core_2 = require("@embroider/core");
 // This runs at broccoli-pipeline-construction time, whereas our actual
 // CompatAppAdapter instance only becomes available during tree-building
 // time.
@@ -248,15 +246,16 @@ class CompatAppAdapter {
             ...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),
         ]);
     }
-    templateResolver() {
+    resolverTransform() {
         return new resolver_1.default({
+            emberVersion: this.activeAddonChildren().find(a => a.name === 'ember-source').packageJSON.version,
             root: this.root,
             modulePrefix: this.modulePrefix(),
             podModulePrefix: this.podModulePrefix(),
             options: this.options,
             activePackageRules: this.activeRules(),
             adjustImportsOptionsPath: this.adjustImportsOptionsPath(),
-        });
+        }).astTransformer();
     }
     adjustImportsOptionsPath() {
         let file = (0, path_1.join)(this.root, '_adjust_imports.json');
@@ -274,10 +273,6 @@ class CompatAppAdapter {
         for (let addon of this.allActiveAddons) {
             activeAddons[addon.name] = addon.root;
         }
-        let emberSource = this.activeAddonChildren().find(a => a.name === 'ember-source');
-        let emberNeedsModulesPolyfill = semver_1.default.satisfies(emberSource.version, '<3.27.0-beta.0', {
-            includePrerelease: true,
-        });
         return {
             activeAddons,
             renameModules,
@@ -291,8 +286,7 @@ class CompatAppAdapter {
             // it's important that this is a persistent location, because we fill it
             // up as a side-effect of babel transpilation, and babel is subject to
             // persistent caching.
-            externalsDir: (0, path_1.join)(shared_internals_1.tmpdir, 'embroider', 'externals'),
-            emberNeedsModulesPolyfill,
+            externalsDir: (0, path_1.join)(core_2.tmpdir, 'embroider', 'externals'),
             appRoot: this.root,
         };
     }
@@ -300,24 +294,14 @@ class CompatAppAdapter {
     // along so it's capable of parsing component snippets in people's module
     // rules.
     internalTemplateResolver() {
-        let resolver = new resolver_1.default({
+        return new resolver_1.default({
+            emberVersion: this.activeAddonChildren().find(a => a.name === 'ember-source').packageJSON.version,
             root: this.root,
             modulePrefix: this.modulePrefix(),
             options: this.options,
             activePackageRules: this.activeRules(),
             adjustImportsOptions: this.makeAdjustImportOptions(false),
         });
-        const compilerPath = (0, resolve_1.sync)(this.templateCompilerPath(), { basedir: this.root });
-        const { cacheKey: compilerChecksum } = (0, load_ember_template_compiler_1.getEmberExports)(compilerPath);
-        // It's ok that this isn't a fully configured template compiler. We're only
-        // using it to parse component snippets out of rules.
-        resolver.astTransformer(new core_1.NodeTemplateCompiler({
-            compilerPath,
-            compilerChecksum,
-            EmberENV: {},
-            plugins: {},
-        }));
-        return resolver;
     }
     extraImports() {
         let output = [];
@@ -375,7 +359,7 @@ __decorate([
 ], CompatAppAdapter.prototype, "activeRules", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
-], CompatAppAdapter.prototype, "templateResolver", null);
+], CompatAppAdapter.prototype, "resolverTransform", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppAdapter.prototype, "adjustImportsOptionsPath", null);

package/src/compat-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat-app.js","sourceRoot":"","sources":["compat-app.ts"],"names":[],"mappings":"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","sourcesContent":["import { Node as BroccoliNode } from 'broccoli-node-api';\nimport mergeTrees from 'broccoli-merge-trees';\nimport {\n  Stage,\n  PackageCache,\n  OutputPaths,\n  BuildStage,\n  Asset,\n  EmberAsset,\n  AppAdapter,\n  AppBuilder,\n  EmberENV,\n  Package,\n  TemplateCompilerPlugins,\n  Resolver,\n  NodeTemplateCompiler,\n  AddonPackage,\n} from '@embroider/core';\nimport V1InstanceCache from './v1-instance-cache';\nimport V1App from './v1-app';\nimport walkSync from 'walk-sync';\nimport { join } from 'path';\nimport { JSDOM } from 'jsdom';\nimport { V1Config } from './v1-config';\nimport { statSync, readdirSync, writeFileSync } from 'fs';\nimport Options, { optionsWithDefaults } from './options';\nimport CompatResolver from './resolver';\nimport { activePackageRules, PackageRules, expandModuleRules } from './dependency-rules';\nimport flatMap from 'lodash/flatMap';\nimport { Memoize } from 'typescript-memoize';\nimport flatten from 'lodash/flatten';\nimport { sync as resolveSync } from 'resolve';\nimport { MacrosConfig } from '@embroider/macros/src/node';\nimport bind from 'bind-decorator';\nimport { pathExistsSync } from 'fs-extra';\nimport { tmpdir } from '@embroider/shared-internals';\nimport { Options as AdjustImportsOptions } from '@embroider/core/src/babel-plugin-adjust-imports';\nimport { getEmberExports } from '@embroider/core/src/load-ember-template-compiler';\n\nimport semver from 'semver';\n\ninterface TreeNames {\n  appJS: BroccoliNode;\n  htmlTree: BroccoliNode;\n  publicTree: BroccoliNode | undefined;\n  configTree: BroccoliNode;\n}\n\n// This runs at broccoli-pipeline-construction time, whereas our actual\n// CompatAppAdapter instance only becomes available during tree-building\n// time.\nfunction setup(legacyEmberAppInstance: object, options: Required<Options>) {\n  let oldPackage = V1InstanceCache.forApp(legacyEmberAppInstance, options).app;\n\n  let { appJS } = oldPackage.processAppJS();\n  let htmlTree = oldPackage.htmlTree;\n  let publicTree = oldPackage.publicTree;\n  let configTree = oldPackage.config;\n  let appBootTree = oldPackage.appBoot;\n\n  if (options.extraPublicTrees.length > 0) {\n    publicTree = mergeTrees([publicTree, ...options.extraPublicTrees].filter(Boolean) as BroccoliNode[]);\n  }\n\n  let inTrees = {\n    appJS,\n    htmlTree,\n    publicTree,\n    configTree,\n    appBootTree,\n  };\n\n  let instantiate = async (root: string, appSrcDir: string, packageCache: PackageCache) => {\n    let appPackage = packageCache.get(appSrcDir);\n    let adapter = new CompatAppAdapter(\n      root,\n      appPackage,\n      options,\n      oldPackage,\n      configTree,\n      packageCache.get(join(root, 'node_modules', '@embroider', 'synthesized-vendor')),\n      packageCache.get(join(root, 'node_modules', '@embroider', 'synthesized-styles'))\n    );\n\n    return new AppBuilder<TreeNames>(\n      root,\n      appPackage,\n      adapter,\n      options,\n      MacrosConfig.for(legacyEmberAppInstance, appSrcDir)\n    );\n  };\n\n  return { inTrees, instantiate };\n}\n\nclass CompatAppAdapter implements AppAdapter<TreeNames> {\n  constructor(\n    private root: string,\n    private appPackage: Package,\n    private options: Required<Options>,\n    private oldPackage: V1App,\n    private configTree: V1Config,\n    private synthVendor: Package,\n    private synthStyles: Package\n  ) {}\n\n  appJSSrcDir(treePaths: OutputPaths<TreeNames>) {\n    return treePaths.appJS;\n  }\n\n  @Memoize()\n  fastbootJSSrcDir(_treePaths: OutputPaths<TreeNames>) {\n    let target = join(this.oldPackage.root, 'fastboot');\n    if (pathExistsSync(target)) {\n      return target;\n    }\n  }\n\n  get env() {\n    return this.oldPackage.env;\n  }\n\n  assets(treePaths: OutputPaths<TreeNames>): Asset[] {\n    let assets: Asset[] = [];\n\n    // Everything in our traditional public tree is an on-disk asset\n    if (treePaths.publicTree) {\n      walkSync\n        .entries(treePaths.publicTree, {\n          directories: false,\n        })\n        .forEach(entry => {\n          assets.push({\n            kind: 'on-disk',\n            relativePath: entry.relativePath,\n            sourcePath: entry.fullPath,\n            mtime: entry.mtime as unknown as number, // https://github.com/joliss/node-walk-sync/pull/38\n            size: entry.size,\n          });\n        });\n    }\n\n    // ember-cli traditionally outputs a dummy testem.js file to prevent\n    // spurious errors when running tests under \"ember s\".\n    if (this.oldPackage.shouldBuildTests) {\n      let testemAsset = this.findTestemAsset();\n      if (testemAsset) {\n        assets.push(testemAsset);\n      }\n    }\n\n    for (let asset of this.emberEntrypoints(treePaths.htmlTree)) {\n      assets.push(asset);\n    }\n\n    return assets;\n  }\n\n  @Memoize()\n  findTestemAsset(): Asset | undefined {\n    let sourcePath;\n    try {\n      sourcePath = resolveSync('ember-cli/lib/broccoli/testem.js', { basedir: this.root });\n    } catch (err) {}\n    if (sourcePath) {\n      let stat = statSync(sourcePath);\n      return {\n        kind: 'on-disk',\n        relativePath: 'testem.js',\n        sourcePath,\n        mtime: stat.mtime.getTime(),\n        size: stat.size,\n      };\n    }\n  }\n\n  developingAddons(): string[] {\n    if (this.oldPackage.owningAddon) {\n      return [this.oldPackage.owningAddon.root];\n    }\n    return [];\n  }\n\n  @Memoize()\n  activeAddonChildren(pkg: Package = this.appPackage): AddonPackage[] {\n    let result = (pkg.dependencies.filter(this.isActiveAddon) as AddonPackage[]).filter(\n      // When looking for child addons, we want to ignore 'peerDependencies' of\n      // a given package, to align with how ember-cli resolves addons. So here\n      // we only include dependencies that definitely appear in one of the other\n      // sections.\n      addon => pkg.packageJSON.dependencies?.[addon.name] || pkg.packageJSON.devDependencies?.[addon.name]\n    );\n    if (pkg === this.appPackage) {\n      let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon) as AddonPackage[];\n      result = [...result, ...extras];\n    }\n    return result.sort(this.orderAddons);\n  }\n\n  @Memoize()\n  get allActiveAddons(): AddonPackage[] {\n    let result = this.appPackage.findDescendants(this.isActiveAddon) as AddonPackage[];\n    let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon) as AddonPackage[];\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(this.isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n    return result.sort(this.orderAddons);\n  }\n\n  @bind\n  private isActiveAddon(pkg: Package): boolean {\n    // todo: filter by addon-provided hook\n    return pkg.isEmberPackage();\n  }\n\n  @bind\n  private orderAddons(depA: Package, depB: Package): number {\n    let depAIdx = 0;\n    let depBIdx = 0;\n\n    if (depA && depA.meta && depA.isV2Addon()) {\n      depAIdx = depA.meta['order-index'] || 0;\n    }\n    if (depB && depB.meta && depB.isV2Addon()) {\n      depBIdx = depB.meta['order-index'] || 0;\n    }\n\n    return depAIdx - depBIdx;\n  }\n\n  @Memoize()\n  private resolvableExtensions(): string[] {\n    // webpack's default is ['.wasm', '.mjs', '.js', '.json']. Keeping that\n    // subset in that order is sensible, since many third-party libraries will\n    // expect it to work that way.\n    //\n    // For TS, we defer to ember-cli-babel, and the setting for\n    // \"enableTypescriptTransform\" can be set with and without\n    // ember-cli-typescript\n    return ['.wasm', '.mjs', '.js', '.json', '.hbs', '.ts'];\n  }\n\n  private *emberEntrypoints(htmlTreePath: string): IterableIterator<Asset> {\n    let classicEntrypoints = [\n      { entrypoint: 'index.html', includeTests: false },\n      { entrypoint: 'tests/index.html', includeTests: true },\n    ];\n    if (!this.oldPackage.shouldBuildTests) {\n      classicEntrypoints.pop();\n    }\n    for (let { entrypoint, includeTests } of classicEntrypoints) {\n      let sourcePath = join(htmlTreePath, entrypoint);\n      let stats = statSync(sourcePath);\n      let asset: EmberAsset = {\n        kind: 'ember',\n        relativePath: entrypoint,\n        includeTests,\n        sourcePath,\n        mtime: stats.mtime.getTime(),\n        size: stats.size,\n        rootURL: this.rootURL(),\n        prepare: (dom: JSDOM) => {\n          let scripts = [...dom.window.document.querySelectorAll('script')];\n          let styles = [...dom.window.document.querySelectorAll('link[rel=\"stylesheet\"]')] as HTMLLinkElement[];\n\n          return {\n            javascript: definitelyReplace(dom, this.oldPackage.findAppScript(scripts, entrypoint)),\n            styles: definitelyReplace(dom, this.oldPackage.findAppStyles(styles, entrypoint)),\n            implicitScripts: definitelyReplace(dom, this.oldPackage.findVendorScript(scripts, entrypoint)),\n            implicitStyles: definitelyReplace(dom, this.oldPackage.findVendorStyles(styles, entrypoint)),\n            testJavascript: maybeReplace(dom, this.oldPackage.findTestScript(scripts)),\n            implicitTestScripts: maybeReplace(dom, this.oldPackage.findTestSupportScript(scripts)),\n            implicitTestStyles: maybeReplace(dom, this.oldPackage.findTestSupportStyles(styles)),\n          };\n        },\n      };\n      yield asset;\n    }\n  }\n\n  autoRun(): boolean {\n    return this.oldPackage.autoRun;\n  }\n\n  appBoot(): string | undefined {\n    return this.oldPackage.appBoot.readAppBoot();\n  }\n\n  mainModule(): string {\n    return 'app';\n  }\n\n  mainModuleConfig(): unknown {\n    return this.configTree.readConfig().APP;\n  }\n\n  emberENV(): EmberENV {\n    return this.configTree.readConfig().EmberENV;\n  }\n\n  modulePrefix(): string {\n    return this.configTree.readConfig().modulePrefix;\n  }\n\n  podModulePrefix(): string | undefined {\n    return this.configTree.readConfig().podModulePrefix;\n  }\n\n  rootURL(): string {\n    return this.configTree.readConfig().rootURL;\n  }\n\n  templateCompilerPath(): string {\n    return 'ember-source/vendor/ember/ember-template-compiler';\n  }\n\n  strictV2Format() {\n    return false;\n  }\n\n  @Memoize()\n  private activeRules() {\n    return activePackageRules(this.options.packageRules.concat(defaultAddonPackageRules()), [\n      this.appPackage,\n      ...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),\n    ]);\n  }\n\n  @Memoize()\n  templateResolver(): Resolver {\n    return new CompatResolver({\n      root: this.root,\n      modulePrefix: this.modulePrefix(),\n      podModulePrefix: this.podModulePrefix(),\n      options: this.options,\n      activePackageRules: this.activeRules(),\n      adjustImportsOptionsPath: this.adjustImportsOptionsPath(),\n    });\n  }\n\n  @Memoize()\n  adjustImportsOptionsPath(): string {\n    let file = join(this.root, '_adjust_imports.json');\n    writeFileSync(file, JSON.stringify(this.adjustImportsOptions()));\n    return file;\n  }\n\n  @Memoize()\n  adjustImportsOptions(): AdjustImportsOptions {\n    return this.makeAdjustImportOptions(true);\n  }\n\n  // this gets serialized out by babel plugin and ast plugin\n  private makeAdjustImportOptions(outer: boolean): AdjustImportsOptions {\n    let renamePackages = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-packages']));\n    let renameModules = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-modules']));\n\n    let activeAddons: AdjustImportsOptions['activeAddons'] = {};\n    for (let addon of this.allActiveAddons) {\n      activeAddons[addon.name] = addon.root;\n    }\n\n    let emberSource = this.activeAddonChildren().find(a => a.name === 'ember-source')!;\n    let emberNeedsModulesPolyfill = semver.satisfies(emberSource.version, '<3.27.0-beta.0', {\n      includePrerelease: true,\n    });\n\n    return {\n      activeAddons,\n      renameModules,\n      renamePackages,\n      // \"outer\" here prevents uncontrolled recursion. We can't know our\n      // extraImports until after we have the internalTemplateResolver which in\n      // turn needs some adjustImportsOptions\n      extraImports: outer ? this.extraImports() : [],\n      relocatedFiles: {}, // this is the only part we can't completely fill out here. It needs to wait for the AppBuilder to finish smooshing together all appTrees\n      resolvableExtensions: this.resolvableExtensions(),\n\n      // it's important that this is a persistent location, because we fill it\n      // up as a side-effect of babel transpilation, and babel is subject to\n      // persistent caching.\n      externalsDir: join(tmpdir, 'embroider', 'externals'),\n      emberNeedsModulesPolyfill,\n      appRoot: this.root,\n    };\n  }\n\n  // unlike `templateResolver`, this one brings its own simple TemplateCompiler\n  // along so it's capable of parsing component snippets in people's module\n  // rules.\n  @Memoize()\n  private internalTemplateResolver(): CompatResolver {\n    let resolver = new CompatResolver({\n      root: this.root,\n      modulePrefix: this.modulePrefix(),\n      options: this.options,\n      activePackageRules: this.activeRules(),\n      adjustImportsOptions: this.makeAdjustImportOptions(false),\n    });\n\n    const compilerPath = resolveSync(this.templateCompilerPath(), { basedir: this.root });\n    const { cacheKey: compilerChecksum } = getEmberExports(compilerPath);\n    // It's ok that this isn't a fully configured template compiler. We're only\n    // using it to parse component snippets out of rules.\n    resolver.astTransformer(\n      new NodeTemplateCompiler({\n        compilerPath,\n        compilerChecksum,\n\n        EmberENV: {},\n        plugins: {},\n      })\n    );\n    return resolver;\n  }\n\n  private extraImports() {\n    let output: { absPath: string; target: string; runtimeName?: string }[][] = [];\n\n    for (let rule of this.activeRules()) {\n      if (rule.addonModules) {\n        for (let [filename, moduleRules] of Object.entries(rule.addonModules)) {\n          for (let root of rule.roots) {\n            let absPath = join(root, filename);\n            output.push(expandModuleRules(absPath, moduleRules, this.internalTemplateResolver()));\n          }\n        }\n      }\n      if (rule.appModules) {\n        for (let [filename, moduleRules] of Object.entries(rule.appModules)) {\n          let absPath = join(this.root, filename);\n          output.push(expandModuleRules(absPath, moduleRules, this.internalTemplateResolver()));\n        }\n      }\n    }\n    return flatten(output);\n  }\n\n  htmlbarsPlugins(): TemplateCompilerPlugins {\n    return this.oldPackage.htmlbarsPlugins;\n  }\n\n  babelMajorVersion() {\n    return this.oldPackage.babelMajorVersion();\n  }\n\n  babelConfig() {\n    return this.oldPackage.babelConfig();\n  }\n}\n\nexport default class CompatApp extends BuildStage<TreeNames> {\n  constructor(legacyEmberAppInstance: object, addons: Stage, options?: Options) {\n    let { inTrees, instantiate } = setup(legacyEmberAppInstance, optionsWithDefaults(options));\n    super(addons, inTrees, '@embroider/compat/app', instantiate);\n  }\n}\n\nfunction maybeReplace(dom: JSDOM, element: Element | undefined): Node | undefined {\n  if (element) {\n    return definitelyReplace(dom, element);\n  }\n}\n\nfunction definitelyReplace(dom: JSDOM, element: Element): Node {\n  let placeholder = dom.window.document.createTextNode('');\n  element.replaceWith(placeholder);\n  return placeholder;\n}\n\nfunction defaultAddonPackageRules(): PackageRules[] {\n  return readdirSync(join(__dirname, 'addon-dependency-rules'))\n    .map(filename => {\n      if (filename.endsWith('.js')) {\n        // eslint-disable-next-line @typescript-eslint/no-require-imports\n        return require(join(__dirname, 'addon-dependency-rules', filename)).default;\n      }\n    })\n    .filter(Boolean)\n    .reduce((a, b) => a.concat(b), []);\n}\n"]}
+{"version":3,"file":"compat-app.js","sourceRoot":"","sources":["compat-app.ts"],"names":[],"mappings":"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","sourcesContent":["import { Node as BroccoliNode } from 'broccoli-node-api';\nimport mergeTrees from 'broccoli-merge-trees';\nimport {\n  Stage,\n  PackageCache,\n  OutputPaths,\n  BuildStage,\n  Asset,\n  EmberAsset,\n  AppAdapter,\n  AppBuilder,\n  EmberENV,\n  Package,\n  AddonPackage,\n} from '@embroider/core';\nimport V1InstanceCache from './v1-instance-cache';\nimport V1App from './v1-app';\nimport walkSync from 'walk-sync';\nimport { join } from 'path';\nimport { JSDOM } from 'jsdom';\nimport { V1Config } from './v1-config';\nimport { statSync, readdirSync, writeFileSync } from 'fs';\nimport Options, { optionsWithDefaults } from './options';\nimport CompatResolver from './resolver';\nimport { activePackageRules, PackageRules, expandModuleRules } from './dependency-rules';\nimport flatMap from 'lodash/flatMap';\nimport { Memoize } from 'typescript-memoize';\nimport flatten from 'lodash/flatten';\nimport { sync as resolveSync } from 'resolve';\nimport { MacrosConfig } from '@embroider/macros/src/node';\nimport bind from 'bind-decorator';\nimport { pathExistsSync } from 'fs-extra';\nimport { tmpdir } from '@embroider/core';\nimport { Options as AdjustImportsOptions } from '@embroider/core/src/babel-plugin-adjust-imports';\nimport type { Transform } from 'babel-plugin-ember-template-compilation';\n\ninterface TreeNames {\n  appJS: BroccoliNode;\n  htmlTree: BroccoliNode;\n  publicTree: BroccoliNode | undefined;\n  configTree: BroccoliNode;\n}\n\n// This runs at broccoli-pipeline-construction time, whereas our actual\n// CompatAppAdapter instance only becomes available during tree-building\n// time.\nfunction setup(legacyEmberAppInstance: object, options: Required<Options>) {\n  let oldPackage = V1InstanceCache.forApp(legacyEmberAppInstance, options).app;\n\n  let { appJS } = oldPackage.processAppJS();\n  let htmlTree = oldPackage.htmlTree;\n  let publicTree = oldPackage.publicTree;\n  let configTree = oldPackage.config;\n  let appBootTree = oldPackage.appBoot;\n\n  if (options.extraPublicTrees.length > 0) {\n    publicTree = mergeTrees([publicTree, ...options.extraPublicTrees].filter(Boolean) as BroccoliNode[]);\n  }\n\n  let inTrees = {\n    appJS,\n    htmlTree,\n    publicTree,\n    configTree,\n    appBootTree,\n  };\n\n  let instantiate = async (root: string, appSrcDir: string, packageCache: PackageCache) => {\n    let appPackage = packageCache.get(appSrcDir);\n    let adapter = new CompatAppAdapter(\n      root,\n      appPackage,\n      options,\n      oldPackage,\n      configTree,\n      packageCache.get(join(root, 'node_modules', '@embroider', 'synthesized-vendor')),\n      packageCache.get(join(root, 'node_modules', '@embroider', 'synthesized-styles'))\n    );\n\n    return new AppBuilder<TreeNames>(\n      root,\n      appPackage,\n      adapter,\n      options,\n      MacrosConfig.for(legacyEmberAppInstance, appSrcDir)\n    );\n  };\n\n  return { inTrees, instantiate };\n}\n\nclass CompatAppAdapter implements AppAdapter<TreeNames> {\n  constructor(\n    private root: string,\n    private appPackage: Package,\n    private options: Required<Options>,\n    private oldPackage: V1App,\n    private configTree: V1Config,\n    private synthVendor: Package,\n    private synthStyles: Package\n  ) {}\n\n  appJSSrcDir(treePaths: OutputPaths<TreeNames>) {\n    return treePaths.appJS;\n  }\n\n  @Memoize()\n  fastbootJSSrcDir(_treePaths: OutputPaths<TreeNames>) {\n    let target = join(this.oldPackage.root, 'fastboot');\n    if (pathExistsSync(target)) {\n      return target;\n    }\n  }\n\n  get env() {\n    return this.oldPackage.env;\n  }\n\n  assets(treePaths: OutputPaths<TreeNames>): Asset[] {\n    let assets: Asset[] = [];\n\n    // Everything in our traditional public tree is an on-disk asset\n    if (treePaths.publicTree) {\n      walkSync\n        .entries(treePaths.publicTree, {\n          directories: false,\n        })\n        .forEach(entry => {\n          assets.push({\n            kind: 'on-disk',\n            relativePath: entry.relativePath,\n            sourcePath: entry.fullPath,\n            mtime: entry.mtime as unknown as number, // https://github.com/joliss/node-walk-sync/pull/38\n            size: entry.size,\n          });\n        });\n    }\n\n    // ember-cli traditionally outputs a dummy testem.js file to prevent\n    // spurious errors when running tests under \"ember s\".\n    if (this.oldPackage.shouldBuildTests) {\n      let testemAsset = this.findTestemAsset();\n      if (testemAsset) {\n        assets.push(testemAsset);\n      }\n    }\n\n    for (let asset of this.emberEntrypoints(treePaths.htmlTree)) {\n      assets.push(asset);\n    }\n\n    return assets;\n  }\n\n  @Memoize()\n  findTestemAsset(): Asset | undefined {\n    let sourcePath;\n    try {\n      sourcePath = resolveSync('ember-cli/lib/broccoli/testem.js', { basedir: this.root });\n    } catch (err) {}\n    if (sourcePath) {\n      let stat = statSync(sourcePath);\n      return {\n        kind: 'on-disk',\n        relativePath: 'testem.js',\n        sourcePath,\n        mtime: stat.mtime.getTime(),\n        size: stat.size,\n      };\n    }\n  }\n\n  developingAddons(): string[] {\n    if (this.oldPackage.owningAddon) {\n      return [this.oldPackage.owningAddon.root];\n    }\n    return [];\n  }\n\n  @Memoize()\n  activeAddonChildren(pkg: Package = this.appPackage): AddonPackage[] {\n    let result = (pkg.dependencies.filter(this.isActiveAddon) as AddonPackage[]).filter(\n      // When looking for child addons, we want to ignore 'peerDependencies' of\n      // a given package, to align with how ember-cli resolves addons. So here\n      // we only include dependencies that definitely appear in one of the other\n      // sections.\n      addon => pkg.packageJSON.dependencies?.[addon.name] || pkg.packageJSON.devDependencies?.[addon.name]\n    );\n    if (pkg === this.appPackage) {\n      let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon) as AddonPackage[];\n      result = [...result, ...extras];\n    }\n    return result.sort(this.orderAddons);\n  }\n\n  @Memoize()\n  get allActiveAddons(): AddonPackage[] {\n    let result = this.appPackage.findDescendants(this.isActiveAddon) as AddonPackage[];\n    let extras = [this.synthVendor, this.synthStyles].filter(this.isActiveAddon) as AddonPackage[];\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(this.isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n    return result.sort(this.orderAddons);\n  }\n\n  @bind\n  private isActiveAddon(pkg: Package): boolean {\n    // todo: filter by addon-provided hook\n    return pkg.isEmberPackage();\n  }\n\n  @bind\n  private orderAddons(depA: Package, depB: Package): number {\n    let depAIdx = 0;\n    let depBIdx = 0;\n\n    if (depA && depA.meta && depA.isV2Addon()) {\n      depAIdx = depA.meta['order-index'] || 0;\n    }\n    if (depB && depB.meta && depB.isV2Addon()) {\n      depBIdx = depB.meta['order-index'] || 0;\n    }\n\n    return depAIdx - depBIdx;\n  }\n\n  @Memoize()\n  private resolvableExtensions(): string[] {\n    // webpack's default is ['.wasm', '.mjs', '.js', '.json']. Keeping that\n    // subset in that order is sensible, since many third-party libraries will\n    // expect it to work that way.\n    //\n    // For TS, we defer to ember-cli-babel, and the setting for\n    // \"enableTypescriptTransform\" can be set with and without\n    // ember-cli-typescript\n    return ['.wasm', '.mjs', '.js', '.json', '.hbs', '.ts'];\n  }\n\n  private *emberEntrypoints(htmlTreePath: string): IterableIterator<Asset> {\n    let classicEntrypoints = [\n      { entrypoint: 'index.html', includeTests: false },\n      { entrypoint: 'tests/index.html', includeTests: true },\n    ];\n    if (!this.oldPackage.shouldBuildTests) {\n      classicEntrypoints.pop();\n    }\n    for (let { entrypoint, includeTests } of classicEntrypoints) {\n      let sourcePath = join(htmlTreePath, entrypoint);\n      let stats = statSync(sourcePath);\n      let asset: EmberAsset = {\n        kind: 'ember',\n        relativePath: entrypoint,\n        includeTests,\n        sourcePath,\n        mtime: stats.mtime.getTime(),\n        size: stats.size,\n        rootURL: this.rootURL(),\n        prepare: (dom: JSDOM) => {\n          let scripts = [...dom.window.document.querySelectorAll('script')];\n          let styles = [...dom.window.document.querySelectorAll('link[rel=\"stylesheet\"]')] as HTMLLinkElement[];\n\n          return {\n            javascript: definitelyReplace(dom, this.oldPackage.findAppScript(scripts, entrypoint)),\n            styles: definitelyReplace(dom, this.oldPackage.findAppStyles(styles, entrypoint)),\n            implicitScripts: definitelyReplace(dom, this.oldPackage.findVendorScript(scripts, entrypoint)),\n            implicitStyles: definitelyReplace(dom, this.oldPackage.findVendorStyles(styles, entrypoint)),\n            testJavascript: maybeReplace(dom, this.oldPackage.findTestScript(scripts)),\n            implicitTestScripts: maybeReplace(dom, this.oldPackage.findTestSupportScript(scripts)),\n            implicitTestStyles: maybeReplace(dom, this.oldPackage.findTestSupportStyles(styles)),\n          };\n        },\n      };\n      yield asset;\n    }\n  }\n\n  autoRun(): boolean {\n    return this.oldPackage.autoRun;\n  }\n\n  appBoot(): string | undefined {\n    return this.oldPackage.appBoot.readAppBoot();\n  }\n\n  mainModule(): string {\n    return 'app';\n  }\n\n  mainModuleConfig(): unknown {\n    return this.configTree.readConfig().APP;\n  }\n\n  emberENV(): EmberENV {\n    return this.configTree.readConfig().EmberENV;\n  }\n\n  modulePrefix(): string {\n    return this.configTree.readConfig().modulePrefix;\n  }\n\n  podModulePrefix(): string | undefined {\n    return this.configTree.readConfig().podModulePrefix;\n  }\n\n  rootURL(): string {\n    return this.configTree.readConfig().rootURL;\n  }\n\n  templateCompilerPath(): string {\n    return 'ember-source/vendor/ember/ember-template-compiler';\n  }\n\n  strictV2Format() {\n    return false;\n  }\n\n  @Memoize()\n  private activeRules() {\n    return activePackageRules(this.options.packageRules.concat(defaultAddonPackageRules()), [\n      this.appPackage,\n      ...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),\n    ]);\n  }\n\n  @Memoize()\n  resolverTransform(): Transform | undefined {\n    return new CompatResolver({\n      emberVersion: this.activeAddonChildren().find(a => a.name === 'ember-source')!.packageJSON.version,\n      root: this.root,\n      modulePrefix: this.modulePrefix(),\n      podModulePrefix: this.podModulePrefix(),\n      options: this.options,\n      activePackageRules: this.activeRules(),\n      adjustImportsOptionsPath: this.adjustImportsOptionsPath(),\n    }).astTransformer();\n  }\n\n  @Memoize()\n  adjustImportsOptionsPath(): string {\n    let file = join(this.root, '_adjust_imports.json');\n    writeFileSync(file, JSON.stringify(this.adjustImportsOptions()));\n    return file;\n  }\n\n  @Memoize()\n  adjustImportsOptions(): AdjustImportsOptions {\n    return this.makeAdjustImportOptions(true);\n  }\n\n  // this gets serialized out by babel plugin and ast plugin\n  private makeAdjustImportOptions(outer: boolean): AdjustImportsOptions {\n    let renamePackages = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-packages']));\n    let renameModules = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-modules']));\n\n    let activeAddons: AdjustImportsOptions['activeAddons'] = {};\n    for (let addon of this.allActiveAddons) {\n      activeAddons[addon.name] = addon.root;\n    }\n\n    return {\n      activeAddons,\n      renameModules,\n      renamePackages,\n      // \"outer\" here prevents uncontrolled recursion. We can't know our\n      // extraImports until after we have the internalTemplateResolver which in\n      // turn needs some adjustImportsOptions\n      extraImports: outer ? this.extraImports() : [],\n      relocatedFiles: {}, // this is the only part we can't completely fill out here. It needs to wait for the AppBuilder to finish smooshing together all appTrees\n      resolvableExtensions: this.resolvableExtensions(),\n\n      // it's important that this is a persistent location, because we fill it\n      // up as a side-effect of babel transpilation, and babel is subject to\n      // persistent caching.\n      externalsDir: join(tmpdir, 'embroider', 'externals'),\n      appRoot: this.root,\n    };\n  }\n\n  // unlike `templateResolver`, this one brings its own simple TemplateCompiler\n  // along so it's capable of parsing component snippets in people's module\n  // rules.\n  @Memoize()\n  private internalTemplateResolver(): CompatResolver {\n    return new CompatResolver({\n      emberVersion: this.activeAddonChildren().find(a => a.name === 'ember-source')!.packageJSON.version,\n      root: this.root,\n      modulePrefix: this.modulePrefix(),\n      options: this.options,\n      activePackageRules: this.activeRules(),\n      adjustImportsOptions: this.makeAdjustImportOptions(false),\n    });\n  }\n\n  private extraImports() {\n    let output: { absPath: string; target: string; runtimeName?: string }[][] = [];\n\n    for (let rule of this.activeRules()) {\n      if (rule.addonModules) {\n        for (let [filename, moduleRules] of Object.entries(rule.addonModules)) {\n          for (let root of rule.roots) {\n            let absPath = join(root, filename);\n            output.push(expandModuleRules(absPath, moduleRules, this.internalTemplateResolver()));\n          }\n        }\n      }\n      if (rule.appModules) {\n        for (let [filename, moduleRules] of Object.entries(rule.appModules)) {\n          let absPath = join(this.root, filename);\n          output.push(expandModuleRules(absPath, moduleRules, this.internalTemplateResolver()));\n        }\n      }\n    }\n    return flatten(output);\n  }\n\n  htmlbarsPlugins(): Transform[] {\n    return this.oldPackage.htmlbarsPlugins;\n  }\n\n  babelMajorVersion() {\n    return this.oldPackage.babelMajorVersion();\n  }\n\n  babelConfig() {\n    return this.oldPackage.babelConfig();\n  }\n}\n\nexport default class CompatApp extends BuildStage<TreeNames> {\n  constructor(legacyEmberAppInstance: object, addons: Stage, options?: Options) {\n    let { inTrees, instantiate } = setup(legacyEmberAppInstance, optionsWithDefaults(options));\n    super(addons, inTrees, '@embroider/compat/app', instantiate);\n  }\n}\n\nfunction maybeReplace(dom: JSDOM, element: Element | undefined): Node | undefined {\n  if (element) {\n    return definitelyReplace(dom, element);\n  }\n}\n\nfunction definitelyReplace(dom: JSDOM, element: Element): Node {\n  let placeholder = dom.window.document.createTextNode('');\n  element.replaceWith(placeholder);\n  return placeholder;\n}\n\nfunction defaultAddonPackageRules(): PackageRules[] {\n  return readdirSync(join(__dirname, 'addon-dependency-rules'))\n    .map(filename => {\n      if (filename.endsWith('.js')) {\n        // eslint-disable-next-line @typescript-eslint/no-require-imports\n        return require(join(__dirname, 'addon-dependency-rules', filename)).default;\n      }\n    })\n    .filter(Boolean)\n    .reduce((a, b) => a.concat(b), []);\n}\n"]}

package/src/dasherize-component-name.d.ts

@@ -1 +1,2 @@
 export declare function dasherize(key: string): string;
+export declare function snippetToDasherizedName(snippet: string): string | undefined;

package/src/dasherize-component-name.js

@@ -1,7 +1,7 @@
 "use strict";
 // copied from https://github.com/emberjs/ember.js/blob/978cf6773d6eea3e656d0da797980305061186cf/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dasherize = void 0;
+exports.snippetToDasherizedName = exports.dasherize = void 0;
 const SIMPLE_DASHERIZE_REGEXP = /[A-Z]|::/g;
 const ALPHA = /[A-Za-z0-9]/;
 function dasherize(key) {
@@ -17,4 +17,13 @@ function dasherize(key) {
     return name;
 }
 exports.dasherize = dasherize;
+const NAME_FROM_SNIPPET = /<(?:([^\s/]+).*>)|(?:{{\s?component\s+['"]([^'"]+)['"])|(?:\{\{([^\s]+).*\}\})/;
+function snippetToDasherizedName(snippet) {
+    var _a, _b;
+    let result = NAME_FROM_SNIPPET.exec(snippet);
+    if (result) {
+        return dasherize((_b = (_a = result[1]) !== null && _a !== void 0 ? _a : result[2]) !== null && _b !== void 0 ? _b : result[3]);
+    }
+}
+exports.snippetToDasherizedName = snippetToDasherizedName;
 //# sourceMappingURL=dasherize-component-name.js.map

package/src/dasherize-component-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"dasherize-component-name.js","sourceRoot":"","sources":["dasherize-component-name.ts"],"names":[],"mappings":";AAAA,wKAAwK;;;AAExK,MAAM,uBAAuB,GAAG,WAAW,CAAC;AAC5C,MAAM,KAAK,GAAG,aAAa,CAAC;AAE5B,SAAgB,SAAS,CAAC,GAAW;IACnC,IAAI,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC9D,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAO,GAAG,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;SAC3B;QAED,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,8BAcC","sourcesContent":["// copied from https://github.com/emberjs/ember.js/blob/978cf6773d6eea3e656d0da797980305061186cf/packages/ember-template-compiler/lib/system/dasherize-component-name.ts\n\nconst SIMPLE_DASHERIZE_REGEXP = /[A-Z]|::/g;\nconst ALPHA = /[A-Za-z0-9]/;\n\nexport function dasherize(key: string) {\n  let name = key.replace(SIMPLE_DASHERIZE_REGEXP, (char, index) => {\n    if (char === '::') {\n      return '/';\n    }\n\n    if (index === 0 || !ALPHA.test(key[index - 1])) {\n      return char.toLowerCase();\n    }\n\n    return `-${char.toLowerCase()}`;\n  });\n\n  return name;\n}\n"]}
+{"version":3,"file":"dasherize-component-name.js","sourceRoot":"","sources":["dasherize-component-name.ts"],"names":[],"mappings":";AAAA,wKAAwK;;;AAExK,MAAM,uBAAuB,GAAG,WAAW,CAAC;AAC5C,MAAM,KAAK,GAAG,aAAa,CAAC;AAE5B,SAAgB,SAAS,CAAC,GAAW;IACnC,IAAI,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC9D,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,OAAO,GAAG,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;SAC3B;QAED,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAdD,8BAcC;AAED,MAAM,iBAAiB,GAAG,gFAAgF,CAAC;AAC3G,SAAgB,uBAAuB,CAAC,OAAe;;IACrD,IAAI,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,MAAM,EAAE;QACV,OAAO,SAAS,CAAC,MAAA,MAAA,MAAM,CAAC,CAAC,CAAC,mCAAI,MAAM,CAAC,CAAC,CAAC,mCAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KACvD;AACH,CAAC;AALD,0DAKC","sourcesContent":["// copied from https://github.com/emberjs/ember.js/blob/978cf6773d6eea3e656d0da797980305061186cf/packages/ember-template-compiler/lib/system/dasherize-component-name.ts\n\nconst SIMPLE_DASHERIZE_REGEXP = /[A-Z]|::/g;\nconst ALPHA = /[A-Za-z0-9]/;\n\nexport function dasherize(key: string) {\n  let name = key.replace(SIMPLE_DASHERIZE_REGEXP, (char, index) => {\n    if (char === '::') {\n      return '/';\n    }\n\n    if (index === 0 || !ALPHA.test(key[index - 1])) {\n      return char.toLowerCase();\n    }\n\n    return `-${char.toLowerCase()}`;\n  });\n\n  return name;\n}\n\nconst NAME_FROM_SNIPPET = /<(?:([^\\s/]+).*>)|(?:{{\\s?component\\s+['\"]([^'\"]+)['\"])|(?:\\{\\{([^\\s]+).*\\}\\})/;\nexport function snippetToDasherizedName(snippet: string): string | undefined {\n  let result = NAME_FROM_SNIPPET.exec(snippet);\n  if (result) {\n    return dasherize(result[1] ?? result[2] ?? result[3]);\n  }\n}\n"]}

package/src/default-pipeline.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stableWorkspaceDir = void 0;
 const _1 = require(".");
 const core_1 = require("@embroider/core");
-const shared_internals_1 = require("@embroider/shared-internals");
+const core_2 = require("@embroider/core");
 const broccoli_file_creator_1 = __importDefault(require("broccoli-file-creator"));
 const broccoli_merge_trees_1 = __importDefault(require("broccoli-merge-trees"));
 const crypto_1 = require("crypto");
@@ -15,7 +15,7 @@ const pkg_up_1 = require("pkg-up");
 function stableWorkspaceDir(appRoot) {
     let hash = (0, crypto_1.createHash)('md5');
     hash.update((0, path_1.dirname)((0, pkg_up_1.sync)({ cwd: appRoot })));
-    return (0, path_1.join)(shared_internals_1.tmpdir, 'embroider', hash.digest('hex').slice(0, 6));
+    return (0, path_1.join)(core_2.tmpdir, 'embroider', hash.digest('hex').slice(0, 6));
 }
 exports.stableWorkspaceDir = stableWorkspaceDir;
 function defaultPipeline(emberApp, packager, options = {}) {

package/src/default-pipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-pipeline.js","sourceRoot":"","sources":["default-pipeline.ts"],"names":[],"mappings":"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","sourcesContent":["import { App, Addons as CompatAddons, Options, PrebuiltAddons } from '.';\nimport { toBroccoliPlugin, PackagerConstructor, Variant, EmberAppInstance } from '@embroider/core';\nimport { tmpdir } from '@embroider/shared-internals';\nimport { Node } from 'broccoli-node-api';\nimport writeFile from 'broccoli-file-creator';\nimport mergeTrees from 'broccoli-merge-trees';\nimport { createHash } from 'crypto';\nimport { join, dirname } from 'path';\nimport { sync as pkgUpSync } from 'pkg-up';\n\nexport interface PipelineOptions<PackagerOptions> extends Options {\n  packagerOptions?: PackagerOptions;\n  onOutputPath?: (outputPath: string) => void;\n  variants?: Variant[];\n}\n\nexport function stableWorkspaceDir(appRoot: string) {\n  let hash = createHash('md5');\n  hash.update(dirname(pkgUpSync({ cwd: appRoot })!));\n  return join(tmpdir, 'embroider', hash.digest('hex').slice(0, 6));\n}\n\nexport default function defaultPipeline<PackagerOptions>(\n  emberApp: EmberAppInstance,\n  packager?: PackagerConstructor<PackagerOptions>,\n  options: PipelineOptions<PackagerOptions> = {}\n): Node {\n  let outputPath: string;\n  let addons;\n\n  if (process.env.REUSE_WORKSPACE) {\n    addons = new PrebuiltAddons(emberApp, options, process.env.REUSE_WORKSPACE);\n  } else {\n    if (process.env.SAVE_WORKSPACE) {\n      options.workspaceDir = process.env.SAVE_WORKSPACE;\n    } else {\n      options.workspaceDir = stableWorkspaceDir(emberApp.project.root);\n    }\n\n    emberApp.project.ui.write(`Building into ${options.workspaceDir}\\n`);\n    addons = new CompatAddons(emberApp, options);\n    addons.ready().then(result => {\n      outputPath = result.outputPath;\n    });\n  }\n\n  if (process.env.STAGE1_ONLY) {\n    return mergeTrees([addons.tree, writeFile('.stage1-output', () => outputPath)]);\n  }\n\n  let embroiderApp = new App(emberApp, addons, options);\n\n  if (process.env.STAGE2_ONLY || !packager) {\n    return mergeTrees([embroiderApp.tree, writeFile('.stage2-output', () => outputPath)]);\n  }\n\n  let BroccoliPackager = toBroccoliPlugin(packager);\n  let variants = (options && options.variants) || defaultVariants(emberApp);\n  return new BroccoliPackager(embroiderApp, variants, options && options.packagerOptions);\n}\n\nfunction hasFastboot(emberApp: EmberAppInstance | EmberAppInstance) {\n  return emberApp.project.addons.find(a => a.name === 'ember-cli-fastboot');\n}\n\nfunction defaultVariants(emberApp: EmberAppInstance): Variant[] {\n  let variants: Variant[] = [];\n  if (emberApp.env === 'production') {\n    variants.push({\n      name: 'browser',\n      runtime: 'browser',\n      optimizeForProduction: true,\n    });\n    if (hasFastboot(emberApp)) {\n      variants.push({\n        name: 'fastboot',\n        runtime: 'fastboot',\n        optimizeForProduction: true,\n      });\n    }\n  } else {\n    variants.push({\n      name: 'dev',\n      runtime: hasFastboot(emberApp) ? 'all' : 'browser',\n      optimizeForProduction: false,\n    });\n  }\n  return variants;\n}\n"]}
+{"version":3,"file":"default-pipeline.js","sourceRoot":"","sources":["default-pipeline.ts"],"names":[],"mappings":"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","sourcesContent":["import { App, Addons as CompatAddons, Options, PrebuiltAddons } from '.';\nimport { toBroccoliPlugin, PackagerConstructor, Variant, EmberAppInstance } from '@embroider/core';\nimport { tmpdir } from '@embroider/core';\nimport { Node } from 'broccoli-node-api';\nimport writeFile from 'broccoli-file-creator';\nimport mergeTrees from 'broccoli-merge-trees';\nimport { createHash } from 'crypto';\nimport { join, dirname } from 'path';\nimport { sync as pkgUpSync } from 'pkg-up';\n\nexport interface PipelineOptions<PackagerOptions> extends Options {\n  packagerOptions?: PackagerOptions;\n  onOutputPath?: (outputPath: string) => void;\n  variants?: Variant[];\n}\n\nexport function stableWorkspaceDir(appRoot: string) {\n  let hash = createHash('md5');\n  hash.update(dirname(pkgUpSync({ cwd: appRoot })!));\n  return join(tmpdir, 'embroider', hash.digest('hex').slice(0, 6));\n}\n\nexport default function defaultPipeline<PackagerOptions>(\n  emberApp: EmberAppInstance,\n  packager?: PackagerConstructor<PackagerOptions>,\n  options: PipelineOptions<PackagerOptions> = {}\n): Node {\n  let outputPath: string;\n  let addons;\n\n  if (process.env.REUSE_WORKSPACE) {\n    addons = new PrebuiltAddons(emberApp, options, process.env.REUSE_WORKSPACE);\n  } else {\n    if (process.env.SAVE_WORKSPACE) {\n      options.workspaceDir = process.env.SAVE_WORKSPACE;\n    } else {\n      options.workspaceDir = stableWorkspaceDir(emberApp.project.root);\n    }\n\n    emberApp.project.ui.write(`Building into ${options.workspaceDir}\\n`);\n    addons = new CompatAddons(emberApp, options);\n    addons.ready().then(result => {\n      outputPath = result.outputPath;\n    });\n  }\n\n  if (process.env.STAGE1_ONLY) {\n    return mergeTrees([addons.tree, writeFile('.stage1-output', () => outputPath)]);\n  }\n\n  let embroiderApp = new App(emberApp, addons, options);\n\n  if (process.env.STAGE2_ONLY || !packager) {\n    return mergeTrees([embroiderApp.tree, writeFile('.stage2-output', () => outputPath)]);\n  }\n\n  let BroccoliPackager = toBroccoliPlugin(packager);\n  let variants = (options && options.variants) || defaultVariants(emberApp);\n  return new BroccoliPackager(embroiderApp, variants, options && options.packagerOptions);\n}\n\nfunction hasFastboot(emberApp: EmberAppInstance | EmberAppInstance) {\n  return emberApp.project.addons.find(a => a.name === 'ember-cli-fastboot');\n}\n\nfunction defaultVariants(emberApp: EmberAppInstance): Variant[] {\n  let variants: Variant[] = [];\n  if (emberApp.env === 'production') {\n    variants.push({\n      name: 'browser',\n      runtime: 'browser',\n      optimizeForProduction: true,\n    });\n    if (hasFastboot(emberApp)) {\n      variants.push({\n        name: 'fastboot',\n        runtime: 'fastboot',\n        optimizeForProduction: true,\n      });\n    }\n  } else {\n    variants.push({\n      name: 'dev',\n      runtime: hasFastboot(emberApp) ? 'all' : 'browser',\n      optimizeForProduction: false,\n    });\n  }\n  return variants;\n}\n"]}

package/src/dependency-rules.js

@@ -82,7 +82,12 @@ function expandModuleRules(absPath, moduleRules, resolver) {
     if (moduleRules.dependsOnComponents) {
         for (let snippet of moduleRules.dependsOnComponents) {
             let found = resolver.resolveComponentSnippet(snippet, moduleRules);
-            for (let { absPath: target, runtimeName } of found.modules) {
+            if (found.jsModule) {
+                let { absPath: target, runtimeName } = found.jsModule;
+                output.push({ absPath, target: (0, core_1.explicitRelative)((0, path_1.dirname)(absPath), target), runtimeName });
+            }
+            if (found.hbsModule) {
+                let { absPath: target, runtimeName } = found.hbsModule;
                 output.push({ absPath, target: (0, core_1.explicitRelative)((0, path_1.dirname)(absPath), target), runtimeName });
             }
         }

package/src/dependency-rules.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-rules.js","sourceRoot":"","sources":["dependency-rules.ts"],"names":[],"mappings":"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","sourcesContent":["import { Package, explicitRelative, getOrCreate } from '@embroider/core';\nimport { satisfies } from 'semver';\nimport CompatResolver from './resolver';\nimport { dirname } from 'path';\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\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  dependsOnComponents: ComponentSnippet[];\n  argumentsAreComponents: string[];\n  safeInteriorPaths: string[];\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  let dependsOnComponents = [];\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    }\n  }\n  if (componentRules.invokes) {\n    for (let [path, snippets] of Object.entries(componentRules.invokes)) {\n      safeInteriorPaths.push(path);\n      for (let snippet of snippets) {\n        dependsOnComponents.push(snippet);\n      }\n    }\n  }\n  return {\n    argumentsAreComponents,\n    safeInteriorPaths,\n    dependsOnComponents,\n    yieldsSafeComponents: componentRules.yieldsSafeComponents || [],\n    yieldsArguments: componentRules.yieldsArguments || [],\n  };\n}\n\nexport function activePackageRules(packageRules: PackageRules[], activePackages: Package[]): 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 expandModuleRules(absPath: string, moduleRules: ModuleRules, resolver: CompatResolver) {\n  let output: { absPath: string; target: string; runtimeName: string }[] = [];\n  if (moduleRules.dependsOnModules) {\n    for (let path of moduleRules.dependsOnModules) {\n      let found = resolver.resolveImport(path, absPath);\n      if (!found) {\n        throw new Error(`can't locate ${path} referred to in module rules:${JSON.stringify(moduleRules, null, 2)}`);\n      }\n      output.push({\n        absPath,\n        target: explicitRelative(dirname(absPath), found.absPath),\n        runtimeName: found.runtimeName,\n      });\n    }\n  }\n  if (moduleRules.dependsOnComponents) {\n    for (let snippet of moduleRules.dependsOnComponents) {\n      let found = resolver.resolveComponentSnippet(snippet, moduleRules);\n      for (let { absPath: target, runtimeName } of found.modules) {\n        output.push({ absPath, target: explicitRelative(dirname(absPath), target), runtimeName });\n      }\n    }\n  }\n  return output;\n}\n"]}
+{"version":3,"file":"dependency-rules.js","sourceRoot":"","sources":["dependency-rules.ts"],"names":[],"mappings":"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","sourcesContent":["import { Package, explicitRelative, getOrCreate } from '@embroider/core';\nimport { satisfies } from 'semver';\nimport CompatResolver from './resolver';\nimport { dirname } from 'path';\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\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  dependsOnComponents: ComponentSnippet[];\n  argumentsAreComponents: string[];\n  safeInteriorPaths: string[];\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  let dependsOnComponents = [];\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    }\n  }\n  if (componentRules.invokes) {\n    for (let [path, snippets] of Object.entries(componentRules.invokes)) {\n      safeInteriorPaths.push(path);\n      for (let snippet of snippets) {\n        dependsOnComponents.push(snippet);\n      }\n    }\n  }\n  return {\n    argumentsAreComponents,\n    safeInteriorPaths,\n    dependsOnComponents,\n    yieldsSafeComponents: componentRules.yieldsSafeComponents || [],\n    yieldsArguments: componentRules.yieldsArguments || [],\n  };\n}\n\nexport function activePackageRules(packageRules: PackageRules[], activePackages: Package[]): 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 expandModuleRules(absPath: string, moduleRules: ModuleRules, resolver: CompatResolver) {\n  let output: { absPath: string; target: string; runtimeName: string }[] = [];\n  if (moduleRules.dependsOnModules) {\n    for (let path of moduleRules.dependsOnModules) {\n      let found = resolver.resolveImport(path, absPath);\n      if (!found) {\n        throw new Error(`can't locate ${path} referred to in module rules:${JSON.stringify(moduleRules, null, 2)}`);\n      }\n      output.push({\n        absPath,\n        target: explicitRelative(dirname(absPath), found.absPath),\n        runtimeName: found.runtimeName,\n      });\n    }\n  }\n  if (moduleRules.dependsOnComponents) {\n    for (let snippet of moduleRules.dependsOnComponents) {\n      let found = resolver.resolveComponentSnippet(snippet, moduleRules);\n      if (found.jsModule) {\n        let { absPath: target, runtimeName } = found.jsModule;\n        output.push({ absPath, target: explicitRelative(dirname(absPath), target), runtimeName });\n      }\n      if (found.hbsModule) {\n        let { absPath: target, runtimeName } = found.hbsModule;\n        output.push({ absPath, target: explicitRelative(dirname(absPath), target), runtimeName });\n      }\n    }\n  }\n  return output;\n}\n"]}

package/src/{template-compiler-broccoli-plugin.d.ts → hbs-to-js-broccoli-plugin.d.ts}

@@ -1,10 +1,8 @@
 import type { Node } from 'broccoli-node-api';
 import Filter from 'broccoli-persistent-filter';
-import type { TemplateCompiler } from '@embroider/core';
 export default class TemplateCompileTree extends Filter {
-    private templateCompiler;
-    constructor(inputTree: Node, templateCompiler: TemplateCompiler);
+    constructor(inputTree: Node);
+    getDestFilePath(relativePath: string, entry: Parameters<Filter['getDestFilePath']>[1]): string | null;
     processString(source: string, relativePath: string): string;
-    cacheKeyProcessString(source: string, relativePath: string): string;
     baseDir(): string;
 }

package/src/hbs-to-js-broccoli-plugin.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const broccoli_persistent_filter_1 = __importDefault(require("broccoli-persistent-filter"));
+const core_1 = require("@embroider/core");
+const path_1 = require("path");
+class TemplateCompileTree extends broccoli_persistent_filter_1.default {
+    constructor(inputTree) {
+        super(inputTree, {
+            name: `embroider-template-compile-stage1`,
+            persist: true,
+            extensions: ['hbs', 'handlebars'],
+        });
+    }
+    getDestFilePath(relativePath, entry) {
+        if (this.isDirectory(relativePath, entry)) {
+            return null;
+        }
+        for (let ext of ['hbs', 'handlebars']) {
+            if (relativePath.slice(-ext.length - 1) === '.' + ext) {
+                // we deliberately don't chop off the .hbs before appending .js, because if
+                // the user has both .js` and .hbs` side-by-side we don't want our new file
+                // to collide with theirs.
+                return relativePath + '.js';
+            }
+        }
+        return null;
+    }
+    processString(source, relativePath) {
+        return (0, core_1.hbsToJS)(source, { filename: relativePath });
+    }
+    baseDir() {
+        return (0, path_1.join)(__dirname, '..');
+    }
+}
+exports.default = TemplateCompileTree;
+//# sourceMappingURL=hbs-to-js-broccoli-plugin.js.map

package/src/hbs-to-js-broccoli-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hbs-to-js-broccoli-plugin.js","sourceRoot":"","sources":["hbs-to-js-broccoli-plugin.ts"],"names":[],"mappings":";;;;;AACA,4FAAgD;AAChD,0CAA0C;AAC1C,+BAA4B;AAE5B,MAAqB,mBAAoB,SAAQ,oCAAM;IACrD,YAAY,SAAe;QACzB,KAAK,CAAC,SAAS,EAAE;YACf,IAAI,EAAE,mCAAmC;YACzC,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,YAAoB,EAAE,KAA+C;QACnF,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACb;QACD,KAAK,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE;YACrC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,GAAG,EAAE;gBACrD,2EAA2E;gBAC3E,2EAA2E;gBAC3E,0BAA0B;gBAC1B,OAAO,YAAY,GAAG,KAAK,CAAC;aAC7B;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,YAAoB;QAChD,OAAO,IAAA,cAAO,EAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;IACrD,CAAC;IACD,OAAO;QACL,OAAO,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;CACF;AA9BD,sCA8BC","sourcesContent":["import type { Node } from 'broccoli-node-api';\nimport Filter from 'broccoli-persistent-filter';\nimport { hbsToJS } from '@embroider/core';\nimport { join } from 'path';\n\nexport default class TemplateCompileTree extends Filter {\n  constructor(inputTree: Node) {\n    super(inputTree, {\n      name: `embroider-template-compile-stage1`,\n      persist: true,\n      extensions: ['hbs', 'handlebars'],\n    });\n  }\n\n  getDestFilePath(relativePath: string, entry: Parameters<Filter['getDestFilePath']>[1]) {\n    if (this.isDirectory(relativePath, entry)) {\n      return null;\n    }\n    for (let ext of ['hbs', 'handlebars']) {\n      if (relativePath.slice(-ext.length - 1) === '.' + ext) {\n        // we deliberately don't chop off the .hbs before appending .js, because if\n        // the user has both .js` and .hbs` side-by-side we don't want our new file\n        // to collide with theirs.\n        return relativePath + '.js';\n      }\n    }\n    return null;\n  }\n\n  processString(source: string, relativePath: string) {\n    return hbsToJS(source, { filename: relativePath });\n  }\n  baseDir() {\n    return join(__dirname, '..');\n  }\n}\n"]}

package/src/moved-package-cache.js

@@ -5,14 +5,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MovedPackageCache = exports.MovablePackageCache = void 0;
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const typescript_memoize_1 = require("typescript-memoize");
 const core_1 = require("@embroider/core");
+const os_1 = __importDefault(require("os"));
 function assertNoTildeExpansion(source, target) {
-    if (target.includes('~')) {
+    if (target.includes('~') && os_1.default.platform() !== 'win32') {
         throw new Error(`The symbolic link: ${source}'s target: ${target} contained a bash expansion '~' which is not supported.`);
     }
 }