@embroider/core 3.4.20-unstable.3e8dbe3 → 3.4.20-unstable.4070ba7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.20-unstable.3e8dbe3",
+  "version": "3.4.20-unstable.4070ba7",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -49,9 +49,9 @@
     "semver": "^7.3.5",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.10-unstable.3e8dbe3",
-    "@embroider/shared-internals": "2.8.2-unstable.3e8dbe3",
-    "@embroider/reverse-exports": "0.1.1-unstable.3e8dbe3"
+    "@embroider/macros": "1.16.10-unstable.4070ba7",
+    "@embroider/shared-internals": "2.8.2-unstable.4070ba7",
+    "@embroider/reverse-exports": "0.1.1-unstable.4070ba7"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",
@@ -63,7 +63,7 @@
     "@types/js-string-escape": "^1.0.0",
     "@types/jsdom": "^16.2.11",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.5",
     "@types/tmp": "^0.1.0",

package/src/index.d.ts

@@ -2,13 +2,13 @@ export { Packager, PackagerConstructor, Variant, applyVariantToBabelConfig, getA
 export { HTMLEntrypoint, BundleSummary } from './html-entrypoint';
 export { default as Stage } from './stage';
 export { default as Options, optionsWithDefaults } from './options';
-export { default as toBroccoliPlugin } from './to-broccoli-plugin';
 export { default as WaitForTrees, OutputPaths } from './wait-for-trees';
 export { compile as jsHandlebarsCompile } from './js-handlebars';
 export { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';
-export { Resolver, ModuleRequest, Resolution } from './module-resolver';
+export { Resolver } from './module-resolver';
+export { ModuleRequest, type Resolution, type RequestAdapter, type RequestAdapterCreate } from './module-request';
 export type { Options as ResolverOptions } from './module-resolver-options';
 export { ResolverLoader } from './resolver-loader';
-export { virtualContent } from './virtual-content';
+export { virtualContent, type VirtualResponse } from './virtual-content';
 export type { Engine } from './app-files';
 export * from '@embroider/shared-internals';

package/src/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.virtualContent = exports.ResolverLoader = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.toBroccoliPlugin = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
+exports.virtualContent = exports.ResolverLoader = exports.ModuleRequest = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
 var packager_1 = require("./packager");
 Object.defineProperty(exports, "applyVariantToBabelConfig", { enumerable: true, get: function () { return packager_1.applyVariantToBabelConfig; } });
 Object.defineProperty(exports, "getAppMeta", { enumerable: true, get: function () { return packager_1.getAppMeta; } });
@@ -26,8 +26,6 @@ var html_entrypoint_1 = require("./html-entrypoint");
 Object.defineProperty(exports, "HTMLEntrypoint", { enumerable: true, get: function () { return html_entrypoint_1.HTMLEntrypoint; } });
 var options_1 = require("./options");
 Object.defineProperty(exports, "optionsWithDefaults", { enumerable: true, get: function () { return options_1.optionsWithDefaults; } });
-var to_broccoli_plugin_1 = require("./to-broccoli-plugin");
-Object.defineProperty(exports, "toBroccoliPlugin", { enumerable: true, get: function () { return __importDefault(to_broccoli_plugin_1).default; } });
 var wait_for_trees_1 = require("./wait-for-trees");
 Object.defineProperty(exports, "WaitForTrees", { enumerable: true, get: function () { return __importDefault(wait_for_trees_1).default; } });
 var js_handlebars_1 = require("./js-handlebars");
@@ -41,6 +39,8 @@ Object.defineProperty(exports, "expectWarning", { enumerable: true, get: functio
 Object.defineProperty(exports, "throwOnWarnings", { enumerable: true, get: function () { return messages_1.throwOnWarnings; } });
 var module_resolver_1 = require("./module-resolver");
 Object.defineProperty(exports, "Resolver", { enumerable: true, get: function () { return module_resolver_1.Resolver; } });
+var module_request_1 = require("./module-request");
+Object.defineProperty(exports, "ModuleRequest", { enumerable: true, get: function () { return module_request_1.ModuleRequest; } });
 var resolver_loader_1 = require("./resolver-loader");
 Object.defineProperty(exports, "ResolverLoader", { enumerable: true, get: function () { return resolver_loader_1.ResolverLoader; } });
 var virtual_content_1 = require("./virtual-content");

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,uCAOoB;AAHlB,qHAAA,yBAAyB,OAAA;AACzB,sGAAA,UAAU,OAAA;AACV,+GAAA,mBAAmB,OAAA;AAErB,qDAAkE;AAAzD,iHAAA,cAAc,OAAA;AAEvB,qCAAoE;AAAvC,8GAAA,mBAAmB,OAAA;AAChD,2DAAmE;AAA1D,uIAAA,OAAO,OAAoB;AACpC,mDAAwE;AAA/D,+HAAA,OAAO,OAAgB;AAChC,iDAAiE;AAAxD,oHAAA,OAAO,OAAuB;AACvC,uCAA4F;AAAnF,gGAAA,IAAI,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,gGAAA,IAAI,OAAA;AAAE,iGAAA,KAAK,OAAA;AAAE,yGAAA,aAAa,OAAA;AAAE,2GAAA,eAAe,OAAA;AACvE,qDAAwE;AAA/D,2GAAA,QAAQ,OAAA;AAEjB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAGvB,8EAA8E;AAC9E,+DAA+D;AAC/D,8DAA4C","sourcesContent":["export {\n  Packager,\n  PackagerConstructor,\n  Variant,\n  applyVariantToBabelConfig,\n  getAppMeta,\n  getPackagerCacheDir,\n} from './packager';\nexport { HTMLEntrypoint, BundleSummary } from './html-entrypoint';\nexport { default as Stage } from './stage';\nexport { default as Options, optionsWithDefaults } from './options';\nexport { default as toBroccoliPlugin } from './to-broccoli-plugin';\nexport { default as WaitForTrees, OutputPaths } from './wait-for-trees';\nexport { compile as jsHandlebarsCompile } from './js-handlebars';\nexport { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';\nexport { Resolver, ModuleRequest, Resolution } from './module-resolver';\nexport type { Options as ResolverOptions } from './module-resolver-options';\nexport { ResolverLoader } from './resolver-loader';\nexport { virtualContent } from './virtual-content';\nexport type { Engine } from './app-files';\n\n// this is reexported because we already make users manage a peerDep from some\n// other packages (like embroider/webpack and @embroider/compat\nexport * from '@embroider/shared-internals';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,uCAOoB;AAHlB,qHAAA,yBAAyB,OAAA;AACzB,sGAAA,UAAU,OAAA;AACV,+GAAA,mBAAmB,OAAA;AAErB,qDAAkE;AAAzD,iHAAA,cAAc,OAAA;AAEvB,qCAAoE;AAAvC,8GAAA,mBAAmB,OAAA;AAChD,mDAAwE;AAA/D,+HAAA,OAAO,OAAgB;AAChC,iDAAiE;AAAxD,oHAAA,OAAO,OAAuB;AACvC,uCAA4F;AAAnF,gGAAA,IAAI,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,gGAAA,IAAI,OAAA;AAAE,iGAAA,KAAK,OAAA;AAAE,yGAAA,aAAa,OAAA;AAAE,2GAAA,eAAe,OAAA;AACvE,qDAA6C;AAApC,2GAAA,QAAQ,OAAA;AACjB,mDAAkH;AAAzG,+GAAA,aAAa,OAAA;AAEtB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAyE;AAAhE,iHAAA,cAAc,OAAA;AAGvB,8EAA8E;AAC9E,+DAA+D;AAC/D,8DAA4C","sourcesContent":["export {\n  Packager,\n  PackagerConstructor,\n  Variant,\n  applyVariantToBabelConfig,\n  getAppMeta,\n  getPackagerCacheDir,\n} from './packager';\nexport { HTMLEntrypoint, BundleSummary } from './html-entrypoint';\nexport { default as Stage } from './stage';\nexport { default as Options, optionsWithDefaults } from './options';\nexport { default as WaitForTrees, OutputPaths } from './wait-for-trees';\nexport { compile as jsHandlebarsCompile } from './js-handlebars';\nexport { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';\nexport { Resolver } from './module-resolver';\nexport { ModuleRequest, type Resolution, type RequestAdapter, type RequestAdapterCreate } from './module-request';\nexport type { Options as ResolverOptions } from './module-resolver-options';\nexport { ResolverLoader } from './resolver-loader';\nexport { virtualContent, type VirtualResponse } from './virtual-content';\nexport type { Engine } from './app-files';\n\n// this is reexported because we already make users manage a peerDep from some\n// other packages (like embroider/webpack and @embroider/compat\nexport * from '@embroider/shared-internals';\n"]}

package/src/module-request.d.ts

@@ -0,0 +1,43 @@
+import type { VirtualResponse } from './virtual-content';
+export type Resolution<T = unknown, E = unknown> = {
+    type: 'found';
+    filename: string;
+    virtual: VirtualResponse | false;
+    result: T;
+} | {
+    type: 'not_found';
+    err: E;
+};
+export type RequestAdapterCreate<Init, Res extends Resolution> = (params: Init) => {
+    initialState: InitialRequestState;
+    adapter: RequestAdapter<Res>;
+} | undefined;
+export interface RequestAdapter<Res extends Resolution> {
+    readonly debugType: string;
+    resolve(request: ModuleRequest<Res>): Promise<Res>;
+    notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);
+    virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);
+}
+export interface InitialRequestState {
+    readonly specifier: string;
+    readonly fromFile: string;
+    readonly meta: Record<string, unknown> | undefined;
+}
+export declare class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {
+    #private;
+    static create<Init, Res extends Resolution>(createAdapter: RequestAdapterCreate<Init, Res>, params: Init): ModuleRequest<Res> | undefined;
+    private constructor();
+    get specifier(): string;
+    get fromFile(): string;
+    get debugType(): string;
+    get meta(): Record<string, unknown> | undefined;
+    get resolvedTo(): Res | (() => Promise<Res>) | undefined;
+    alias(newSpecifier: string): this;
+    rehome(newFromFile: string): this;
+    virtualize(virtualResponse: VirtualResponse): this;
+    withMeta(meta: Record<string, any> | undefined): this;
+    notFound(): this;
+    resolveTo(res: Res | (() => Promise<Res>)): this;
+    defaultResolve(): Promise<Res>;
+    clone(): this;
+}

package/src/module-request.js

@@ -0,0 +1,91 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _ModuleRequest_adapter, _ModuleRequest_specifier, _ModuleRequest_fromFile, _ModuleRequest_meta, _ModuleRequest_resolvedTo;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleRequest = void 0;
+class ModuleRequest {
+    static create(createAdapter, params) {
+        let result = createAdapter(params);
+        if (result) {
+            return new ModuleRequest(result.adapter, result.initialState);
+        }
+    }
+    constructor(adapter, initialize) {
+        _ModuleRequest_adapter.set(this, void 0);
+        _ModuleRequest_specifier.set(this, void 0);
+        _ModuleRequest_fromFile.set(this, void 0);
+        _ModuleRequest_meta.set(this, void 0);
+        _ModuleRequest_resolvedTo.set(this, void 0);
+        __classPrivateFieldSet(this, _ModuleRequest_adapter, adapter, "f");
+        __classPrivateFieldSet(this, _ModuleRequest_specifier, initialize.specifier, "f");
+        __classPrivateFieldSet(this, _ModuleRequest_fromFile, initialize.fromFile, "f");
+        __classPrivateFieldSet(this, _ModuleRequest_meta, initialize.meta, "f");
+    }
+    get specifier() {
+        return __classPrivateFieldGet(this, _ModuleRequest_specifier, "f");
+    }
+    get fromFile() {
+        return __classPrivateFieldGet(this, _ModuleRequest_fromFile, "f");
+    }
+    get debugType() {
+        return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").debugType;
+    }
+    get meta() {
+        return __classPrivateFieldGet(this, _ModuleRequest_meta, "f");
+    }
+    get resolvedTo() {
+        return __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f");
+    }
+    alias(newSpecifier) {
+        if (__classPrivateFieldGet(this, _ModuleRequest_specifier, "f") === newSpecifier) {
+            return this;
+        }
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_specifier, newSpecifier, "f");
+        return result;
+    }
+    rehome(newFromFile) {
+        if (__classPrivateFieldGet(this, _ModuleRequest_fromFile, "f") === newFromFile) {
+            return this;
+        }
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_fromFile, newFromFile, "f");
+        return result;
+    }
+    virtualize(virtualResponse) {
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").virtualResponse(this, virtualResponse));
+    }
+    withMeta(meta) {
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_meta, meta, "f");
+        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f"), "f");
+        return result;
+    }
+    notFound() {
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").notFoundResponse(this));
+    }
+    resolveTo(res) {
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, res, "f");
+        return result;
+    }
+    defaultResolve() {
+        return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").resolve(this);
+    }
+    clone() {
+        return new ModuleRequest(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f"), this);
+    }
+}
+exports.ModuleRequest = ModuleRequest;
+_ModuleRequest_adapter = new WeakMap(), _ModuleRequest_specifier = new WeakMap(), _ModuleRequest_fromFile = new WeakMap(), _ModuleRequest_meta = new WeakMap(), _ModuleRequest_resolvedTo = new WeakMap();
+//# sourceMappingURL=module-request.js.map

