@embroider/compat 3.7.0 → 3.7.1-unstable.3e8dbe3

package/src/http-audit.d.ts

@@ -0,0 +1,13 @@
+import type { Finding } from './audit';
+import { type Module } from './module-visitor';
+export interface HTTPAuditOptions {
+    appURL: string;
+    startingFrom: string[];
+    fetch?: typeof fetch;
+}
+export declare function httpAudit(options: HTTPAuditOptions): Promise<{
+    modules: {
+        [file: string]: Module;
+    };
+    findings: Finding[];
+}>;

package/src/http-audit.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpAudit = httpAudit;
+const babel_visitor_1 = require("./audit/babel-visitor");
+const module_visitor_1 = require("./module-visitor");
+async function httpAudit(options) {
+    let findings = [];
+    async function resolveId(specifier, fromFile) {
+        return new URL(specifier, fromFile).href;
+    }
+    async function fetchWithRetry(id, options) {
+        var _a;
+        let remainingTries = 5;
+        let backoffMS = 666;
+        for (;;) {
+            try {
+                return await ((_a = options.fetch) !== null && _a !== void 0 ? _a : globalThis.fetch)(id);
+            }
+            catch (err) {
+                if (remainingTries-- > 0) {
+                    backoffMS *= 1.5;
+                    await new Promise(r => setTimeout(r, backoffMS));
+                }
+            }
+        }
+    }
+    async function load(id) {
+        let response = await fetchWithRetry(id, options);
+        let content = await response.text();
+        let type;
+        if (response.status !== 200) {
+            throw new Error(`oops status code ${response.status} - ${response.statusText} for ${id}: ${content}`);
+        }
+        switch (response.headers.get('content-type')) {
+            case 'text/javascript':
+                type = 'javascript';
+                break;
+            case 'text/html':
+                type = 'html';
+                break;
+            default:
+                throw new Error(`oops content type ${response.headers.get('content-type')} for ${id}`);
+        }
+        return { content, type };
+    }
+    let modules = await (0, module_visitor_1.visitModules)({
+        base: options.appURL,
+        entrypoints: options.startingFrom.map(s => new URL(s, options.appURL).href),
+        babelConfig: { ast: true },
+        frames: new babel_visitor_1.CodeFrameStorage(),
+        findings,
+        resolveId,
+        load,
+    });
+    return {
+        modules,
+        findings,
+    };
+}
+//# sourceMappingURL=http-audit.js.map

package/src/http-audit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-audit.js","sourceRoot":"","sources":["http-audit.ts"],"names":[],"mappings":";;AAUA,8BA2DC;AApED,yDAAyD;AACzD,qDAA+E;AAQxE,KAAK,UAAU,SAAS,CAC7B,OAAyB;IAEzB,IAAI,QAAQ,GAAc,EAAE,CAAC;IAE7B,KAAK,UAAU,SAAS,CAAC,SAAiB,EAAE,QAAgB;QAC1D,OAAO,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;IAED,KAAK,UAAU,cAAc,CAAC,EAAU,EAAE,OAAyB;;QACjE,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,IAAI,SAAS,GAAG,GAAG,CAAC;QAEpB,SAAS,CAAC;YACR,IAAI,CAAC;gBACH,OAAO,MAAM,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YACvD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,cAAc,EAAE,GAAG,CAAC,EAAE,CAAC;oBACzB,SAAS,IAAI,GAAG,CAAC;oBACjB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,UAAU,IAAI,CAAC,EAAU;QAC5B,IAAI,QAAQ,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,IAAiB,CAAC;QACtB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,UAAU,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC,CAAC;QACxG,CAAC;QACD,QAAQ,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC7C,KAAK,iBAAiB;gBACpB,IAAI,GAAG,YAAY,CAAC;gBACpB,MAAM;YACR,KAAK,WAAW;gBACd,IAAI,GAAG,MAAM,CAAC;gBACd,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,OAAO,GAAG,MAAM,IAAA,6BAAY,EAAC;QAC/B,IAAI,EAAE,OAAO,CAAC,MAAM;QACpB,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;QAC3E,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;QAC1B,MAAM,EAAE,IAAI,gCAAgB,EAAE;QAC9B,QAAQ;QACR,SAAS;QACT,IAAI;KACL,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,QAAQ;KACT,CAAC;AACJ,CAAC","sourcesContent":["import type { Finding } from './audit';\nimport { CodeFrameStorage } from './audit/babel-visitor';\nimport { type Module, visitModules, type ContentType } from './module-visitor';\n\nexport interface HTTPAuditOptions {\n  appURL: string;\n  startingFrom: string[];\n  fetch?: typeof fetch;\n}\n\nexport async function httpAudit(\n  options: HTTPAuditOptions\n): Promise<{ modules: { [file: string]: Module }; findings: Finding[] }> {\n  let findings: Finding[] = [];\n\n  async function resolveId(specifier: string, fromFile: string): Promise<string | undefined> {\n    return new URL(specifier, fromFile).href;\n  }\n\n  async function fetchWithRetry(id: string, options: HTTPAuditOptions) {\n    let remainingTries = 5;\n    let backoffMS = 666;\n\n    for (;;) {\n      try {\n        return await (options.fetch ?? globalThis.fetch)(id);\n      } catch (err) {\n        if (remainingTries-- > 0) {\n          backoffMS *= 1.5;\n          await new Promise(r => setTimeout(r, backoffMS));\n        }\n      }\n    }\n  }\n\n  async function load(id: string): Promise<{ content: string | Buffer; type: ContentType }> {\n    let response = await fetchWithRetry(id, options);\n    let content = await response.text();\n    let type: ContentType;\n    if (response.status !== 200) {\n      throw new Error(`oops status code ${response.status} - ${response.statusText} for ${id}: ${content}`);\n    }\n    switch (response.headers.get('content-type')) {\n      case 'text/javascript':\n        type = 'javascript';\n        break;\n      case 'text/html':\n        type = 'html';\n        break;\n      default:\n        throw new Error(`oops content type ${response.headers.get('content-type')} for ${id}`);\n    }\n    return { content, type };\n  }\n\n  let modules = await visitModules({\n    base: options.appURL,\n    entrypoints: options.startingFrom.map(s => new URL(s, options.appURL).href),\n    babelConfig: { ast: true },\n    frames: new CodeFrameStorage(),\n    findings,\n    resolveId,\n    load,\n  });\n\n  return {\n    modules,\n    findings,\n  };\n}\n"]}

package/src/index.d.ts

@@ -2,6 +2,5 @@ export { default as App } from './compat-app';
 export { default as Addons } from './compat-addons';
 export { default as Options, recommendedOptions } from './options';
 export { default as V1Addon } from './v1-addon';
-export { default as compatBuild, PipelineOptions } from './default-pipeline';
-export { default as templateTagCodemod } from './template-tag-codemod';
+export { default as compatBuild, prebuild, PipelineOptions } from './default-pipeline';
 export { PackageRules, ModuleRules } from './dependency-rules';

