@embroider/core 3.4.20-unstable.e6197c7 → 3.4.20-unstable.e73d3a7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.20-unstable.e6197c7",
+  "version": "3.4.20-unstable.e73d3a7",
   "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.e6197c7",
-    "@embroider/reverse-exports": "0.1.1-unstable.e6197c7",
-    "@embroider/shared-internals": "2.8.2-unstable.e6197c7"
+    "@embroider/macros": "1.16.10-unstable.e73d3a7",
+    "@embroider/reverse-exports": "0.1.1-unstable.e73d3a7",
+    "@embroider/shared-internals": "2.8.2-unstable.e73d3a7"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",

package/src/index.d.ts

@@ -1,4 +1,4 @@
-export { Packager, PackagerConstructor, Variant, applyVariantToBabelConfig, getAppMeta, getPackagerCacheDir, } from './packager';
+export { Packager, PackagerConstructor, Variant, applyVariantToBabelConfig, getPackagerCacheDir } from './packager';
 export { HTMLEntrypoint, BundleSummary } from './html-entrypoint';
 export { default as Stage } from './stage';
 export { default as Options, optionsWithDefaults } from './options';

package/src/index.js

@@ -17,10 +17,9 @@ 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.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;
+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.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; } });
 Object.defineProperty(exports, "getPackagerCacheDir", { enumerable: true, get: function () { return packager_1.getPackagerCacheDir; } });
 var html_entrypoint_1 = require("./html-entrypoint");
 Object.defineProperty(exports, "HTMLEntrypoint", { enumerable: true, get: function () { return html_entrypoint_1.HTMLEntrypoint; } });

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,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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,uCAAoH;AAAnE,qHAAA,yBAAyB,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAC/F,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 { Packager, PackagerConstructor, Variant, applyVariantToBabelConfig, getPackagerCacheDir } 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

@@ -41,3 +41,4 @@ export declare class ModuleRequest<Res extends Resolution = Resolution> implemen
     defaultResolve(): Promise<Res>;
     clone(): this;
 }
+export declare function extractResolution<Res extends Resolution = Resolution>(res: Res | (() => Promise<Res>)): Promise<Res>;

package/src/module-request.js