package/src/module-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-request.js","sourceRoot":"","sources":["module-request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAgCA,MAAa,aAAa;IACxB,MAAM,CAAC,MAAM,CACX,aAA8C,EAC9C,MAAY;QAEZ,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAQD,YAAoB,OAA4B,EAAE,UAA+B;QANjF,yCAA8B;QAC9B,2CAAmB;QACnB,0CAAkB;QAClB,sCAA2C;QAC3C,4CAAoD;QAGlD,uBAAA,IAAI,0BAAY,OAAO,MAAA,CAAC;QACxB,uBAAA,IAAI,4BAAc,UAAU,CAAC,SAAS,MAAA,CAAC;QACvC,uBAAA,IAAI,2BAAa,UAAU,CAAC,QAAQ,MAAA,CAAC;QACrC,uBAAA,IAAI,uBAAS,UAAU,CAAC,IAAI,MAAA,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,gCAAW,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,uBAAA,IAAI,+BAAU,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,8BAAS,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2BAAM,CAAC;IACpB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,iCAAY,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,IAAI,uBAAA,IAAI,gCAAW,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,4BAAc,YAAY,MAAA,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,WAAmB;QACxB,IAAI,uBAAA,IAAI,+BAAU,KAAK,WAAW,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,2BAAa,WAAW,MAAA,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,eAAgC;QACzC,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,QAAQ,CAAC,IAAqC;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,uBAAS,IAAI,MAAA,CAAC;QACpB,uBAAA,MAAM,6BAAe,uBAAA,IAAI,iCAAY,MAAA,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,GAA+B;QACvC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,6BAAe,GAAG,MAAA,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,OAAO,uBAAA,IAAI,8BAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,uBAAA,IAAI,8BAAS,EAAE,IAAI,CAAS,CAAC;IACxD,CAAC;CACF;AA1FD,sCA0FC","sourcesContent":["import type { VirtualResponse } from './virtual-content';\n\n// This is generic because different build systems have different ways of\n// representing a found module, and we just pass those values through.\nexport type Resolution<T = unknown, E = unknown> =\n  | { type: 'found'; filename: string; virtual: VirtualResponse | false; result: T }\n\n  // the important thing about this Resolution is that embroider should do its\n  // fallback behaviors here.\n  | { type: 'not_found'; err: E };\n\nexport type RequestAdapterCreate<Init, Res extends Resolution> = (\n  params: Init\n) => { initialState: InitialRequestState; adapter: RequestAdapter<Res> } | undefined;\n\nexport interface RequestAdapter<Res extends Resolution> {\n  readonly debugType: string;\n  resolve(request: ModuleRequest<Res>): Promise<Res>;\n\n  // the function-returning variants of both of these are only because webpack\n  // plugins are a pain in the butt. Integrators are encouraged to use the plain\n  // Response-returning variants in all sane build environments.\n  notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);\n  virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);\n}\n\nexport interface InitialRequestState {\n  readonly specifier: string;\n  readonly fromFile: string;\n  readonly meta: Record<string, unknown> | undefined;\n}\n\nexport class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {\n  static create<Init, Res extends Resolution>(\n    createAdapter: RequestAdapterCreate<Init, Res>,\n    params: Init\n  ): ModuleRequest<Res> | undefined {\n    let result = createAdapter(params);\n    if (result) {\n      return new ModuleRequest(result.adapter, result.initialState);\n    }\n  }\n\n  #adapter: RequestAdapter<Res>;\n  #specifier: string;\n  #fromFile: string;\n  #meta: Record<string, unknown> | undefined;\n  #resolvedTo: Res | (() => Promise<Res>) | undefined;\n\n  private constructor(adapter: RequestAdapter<Res>, initialize: InitialRequestState) {\n    this.#adapter = adapter;\n    this.#specifier = initialize.specifier;\n    this.#fromFile = initialize.fromFile;\n    this.#meta = initialize.meta;\n  }\n\n  get specifier(): string {\n    return this.#specifier;\n  }\n\n  get fromFile(): string {\n    return this.#fromFile;\n  }\n\n  get debugType(): string {\n    return this.#adapter.debugType;\n  }\n\n  get meta(): Record<string, unknown> | undefined {\n    return this.#meta;\n  }\n\n  get resolvedTo(): Res | (() => Promise<Res>) | undefined {\n    return this.#resolvedTo;\n  }\n\n  alias(newSpecifier: string): this {\n    if (this.#specifier === newSpecifier) {\n      return this;\n    }\n    let result = this.clone();\n    result.#specifier = newSpecifier;\n    return result;\n  }\n\n  rehome(newFromFile: string): this {\n    if (this.#fromFile === newFromFile) {\n      return this;\n    }\n    let result = this.clone();\n    result.#fromFile = newFromFile;\n    return result;\n  }\n\n  virtualize(virtualResponse: VirtualResponse): this {\n    return this.resolveTo(this.#adapter.virtualResponse(this, virtualResponse));\n  }\n\n  withMeta(meta: Record<string, any> | undefined): this {\n    let result = this.clone();\n    result.#meta = meta;\n    result.#resolvedTo = this.#resolvedTo;\n    return result;\n  }\n\n  notFound(): this {\n    return this.resolveTo(this.#adapter.notFoundResponse(this));\n  }\n\n  resolveTo(res: Res | (() => Promise<Res>)): this {\n    let result = this.clone();\n    result.#resolvedTo = res;\n    return result;\n  }\n\n  defaultResolve(): Promise<Res> {\n    return this.#adapter.resolve(this);\n  }\n\n  clone(): this {\n    return new ModuleRequest(this.#adapter, this) as this;\n  }\n}\n"]}

