@embroider/core 3.5.0 → 3.5.1-unstable.1c0f616

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.5.0",
+  "version": "3.5.1-unstable.1c0f616",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -11,24 +11,32 @@
   "license": "MIT",
   "author": "Edward Faulkner",
   "main": "src/index.js",
+  "typesVersions": {
+    "*": {
+      "virtual": [
+        "types/virtual"
+      ]
+    }
+  },
   "files": [
     "src/**/*.js",
     "src/**/*.d.ts",
-    "src/**/*.js.map"
+    "src/**/*.js.map",
+    "types"
   ],
   "dependencies": {
     "@babel/core": "^7.14.5",
     "@babel/parser": "^7.14.5",
     "@babel/traverse": "^7.14.5",
     "assert-never": "^1.2.1",
-    "babel-plugin-ember-template-compilation": "^2.1.1",
+    "babel-plugin-ember-template-compilation": "^2.3.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
     "broccoli-source": "^3.0.1",
     "debug": "^4.3.2",
+    "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^2.1.1",
-    "filesize": "^10.0.7",
     "fs-extra": "^9.1.0",
     "fs-tree-diff": "^2.0.1",
     "handlebars": "^4.7.7",
@@ -37,11 +45,13 @@
     "lodash": "^4.17.21",
     "resolve": "^1.20.0",
     "resolve-package-path": "^4.0.1",
+    "resolve.exports": "^2.0.2",
     "semver": "^7.3.5",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.10",
-    "@embroider/shared-internals": "2.8.1"
+    "@embroider/macros": "1.16.11-unstable.1c0f616",
+    "@embroider/reverse-exports": "0.1.1-unstable.1c0f616",
+    "@embroider/shared-internals": "2.8.2-unstable.1c0f616"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",
@@ -50,18 +60,19 @@
     "@types/babel__traverse": "^7.18.5",
     "@types/debug": "^4.1.5",
     "@types/fs-extra": "^9.0.12",
-    "@types/jsdom": "^16.2.11",
     "@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/qunit": "^2.19.12",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.5",
     "@types/tmp": "^0.1.0",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
-    "typescript": "^5.1.6",
-    "@embroider/test-support": "0.36.0",
-    "@embroider/sample-transforms": "0.0.0"
+    "typescript": "^5.4.5",
+    "@embroider/sample-transforms": "0.0.0",
+    "@embroider/test-support": "0.36.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/app-files.d.ts

@@ -7,7 +7,6 @@ export interface RouteFiles {
 }
 export declare class AppFiles {
     readonly engine: Engine;
-    readonly tests: ReadonlyArray<string>;
     readonly components: ReadonlyArray<string>;
     readonly helpers: ReadonlyArray<string>;
     readonly modifiers: ReadonlyArray<string>;
@@ -20,16 +19,15 @@ export declare class AppFiles {
             shadowedFilename: string | undefined;
         };
     };
-    constructor(engine: Engine, appFiles: Set<string>, fastbootFiles: Set<string>, resolvableExtensions: RegExp, podModulePrefix?: string);
+    constructor(engine: Engine, appFiles: Set<string>, fastbootFiles: Set<string>, resolvableExtensions: RegExp, staticAppPathsPattern: RegExp | undefined, podModulePrefix?: string);
     private handleClassicRouteFile;
     private handlePodsRouteFile;
     get routeFiles(): Readonly<RouteFiles>;
 }
 export interface Engine {
     package: Package;
-    addons: Set<AddonPackage>;
-    parent: Engine | undefined;
-    sourcePath: string;
+    addons: Map<AddonPackage, string>;
+    isApp: boolean;
     modulePrefix: string;
     appRelativePath: string;
 }