@@ -13,6 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _ModuleRequest_adapter, _ModuleRequest_specifier, _ModuleRequest_fromFile, _ModuleRequest_meta, _ModuleRequest_resolvedTo;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleRequest = void 0;
+exports.extractResolution = extractResolution;
 class ModuleRequest {
     static create(createAdapter, params) {
         let result = createAdapter(params);
@@ -88,4 +89,12 @@ class ModuleRequest {
 }
 exports.ModuleRequest = ModuleRequest;
 _ModuleRequest_adapter = new WeakMap(), _ModuleRequest_specifier = new WeakMap(), _ModuleRequest_fromFile = new WeakMap(), _ModuleRequest_meta = new WeakMap(), _ModuleRequest_resolvedTo = new WeakMap();
+async function extractResolution(res) {
+    if (typeof res === 'function') {
+        return await res();
+    }
+    else {
+        return res;
+    }
+}
 //# sourceMappingURL=module-request.js.map

package/src/module-request.js.map

@@ -1 +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"]}
+{"version":3,"file":"module-request.js","sourceRoot":"","sources":["module-request.ts"],"names":[],"mappings":"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","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\nexport async function extractResolution<Res extends Resolution = Resolution>(\n  res: Res | (() => Promise<Res>)\n): Promise<Res> {\n  if (typeof res === 'function') {\n    return await res();\n  } else {\n    return res;\n  }\n}\n"]}

package/src/module-resolver.d.ts

@@ -1,13 +1,14 @@
 import type { Package } from '@embroider/shared-internals';
 import { RewrittenPackageCache } from '@embroider/shared-internals';
+import { type NodeResolveOpts } from './node-resolve';
 import type { Options, EngineConfig } from './module-resolver-options';
-import type { ModuleRequest, Resolution } from './module-request';
+import { type ModuleRequest, type Resolution } from './module-request';
 export declare class Resolver {
     readonly options: Options;
     constructor(options: Options);
     private beforeResolve;
     resolve<ResolveResolution extends Resolution>(request: ModuleRequest<ResolveResolution>): Promise<ResolveResolution>;
-    nodeResolve(specifier: string, fromFile: string): Promise<{
+    nodeResolve(specifier: string, fromFile: string, opts?: NodeResolveOpts): Promise<{
         type: 'virtual';
         filename: string;
         content: string;
@@ -19,6 +20,8 @@ export declare class Resolver {
         err: Error;
     }>;
     get packageCache(): RewrittenPackageCache;
+    private afterResolve;
+    private handleSyntheticComponents;
     private logicalPackage;
     private generateFastbootSwitch;
     private handleFastbootSwitch;
@@ -55,7 +58,10 @@ export declare class Resolver {
     private getEntryFromMergeMap;
     private withResolvableExtensions;
     private searchAppTree;
-    private reverseSearchAppTree;
+    reverseSearchAppTree(owningPackage: Package, fromFile: string): {
+        owningEngine: EngineConfig;
+        inAppName: string;
+    } | undefined;
     reverseComponentLookup(filename: string): string | undefined;
     private tryReverseComponent;
 }

package/src/module-resolver.js

@@ -17,14 +17,12 @@ const debug_1 = __importDefault(require("debug"));
 const assert_never_1 = __importDefault(require("assert-never"));
 const reverse_exports_1 = require("@embroider/reverse-exports");
 const resolve_exports_1 = require("resolve.exports");
-const virtual_content_1 = require("./virtual-content");
 const typescript_memoize_1 = require("typescript-memoize");
 const describe_exports_1 = require("./describe-exports");
 const fs_1 = require("fs");
 const node_resolve_1 = require("./node-resolve");
-const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
 const semver_1 = require("semver");
-const virtual_entrypoint_1 = require("./virtual-entrypoint");
+const module_request_1 = require("./module-request");
 const debug = (0, debug_1.default)('embroider:resolver');
 // Using a formatter makes this work lazy so nothing happens when we aren't
 // logging. It is unfortunate that formatters are a globally mutable config and
@@ -96,16 +94,12 @@ class Resolver {
         request = await this.beforeResolve(request);
         let resolution;
         if (request.resolvedTo) {
-            if (typeof request.resolvedTo === 'function') {
-                resolution = await request.resolvedTo();
-            }
-            else {
-                resolution = request.resolvedTo;
-            }
+            resolution = await (0, module_request_1.extractResolution)(request.resolvedTo);
         }
         else {
             resolution = await request.defaultResolve();
         }
+        resolution = await this.afterResolve(request, resolution);
         switch (resolution.type) {
             case 'found':
                 return resolution;
@@ -121,12 +115,7 @@ class Resolver {
             return resolution;
         }
         if (nextRequest.resolvedTo) {
-            if (typeof nextRequest.resolvedTo === 'function') {
-                return await nextRequest.resolvedTo();
-            }
-            else {
-                return nextRequest.resolvedTo;
-            }
+            return await (0, module_request_1.extractResolution)(nextRequest.resolvedTo);
         }
         if (nextRequest.fromFile === request.fromFile && nextRequest.specifier === request.specifier) {
             throw new Error('Bug Discovered! New request is not === original request but has the same fromFile and specifier. This will likely create a loop.');
@@ -136,12 +125,40 @@ class Resolver {
     // Use standard NodeJS resolving, with our required compatibility rules on
     // top. This is a convenience method for calling resolveSync with the
     // defaultResolve already configured to be "do the normal node thing".
-    async nodeResolve(specifier, fromFile) {
-        return (0, node_resolve_1.nodeResolve)(this, specifier, fromFile);
+    async nodeResolve(specifier, fromFile, opts) {
+        return (0, node_resolve_1.nodeResolve)(this, specifier, fromFile, opts);
     }
     get packageCache() {
         return shared_internals_2.RewrittenPackageCache.shared('embroider', this.options.appRoot);
     }
+    async afterResolve(request, resolution) {
+        resolution = await this.handleSyntheticComponents(request, resolution);
+        return resolution;
+    }
+    async handleSyntheticComponents(request, resolution) {
+        // Key assumption: the system's defaultResolve performs extension search for
+        // extensionless requests, with JS at a higher priority than HBS.
+        // When the request had an explicit ".js" extension, the system default
+        // extension search doesn't help us locate an HBS, so we need to check for
+        // it ourselves here.
+        if (resolution.type === 'not_found') {
+            let hbsSpecifier = (0, shared_internals_1.syntheticJStoHBS)(request.specifier);
+            if (hbsSpecifier) {
+                resolution = await this.resolve(request.alias(hbsSpecifier));
+            }
+        }
+        // At this point, we might have resolved an HBS file (either because the
+        // request was extensionless and the default search found it, or because of
+        // our own code above) when the request was for a JS file.
+        if (resolution.type === 'found') {
+            let syntheticId = (0, shared_internals_1.needsSyntheticComponentJS)(request.specifier, resolution.filename);
+            if (syntheticId && (0, shared_internals_1.isInComponents)(resolution.filename, this.packageCache)) {
+                let newRequest = logTransition(`synthetic component JS`, request, request.virtualize({ type: 'template-only-component-js', specifier: syntheticId }));
+                return await (0, module_request_1.extractResolution)(newRequest.resolvedTo);
+            }
+        }
+        return resolution;
+    }
     logicalPackage(owningPackage, file) {
         let logicalLocation = this.reverseSearchAppTree(owningPackage, file);
         if (logicalLocation) {
@@ -177,12 +194,12 @@ class Resolver {
                         let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)((0, path_1.resolve)(pkg.root, fastbootFile.shadowedFilename), 'utf8'), {
                             configFile: false,
                         });
-                        let switchFile = (0, virtual_content_1.fastbootSwitch)(candidate, (0, path_1.resolve)(pkg.root, 'package.json'), names);
-                        if (switchFile === request.fromFile) {
+                        let switchFile = fastbootSwitch(candidate, (0, path_1.resolve)(pkg.root, 'package.json'), names);
+                        if (switchFile.specifier === request.fromFile) {
                             return logTransition('internal lookup from fastbootSwitch', request);
                         }
                         else {
-                            return logTransition('shadowed app fastboot', request, request.virtualize({ type: 'fastboot-switch', specifier: switchFile }));
+                            return logTransition('shadowed app fastboot', request, request.virtualize(switchFile));
                         }
                     }
                     else {
@@ -198,7 +215,7 @@ class Resolver {
         if (request.resolvedTo) {
             return request;
         }
-        let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
+        let match = decodeFastbootSwitch(request.fromFile);
         if (!match) {
             return request;
         }
@@ -245,57 +262,88 @@ class Resolver {
         if (request.resolvedTo) {
             return request;
         }
-        let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
-        if (!im) {
-            return request;
-        }
-        let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
-            throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
-        }
-        let packageName = (0, shared_internals_1.packageName)(im.fromFile);
-        if (packageName) {
-            let dep = this.packageCache.resolve(packageName, pkg);
-            return logTransition(`dep's implicit modules`, request, request.virtualize({ type: im.type, specifier: (0, path_1.resolve)(dep.root, `-embroider-${im.type}.js`) }));
-        }
-        else {
-            return logTransition(`own implicit modules`, request, request.virtualize({ type: im.type, specifier: (0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`) }));
+        for (let variant of ['', 'test-']) {
+            let suffix = `-embroider-implicit-${variant}modules.js`;
+            if (!request.specifier.endsWith(suffix)) {
+                continue;
+            }
+            let filename = request.specifier.slice(0, -1 * suffix.length);
+            if (!filename.endsWith('/') && filename.endsWith('\\')) {
+                continue;
+            }
+            filename = filename.slice(0, -1);
+            let pkg = this.packageCache.ownerOfFile(request.fromFile);
+            if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+                throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
+            }
+            let type = `implicit-${variant}modules`;
+            let packageName = (0, shared_internals_1.packageName)(filename);
+            if (packageName) {
+                let dep = this.packageCache.resolve(packageName, pkg);
+                return logTransition(`dep's implicit modules`, request, request.virtualize({ type, specifier: (0, path_1.resolve)(dep.root, `-embroider-${type}.js`), fromFile: dep.root }));
+            }
+            else {
+                return logTransition(`own implicit modules`, request, request.virtualize({ type, specifier: (0, path_1.resolve)(pkg.root, `-embroider-${type}.js`), fromFile: pkg.root }));
+            }
         }
+        return request;
     }
     handleEntrypoint(request) {
+        var _a;
         if (request.resolvedTo) {
             return request;
         }
-        let virtualResponse = (0, virtual_entrypoint_1.virtualEntrypoint)(request, this.packageCache);
-        if (virtualResponse) {
-            return logTransition('entrypoint', request, request.virtualize(virtualResponse));
+        const compatModulesSpecifier = '@embroider/virtual/compat-modules';
+        let isCompatModules = request.specifier === compatModulesSpecifier || request.specifier.startsWith(compatModulesSpecifier + '/');
+        if (!isCompatModules) {
+            return request;
+        }
+        const requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (!(requestingPkg === null || requestingPkg === void 0 ? void 0 : requestingPkg.isV2Ember())) {
+            throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
+        }
+        let pkg;
+        if (request.specifier === compatModulesSpecifier) {
+            pkg = requestingPkg;
         }
         else {
-            return request;
+            let packageName = request.specifier.slice(compatModulesSpecifier.length + 1);
+            pkg = this.packageCache.resolve(packageName, requestingPkg);
         }
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        let specifier = (0, path_1.resolve)(pkg.root, (_a = matched === null || matched === void 0 ? void 0 : matched[0]) !== null && _a !== void 0 ? _a : '-embroider-entrypoint.js');
+        return logTransition('entrypoint', request, request.virtualize({
+            type: 'entrypoint',
+            specifier,
+            fromDir: (0, path_1.dirname)(specifier),
+        }));
     }
     handleRouteEntrypoint(request) {
         if (request.resolvedTo) {
             return request;
         }
-        let routeName = (0, virtual_route_entrypoint_1.decodePublicRouteEntrypoint)(request.specifier);
-        if (!routeName) {
+        const publicPrefix = '@embroider/core/route/';
+        if (!request.specifier.startsWith(publicPrefix)) {
             return request;
         }
+        let routeName = request.specifier.slice(publicPrefix.length);
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
         }
-        return logTransition('route entrypoint', request, request.virtualize({ type: 'route-entrypoint', specifier: (0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg, routeName) }));
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-route-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        let target = matched ? `${matched}:route=${routeName}` : `-embroider-route-entrypoint.js:route=${routeName}`;
+        let specifier = (0, path_1.resolve)(pkg.root, target);
+        return logTransition('route entrypoint', request, request.virtualize({ type: 'route-entrypoint', specifier, route: routeName, fromDir: (0, path_1.dirname)(specifier) }));
     }
     handleImplicitTestScripts(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/test-support.js',
-            '/@embroider/virtual/test-support.js',
-            './@embroider/virtual/test-support.js',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/test-support.js') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -305,13 +353,7 @@ class Resolver {
         return logTransition('test-support', request, request.virtualize({ type: 'test-support-js', specifier: (0, path_1.resolve)(pkg.root, '-embroider-test-support.js') }));
     }
     handleTestSupportStyles(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/test-support.css',
-            '/@embroider/virtual/test-support.css',
-            './@embroider/virtual/test-support.css',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/test-support.css') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -351,13 +393,7 @@ class Resolver {
         }
     }
     handleVendorStyles(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/vendor.css',
-            '/@embroider/virtual/vendor.css',
-            './@embroider/virtual/vendor.css',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/vendor.css') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -371,6 +407,7 @@ class Resolver {
         return logTransition('resolveHelper', request, request.alias(`${target.packageName}/helpers/${target.memberName}`).rehome((0, path_1.resolve)(inEngine.root, 'package.json')));
     }
     async resolveComponent(path, inEngine, request) {
+        var _a, _b;
         let target = this.parseGlobalPath(path, inEngine);
         let hbsModule = null;
         let jsModule = null;
@@ -401,7 +438,10 @@ class Resolver {
             }
             return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize({
                 type: 'component-pair',
-                specifier: (0, virtual_content_1.virtualPairComponent)(this.options.appRoot, hbsModule.filename, jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename),
+                hbsModule: hbsModule.filename,
+                jsModule: (_a = jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename) !== null && _a !== void 0 ? _a : null,
+                debugName: (0, path_1.basename)(hbsModule.filename).replace(/\.(js|hbs)$/, ''),
+                specifier: `${this.options.appRoot}/embroider-pair-component/${encodeURIComponent(hbsModule.filename)}/__vpc__/${encodeURIComponent((_b = jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename) !== null && _b !== void 0 ? _b : '')}`,
             }));
         }
         else if (jsModule) {
@@ -648,6 +688,7 @@ class Resolver {
         return request;
     }
     handleRenaming(request) {
+        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -683,7 +724,7 @@ class Resolver {
         }
         if (pkg.name === packageName) {
             // we found a self-import
-            if (pkg.meta['auto-upgraded']) {
+            if ((_a = pkg.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) {
                 // auto-upgraded packages always get automatically adjusted. They never
                 // supported fancy package.json exports features so this direct mapping
                 // to the root is always right.
@@ -720,13 +761,7 @@ class Resolver {
         return request;
     }
     handleVendor(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/vendor.js',
-            '/@embroider/virtual/vendor.js',
-            './@embroider/virtual/vendor.js',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/vendor.js') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -750,6 +785,7 @@ class Resolver {
         return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
+        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -790,7 +826,7 @@ class Resolver {
         // package to which it belongs (normally the app) that affects some policy
         // choices about what it can import
         let logicalPackage = this.logicalPackage(pkg, fromFile);
-        if (logicalPackage.meta['auto-upgraded'] && !logicalPackage.hasDependency('ember-auto-import')) {
+        if (((_a = logicalPackage.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) && !logicalPackage.hasDependency('ember-auto-import')) {
             try {
                 let dep = this.packageCache.resolve(packageName, logicalPackage);
                 if (!dep.isEmberAddon()) {
@@ -994,10 +1030,7 @@ class Resolver {
                     throw new Error(`${matched.entry['app-js'].fromPackageName} declared ${inEngineSpecifier} in packageJSON.ember-addon.app-js, but that module does not exist`);
                 }
                 let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)(foundAppJS.filename, 'utf8'), { configFile: false });
-                return request.virtualize({
-                    type: 'fastboot-switch',
-                    specifier: (0, virtual_content_1.fastbootSwitch)(matched.matched, (0, path_1.resolve)(engine.root, 'package.json'), names),
-                });
+                return request.virtualize(fastbootSwitch(matched.matched, (0, path_1.resolve)(engine.root, 'package.json'), names));
         }
     }
     // check whether the given file with the given owningPackage is an addon's
@@ -1088,4 +1121,27 @@ function engineRelativeName(pkg, filename) {
         return '.' + outsideName.slice(pkg.name.length);
     }
 }
+const fastbootSwitchSuffix = '/embroider_fastboot_switch';
+function fastbootSwitch(specifier, fromFile, names) {
+    let filename = `${(0, path_1.resolve)((0, path_1.dirname)(fromFile), specifier)}${fastbootSwitchSuffix}`;
+    let virtualSpecifier;
+    if (names.size > 0) {
+        virtualSpecifier = `${filename}?names=${[...names].join(',')}`;
+    }
+    else {
+        virtualSpecifier = filename;
+    }
+    return {
+        type: 'fastboot-switch',
+        specifier: virtualSpecifier,
+        names,
+        hasDefaultExport: 'x',
+    };
+}
+function decodeFastbootSwitch(filename) {
+    let index = filename.indexOf(fastbootSwitchSuffix);
+    if (index >= 0) {
+        return { filename: filename.slice(0, index) };
+    }
+}
 //# sourceMappingURL=module-resolver.js.map