package/src/module-resolver-options.d.ts

@@ -1,5 +1,4 @@
 import { type AddonPackage, type Package } from '@embroider/shared-internals';
-import type UserOptions from './options';
 export interface Options {
     renamePackages: {
         [fromName: string]: string;
@@ -13,7 +12,6 @@ export interface Options {
     modulePrefix: string;
     splitAtRoutes?: (RegExp | string)[];
     podModulePrefix?: string;
-    amdCompatibility: Required<UserOptions['amdCompatibility']>;
     staticAppPaths: string[];
     emberVersion: string;
 }

package/src/module-resolver-options.js

@@ -30,9 +30,6 @@ function buildResolverOptions(inputs) {
         resolvableExtensions: resolvableExtensions(),
         appRoot: appPackage.root,
         engines,
-        amdCompatibility: {
-            es: [],
-        },
         modulePrefix,
         staticAppPaths: (_b = inputs.staticAppPaths) !== null && _b !== void 0 ? _b : [],
         emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source').version,

package/src/module-resolver-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-resolver-options.js","sourceRoot":"","sources":["module-resolver-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { explicitRelative, RewrittenPackageCache, type AddonPackage, type Package } from '@embroider/shared-internals';\nimport type UserOptions from './options';\nimport type { Engine } from './app-files';\nimport { resolve as resolvePath } from 'path';\nimport { realpathSync } from 'fs-extra';\nimport flatMap from 'lodash/flatMap';\n\nexport interface Options {\n  renamePackages: {\n    [fromName: string]: string;\n  };\n  renameModules: {\n    [fromName: string]: string;\n  };\n  resolvableExtensions: string[];\n  appRoot: string;\n  engines: EngineConfig[];\n  modulePrefix: string;\n  splitAtRoutes?: (RegExp | string)[];\n  podModulePrefix?: string;\n  amdCompatibility: Required<UserOptions['amdCompatibility']>;\n  staticAppPaths: string[];\n  emberVersion: string;\n}\n\nexport interface EngineConfig {\n  packageName: string;\n  activeAddons: { name: string; root: string; canResolveFromFile: string }[];\n  fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n  root: string;\n  isLazy: boolean;\n}\n\nexport function buildResolverOptions<T extends Options>(inputs: {\n  appPackage?: Package;\n  extraDeps?: Map<string, AddonPackage[]>;\n  modulePrefix?: string;\n  podModulePrefix?: string;\n  splitAtRoutes?: (RegExp | string)[];\n  staticAppPaths?: string[];\n  extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;\n}): T {\n  let appPackage: Package;\n  if (inputs.appPackage) {\n    appPackage = inputs.appPackage;\n  } else {\n    let packageCache = RewrittenPackageCache.shared('embroider', process.cwd());\n    appPackage = packageCache.get(packageCache.appRoot);\n  }\n\n  let extraDeps = inputs.extraDeps ?? new Map();\n\n  let allActiveAddons: AddonPackage[] = findAllActiveAddons(appPackage, extraDeps);\n  let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));\n  let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));\n  let modulePrefix = appPackage.name;\n  let engines = partitionEngines(appPackage, modulePrefix, extraDeps);\n\n  let output: Options = {\n    renamePackages,\n    renameModules,\n    resolvableExtensions: resolvableExtensions(),\n    appRoot: appPackage.root,\n    engines,\n    amdCompatibility: {\n      es: [],\n    },\n    modulePrefix,\n    staticAppPaths: inputs.staticAppPaths ?? [],\n    emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source')!.version,\n    splitAtRoutes: inputs.splitAtRoutes,\n    podModulePrefix: inputs.podModulePrefix,\n  };\n\n  if (inputs.extend) {\n    return inputs.extend(output as T, allActiveAddons);\n  }\n  return output as T;\n}\n\nfunction resolvableExtensions(): string[] {\n  let fromEnv = process.env.EMBROIDER_RESOLVABLE_EXTENSIONS;\n  if (fromEnv) {\n    return fromEnv.split(',');\n  } else {\n    return ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];\n  }\n}\n\nfunction partitionEngines(\n  appPackage: Package,\n  modulePrefix: string,\n  extraDeps: Map<string, AddonPackage[]>\n): EngineConfig[] {\n  let queue: Engine[] = [\n    {\n      package: appPackage,\n      addons: new Map(),\n      isApp: true,\n      modulePrefix,\n      appRelativePath: '.',\n    },\n  ];\n  let done: Engine[] = [];\n  let seenEngines: Set<Package> = new Set();\n  while (true) {\n    let current = queue.shift();\n    if (!current) {\n      break;\n    }\n    findActiveAddons(current.package, current, extraDeps);\n    for (let addon of current.addons.keys()) {\n      if (addon.isEngine() && !seenEngines.has(addon)) {\n        seenEngines.add(addon);\n        queue.push({\n          package: addon,\n          addons: new Map(),\n          isApp: !current,\n          modulePrefix: addon.name,\n          appRelativePath: explicitRelative(appPackage.root, addon.root),\n        });\n      }\n    }\n    done.push(current);\n  }\n\n  return done.map(engine => ({\n    packageName: engine.package.name,\n    // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks\n    root: realpathSync(engine.package.root),\n    fastbootFiles: {},\n    activeAddons: [...engine.addons]\n      .map(([addon, canResolveFromFile]) => ({\n        name: addon.name,\n        root: addon.root,\n        canResolveFromFile,\n      }))\n      // the traditional order is the order in which addons will run, such\n      // that the last one wins. Our resolver's order is the order to\n      // search, so first one wins.\n      .reverse(),\n    isLazy: engine.package.isLazyEngine(),\n  }));\n}\n\n// recurse to find all active addons that don't cross an engine boundary.\n// Inner engines themselves will be returned, but not those engines' children.\n// The output set's insertion order is the proper ember-cli compatible\n// ordering of the addons.\nfunction findActiveAddons(pkg: Package, engine: Engine, extraDeps: Map<string, AddonPackage[]>, isChild = false): void {\n  for (let child of activeAddonChildren(pkg, extraDeps)) {\n    if (!child.isEngine()) {\n      findActiveAddons(child, engine, extraDeps, true);\n    }\n    let canResolveFrom = resolvePath(pkg.root, 'package.json');\n    engine.addons.set(child, canResolveFrom);\n  }\n  // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)\n  if (!isChild) {\n    engine.addons = new Map(\n      [...engine.addons].sort(([a], [b]) => {\n        return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);\n      })\n    );\n  }\n}\n\nfunction activeAddonChildren(pkg: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = (pkg.dependencies.filter(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 are definitely active due to one of\n    // the other sections.\n    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies'\n  );\n  let extras = extraDeps.get(pkg.root);\n  if (extras) {\n    result = [...result, ...extras];\n  }\n  return result.sort(orderAddons);\n}\n\nfunction isActiveAddon(pkg: Package): boolean {\n  // stage1 already took care of converting everything that's actually active\n  // into v2 addons. If it's not a v2 addon, we don't want it.\n  //\n  // We can encounter v1 addons here when there is inactive stuff floating\n  // around in the node_modules that accidentally satisfy something like an\n  // optional peer dep.\n  return pkg.isV2Addon();\n}\n\nfunction 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\nfunction findAllActiveAddons(appPackage: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = appPackage.findDescendants(isActiveAddon) as AddonPackage[];\n  let extras = extraDeps.get(appPackage.root);\n  if (extras) {\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n  }\n  return result.sort(orderAddons);\n}\n"]}
+{"version":3,"file":"module-resolver-options.js","sourceRoot":"","sources":["module-resolver-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { explicitRelative, RewrittenPackageCache, type AddonPackage, type Package } from '@embroider/shared-internals';\nimport type { Engine } from './app-files';\nimport { resolve as resolvePath } from 'path';\nimport { realpathSync } from 'fs-extra';\nimport flatMap from 'lodash/flatMap';\n\nexport interface Options {\n  renamePackages: {\n    [fromName: string]: string;\n  };\n  renameModules: {\n    [fromName: string]: string;\n  };\n  resolvableExtensions: string[];\n  appRoot: string;\n  engines: EngineConfig[];\n  modulePrefix: string;\n  splitAtRoutes?: (RegExp | string)[];\n  podModulePrefix?: string;\n  staticAppPaths: string[];\n  emberVersion: string;\n}\n\nexport interface EngineConfig {\n  packageName: string;\n  activeAddons: { name: string; root: string; canResolveFromFile: string }[];\n  fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n  root: string;\n  isLazy: boolean;\n}\n\nexport function buildResolverOptions<T extends Options>(inputs: {\n  appPackage?: Package;\n  extraDeps?: Map<string, AddonPackage[]>;\n  modulePrefix?: string;\n  podModulePrefix?: string;\n  splitAtRoutes?: (RegExp | string)[];\n  staticAppPaths?: string[];\n  extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;\n}): T {\n  let appPackage: Package;\n  if (inputs.appPackage) {\n    appPackage = inputs.appPackage;\n  } else {\n    let packageCache = RewrittenPackageCache.shared('embroider', process.cwd());\n    appPackage = packageCache.get(packageCache.appRoot);\n  }\n\n  let extraDeps = inputs.extraDeps ?? new Map();\n\n  let allActiveAddons: AddonPackage[] = findAllActiveAddons(appPackage, extraDeps);\n  let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));\n  let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));\n  let modulePrefix = appPackage.name;\n  let engines = partitionEngines(appPackage, modulePrefix, extraDeps);\n\n  let output: Options = {\n    renamePackages,\n    renameModules,\n    resolvableExtensions: resolvableExtensions(),\n    appRoot: appPackage.root,\n    engines,\n    modulePrefix,\n    staticAppPaths: inputs.staticAppPaths ?? [],\n    emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source')!.version,\n    splitAtRoutes: inputs.splitAtRoutes,\n    podModulePrefix: inputs.podModulePrefix,\n  };\n\n  if (inputs.extend) {\n    return inputs.extend(output as T, allActiveAddons);\n  }\n  return output as T;\n}\n\nfunction resolvableExtensions(): string[] {\n  let fromEnv = process.env.EMBROIDER_RESOLVABLE_EXTENSIONS;\n  if (fromEnv) {\n    return fromEnv.split(',');\n  } else {\n    return ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];\n  }\n}\n\nfunction partitionEngines(\n  appPackage: Package,\n  modulePrefix: string,\n  extraDeps: Map<string, AddonPackage[]>\n): EngineConfig[] {\n  let queue: Engine[] = [\n    {\n      package: appPackage,\n      addons: new Map(),\n      isApp: true,\n      modulePrefix,\n      appRelativePath: '.',\n    },\n  ];\n  let done: Engine[] = [];\n  let seenEngines: Set<Package> = new Set();\n  while (true) {\n    let current = queue.shift();\n    if (!current) {\n      break;\n    }\n    findActiveAddons(current.package, current, extraDeps);\n    for (let addon of current.addons.keys()) {\n      if (addon.isEngine() && !seenEngines.has(addon)) {\n        seenEngines.add(addon);\n        queue.push({\n          package: addon,\n          addons: new Map(),\n          isApp: !current,\n          modulePrefix: addon.name,\n          appRelativePath: explicitRelative(appPackage.root, addon.root),\n        });\n      }\n    }\n    done.push(current);\n  }\n\n  return done.map(engine => ({\n    packageName: engine.package.name,\n    // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks\n    root: realpathSync(engine.package.root),\n    fastbootFiles: {},\n    activeAddons: [...engine.addons]\n      .map(([addon, canResolveFromFile]) => ({\n        name: addon.name,\n        root: addon.root,\n        canResolveFromFile,\n      }))\n      // the traditional order is the order in which addons will run, such\n      // that the last one wins. Our resolver's order is the order to\n      // search, so first one wins.\n      .reverse(),\n    isLazy: engine.package.isLazyEngine(),\n  }));\n}\n\n// recurse to find all active addons that don't cross an engine boundary.\n// Inner engines themselves will be returned, but not those engines' children.\n// The output set's insertion order is the proper ember-cli compatible\n// ordering of the addons.\nfunction findActiveAddons(pkg: Package, engine: Engine, extraDeps: Map<string, AddonPackage[]>, isChild = false): void {\n  for (let child of activeAddonChildren(pkg, extraDeps)) {\n    if (!child.isEngine()) {\n      findActiveAddons(child, engine, extraDeps, true);\n    }\n    let canResolveFrom = resolvePath(pkg.root, 'package.json');\n    engine.addons.set(child, canResolveFrom);\n  }\n  // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)\n  if (!isChild) {\n    engine.addons = new Map(\n      [...engine.addons].sort(([a], [b]) => {\n        return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);\n      })\n    );\n  }\n}\n\nfunction activeAddonChildren(pkg: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = (pkg.dependencies.filter(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 are definitely active due to one of\n    // the other sections.\n    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies'\n  );\n  let extras = extraDeps.get(pkg.root);\n  if (extras) {\n    result = [...result, ...extras];\n  }\n  return result.sort(orderAddons);\n}\n\nfunction isActiveAddon(pkg: Package): boolean {\n  // stage1 already took care of converting everything that's actually active\n  // into v2 addons. If it's not a v2 addon, we don't want it.\n  //\n  // We can encounter v1 addons here when there is inactive stuff floating\n  // around in the node_modules that accidentally satisfy something like an\n  // optional peer dep.\n  return pkg.isV2Addon();\n}\n\nfunction 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\nfunction findAllActiveAddons(appPackage: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = appPackage.findDescendants(isActiveAddon) as AddonPackage[];\n  let extras = extraDeps.get(appPackage.root);\n  if (extras) {\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n  }\n  return result.sort(orderAddons);\n}\n"]}

package/src/module-resolver.d.ts

@@ -1,34 +1,7 @@
 import type { Package } from '@embroider/shared-internals';
 import { RewrittenPackageCache } from '@embroider/shared-internals';
 import type { Options, EngineConfig } from './module-resolver-options';
-export interface ModuleRequest<Res extends Resolution = Resolution> {
-    readonly specifier: string;
-    readonly fromFile: string;
-    readonly isVirtual: boolean;
-    readonly meta: Record<string, unknown> | undefined;
-    readonly debugType: string;
-    readonly isNotFound: boolean;
-    readonly resolvedTo: Res | undefined;
-    alias(newSpecifier: string): this;
-    rehome(newFromFile: string): this;
-    virtualize(virtualFilename: string): this;
-    withMeta(meta: Record<string, any> | undefined): this;
-    notFound(): this;
-    defaultResolve(): Promise<Res>;
-    resolveTo(resolution: Res): this;
-}
-export type Resolution<T = unknown, E = unknown> = {
-    type: 'found';
-    filename: string;
-    isVirtual: boolean;
-    result: T;
-} | {
-    type: 'ignored';
-    result: T;
-} | {
-    type: 'not_found';
-    err: E;
-};
+import type { ModuleRequest, Resolution } from './module-request';
 export declare class Resolver {
     readonly options: Options;
     constructor(options: Options);
@@ -75,7 +48,6 @@ export declare class Resolver {
     private resolveWithinMovedPackage;
     private preHandleExternal;
     private locateActiveAddon;
-    private external;
     private fallbackResolve;
     private restoreRehomedRequest;
     private relativeFallbackResolve;