package/src/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.templateTagCodemod = exports.compatBuild = exports.V1Addon = exports.recommendedOptions = exports.Addons = exports.App = void 0;
+exports.prebuild = exports.compatBuild = exports.V1Addon = exports.recommendedOptions = exports.Addons = exports.App = void 0;
 var compat_app_1 = require("./compat-app");
 Object.defineProperty(exports, "App", { enumerable: true, get: function () { return __importDefault(compat_app_1).default; } });
 var compat_addons_1 = require("./compat-addons");
@@ -14,6 +14,5 @@ var v1_addon_1 = require("./v1-addon");
 Object.defineProperty(exports, "V1Addon", { enumerable: true, get: function () { return __importDefault(v1_addon_1).default; } });
 var default_pipeline_1 = require("./default-pipeline");
 Object.defineProperty(exports, "compatBuild", { enumerable: true, get: function () { return __importDefault(default_pipeline_1).default; } });
-var template_tag_codemod_1 = require("./template-tag-codemod");
-Object.defineProperty(exports, "templateTagCodemod", { enumerable: true, get: function () { return __importDefault(template_tag_codemod_1).default; } });
+Object.defineProperty(exports, "prebuild", { enumerable: true, get: function () { return default_pipeline_1.prebuild; } });
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["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,uDAA6E;AAApE,gIAAA,OAAO,OAAe;AAC/B,+DAAuE;AAA9D,2IAAA,OAAO,OAAsB","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 { default as compatBuild, PipelineOptions } from './default-pipeline';\nexport { default as templateTagCodemod } from './template-tag-codemod';\nexport { PackageRules, ModuleRules } from './dependency-rules';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["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,uDAAuF;AAA9E,gIAAA,OAAO,OAAe;AAAE,4GAAA,QAAQ,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 { default as compatBuild, prebuild, PipelineOptions } from './default-pipeline';\nexport { PackageRules, ModuleRules } from './dependency-rules';\n"]}

package/src/module-visitor.d.ts

@@ -0,0 +1,52 @@
+import { type CodeFrameStorage, type NamespaceMarker } from './audit/babel-visitor';
+import type { Finding } from './audit';
+import type { TransformOptions } from '@babel/core';
+export type Module = CompleteModule | ParsedModule | UnparseableModule;
+export interface UnparseableModule {
+    type: 'unparseable';
+    appRelativePath: string;
+    consumedFrom: (string | RootMarker)[];
+}
+export interface ParsedModule extends Omit<UnparseableModule, 'type'> {
+    type: 'parsed';
+    imports: Import[];
+    resolutions: {
+        [source: string]: string | null;
+    };
+    content: string;
+    isCJS: boolean;
+    isAMD: boolean;
+}
+export interface CompleteModule extends Omit<ParsedModule, 'type'> {
+    type: 'complete';
+    exports: string[];
+}
+export interface Import {
+    source: string;
+    specifiers: {
+        name: string | NamespaceMarker;
+        local: string | null;
+        codeFrameIndex: number | undefined;
+    }[];
+    codeFrameIndex: number | undefined;
+}
+interface VisitorParams {
+    base: string;
+    resolveId: (specifier: string, fromFile: string) => Promise<string | undefined>;
+    load: (id: string) => Promise<{
+        content: string | Buffer;
+        type: ContentType;
+    } | undefined>;
+    entrypoints: string[];
+    debug?: boolean;
+    findings: Finding[];
+    frames: CodeFrameStorage;
+    babelConfig: TransformOptions;
+}
+export declare function visitModules(params: VisitorParams): Promise<Record<string, Module>>;
+export type ContentType = 'javascript' | 'html';
+export interface RootMarker {
+    isRoot: true;
+}
+export declare function isRootMarker(value: string | RootMarker | undefined): value is RootMarker;
+export {};

package/src/module-visitor.js

@@ -0,0 +1,285 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.visitModules = visitModules;
+exports.isRootMarker = isRootMarker;
+const core_1 = require("@embroider/core");
+const babel_visitor_1 = require("./audit/babel-visitor");
+const fromPairs_1 = __importDefault(require("lodash/fromPairs"));
+const assert_never_1 = __importDefault(require("assert-never"));
+const jsdom_1 = require("jsdom");
+function isResolved(module) {
+    return Boolean((module === null || module === void 0 ? void 0 : module.parsed) && module.resolved);
+}
+function isLinked(module) {
+    return Boolean((module === null || module === void 0 ? void 0 : module.parsed) && module.resolved && module.linked);
+}
+async function visitModules(params) {
+    let visitor = new ModuleVisitor(params);
+    return await visitor.run();
+}
+class ModuleVisitor {
+    constructor(params) {
+        this.params = params;
+        this.modules = new Map();
+        this.moduleQueue = new Set();
+        this.base = params.base;
+        this.debugEnabled = Boolean(params.debug);
+        this.resolveId = params.resolveId;
+        this.load = params.load;
+        this.entrypoints = params.entrypoints;
+    }
+    async run() {
+        for (let entry of this.entrypoints) {
+            this.scheduleVisit(entry, { isRoot: true });
+        }
+        await this.drainQueue();
+        this.linkModules();
+        return this.buildResults();
+    }
+    async drainQueue() {
+        while (this.moduleQueue.size > 0) {
+            let id = this.moduleQueue.values().next().value;
+            this.moduleQueue.delete(id);
+            this.debug('visit', id);
+            let loaded = await this.load(id);
+            if (Array.isArray(loaded)) {
+                for (let finding of loaded) {
+                    this.params.findings.push(finding);
+                }
+                continue;
+            }
+            // if the load hook returned undefined we need to just skip it
+            if (loaded === undefined) {
+                continue;
+            }
+            let { content, type } = loaded;
+            let visitor = this.visitorFor(type);
+            // cast is safe because the only way to get into the queue is to go
+            // through scheduleVisit, and scheduleVisit creates the entry in
+            // this.modules.
+            let module = this.modules.get(id);
+            let visitResult = await visitor.call(this, id, content);
+            if (Array.isArray(visitResult)) {
+                // the visitor was unable to figure out the ParseFields and returned
+                // some number of Findings to us to explain why.
+                for (let finding of visitResult) {
+                    this.params.findings.push(finding);
+                }
+            }
+            else {
+                module.parsed = visitResult;
+                module.resolved = await this.resolveDeps(visitResult.dependencies, id);
+            }
+        }
+    }
+    linkModules() {
+        for (let module of this.modules.values()) {
+            if (isResolved(module)) {
+                this.linkModule(module);
+            }
+        }
+    }
+    linkModule(module) {
+        let exports = new Set();
+        for (let exp of module.parsed.exports) {
+            if (typeof exp === 'string') {
+                exports.add(exp);
+            }
+            else {
+                let moduleName = module.resolved.get(exp.all);
+                if (!isResolutionFailure(moduleName)) {
+                    let target = this.modules.get(moduleName);
+                    if (!isLinked(target) && isResolved(target)) {
+                        this.linkModule(target);
+                    }
+                    if (isLinked(target)) {
+                        for (let innerExp of target.linked.exports) {
+                            exports.add(innerExp);
+                        }
+                    }
+                    else {
+                        // our module doesn't successfully enter linked state because it
+                        // depends on stuff that also couldn't
+                        return;
+                    }
+                }
+            }
+        }
+        module.linked = {
+            exports,
+        };
+    }
+    async resolveDeps(deps, fromFile) {
+        let resolved = new Map();
+        for (let dep of deps) {
+            if (['@embroider/macros'].includes(dep)) {
+                // the audit process deliberately removes the @embroider/macros babel
+                // plugins, so the imports are still present and should be left alone.
+                continue;
+            }
+            let resolution = await this.resolveId(dep, fromFile);
+            if (resolution) {
+                resolved.set(dep, resolution);
+                this.scheduleVisit(resolution, fromFile);
+                continue;
+            }
+            else {
+                resolved.set(dep, { isResolutionFailure: true });
+                continue;
+            }
+        }
+        return resolved;
+    }
+    scheduleVisit(id, parent) {
+        let record = this.modules.get(id);
+        if (!record) {
+            this.debug(`discovered`, id);
+            record = {
+                consumedFrom: [parent],
+            };
+            this.modules.set(id, record);
+            this.moduleQueue.add(id);
+        }
+        else {
+            record.consumedFrom.push(parent);
+        }
+    }
+    visitorFor(type) {
+        switch (type) {
+            case 'html':
+                return this.visitHTML;
+            case 'javascript':
+                return this.visitJS;
+            default:
+                throw (0, assert_never_1.default)(type);
+        }
+    }
+    async visitHTML(_filename, content) {
+        let dom = new jsdom_1.JSDOM(content);
+        let scripts = dom.window.document.querySelectorAll('script[type="module"]');
+        let dependencies = [];
+        for (let script of scripts) {
+            let src = script.src;
+            if (!src) {
+                continue;
+            }
+            if (new URL(src, 'http://example.com:4321').origin !== 'http://example.com:4321') {
+                // src was absolute, we don't handle it
+                continue;
+            }
+            dependencies.push(src);
+        }
+        return {
+            imports: [],
+            exports: new Set(),
+            isCJS: false,
+            isAMD: false,
+            dependencies,
+            transpiledContent: content,
+        };
+    }
+    async visitJS(filename, content) {
+        let rawSource = content.toString('utf8');
+        try {
+            let result = (0, babel_visitor_1.auditJS)(rawSource, filename, this.params.babelConfig, this.params.frames);
+            for (let problem of result.problems) {
+                this.params.findings.push({
+                    filename,
+                    message: problem.message,
+                    detail: problem.detail,
+                    codeFrame: this.params.frames.render(problem.codeFrameIndex),
+                });
+            }
+            return {
+                exports: result.exports,
+                imports: result.imports,
+                isCJS: result.isCJS,
+                isAMD: result.isAMD,
+                dependencies: result.imports.map(i => i.source),
+                transpiledContent: result.transpiledContent,
+            };
+        }
+        catch (err) {
+            if (['BABEL_PARSE_ERROR', 'BABEL_TRANSFORM_ERROR'].includes(err.code)) {
+                return [
+                    {
+                        filename,
+                        message: `failed to parse`,
+                        detail: err.toString().replace(filename, (0, core_1.explicitRelative)(this.base, filename)),
+                    },
+                ];
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    debug(message, ...args) {
+        if (this.debugEnabled) {
+            console.log(message, ...args);
+        }
+    }
+    toPublicModule(filename, module) {
+        let result = {
+            type: 'unparseable',
+            appRelativePath: (0, core_1.explicitRelative)(this.base, filename),
+            consumedFrom: module.consumedFrom.map(entry => {
+                if (isRootMarker(entry)) {
+                    return entry;
+                }
+                else {
+                    return (0, core_1.explicitRelative)(this.base, entry);
+                }
+            }),
+        };
+        if (!module.parsed || !module.resolved) {
+            return result;
+        }
+        let parsedResult = {
+            ...result,
+            type: 'parsed',
+            resolutions: (0, fromPairs_1.default)([...module.resolved].map(([source, target]) => [
+                source,
+                isResolutionFailure(target) ? null : (0, core_1.explicitRelative)(this.base, target),
+            ])),
+            imports: module.parsed.imports.map(i => ({
+                source: i.source,
+                specifiers: i.specifiers.map(s => ({
+                    name: s.name,
+                    local: s.local,
+                    codeFrameIndex: s.codeFrameIndex,
+                })),
+                codeFrameIndex: i.codeFrameIndex,
+            })),
+            content: module.parsed.transpiledContent.toString(),
+            isAMD: Boolean(module.parsed.isAMD),
+            isCJS: Boolean(module.parsed.isCJS),
+        };
+        if (!module.linked) {
+            return parsedResult;
+        }
+        return {
+            ...parsedResult,
+            type: 'complete',
+            exports: [...module.linked.exports],
+        };
+    }
+    buildResults() {
+        let publicModules = {};
+        for (let [filename, module] of this.modules) {
+            let publicModule = this.toPublicModule(filename, module);
+            publicModules[(0, core_1.explicitRelative)(this.base, filename)] = publicModule;
+        }
+        return publicModules;
+    }
+}
+function isRootMarker(value) {
+    return Boolean(value && typeof value !== 'string' && value.isRoot);
+}
+function isResolutionFailure(result) {
+    return typeof result === 'object' && 'isResolutionFailure' in result;
+}
+//# sourceMappingURL=module-visitor.js.map

package/src/module-visitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-visitor.js","sourceRoot":"","sources":["module-visitor.ts"],"names":[],"mappings":";;;;;AAkGA,oCAGC;AAuSD,oCAEC;AA9YD,0CAAmD;AACnD,yDAM+B;AAC/B,iEAAyC;AACzC,gEAAuC;AACvC,iCAA8B;AAsD9B,SAAS,UAAU,CAAC,MAAkC;IACpD,OAAO,OAAO,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,MAAM,CAAC,QAAQ,CAAC,CAAC;AACpD,CAAC;AAMD,SAAS,QAAQ,CAAC,MAAkC;IAClD,OAAO,OAAO,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;AACrE,CAAC;AAwBM,KAAK,UAAU,YAAY,CAAC,MAAqB;IACtD,IAAI,OAAO,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;AAC7B,CAAC;AAID,MAAM,aAAa;IAUjB,YAAoB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;QATjC,YAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;QAEjD,gBAAW,GAAG,IAAI,GAAG,EAAU,CAAC;QAQtC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACjC,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAe,CAAC;YAC1D,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACxB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,KAAK,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;oBAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC;gBACD,SAAS;YACX,CAAC;YACD,8DAA8D;YAC9D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,SAAS;YACX,CAAC;YACD,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAE/B,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEpC,mEAAmE;YACnE,gEAAgE;YAChE,gBAAgB;YAChB,IAAI,MAAM,GAAmB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;YACnD,IAAI,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;YACxD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,oEAAoE;gBACpE,gDAAgD;gBAChD,KAAK,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;oBAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;gBAC5B,MAAM,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;IACH,CAAC;IAEO,WAAW;QACjB,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,MAA8B;QAC/C,IAAI,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAChC,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACtC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,IAAI,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;gBAC/C,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC;oBACrC,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;oBAC3C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC5C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;oBAC1B,CAAC;oBACD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBACrB,KAAK,IAAI,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;4BAC3C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBACxB,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,gEAAgE;wBAChE,sCAAsC;wBACtC,OAAO;oBACT,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,CAAC,MAAM,GAAG;YACd,OAAO;SACR,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,IAAc,EAAE,QAAgB;QACxD,IAAI,QAAQ,GAAG,IAAI,GAAG,EAA6C,CAAC;QACpE,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,qEAAqE;gBACrE,sEAAsE;gBACtE,SAAS;YACX,CAAC;YAED,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,UAAU,EAAE,CAAC;gBACf,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBAC9B,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACzC,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,mBAAmB,EAAE,IAAY,EAAE,CAAC,CAAC;gBACzD,SAAS;YACX,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,aAAa,CAAC,EAAU,EAAE,MAA2B;QAC3D,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC7B,MAAM,GAAG;gBACP,YAAY,EAAE,CAAC,MAAM,CAAC;aACvB,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,UAAU,CAChB,IAAiB;QAMjB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,SAAS,CAAC;YACxB,KAAK,YAAY;gBACf,OAAO,IAAI,CAAC,OAAO,CAAC;YACtB;gBACE,MAAM,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,SAAiB,EAAE,OAAwB;QACjE,IAAI,GAAG,GAAG,IAAI,aAAK,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,uBAAuB,CAAkC,CAAC;QAC7G,IAAI,YAAY,GAAG,EAAc,CAAC;QAClC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;YACrB,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,SAAS;YACX,CAAC;YACD,IAAI,IAAI,GAAG,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC,MAAM,KAAK,yBAAyB,EAAE,CAAC;gBACjF,uCAAuC;gBACvC,SAAS;YACX,CAAC;YACD,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QAED,OAAO;YACL,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;YACZ,YAAY;YACZ,iBAAiB,EAAE,OAAO;SAC3B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,QAAgB,EAChB,OAAwB;QAExB,IAAI,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,MAAM,GAAG,IAAA,uBAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEvF,KAAK,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACxB,QAAQ;oBACR,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;iBAC7D,CAAC,CAAC;YACL,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC/C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;aAC5C,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtE,OAAO;oBACL;wBACE,QAAQ;wBACR,OAAO,EAAE,iBAAiB;wBAC1B,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAA,uBAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBAChF;iBACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAe,EAAE,GAAG,IAAW;QAC3C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,QAAgB,EAAE,MAAsB;QAC7D,IAAI,MAAM,GAAsB;YAC9B,IAAI,EAAE,aAAa;YACnB,eAAe,EAAE,IAAA,uBAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;YACtD,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC5C,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAA,uBAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC,CAAC;SACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,YAAY,GAAiB;YAC/B,GAAG,MAAM;YACT,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,IAAA,mBAAS,EACpB,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;gBAC7C,MAAM;gBACN,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,uBAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC;aACzE,CAAC,CACH;YACD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACvC,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACjC,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,KAAK,EAAE,CAAC,CAAC,KAAK;oBACd,cAAc,EAAE,CAAC,CAAC,cAAc;iBACjC,CAAC,CAAC;gBACH,cAAc,EAAE,CAAC,CAAC,cAAc;aACjC,CAAC,CAAC;YACH,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;SACpC,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,OAAO;YACL,GAAG,YAAY;YACf,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;SACpC,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,aAAa,GAA2B,EAAE,CAAC;QAC/C,KAAK,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC5C,IAAI,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzD,aAAa,CAAC,IAAA,uBAAgB,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,YAAY,CAAC;QACtE,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAMD,SAAgB,YAAY,CAAC,KAAsC;IACjE,OAAO,OAAO,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;AACrE,CAAC;AAMD,SAAS,mBAAmB,CAAC,MAA8C;IACzE,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,qBAAqB,IAAI,MAAM,CAAC;AACvE,CAAC","sourcesContent":["import { explicitRelative } from '@embroider/core';\nimport {\n  type CodeFrameStorage,\n  auditJS,\n  type ExportAll,\n  type InternalImport,\n  type NamespaceMarker,\n} from './audit/babel-visitor';\nimport fromPairs from 'lodash/fromPairs';\nimport assertNever from 'assert-never';\nimport { JSDOM } from 'jsdom';\n\nimport type { Finding } from './audit';\nimport type { TransformOptions } from '@babel/core';\n\nexport type Module = CompleteModule | ParsedModule | UnparseableModule;\n\nexport interface UnparseableModule {\n  type: 'unparseable';\n  appRelativePath: string;\n  consumedFrom: (string | RootMarker)[];\n}\n\nexport interface ParsedModule extends Omit<UnparseableModule, 'type'> {\n  type: 'parsed';\n  imports: Import[];\n  resolutions: { [source: string]: string | null };\n  content: string;\n  isCJS: boolean;\n  isAMD: boolean;\n}\n\nexport interface CompleteModule extends Omit<ParsedModule, 'type'> {\n  type: 'complete';\n  exports: string[];\n}\n\ninterface InternalModule {\n  consumedFrom: (string | RootMarker)[];\n\n  parsed?: {\n    imports: InternalImport[];\n    exports: Set<string | ExportAll>;\n    isCJS: boolean;\n    isAMD: boolean;\n    dependencies: string[];\n    transpiledContent: string | Buffer;\n  };\n\n  resolved?: Map<string, string | ResolutionFailure>;\n\n  linked?: {\n    exports: Set<string>;\n  };\n}\n\ntype ParsedInternalModule = Omit<InternalModule, 'parsed'> & {\n  parsed: NonNullable<InternalModule['parsed']>;\n};\n\ntype ResolvedInternalModule = Omit<ParsedInternalModule, 'resolved'> & {\n  resolved: NonNullable<ParsedInternalModule['resolved']>;\n};\n\nfunction isResolved(module: InternalModule | undefined): module is ResolvedInternalModule {\n  return Boolean(module?.parsed && module.resolved);\n}\n\ntype LinkedInternalModule = Omit<ResolvedInternalModule, 'linked'> & {\n  linked: NonNullable<ResolvedInternalModule['linked']>;\n};\n\nfunction isLinked(module: InternalModule | undefined): module is LinkedInternalModule {\n  return Boolean(module?.parsed && module.resolved && module.linked);\n}\n\nexport interface Import {\n  source: string;\n  specifiers: {\n    name: string | NamespaceMarker;\n    local: string | null; // can be null when re-exporting, because in that case we import `name` from `source` but don't create any local binding for it\n    codeFrameIndex: number | undefined;\n  }[];\n  codeFrameIndex: number | undefined;\n}\n\ninterface VisitorParams {\n  base: string;\n  resolveId: (specifier: string, fromFile: string) => Promise<string | undefined>;\n  load: (id: string) => Promise<{ content: string | Buffer; type: ContentType } | undefined>;\n  entrypoints: string[];\n  debug?: boolean;\n\n  findings: Finding[];\n  frames: CodeFrameStorage;\n  babelConfig: TransformOptions;\n}\n\nexport async function visitModules(params: VisitorParams): Promise<Record<string, Module>> {\n  let visitor = new ModuleVisitor(params);\n  return await visitor.run();\n}\n\nexport type ContentType = 'javascript' | 'html';\n\nclass ModuleVisitor {\n  private modules: Map<string, InternalModule> = new Map();\n\n  private moduleQueue = new Set<string>();\n  private base: string;\n  private debugEnabled: boolean;\n  private resolveId: (specifier: string, fromFile: string) => Promise<string | undefined>;\n  private load: (id: string) => Promise<{ content: string | Buffer; type: ContentType } | undefined>;\n  private entrypoints: string[];\n\n  constructor(private params: VisitorParams) {\n    this.base = params.base;\n    this.debugEnabled = Boolean(params.debug);\n    this.resolveId = params.resolveId;\n    this.load = params.load;\n    this.entrypoints = params.entrypoints;\n  }\n\n  async run(): Promise<Record<string, Module>> {\n    for (let entry of this.entrypoints) {\n      this.scheduleVisit(entry, { isRoot: true });\n    }\n    await this.drainQueue();\n    this.linkModules();\n    return this.buildResults();\n  }\n\n  private async drainQueue() {\n    while (this.moduleQueue.size > 0) {\n      let id = this.moduleQueue.values().next().value as string;\n      this.moduleQueue.delete(id);\n      this.debug('visit', id);\n      let loaded = await this.load(id);\n      if (Array.isArray(loaded)) {\n        for (let finding of loaded) {\n          this.params.findings.push(finding);\n        }\n        continue;\n      }\n      // if the load hook returned undefined we need to just skip it\n      if (loaded === undefined) {\n        continue;\n      }\n      let { content, type } = loaded;\n\n      let visitor = this.visitorFor(type);\n\n      // cast is safe because the only way to get into the queue is to go\n      // through scheduleVisit, and scheduleVisit creates the entry in\n      // this.modules.\n      let module: InternalModule = this.modules.get(id)!;\n      let visitResult = await visitor.call(this, id, content);\n      if (Array.isArray(visitResult)) {\n        // the visitor was unable to figure out the ParseFields and returned\n        // some number of Findings to us to explain why.\n        for (let finding of visitResult) {\n          this.params.findings.push(finding);\n        }\n      } else {\n        module.parsed = visitResult;\n        module.resolved = await this.resolveDeps(visitResult.dependencies, id);\n      }\n    }\n  }\n\n  private linkModules() {\n    for (let module of this.modules.values()) {\n      if (isResolved(module)) {\n        this.linkModule(module);\n      }\n    }\n  }\n\n  private linkModule(module: ResolvedInternalModule) {\n    let exports = new Set<string>();\n    for (let exp of module.parsed.exports) {\n      if (typeof exp === 'string') {\n        exports.add(exp);\n      } else {\n        let moduleName = module.resolved.get(exp.all)!;\n        if (!isResolutionFailure(moduleName)) {\n          let target = this.modules.get(moduleName)!;\n          if (!isLinked(target) && isResolved(target)) {\n            this.linkModule(target);\n          }\n          if (isLinked(target)) {\n            for (let innerExp of target.linked.exports) {\n              exports.add(innerExp);\n            }\n          } else {\n            // our module doesn't successfully enter linked state because it\n            // depends on stuff that also couldn't\n            return;\n          }\n        }\n      }\n    }\n    module.linked = {\n      exports,\n    };\n  }\n\n  private async resolveDeps(deps: string[], fromFile: string): Promise<InternalModule['resolved']> {\n    let resolved = new Map() as NonNullable<InternalModule['resolved']>;\n    for (let dep of deps) {\n      if (['@embroider/macros'].includes(dep)) {\n        // the audit process deliberately removes the @embroider/macros babel\n        // plugins, so the imports are still present and should be left alone.\n        continue;\n      }\n\n      let resolution = await this.resolveId(dep, fromFile);\n      if (resolution) {\n        resolved.set(dep, resolution);\n        this.scheduleVisit(resolution, fromFile);\n        continue;\n      } else {\n        resolved.set(dep, { isResolutionFailure: true as true });\n        continue;\n      }\n    }\n    return resolved;\n  }\n\n  private scheduleVisit(id: string, parent: string | RootMarker) {\n    let record = this.modules.get(id);\n    if (!record) {\n      this.debug(`discovered`, id);\n      record = {\n        consumedFrom: [parent],\n      };\n      this.modules.set(id, record);\n      this.moduleQueue.add(id);\n    } else {\n      record.consumedFrom.push(parent);\n    }\n  }\n\n  private visitorFor(\n    type: ContentType\n  ): (\n    this: ModuleVisitor,\n    filename: string,\n    content: Buffer | string\n  ) => Promise<NonNullable<InternalModule['parsed'] | Finding[]>> {\n    switch (type) {\n      case 'html':\n        return this.visitHTML;\n      case 'javascript':\n        return this.visitJS;\n      default:\n        throw assertNever(type);\n    }\n  }\n\n  private async visitHTML(_filename: string, content: Buffer | string): Promise<ParsedInternalModule['parsed']> {\n    let dom = new JSDOM(content);\n    let scripts = dom.window.document.querySelectorAll('script[type=\"module\"]') as NodeListOf<HTMLScriptElement>;\n    let dependencies = [] as string[];\n    for (let script of scripts) {\n      let src = script.src;\n      if (!src) {\n        continue;\n      }\n      if (new URL(src, 'http://example.com:4321').origin !== 'http://example.com:4321') {\n        // src was absolute, we don't handle it\n        continue;\n      }\n      dependencies.push(src);\n    }\n\n    return {\n      imports: [],\n      exports: new Set(),\n      isCJS: false,\n      isAMD: false,\n      dependencies,\n      transpiledContent: content,\n    };\n  }\n\n  private async visitJS(\n    filename: string,\n    content: Buffer | string\n  ): Promise<ParsedInternalModule['parsed'] | Finding[]> {\n    let rawSource = content.toString('utf8');\n    try {\n      let result = auditJS(rawSource, filename, this.params.babelConfig, this.params.frames);\n\n      for (let problem of result.problems) {\n        this.params.findings.push({\n          filename,\n          message: problem.message,\n          detail: problem.detail,\n          codeFrame: this.params.frames.render(problem.codeFrameIndex),\n        });\n      }\n      return {\n        exports: result.exports,\n        imports: result.imports,\n        isCJS: result.isCJS,\n        isAMD: result.isAMD,\n        dependencies: result.imports.map(i => i.source),\n        transpiledContent: result.transpiledContent,\n      };\n    } catch (err) {\n      if (['BABEL_PARSE_ERROR', 'BABEL_TRANSFORM_ERROR'].includes(err.code)) {\n        return [\n          {\n            filename,\n            message: `failed to parse`,\n            detail: err.toString().replace(filename, explicitRelative(this.base, filename)),\n          },\n        ];\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  private debug(message: string, ...args: any[]) {\n    if (this.debugEnabled) {\n      console.log(message, ...args);\n    }\n  }\n\n  private toPublicModule(filename: string, module: InternalModule): Module {\n    let result: UnparseableModule = {\n      type: 'unparseable',\n      appRelativePath: explicitRelative(this.base, filename),\n      consumedFrom: module.consumedFrom.map(entry => {\n        if (isRootMarker(entry)) {\n          return entry;\n        } else {\n          return explicitRelative(this.base, entry);\n        }\n      }),\n    };\n\n    if (!module.parsed || !module.resolved) {\n      return result;\n    }\n\n    let parsedResult: ParsedModule = {\n      ...result,\n      type: 'parsed',\n      resolutions: fromPairs(\n        [...module.resolved].map(([source, target]) => [\n          source,\n          isResolutionFailure(target) ? null : explicitRelative(this.base, target),\n        ])\n      ),\n      imports: module.parsed.imports.map(i => ({\n        source: i.source,\n        specifiers: i.specifiers.map(s => ({\n          name: s.name,\n          local: s.local,\n          codeFrameIndex: s.codeFrameIndex,\n        })),\n        codeFrameIndex: i.codeFrameIndex,\n      })),\n      content: module.parsed.transpiledContent.toString(),\n      isAMD: Boolean(module.parsed.isAMD),\n      isCJS: Boolean(module.parsed.isCJS),\n    };\n\n    if (!module.linked) {\n      return parsedResult;\n    }\n\n    return {\n      ...parsedResult,\n      type: 'complete',\n      exports: [...module.linked.exports],\n    };\n  }\n\n  private buildResults() {\n    let publicModules: Record<string, Module> = {};\n    for (let [filename, module] of this.modules) {\n      let publicModule = this.toPublicModule(filename, module);\n      publicModules[explicitRelative(this.base, filename)] = publicModule;\n    }\n    return publicModules;\n  }\n}\n\nexport interface RootMarker {\n  isRoot: true;\n}\n\nexport function isRootMarker(value: string | RootMarker | undefined): value is RootMarker {\n  return Boolean(value && typeof value !== 'string' && value.isRoot);\n}\n\ninterface ResolutionFailure {\n  isResolutionFailure: true;\n}\n\nfunction isResolutionFailure(result: string | ResolutionFailure | undefined): result is ResolutionFailure {\n  return typeof result === 'object' && 'isResolutionFailure' in result;\n}\n"]}

package/src/options.d.ts

@@ -1,5 +1,4 @@
 import type { V1AddonConstructor } from './v1-addon';
-import type { Node } from 'broccoli-node-api';
 import type { Options as CoreOptions } from '@embroider/core';
 import type { PackageRules } from './dependency-rules';
 export default interface Options extends CoreOptions {
@@ -7,9 +6,11 @@ export default interface Options extends CoreOptions {
     staticAddonTestSupportTrees?: boolean;
     staticEmberSource?: boolean;
     compatAdapters?: Map<string, V1AddonConstructor | null>;
-    extraPublicTrees?: Node[];
     packageRules?: PackageRules[];
     allowUnsafeDynamicComponents?: boolean;
+    availableContentForTypes?: string[];
+    useAddonAppBoot?: boolean;
+    useAddonConfigModule?: boolean;
 }
 export declare function optionsWithDefaults(options?: Options): Required<Options>;
 export declare const recommendedOptions: {

package/src/options.js

@@ -12,6 +12,9 @@ const defaults = Object.assign((0, core_1.optionsWithDefaults)(), {
     workspaceDir: null,
     packageRules: [],
     allowUnsafeDynamicComponents: false,
+    availableContentForTypes: [],
+    useAddonAppBoot: true,
+    useAddonConfigModule: true,
 });
 function optionsWithDefaults(options) {
     return Object.assign({}, defaults, options);

package/src/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;;AA8GA,kDAEC;AA7GD,0CAA0E;AAgG1E,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAA,0BAAgB,GAAE,EAAE;IACjD,gBAAgB,EAAE,KAAK;IACvB,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,KAAK;IACxB,cAAc,EAAE,IAAI,GAAG,EAAE;IACzB,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE,EAAE;IAChB,4BAA4B,EAAE,KAAK;CACpC,CAAC,CAAC;AAEH,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,+EAA+E;AAC/E,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,kBAAkB,GAAgC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QACvB,gBAAgB,EAAE,IAAI;QACtB,2BAA2B,EAAE,IAAI;QACjC,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,IAAI;QACtB,iBAAiB,EAAE,IAAI;QACvB,4BAA4B,EAAE,KAAK;KACpC,CAAC;CACH,CAAC,CAAC","sourcesContent":["import type { V1AddonConstructor } from './v1-addon';\nimport type { Node } from 'broccoli-node-api';\nimport type { Options as CoreOptions } from '@embroider/core';\nimport { optionsWithDefaults as coreWithDefaults } from '@embroider/core';\nimport type { PackageRules } from './dependency-rules';\n\n// These options control how hard we will try to achieve compatibility with v1\n// addons. The defaults are conservative and try to maximize compatibility, at\n// the cost of slower or bigger builds. As you eliminate sources of legacy\n// behavior you can benefit from the more aggressive modes.\nexport default interface Options extends CoreOptions {\n  // Controls whether your addon's \"addon\" trees should be resolved statically\n  // at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. In this mode, we force every file into the Ember app,\n  //   which is the legacy behavior.\n  //\n  //   true: produces smaller builds. The addon files must be imported from\n  //   somewhere we can statically see during the build. In this mode, your app\n  //   will only include files that are actually imported from somewhere.\n  //\n  // Commentary: most v1 addons already work well with this set to true, because\n  // they tend to either offer Javascript that users are supposed to directly\n  // `import` or components / helpers / services that get directly imported and\n  // re-exported by code in App Javascript. The exceptions are addons that do\n  // runtime shenanigans with `require` or scoped runtime resolutions.\n  //\n  // To workaround an addon that is preventing you from enabling this flag, you\n  // can use addonDependencyRules.\n  staticAddonTrees?: boolean;\n\n  // Controls whether your addon's \"addonTestSupport\" trees should be resolved\n  // statically at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. All test support files will be forced into your Ember\n  //   app, which is the legacy behavior.\n  //\n  //   true: produces smaller builds. Only files that are explicitly imported\n  //   will end up in your app.\n  //\n  // Commentary: this is analogous to staticAddonTrees and the same guidelines\n  // apply.\n  staticAddonTestSupportTrees?: boolean;\n\n  // when true, we will load ember-source as ES modules. This means unused parts\n  // of ember-source won't be included. But it also means that addons using old\n  // APIs to try to `require()` things from Ember -- particularly from within\n  // vendor.js -- cannot do that anymore.\n  //\n  // When false (the default) we load ember-source the traditional way, which is\n  // that a big ol' script gets smooshed into vendor.js, and none of ember's\n  // public module API actually exists as modules at build time.\n  staticEmberSource?: boolean;\n\n  // Allows you to override how specific addons will build. Like:\n  //\n  //   import V1Addon from '@embroider/compat'; let compatAdapters = new Map();\n  //   compatAdapters.set('some-addon', class extends V1Addon {// do stuff here:\n  //   see examples in ./compat-adapters\n  //   });\n  //\n  // This should be understood as a temporary way to keep yourself from getting\n  // stuck, not an alternative to actually fixing upstream. For the most part,\n  // the real solution will be converting the addon in question to natively\n  // publish as v2.\n  //\n  // We ship with some default compatAdapters to fix otherwise incompatible\n  // behaviors in popular addons. You can override the default adapters by\n  // setting your own value here (including null to completely disable it).\n  compatAdapters?: Map<string, V1AddonConstructor | null>;\n\n  // optional list of additional broccoli trees that should be incorporated into\n  // the final build. This exists because the classic `app.toTree()` method\n  // accepts an optional tree argument that has the same purpose.\n  extraPublicTrees?: Node[];\n\n  // Allows you to tell Embroider about otherwise dynamic dependencies within\n  // your app and addons that it can't figure out on its own. These are combined\n  // with the default rules that ship with Embroider. Your own rules take\n  // precedence over the built-ins. Order matters, first matching rule will\n  // apply to any given addon.\n  //\n  // See the addon-dependency-rules directory in the @embroider/compat package\n  // for the built-in rules.\n  //\n  // These ONLY APPLY to v1-formatted addons. An addon that ships as native v2\n  // is expected to do the right thing on its own.\n  //\n  // Follow to the definition of PackageRules for more info.\n  packageRules?: PackageRules[];\n\n  // This turns build errors into runtime errors. It is not a good idea to keep\n  // it on in production. But it can be helpful when testing how much of your\n  // app is able to work with staticComponents enabled.\n  allowUnsafeDynamicComponents?: boolean;\n}\n\nconst defaults = Object.assign(coreWithDefaults(), {\n  staticAddonTrees: false,\n  staticAddonTestSupportTrees: false,\n  staticEmberSource: false,\n  compatAdapters: new Map(),\n  extraPublicTrees: [],\n  workspaceDir: null,\n  packageRules: [],\n  allowUnsafeDynamicComponents: false,\n});\n\nexport function optionsWithDefaults(options?: Options): Required<Options> {\n  return Object.assign({}, defaults, options);\n}\n\n// These are recommended configurations for addons to test themselves under. By\n// keeping them here, it's easier to do ecosystem-wide compatibility testing.\n// See the `@embroider/test-setup` package which can help consume these to test\n// them in CI.\nexport const recommendedOptions: { [name: string]: Options } = Object.freeze({\n  safe: Object.freeze({}),\n  optimized: Object.freeze({\n    staticAddonTrees: true,\n    staticAddonTestSupportTrees: true,\n    staticHelpers: true,\n    staticModifiers: true,\n    staticComponents: true,\n    staticEmberSource: true,\n    allowUnsafeDynamicComponents: false,\n  }),\n});\n"]}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;;AA6HA,kDAEC;AA7HD,0CAA0E;AA6G1E,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAA,0BAAgB,GAAE,EAAE;IACjD,gBAAgB,EAAE,KAAK;IACvB,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,KAAK;IACxB,cAAc,EAAE,IAAI,GAAG,EAAE;IACzB,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE,EAAE;IAChB,4BAA4B,EAAE,KAAK;IACnC,wBAAwB,EAAE,EAAE;IAC5B,eAAe,EAAE,IAAI;IACrB,oBAAoB,EAAE,IAAI;CAC3B,CAAC,CAAC;AAEH,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,+EAA+E;AAC/E,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,kBAAkB,GAAgC,MAAM,CAAC,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;QACvB,gBAAgB,EAAE,IAAI;QACtB,2BAA2B,EAAE,IAAI;QACjC,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,IAAI;QACtB,iBAAiB,EAAE,IAAI;QACvB,4BAA4B,EAAE,KAAK;KACpC,CAAC;CACH,CAAC,CAAC","sourcesContent":["import type { V1AddonConstructor } from './v1-addon';\nimport type { Options as CoreOptions } from '@embroider/core';\nimport { optionsWithDefaults as coreWithDefaults } from '@embroider/core';\nimport type { PackageRules } from './dependency-rules';\n\n// These options control how hard we will try to achieve compatibility with v1\n// addons. The defaults are conservative and try to maximize compatibility, at\n// the cost of slower or bigger builds. As you eliminate sources of legacy\n// behavior you can benefit from the more aggressive modes.\nexport default interface Options extends CoreOptions {\n  // Controls whether your addon's \"addon\" trees should be resolved statically\n  // at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. In this mode, we force every file into the Ember app,\n  //   which is the legacy behavior.\n  //\n  //   true: produces smaller builds. The addon files must be imported from\n  //   somewhere we can statically see during the build. In this mode, your app\n  //   will only include files that are actually imported from somewhere.\n  //\n  // Commentary: most v1 addons already work well with this set to true, because\n  // they tend to either offer Javascript that users are supposed to directly\n  // `import` or components / helpers / services that get directly imported and\n  // re-exported by code in App Javascript. The exceptions are addons that do\n  // runtime shenanigans with `require` or scoped runtime resolutions.\n  //\n  // To workaround an addon that is preventing you from enabling this flag, you\n  // can use addonDependencyRules.\n  staticAddonTrees?: boolean;\n\n  // Controls whether your addon's \"addonTestSupport\" trees should be resolved\n  // statically at build time.\n  //\n  //   false (the default): implies maximum backward compatibility at the cost\n  //   of bigger builds. All test support files will be forced into your Ember\n  //   app, which is the legacy behavior.\n  //\n  //   true: produces smaller builds. Only files that are explicitly imported\n  //   will end up in your app.\n  //\n  // Commentary: this is analogous to staticAddonTrees and the same guidelines\n  // apply.\n  staticAddonTestSupportTrees?: boolean;\n\n  // when true, we will load ember-source as ES modules. This means unused parts\n  // of ember-source won't be included. But it also means that addons using old\n  // APIs to try to `require()` things from Ember -- particularly from within\n  // vendor.js -- cannot do that anymore.\n  //\n  // When false (the default) we load ember-source the traditional way, which is\n  // that a big ol' script gets smooshed into vendor.js, and none of ember's\n  // public module API actually exists as modules at build time.\n  staticEmberSource?: boolean;\n\n  // Allows you to override how specific addons will build. Like:\n  //\n  //   import V1Addon from '@embroider/compat'; let compatAdapters = new Map();\n  //   compatAdapters.set('some-addon', class extends V1Addon {// do stuff here:\n  //   see examples in ./compat-adapters\n  //   });\n  //\n  // This should be understood as a temporary way to keep yourself from getting\n  // stuck, not an alternative to actually fixing upstream. For the most part,\n  // the real solution will be converting the addon in question to natively\n  // publish as v2.\n  //\n  // We ship with some default compatAdapters to fix otherwise incompatible\n  // behaviors in popular addons. You can override the default adapters by\n  // setting your own value here (including null to completely disable it).\n  compatAdapters?: Map<string, V1AddonConstructor | null>;\n\n  // Allows you to tell Embroider about otherwise dynamic dependencies within\n  // your app and addons that it can't figure out on its own. These are combined\n  // with the default rules that ship with Embroider. Your own rules take\n  // precedence over the built-ins. Order matters, first matching rule will\n  // apply to any given addon.\n  //\n  // See the addon-dependency-rules directory in the @embroider/compat package\n  // for the built-in rules.\n  //\n  // These ONLY APPLY to v1-formatted addons. An addon that ships as native v2\n  // is expected to do the right thing on its own.\n  //\n  // Follow to the definition of PackageRules for more info.\n  packageRules?: PackageRules[];\n\n  // This turns build errors into runtime errors. It is not a good idea to keep\n  // it on in production. But it can be helpful when testing how much of your\n  // app is able to work with staticComponents enabled.\n  allowUnsafeDynamicComponents?: boolean;\n\n  // Allows you to customize the list of content types addons use to provide HTML\n  // to {{content-for}}. By default, the following content types are expected:\n  // 'head', 'test-head', 'head-footer', 'test-head-footer', 'body', 'test-body',\n  // 'body-footer', 'test-body-footer'. You need to use this config only to extend\n  // this list.\n  availableContentForTypes?: string[];\n\n  // Allows you to cancel the warning that at least one classic addon provides\n  // content-for 'app-boot'. This warning brings awareness for developers\n  // switching to Embroider, but is no longer necessary once content-for\n  // 'app-boot' code has been properly moved to the app-side.\n  useAddonAppBoot?: boolean;\n\n  // content-for 'config-module'. This warning brings awareness for developers\n  // switching to Embroider, but is no longer necessary once content-for\n  // 'config-module' code has been properly moved to the app-side.\n  useAddonConfigModule?: boolean;\n}\n\nconst defaults = Object.assign(coreWithDefaults(), {\n  staticAddonTrees: false,\n  staticAddonTestSupportTrees: false,\n  staticEmberSource: false,\n  compatAdapters: new Map(),\n  extraPublicTrees: [],\n  workspaceDir: null,\n  packageRules: [],\n  allowUnsafeDynamicComponents: false,\n  availableContentForTypes: [],\n  useAddonAppBoot: true,\n  useAddonConfigModule: true,\n});\n\nexport function optionsWithDefaults(options?: Options): Required<Options> {\n  return Object.assign({}, defaults, options);\n}\n\n// These are recommended configurations for addons to test themselves under. By\n// keeping them here, it's easier to do ecosystem-wide compatibility testing.\n// See the `@embroider/test-setup` package which can help consume these to test\n// them in CI.\nexport const recommendedOptions: { [name: string]: Options } = Object.freeze({\n  safe: Object.freeze({}),\n  optimized: Object.freeze({\n    staticAddonTrees: true,\n    staticAddonTestSupportTrees: true,\n    staticHelpers: true,\n    staticModifiers: true,\n    staticComponents: true,\n    staticEmberSource: true,\n    allowUnsafeDynamicComponents: false,\n  }),\n});\n"]}

package/src/resolver-transform.js

@@ -14,7 +14,6 @@ const dependency_rules_1 = require("./dependency-rules");
 const typescript_memoize_1 = require("typescript-memoize");
 const assert_never_1 = __importDefault(require("assert-never"));
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
 const dasherize_component_name_1 = require("./dasherize-component-name");
 const core_1 = require("@embroider/core");
 const lodash_1 = require("lodash");
@@ -481,6 +480,9 @@ class TemplateResolver {
         return { files, components };
     }
     findRules(absPath) {
+        // when babel is invoked by vite our filenames can have query params still
+        // hanging off them. That would break rule matching.
+        absPath = (0, core_1.cleanUrl)(absPath);
         let fileRules = this.rules.files.get(absPath);
         let componentRules;
         let componentName = this.moduleResolver.reverseComponentLookup(absPath);
@@ -525,7 +527,7 @@ class TemplateResolver {
         let componentRules = this.rules.components.get(name);
         return {
             type: 'component',
-            specifier: `#embroider_compat/components/${name}`,
+            specifier: `@embroider/virtual/components/${name}`,
             importedName: 'default',
             yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
             yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
@@ -589,7 +591,7 @@ class TemplateResolver {
         }
         return {
             type: 'helper',
-            specifier: `#embroider_compat/helpers/${path}`,
+            specifier: `@embroider/virtual/helpers/${path}`,
             importedName: 'default',
             nameHint: this.nameHint(path),
         };
@@ -713,7 +715,7 @@ class TemplateResolver {
         let componentRules = this.rules.components.get(path);
         return {
             type: 'component',
-            specifier: `#embroider_compat/ambiguous/${path}`,
+            specifier: `@embroider/virtual/ambiguous/${path}`,
             importedName: 'default',
             yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
             yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
@@ -740,7 +742,7 @@ class TemplateResolver {
         }
         return {
             type: 'modifier',
-            specifier: `#embroider_compat/modifiers/${path}`,
+            specifier: `@embroider/virtual/modifiers/${path}`,
             importedName: 'default',
             nameHint: this.nameHint(path),
         };
@@ -805,7 +807,8 @@ __decorate([
 ], TemplateResolver.prototype, "rules", null);
 // This is the AST transform that resolves components, helpers and modifiers at build time
 function makeResolverTransform({ appRoot, emberVersion, externalNameHint }) {
-    let config = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, core_1.locateEmbroiderWorkingDir)(appRoot), 'resolver.json'));
+    let loader = new core_1.ResolverLoader(appRoot);
+    let config = loader.resolver.options;
     const resolverTransform = env => {
         if (env.strictMode) {
             return {