package/src/app-files.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppFiles = void 0;
 const path_1 = require("path");
 class AppFiles {
-    constructor(engine, appFiles, fastbootFiles, resolvableExtensions, podModulePrefix) {
+    constructor(engine, appFiles, fastbootFiles, resolvableExtensions, staticAppPathsPattern, podModulePrefix) {
         this.engine = engine;
-        let tests = [];
         let components = [];
         let helpers = [];
         let modifiers = [];
@@ -21,7 +20,7 @@ class AppFiles {
         for (let f of fastbootFiles) {
             combinedFiles.add(f);
         }
-        for (let addon of engine.addons) {
+        for (let addon of engine.addons.keys()) {
             let appJS = addon.meta['app-js'];
             if (appJS) {
                 for (let filename of Object.keys(appJS)) {
@@ -50,17 +49,29 @@ class AppFiles {
                 continue;
             }
             if (relativePath.startsWith('tests/')) {
-                tests.push(relativePath);
+                // skip tests because they are dealt with separately
                 continue;
             }
             if (relativePath.startsWith('components/')) {
-                // hbs files are resolvable, but not when they're used via co-location.
+                // hbs files are not resolvable when they're used via co-location with
+                // an associated js file because it's the js that is resolvable.
                 // An hbs file is used via colocation when it's inside the components
                 // directory, and also not named "template.hbs" (because that is an
                 // older pattern used with pods-like layouts).
-                if (!relativePath.endsWith('.hbs') || relativePath.endsWith('/template.hbs')) {
+                let isHbs = relativePath.endsWith('.hbs');
+                if (!isHbs || relativePath.endsWith('/template.hbs')) {
                     components.push(relativePath);
                 }
+                else if (isHbs) {
+                    // template-only components will be compiled as js files during the
+                    // build process, so we push a virtual path to js in the list of files
+                    // because the resolver will be able to recognize a template-only and
+                    // give a correct answer in the end.
+                    let jsPath = relativePath.replace(/\.hbs$/, '.js');
+                    if (!combinedFiles.has(jsPath)) {
+                        components.push(jsPath);
+                    }
+                }
                 continue;
             }
             if (relativePath.startsWith('templates/components/')) {
@@ -79,9 +90,15 @@ class AppFiles {
                 this.handleClassicRouteFile(relativePath)) {
                 continue;
             }
-            otherAppFiles.push(relativePath);
+            if (staticAppPathsPattern) {
+                if (!staticAppPathsPattern.test(relativePath)) {
+                    otherAppFiles.push(relativePath);
+                }
+            }
+            else {
+                otherAppFiles.push(relativePath);
+            }
         }
-        this.tests = tests;
         this.components = components;
         this.helpers = helpers;
         this.modifiers = modifiers;

package/src/app-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":"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","sourcesContent":["import { sep } from 'path';\nimport type { Package, AddonPackage } from '@embroider/shared-internals';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly tests: ReadonlyArray<string>;\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n  readonly fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n\n  constructor(\n    readonly engine: Engine,\n    appFiles: Set<string>,\n    fastbootFiles: Set<string>,\n    resolvableExtensions: RegExp,\n    podModulePrefix?: string\n  ) {\n    let tests: string[] = [];\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n\n    let combinedFiles = new Set<string>();\n    let combinedNonFastbootFiles = new Set<string>();\n    let isFastbootOnly = new Map<string, boolean>();\n\n    for (let f of appFiles) {\n      combinedFiles.add(f);\n      combinedNonFastbootFiles.add(f);\n    }\n    for (let f of fastbootFiles) {\n      combinedFiles.add(f);\n    }\n\n    for (let addon of engine.addons) {\n      let appJS = addon.meta['app-js'];\n      if (appJS) {\n        for (let filename of Object.keys(appJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          combinedFiles.add(filename);\n          combinedNonFastbootFiles.add(filename);\n        }\n      }\n\n      let fastbootJS = addon.meta['fastboot-js'];\n      if (fastbootJS) {\n        for (let filename of Object.keys(fastbootJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          combinedFiles.add(filename);\n        }\n      }\n    }\n\n    for (let relativePath of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(relativePath));\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        continue;\n      }\n\n      if (relativePath.startsWith('tests/')) {\n        tests.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are resolvable, but not when they're used via co-location.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        if (!relativePath.endsWith('.hbs') || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix)) ||\n        this.handleClassicRouteFile(relativePath)\n      ) {\n        continue;\n      }\n\n      otherAppFiles.push(relativePath);\n    }\n    this.tests = tests;\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n    this.isFastbootOnly = isFastbootOnly;\n\n    // this deliberately only describes the app's fastboot files. Not the full\n    // merge from all the addons. This is because they need different handling\n    // in the module resolver -- addon fastboot files can always be a\n    // fallbackResolve, because if the app happens to define the same name\n    // (whether fastboot-specific or just browser) that wins over the addon.\n    // Whereas if the app itself defines a fastbot-specific version of a file,\n    // that must take precedence over the *normal* resolution, and must be\n    // implemented in beforeResolve.\n    this.fastbootFiles = Object.fromEntries(\n      [...fastbootFiles].map(name => [\n        `./${name}`,\n        {\n          localFilename: `./_fastboot_/${name}`,\n          shadowedFilename: appFiles.has(name) ? `./${name}` : undefined,\n        },\n      ])\n    );\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface Engine {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine\n  addons: Set<AddonPackage>;\n  // the parent engine, if any\n  parent: Engine | undefined;\n  // where the engine's own V2 code comes from\n  sourcePath: string;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // this is destPath but relative to the app itself\n  appRelativePath: string;\n}\n"]}
+{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":"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","sourcesContent":["import { sep } from 'path';\nimport type { Package, AddonPackage } from '@embroider/shared-internals';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n  readonly fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n\n  constructor(\n    readonly engine: Engine,\n    appFiles: Set<string>,\n    fastbootFiles: Set<string>,\n    resolvableExtensions: RegExp,\n    staticAppPathsPattern: RegExp | undefined,\n    podModulePrefix?: string\n  ) {\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n\n    let combinedFiles = new Set<string>();\n    let combinedNonFastbootFiles = new Set<string>();\n    let isFastbootOnly = new Map<string, boolean>();\n\n    for (let f of appFiles) {\n      combinedFiles.add(f);\n      combinedNonFastbootFiles.add(f);\n    }\n    for (let f of fastbootFiles) {\n      combinedFiles.add(f);\n    }\n\n    for (let addon of engine.addons.keys()) {\n      let appJS = addon.meta['app-js'];\n      if (appJS) {\n        for (let filename of Object.keys(appJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          combinedFiles.add(filename);\n          combinedNonFastbootFiles.add(filename);\n        }\n      }\n\n      let fastbootJS = addon.meta['fastboot-js'];\n      if (fastbootJS) {\n        for (let filename of Object.keys(fastbootJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          combinedFiles.add(filename);\n        }\n      }\n    }\n\n    for (let relativePath of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(relativePath));\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        continue;\n      }\n\n      if (relativePath.startsWith('tests/')) {\n        // skip tests because they are dealt with separately\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are not resolvable when they're used via co-location with\n        // an associated js file because it's the js that is resolvable.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        let isHbs = relativePath.endsWith('.hbs');\n        if (!isHbs || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        } else if (isHbs) {\n          // template-only components will be compiled as js files during the\n          // build process, so we push a virtual path to js in the list of files\n          // because the resolver will be able to recognize a template-only and\n          // give a correct answer in the end.\n          let jsPath = relativePath.replace(/\\.hbs$/, '.js');\n          if (!combinedFiles.has(jsPath)) {\n            components.push(jsPath);\n          }\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix)) ||\n        this.handleClassicRouteFile(relativePath)\n      ) {\n        continue;\n      }\n\n      if (staticAppPathsPattern) {\n        if (!staticAppPathsPattern.test(relativePath)) {\n          otherAppFiles.push(relativePath);\n        }\n      } else {\n        otherAppFiles.push(relativePath);\n      }\n    }\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n    this.isFastbootOnly = isFastbootOnly;\n\n    // this deliberately only describes the app's fastboot files. Not the full\n    // merge from all the addons. This is because they need different handling\n    // in the module resolver -- addon fastboot files can always be a\n    // fallbackResolve, because if the app happens to define the same name\n    // (whether fastboot-specific or just browser) that wins over the addon.\n    // Whereas if the app itself defines a fastbot-specific version of a file,\n    // that must take precedence over the *normal* resolution, and must be\n    // implemented in beforeResolve.\n    this.fastbootFiles = Object.fromEntries(\n      [...fastbootFiles].map(name => [\n        `./${name}`,\n        {\n          localFilename: `./_fastboot_/${name}`,\n          shadowedFilename: appFiles.has(name) ? `./${name}` : undefined,\n        },\n      ])\n    );\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface Engine {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine. For each one we keep track of a file that can resolve the addon, because we'll need that later.\n  addons: Map<AddonPackage, string>;\n  // is this the top-level engine?\n  isApp: boolean;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // TODO: remove this after we remove the stage2 entrypoint\n  appRelativePath: string;\n}\n"]}

package/src/index.d.ts

@@ -1,14 +1,14 @@
-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 { Asset, EmberAsset, ImplicitAssetPaths } from './asset';
 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, Options as ResolverOptions, ModuleRequest, Resolution, ResolverFunction, SyncResolverFunction, } 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,17 +17,14 @@ 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.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; } });
 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 +38,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;AAGvB,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,qDAO2B;AANzB,2GAAA,QAAQ,OAAA;AAOV,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 { Asset, EmberAsset, ImplicitAssetPaths } from './asset';\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 {\n  Resolver,\n  Options as ResolverOptions,\n  ModuleRequest,\n  Resolution,\n  ResolverFunction,\n  SyncResolverFunction,\n} from './module-resolver';\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,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/measure-concat.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fs_1 = require("fs");
-const filesize_1 = require("filesize");
 class MeasureConcat {
     constructor(name, concat, baseDir) {
         this.name = name;
@@ -22,7 +21,7 @@ class MeasureConcat {
         console.log(`Concatenated ${this.name}:`);
         console.log(Object.entries(this.stats)
             .sort((a, b) => b[1] - a[1])
-            .map(([name, bytes]) => `  ${name}: ${(0, filesize_1.filesize)(bytes, {})}`)
+            .map(([name, bytes]) => `  ${name}: ${bytes} bytes`)
             .join('\n'));
         return await this.concat.end();
     }

package/src/measure-concat.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-concat.js","sourceRoot":"","sources":["measure-concat.ts"],"names":[],"mappings":";;AACA,+BAA4B;AAC5B,2BAA8B;AAC9B,uCAAoC;AAEpC,MAAqB,aAAa;IAEhC,YAAoB,IAAY,EAAU,MAAuB,EAAU,OAAe;QAAtE,SAAI,GAAJ,IAAI,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAiB;QAAU,YAAO,GAAP,OAAO,CAAQ;QAD1F,UAAK,GAAmC,EAAE,CAAC;IACkD,CAAC;IAC9F,OAAO,CAAC,QAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,IAAA,mBAAQ,EAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;aAC3D,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACF;AArBD,gCAqBC","sourcesContent":["import type SourceMapConcat from 'fast-sourcemap-concat';\nimport { join } from 'path';\nimport { statSync } from 'fs';\nimport { filesize } from 'filesize';\n\nexport default class MeasureConcat {\n  stats: { [filename: string]: number } = {};\n  constructor(private name: string, private concat: SourceMapConcat, private baseDir: string) {}\n  addFile(filename: string) {\n    this.stats[filename] = statSync(join(this.baseDir, filename)).size;\n    return this.concat.addFile(filename);\n  }\n  addSpace(contents: string) {\n    this.stats['in-memory'] = (this.stats['in-memory'] || 0) + contents.length;\n    return this.concat.addSpace(contents);\n  }\n  async end() {\n    console.log(`Concatenated ${this.name}:`);\n    console.log(\n      Object.entries(this.stats)\n        .sort((a, b) => b[1] - a[1])\n        .map(([name, bytes]) => `  ${name}: ${filesize(bytes, {})}`)\n        .join('\\n')\n    );\n    return await this.concat.end();\n  }\n}\n"]}
+{"version":3,"file":"measure-concat.js","sourceRoot":"","sources":["measure-concat.ts"],"names":[],"mappings":";;AACA,+BAA4B;AAC5B,2BAA8B;AAE9B,MAAqB,aAAa;IAEhC,YAAoB,IAAY,EAAU,MAAuB,EAAU,OAAe;QAAtE,SAAI,GAAJ,IAAI,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAiB;QAAU,YAAO,GAAP,OAAO,CAAQ;QAD1F,UAAK,GAAmC,EAAE,CAAC;IACkD,CAAC;IAC9F,OAAO,CAAC,QAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,KAAK,QAAQ,CAAC;aACnD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACF;AArBD,gCAqBC","sourcesContent":["import type SourceMapConcat from 'fast-sourcemap-concat';\nimport { join } from 'path';\nimport { statSync } from 'fs';\n\nexport default class MeasureConcat {\n  stats: { [filename: string]: number } = {};\n  constructor(private name: string, private concat: SourceMapConcat, private baseDir: string) {}\n  addFile(filename: string) {\n    this.stats[filename] = statSync(join(this.baseDir, filename)).size;\n    return this.concat.addFile(filename);\n  }\n  addSpace(contents: string) {\n    this.stats['in-memory'] = (this.stats['in-memory'] || 0) + contents.length;\n    return this.concat.addSpace(contents);\n  }\n  async end() {\n    console.log(`Concatenated ${this.name}:`);\n    console.log(\n      Object.entries(this.stats)\n        .sort((a, b) => b[1] - a[1])\n        .map(([name, bytes]) => `  ${name}: ${bytes} bytes`)\n        .join('\\n')\n    );\n    return await this.concat.end();\n  }\n}\n"]}

package/src/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["messages.ts"],"names":[],"mappings":";;;;;;AA6BA,oBAMC;AAID,0CAcC;AAED,sCAQC;AA/DD,kDAA8B;AAC9B,+BAA8B;AAE9B,MAAM,IAAI,GAAG,IAAA,eAAS,EAAC,gBAAgB,CAAC,CAAC;AA8DhC,oBAAI;AA7Db,MAAM,WAAW,GAAG,IAAA,eAAS,EAAC,uBAAuB,CAAC,CAAC;AA6DxC,kCAAW;AA5D1B,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,iBAAiB,CAAC,CAAC;AA4Df,sBAAK;AA1DjC,SAAS,QAAQ,CAAC,OAAe,EAAE,MAAa;IAC9C,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,IAAI,WAAW,GAAG,EAAc,CAAC;AACjC,IAAI,OAAO,GAAoB,IAAI,OAAO,EAAE,CAAC;AAE7C,SAAS,YAAY,CAAC,OAAe,EAAE,MAAa;IAClD,IAAI,gBAAgB,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;IAClD,KAAK,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa;IACpD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,6BAA6B;AAC7B,IAAI,YAAY,GAAG,CAAC,CAAC;AACrB,SAAgB,eAAe,CAAC,KAAmB;IACjD,IAAI,KAAK,EAAE,CAAC;QACV,aAAa;QACb,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;YAChB,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;YACf,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,YAAY;QACZ,SAAS,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAChC,QAAQ,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,EAAc;IAC3D,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1B,IAAI,CAAC;QACH,EAAE,EAAE,CAAC;IACP,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC","sourcesContent":["import makeDebug from 'debug';\nimport { format } from 'util';\n\nconst todo = makeDebug('embroider:todo');\nconst unsupported = makeDebug('embroider:unsupported');\nconst debug = makeDebug('embroider:debug');\n\nfunction realWarn(message: string, params: any[]) {\n  if (hardFailMode > 0) {\n    throw new Error(`Unexpected warning in test suite: ${format(message, ...params)}`);\n  } else {\n    console.log('WARNING: ' + format(message, ...params));\n  }\n}\n\nlet expectStack = [] as RegExp[];\nlet handled: WeakSet<RegExp> = new WeakSet();\n\nfunction expectedWarn(message: string, params: any[]) {\n  let formattedMessage = format(message, ...params);\n  for (let pattern of expectStack) {\n    if (pattern.test(formattedMessage)) {\n      handled.add(pattern);\n      return;\n    }\n  }\n  realWarn(message, params);\n}\n\nexport function warn(message: string, ...params: any[]) {\n  if (expectStack.length === 0) {\n    realWarn(message, params);\n  } else {\n    expectedWarn(message, params);\n  }\n}\n\n// for use in our test suites\nlet hardFailMode = 0;\nexport function throwOnWarnings(hooks?: NestedHooks) {\n  if (hooks) {\n    // qunit mode\n    hooks.before(() => {\n      hardFailMode++;\n    });\n    hooks.after(() => {\n      hardFailMode--;\n    });\n  } else {\n    // Jest mode\n    beforeAll(() => hardFailMode++);\n    afterAll(() => hardFailMode--);\n  }\n}\n\nexport function expectWarning(pattern: RegExp, fn: () => void) {\n  expectStack.push(pattern);\n  try {\n    fn();\n  } finally {\n    expectStack.pop();\n  }\n  return handled.has(pattern);\n}\n\nexport { todo, unsupported, debug };\n"]}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["messages.ts"],"names":[],"mappings":";;;;;;AAgCA,oBAMC;AAID,0CAcC;AAED,sCAQC;AAlED,kDAA8B;AAC9B,+BAA8B;AAK9B,MAAM,IAAI,GAAG,IAAA,eAAS,EAAC,gBAAgB,CAAC,CAAC;AA8DhC,oBAAI;AA7Db,MAAM,WAAW,GAAG,IAAA,eAAS,EAAC,uBAAuB,CAAC,CAAC;AA6DxC,kCAAW;AA5D1B,MAAM,KAAK,GAAG,IAAA,eAAS,EAAC,iBAAiB,CAAC,CAAC;AA4Df,sBAAK;AA1DjC,SAAS,QAAQ,CAAC,OAAe,EAAE,MAAa;IAC9C,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,IAAI,WAAW,GAAG,EAAc,CAAC;AACjC,IAAI,OAAO,GAAoB,IAAI,OAAO,EAAE,CAAC;AAE7C,SAAS,YAAY,CAAC,OAAe,EAAE,MAAa;IAClD,IAAI,gBAAgB,GAAG,IAAA,aAAM,EAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;IAClD,KAAK,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa;IACpD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED,6BAA6B;AAC7B,IAAI,YAAY,GAAG,CAAC,CAAC;AACrB,SAAgB,eAAe,CAAC,KAAmB;IACjD,IAAI,KAAK,EAAE,CAAC;QACV,aAAa;QACb,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;YAChB,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;YACf,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,YAAY;QACZ,SAAS,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;QAChC,QAAQ,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,EAAc;IAC3D,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1B,IAAI,CAAC;QACH,EAAE,EAAE,CAAC;IACP,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC","sourcesContent":["import makeDebug from 'debug';\nimport { format } from 'util';\n// @ts-expect-error we can't import the NestedHooks from qunit here\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nimport type qunit from 'qunit';\n\nconst todo = makeDebug('embroider:todo');\nconst unsupported = makeDebug('embroider:unsupported');\nconst debug = makeDebug('embroider:debug');\n\nfunction realWarn(message: string, params: any[]) {\n  if (hardFailMode > 0) {\n    throw new Error(`Unexpected warning in test suite: ${format(message, ...params)}`);\n  } else {\n    console.log('WARNING: ' + format(message, ...params));\n  }\n}\n\nlet expectStack = [] as RegExp[];\nlet handled: WeakSet<RegExp> = new WeakSet();\n\nfunction expectedWarn(message: string, params: any[]) {\n  let formattedMessage = format(message, ...params);\n  for (let pattern of expectStack) {\n    if (pattern.test(formattedMessage)) {\n      handled.add(pattern);\n      return;\n    }\n  }\n  realWarn(message, params);\n}\n\nexport function warn(message: string, ...params: any[]) {\n  if (expectStack.length === 0) {\n    realWarn(message, params);\n  } else {\n    expectedWarn(message, params);\n  }\n}\n\n// for use in our test suites\nlet hardFailMode = 0;\nexport function throwOnWarnings(hooks?: NestedHooks) {\n  if (hooks) {\n    // qunit mode\n    hooks.before(() => {\n      hardFailMode++;\n    });\n    hooks.after(() => {\n      hardFailMode--;\n    });\n  } else {\n    // Jest mode\n    beforeAll(() => hardFailMode++);\n    afterAll(() => hardFailMode--);\n  }\n}\n\nexport function expectWarning(pattern: RegExp, fn: () => void) {\n  expectStack.push(pattern);\n  try {\n    fn();\n  } finally {\n    expectStack.pop();\n  }\n  return handled.has(pattern);\n}\n\nexport { todo, unsupported, debug };\n"]}

package/src/module-request.d.ts

@@ -0,0 +1,44 @@
+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;
+}
+export declare function extractResolution<Res extends Resolution = Resolution>(res: Res | (() => Promise<Res>)): Promise<Res>;

package/src/module-request.js

@@ -0,0 +1,100 @@
+"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;
+exports.extractResolution = extractResolution;
+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();
+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

@@ -0,0 +1 @@
+{"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-options.d.ts

@@ -0,0 +1,42 @@
+import { type AddonPackage, type Package } from '@embroider/shared-internals';
+export interface Options {
+    renamePackages: {
+        [fromName: string]: string;
+    };
+    renameModules: {
+        [fromName: string]: string;
+    };
+    resolvableExtensions: string[];
+    appRoot: string;
+    engines: EngineConfig[];
+    modulePrefix: string;
+    splitAtRoutes?: (RegExp | string)[];
+    podModulePrefix?: string;
+    staticAppPaths: string[];
+    emberVersion: string;
+}
+export interface EngineConfig {
+    packageName: string;
+    activeAddons: {
+        name: string;
+        root: string;
+        canResolveFromFile: string;
+    }[];
+    fastbootFiles: {
+        [appName: string]: {
+            localFilename: string;
+            shadowedFilename: string | undefined;
+        };
+    };
+    root: string;
+    isLazy: boolean;
+}
+export declare function buildResolverOptions<T extends Options>(inputs: {
+    appPackage?: Package;
+    extraDeps?: Map<string, AddonPackage[]>;
+    modulePrefix?: string;
+    podModulePrefix?: string;
+    splitAtRoutes?: (RegExp | string)[];
+    staticAppPaths?: string[];
+    extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;
+}): T;