@embroider/core 3.4.15-unstable.eb93cd5 → 3.4.16-unstable.11ce470

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.15-unstable.eb93cd5",
+  "version": "3.4.16-unstable.11ce470",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -21,7 +21,7 @@
     "@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",
@@ -29,7 +29,6 @@
     "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",
@@ -41,9 +40,9 @@
     "resolve.exports": "^2.0.2",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.6-unstable.eb93cd5",
-    "@embroider/reverse-exports": "0.1.1-unstable.eb93cd5",
-    "@embroider/shared-internals": "2.6.3-unstable.eb93cd5"
+    "@embroider/macros": "1.16.7-unstable.11ce470",
+    "@embroider/reverse-exports": "0.1.1-unstable.11ce470",
+    "@embroider/shared-internals": "2.6.4-unstable.11ce470"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",

package/src/index.d.ts

@@ -6,7 +6,8 @@ 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 } from './module-resolver';
+export { Resolver, ModuleRequest, Resolution } from './module-resolver';
+export type { Options as ResolverOptions } from './module-resolver-options';
 export { ResolverLoader } from './resolver-loader';
 export { virtualContent } from './virtual-content';
 export type { Engine } from './app-files';

package/src/index.js.map

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

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/module-resolver-options.d.ts

@@ -0,0 +1,44 @@
+import { type AddonPackage, type Package } from '@embroider/shared-internals';
+import type UserOptions from './options';
+export interface Options {
+    renamePackages: {
+        [fromName: string]: string;
+    };
+    renameModules: {
+        [fromName: string]: string;
+    };
+    resolvableExtensions: string[];
+    appRoot: string;
+    engines: EngineConfig[];
+    modulePrefix: string;
+    splitAtRoutes?: (RegExp | string)[];
+    podModulePrefix?: string;
+    amdCompatibility: Required<UserOptions['amdCompatibility']>;
+    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;

package/src/module-resolver-options.js

@@ -0,0 +1,167 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildResolverOptions = buildResolverOptions;
+const shared_internals_1 = require("@embroider/shared-internals");
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const flatMap_1 = __importDefault(require("lodash/flatMap"));
+function buildResolverOptions(inputs) {
+    var _a, _b;
+    let appPackage;
+    if (inputs.appPackage) {
+        appPackage = inputs.appPackage;
+    }
+    else {
+        let packageCache = shared_internals_1.RewrittenPackageCache.shared('embroider', process.cwd());
+        appPackage = packageCache.get(packageCache.appRoot);
+    }
+    let extraDeps = (_a = inputs.extraDeps) !== null && _a !== void 0 ? _a : new Map();
+    let allActiveAddons = findAllActiveAddons(appPackage, extraDeps);
+    let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));
+    let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));
+    let modulePrefix = appPackage.name;
+    let engines = partitionEngines(appPackage, modulePrefix, extraDeps);
+    let output = {
+        renamePackages,
+        renameModules,
+        resolvableExtensions: resolvableExtensions(),
+        appRoot: appPackage.root,
+        engines,
+        amdCompatibility: {
+            es: [],
+        },
+        modulePrefix,
+        staticAppPaths: (_b = inputs.staticAppPaths) !== null && _b !== void 0 ? _b : [],
+        emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source').version,
+        splitAtRoutes: inputs.splitAtRoutes,
+        podModulePrefix: inputs.podModulePrefix,
+    };
+    if (inputs.extend) {
+        return inputs.extend(output, allActiveAddons);
+    }
+    return output;
+}
+function resolvableExtensions() {
+    let fromEnv = process.env.EMBROIDER_RESOLVABLE_EXTENSIONS;
+    if (fromEnv) {
+        return fromEnv.split(',');
+    }
+    else {
+        return ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];
+    }
+}
+function partitionEngines(appPackage, modulePrefix, extraDeps) {
+    let queue = [
+        {
+            package: appPackage,
+            addons: new Map(),
+            isApp: true,
+            modulePrefix,
+            appRelativePath: '.',
+        },
+    ];
+    let done = [];
+    let seenEngines = new Set();
+    while (true) {
+        let current = queue.shift();
+        if (!current) {
+            break;
+        }
+        findActiveAddons(current.package, current, extraDeps);
+        for (let addon of current.addons.keys()) {
+            if (addon.isEngine() && !seenEngines.has(addon)) {
+                seenEngines.add(addon);
+                queue.push({
+                    package: addon,
+                    addons: new Map(),
+                    isApp: !current,
+                    modulePrefix: addon.name,
+                    appRelativePath: (0, shared_internals_1.explicitRelative)(appPackage.root, addon.root),
+                });
+            }
+        }
+        done.push(current);
+    }
+    return done.map(engine => ({
+        packageName: engine.package.name,
+        // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks
+        root: (0, fs_extra_1.realpathSync)(engine.package.root),
+        fastbootFiles: {},
+        activeAddons: [...engine.addons]
+            .map(([addon, canResolveFromFile]) => ({
+            name: addon.name,
+            root: addon.root,
+            canResolveFromFile,
+        }))
+            // the traditional order is the order in which addons will run, such
+            // that the last one wins. Our resolver's order is the order to
+            // search, so first one wins.
+            .reverse(),
+        isLazy: engine.package.isLazyEngine(),
+    }));
+}
+// recurse to find all active addons that don't cross an engine boundary.
+// Inner engines themselves will be returned, but not those engines' children.
+// The output set's insertion order is the proper ember-cli compatible
+// ordering of the addons.
+function findActiveAddons(pkg, engine, extraDeps, isChild = false) {
+    for (let child of activeAddonChildren(pkg, extraDeps)) {
+        if (!child.isEngine()) {
+            findActiveAddons(child, engine, extraDeps, true);
+        }
+        let canResolveFrom = (0, path_1.resolve)(pkg.root, 'package.json');
+        engine.addons.set(child, canResolveFrom);
+    }
+    // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)
+    if (!isChild) {
+        engine.addons = new Map([...engine.addons].sort(([a], [b]) => {
+            return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);
+        }));
+    }
+}
+function activeAddonChildren(pkg, extraDeps) {
+    let result = pkg.dependencies.filter(isActiveAddon).filter(
+    // When looking for child addons, we want to ignore 'peerDependencies' of
+    // a given package, to align with how ember-cli resolves addons. So here
+    // we only include dependencies that are definitely active due to one of
+    // the other sections.
+    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies');
+    let extras = extraDeps.get(pkg.root);
+    if (extras) {
+        result = [...result, ...extras];
+    }
+    return result.sort(orderAddons);
+}
+function isActiveAddon(pkg) {
+    // stage1 already took care of converting everything that's actually active
+    // into v2 addons. If it's not a v2 addon, we don't want it.
+    //
+    // We can encounter v1 addons here when there is inactive stuff floating
+    // around in the node_modules that accidentally satisfy something like an
+    // optional peer dep.
+    return pkg.isV2Addon();
+}
+function orderAddons(depA, depB) {
+    let depAIdx = 0;
+    let depBIdx = 0;
+    if (depA && depA.meta && depA.isV2Addon()) {
+        depAIdx = depA.meta['order-index'] || 0;
+    }
+    if (depB && depB.meta && depB.isV2Addon()) {
+        depBIdx = depB.meta['order-index'] || 0;
+    }
+    return depAIdx - depBIdx;
+}
+function findAllActiveAddons(appPackage, extraDeps) {
+    let result = appPackage.findDescendants(isActiveAddon);
+    let extras = extraDeps.get(appPackage.root);
+    if (extras) {
+        let extraDescendants = (0, flatMap_1.default)(extras, dep => dep.findDescendants(isActiveAddon));
+        result = [...result, ...extras, ...extraDescendants];
+    }
+    return result.sort(orderAddons);
+}
+//# sourceMappingURL=module-resolver-options.js.map

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

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

package/src/module-resolver.d.ts

@@ -1,39 +1,6 @@
 import type { Package } from '@embroider/shared-internals';
 import { RewrittenPackageCache } from '@embroider/shared-internals';
-import type UserOptions from './options';
-export interface Options {
-    renamePackages: {
-        [fromName: string]: string;
-    };
-    renameModules: {
-        [fromName: string]: string;
-    };
-    resolvableExtensions: string[];
-    appRoot: string;
-    engines: EngineConfig[];
-    modulePrefix: string;
-    splitAtRoutes?: (RegExp | string)[];
-    podModulePrefix?: string;
-    amdCompatibility: Required<UserOptions['amdCompatibility']>;
-    autoRun: boolean;
-    staticAppPaths: 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;
-}
+import type { Options, EngineConfig } from './module-resolver-options';
 export interface ModuleRequest<Res extends Resolution = Resolution> {
     readonly specifier: string;
     readonly fromFile: string;
@@ -108,6 +75,9 @@ export declare class Resolver {
     private locateActiveAddon;
     private external;
     private fallbackResolve;
+    private restoreRehomedRequest;
+    private relativeFallbackResolve;
+    private maybeFallbackToActiveAddon;
     private getEntryFromMergeMap;
     private withResolvableExtensions;
     private searchAppTree;

package/src/module-resolver.js

@@ -674,17 +674,11 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!pkg || !pkg.isV2Ember()) {
-            return request;
-        }
         // real deps take precedence over renaming rules. That is, a package like
         // ember-source might provide backburner via module renaming, but if you
         // have an explicit dependency on backburner you should still get that real
         // copy.
-        // if (pkg.root === this.options.engines[0].root && request.specifier === `${pkg.name}/environment/config`) {
-        //   return logTransition('legacy config location', request, request.alias(`${pkg.name}/app/environment/config`));
-        // }
-        if (!pkg.hasDependency(packageName)) {
+        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.hasDependency(packageName))) {
             for (let [candidate, replacement] of Object.entries(this.options.renameModules)) {
                 if (candidate === request.specifier) {
                     return logTransition(`renameModules`, request, request.alias(replacement));
@@ -702,6 +696,9 @@ class Resolver {
                 return logTransition(`renamePackages`, request, request.alias(request.specifier.replace(packageName, this.options.renamePackages[packageName])));
             }
         }
+        if (!pkg || !pkg.isV2Ember()) {
+            return request;
+        }
         if (pkg.name === packageName) {
             // we found a self-import
             if (pkg.meta['auto-upgraded']) {
@@ -897,7 +894,7 @@ class Resolver {
         }
     }
     async fallbackResolve(request) {
-        var _a, _b, _c;
+        var _a, _b;
         if (request.isVirtual) {
             throw new Error('Build tool bug detected! Fallback resolve should never see a virtual request. It is expected that the defaultResolve for your bundler has already resolved this request');
         }
@@ -925,56 +922,33 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!pkg) {
-            return logTransition('no identifiable owningPackage', request);
+        if (pkg) {
+            ({ pkg, request } = this.restoreRehomedRequest(pkg, request));
         }
-        // meta.originalFromFile gets set when we want to try to rehome a request
-        // but then come back to the original location here in the fallback when the
-        // rehomed request fails
-        let movedPkg = this.packageCache.maybeMoved(pkg);
-        if (movedPkg !== pkg) {
-            let originalFromFile = (_a = request.meta) === null || _a === void 0 ? void 0 : _a.originalFromFile;
-            if (typeof originalFromFile !== 'string') {
-                throw new Error(`bug: embroider resolver's meta is not propagating`);
+        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+            // this request is coming from a file that appears to be owned by no ember
+            // package. We offer one fallback behavior for such files. They're allowed
+            // to resolve from the app's namespace.
+            //
+            // This makes it possible for integrations like vite to leave references
+            // to the app in their pre-bundled dependencies, which will end up in an
+            // arbitrary cache that is not inside any particular package.
+            let description = pkg ? 'non-ember package' : 'unowned module';
+            let packageName = (0, shared_internals_1.packageName)(request.specifier);
+            if (packageName === this.options.modulePrefix) {
+                return logTransition(`fallbackResolver: ${description} resolved app namespace`, request, request.rehome(this.packageCache.maybeMoved(this.packageCache.get(this.options.appRoot)).root));
             }
-            request = request.rehome(originalFromFile);
-            pkg = movedPkg;
-        }
-        if (!pkg.isV2Ember()) {
-            return logTransition('fallbackResolve: not in an ember package', request);
+            return logTransition(`fallbackResolver: ${description}`, request);
         }
         let packageName = (0, shared_internals_1.packageName)(request.specifier);
         if (!packageName) {
             // this is a relative import
-            let withinEngine = this.engineConfig(pkg.name);
-            if (withinEngine) {
-                // it's a relative import inside an engine (which also means app), which
-                // means we may need to satisfy the request via app tree merging.
-                let logicalName = engineRelativeName(pkg, (0, path_1.resolve)((0, path_1.dirname)(request.fromFile), request.specifier));
-                if (!logicalName) {
-                    return logTransition('fallbackResolve: relative failure because this file is not externally accessible', request);
-                }
-                let appJSMatch = await this.searchAppTree(request, withinEngine, logicalName);
-                if (appJSMatch) {
-                    return logTransition('fallbackResolve: relative appJsMatch', request, appJSMatch);
-                }
-                else {
-                    return logTransition('fallbackResolve: relative appJs search failure', request);
-                }
-            }
-            else {
-                // nothing else to do for relative imports
-                return logTransition('fallbackResolve: relative failure', request);
-            }
+            return this.relativeFallbackResolve(pkg, request);
         }
-        // auto-upgraded packages can fall back to the set of known active addons
         if (pkg.needsLooseResolving()) {
-            let addon = this.locateActiveAddon(packageName);
-            if (addon) {
-                const rehomed = request.rehome(addon.canResolveFromFile);
-                if (rehomed !== request) {
-                    return logTransition(`activeAddons`, request, rehomed);
-                }
+            let activeAddon = this.maybeFallbackToActiveAddon(request, packageName);
+            if (activeAddon) {
+                return activeAddon;
             }
         }
         let logicalLocation = this.reverseSearchAppTree(pkg, request.fromFile);
@@ -998,7 +972,7 @@ class Resolver {
                 return logTransition('fallbackResolve: non-relative appJsMatch', request, appJSMatch);
             }
         }
-        if (pkg.needsLooseResolving() && ((_c = (_b = request.meta) === null || _b === void 0 ? void 0 : _b.runtimeFallback) !== null && _c !== void 0 ? _c : true)) {
+        if (pkg.needsLooseResolving() && ((_b = (_a = request.meta) === null || _a === void 0 ? void 0 : _a.runtimeFallback) !== null && _b !== void 0 ? _b : true)) {
             // auto-upgraded packages can fall back to attempting to find dependencies at
             // runtime. Native v2 packages can only get this behavior in the
             // isExplicitlyExternal case above because they need to explicitly ask for
@@ -1017,6 +991,54 @@ class Resolver {
         // non-resolvable, which will presumably cause a static build error in stage3.
         return logTransition('fallbackResolve final exit', request);
     }
+    restoreRehomedRequest(pkg, request) {
+        var _a;
+        // meta.originalFromFile gets set when we want to try to rehome a request
+        // but then come back to the original location here in the fallback when the
+        // rehomed request fails
+        let movedPkg = this.packageCache.maybeMoved(pkg);
+        if (movedPkg !== pkg) {
+            let originalFromFile = (_a = request.meta) === null || _a === void 0 ? void 0 : _a.originalFromFile;
+            if (typeof originalFromFile !== 'string') {
+                throw new Error(`bug: embroider resolver's meta is not propagating`);
+            }
+            request = request.rehome(originalFromFile);
+            pkg = movedPkg;
+        }
+        return { pkg, request };
+    }
+    async relativeFallbackResolve(pkg, request) {
+        let withinEngine = this.engineConfig(pkg.name);
+        if (withinEngine) {
+            // it's a relative import inside an engine (which also means app), which
+            // means we may need to satisfy the request via app tree merging.
+            let logicalName = engineRelativeName(pkg, (0, path_1.resolve)((0, path_1.dirname)(request.fromFile), request.specifier));
+            if (!logicalName) {
+                return logTransition('fallbackResolve: relative failure because this file is not externally accessible', request);
+            }
+            let appJSMatch = await this.searchAppTree(request, withinEngine, logicalName);
+            if (appJSMatch) {
+                return logTransition('fallbackResolve: relative appJsMatch', request, appJSMatch);
+            }
+            else {
+                return logTransition('fallbackResolve: relative appJs search failure', request);
+            }
+        }
+        else {
+            // nothing else to do for relative imports
+            return logTransition('fallbackResolve: relative failure', request);
+        }
+    }
+    maybeFallbackToActiveAddon(request, requestedPackageName) {
+        // auto-upgraded packages can fall back to the set of known active addons
+        let addon = this.locateActiveAddon(requestedPackageName);
+        if (addon) {
+            const rehomed = request.rehome(addon.canResolveFromFile);
+            if (rehomed !== request) {
+                return logTransition(`activeAddons`, request, rehomed);
+            }
+        }
+    }
     getEntryFromMergeMap(inEngineSpecifier, root) {
         var _a;
         let entry;