@embroider/core 3.4.6-unstable.f30e685 → 3.4.7

package/src/module-resolver.js

@@ -15,59 +15,63 @@ const path_1 = require("path");
 const shared_internals_2 = require("@embroider/shared-internals");
 const debug_1 = __importDefault(require("debug"));
 const assert_never_1 = __importDefault(require("assert-never"));
-const reverse_exports_1 = __importDefault(require("@embroider/reverse-exports"));
-const resolve_exports_1 = require("resolve.exports");
+const resolve_1 = __importDefault(require("resolve"));
 const virtual_content_1 = require("./virtual-content");
 const typescript_memoize_1 = require("typescript-memoize");
 const describe_exports_1 = require("./describe-exports");
 const fs_1 = require("fs");
-const node_resolve_1 = require("./node-resolve");
 const debug = (0, debug_1.default)('embroider:resolver');
-// Using a formatter makes this work lazy so nothing happens when we aren't
-// logging. It is unfortunate that formatters are a globally mutable config and
-// you can only use single character names, but oh well.
-debug_1.default.formatters.p = (s) => {
-    let cwd = process.cwd();
-    if (s.startsWith(cwd)) {
-        return s.slice(cwd.length + 1);
-    }
-    return s;
-};
 function logTransition(reason, before, after = before) {
     if (after.isVirtual) {
-        debug(`[%s:virtualized] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
-    }
-    else if (after.resolvedTo) {
-        debug(`[%s:resolvedTo] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
+        debug(`virtualized %s in %s because %s`, before.specifier, before.fromFile, reason);
     }
     else if (before.specifier !== after.specifier) {
         if (before.fromFile !== after.fromFile) {
-            debug(`[%s:aliased and rehomed] %s to %s\n  because %s\n  from    %p\n  to      %p`, before.debugType, before.specifier, after.specifier, reason, before.fromFile, after.fromFile);
+            debug(`aliased and rehomed: %s to %s, from %s to %s because %s`, before.specifier, after.specifier, before.fromFile, after.fromFile, reason);
         }
         else {
-            debug(`[%s:aliased] %s to %s\n  because %s`, before.debugType, before.specifier, after.specifier, reason);
+            debug(`aliased: %s to %s in %s because`, before.specifier, after.specifier, before.fromFile, reason);
         }
     }
     else if (before.fromFile !== after.fromFile) {
-        debug(`[%s:rehomed] %s, because %s\n  from    %p\n  to      %p`, before.debugType, before.specifier, reason, before.fromFile, after.fromFile);
-    }
-    else if (after.isNotFound) {
-        debug(`[%s:not-found] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
+        debug(`rehomed: %s from %s to %s because`, before.specifier, before.fromFile, after.fromFile, reason);
     }
     else {
-        debug(`[%s:unchanged] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
+        debug(`unchanged: %s in %s because %s`, before.specifier, before.fromFile, reason);
     }
     return after;
 }
-function isTerminal(request) {
-    return request.isVirtual || request.isNotFound || Boolean(request.resolvedTo);
-}
 const compatPattern = /#embroider_compat\/(?<type>[^\/]+)\/(?<rest>.*)/;
+class NodeModuleRequest {
+    constructor(specifier, fromFile, isVirtual, meta) {
+        this.specifier = specifier;
+        this.fromFile = fromFile;
+        this.isVirtual = isVirtual;
+        this.meta = meta;
+    }
+    alias(specifier) {
+        return new NodeModuleRequest(specifier, this.fromFile, false, this.meta);
+    }
+    rehome(fromFile) {
+        if (this.fromFile === fromFile) {
+            return this;
+        }
+        else {
+            return new NodeModuleRequest(this.specifier, fromFile, false, this.meta);
+        }
+    }
+    virtualize(filename) {
+        return new NodeModuleRequest(filename, this.fromFile, true, this.meta);
+    }
+    withMeta(meta) {
+        return new NodeModuleRequest(this.specifier, this.fromFile, this.isVirtual, meta);
+    }
+}
 class Resolver {
     constructor(options) {
         this.options = options;
     }
-    async beforeResolve(request) {
+    beforeResolve(request) {
         if (request.specifier === '@embroider/macros') {
             // the macros package is always handled directly within babel (not
             // necessarily as a real resolvable package), so we should not mess with it.
@@ -75,11 +79,8 @@ class Resolver {
             // why we need to know about it.
             return logTransition('early exit', request);
         }
-        if (request.specifier === 'require') {
-            return this.external('early require', request, request.specifier);
-        }
         request = this.handleFastbootSwitch(request);
-        request = await this.handleGlobalsCompat(request);
+        request = this.handleGlobalsCompat(request);
         request = this.handleImplicitModules(request);
         request = this.handleRenaming(request);
         // we expect the specifier to be app relative at this point - must be after handleRenaming
@@ -95,45 +96,95 @@ class Resolver {
     // that calls your build system's normal module resolver, this does both pre-
     // and post-resolution adjustments as needed to implement our compatibility
     // rules.
-    async resolve(request) {
-        request = await this.beforeResolve(request);
-        if (request.resolvedTo) {
-            return request.resolvedTo;
-        }
-        let resolution = await request.defaultResolve();
+    //
+    // Depending on the plugin architecture you're working in, it may be easier to
+    // call beforeResolve and fallbackResolve directly, in which case matching the
+    // details of the recursion to what this method does are your responsibility.
+    async resolve(request, defaultResolve) {
+        let gen = this.internalResolve(request, defaultResolve);
+        let out = gen.next();
+        while (!out.done) {
+            out = gen.next(await out.value);
+        }
+        return out.value;
+    }
+    // synchronous alternative to resolve() above. Because our own internals are
+    // all synchronous, you can use this if your defaultResolve function is
+    // synchronous.
+    resolveSync(request, defaultResolve) {
+        let gen = this.internalResolve(request, defaultResolve);
+        let out = gen.next();
+        while (!out.done) {
+            out = gen.next(out.value);
+        }
+        return out.value;
+    }
+    // Our core implementation is a generator so it can power both resolve() and
+    // resolveSync()
+    *internalResolve(request, defaultResolve) {
+        request = this.beforeResolve(request);
+        let resolution = yield defaultResolve(request);
         switch (resolution.type) {
             case 'found':
-            case 'ignored':
                 return resolution;
             case 'not_found':
                 break;
             default:
                 throw (0, assert_never_1.default)(resolution);
         }
-        let nextRequest = await this.fallbackResolve(request);
+        let nextRequest = this.fallbackResolve(request);
         if (nextRequest === request) {
             // no additional fallback is available.
             return resolution;
         }
-        if (nextRequest.resolvedTo) {
-            return nextRequest.resolvedTo;
-        }
         if (nextRequest.fromFile === request.fromFile && nextRequest.specifier === request.specifier) {
             throw new Error('Bug Discovered! New request is not === original request but has the same fromFile and specifier. This will likely create a loop.');
         }
-        if (nextRequest.isVirtual || nextRequest.isNotFound) {
-            // virtual and NotFound requests are terminal, there is no more
-            // beforeResolve or fallbackResolve around them. The defaultResolve is
-            // expected to know how to implement them.
-            return nextRequest.defaultResolve();
+        if (nextRequest.isVirtual) {
+            // virtual requests are terminal, there is no more beforeResolve or
+            // fallbackResolve around them. The defaultResolve is expected to know how
+            // to implement them.
+            return yield defaultResolve(nextRequest);
         }
-        return this.resolve(nextRequest);
+        return yield* this.internalResolve(nextRequest, defaultResolve);
     }
     // Use standard NodeJS resolving, with our required compatibility rules on
     // top. This is a convenience method for calling resolveSync with the
     // defaultResolve already configured to be "do the normal node thing".
-    async nodeResolve(specifier, fromFile) {
-        return (0, node_resolve_1.nodeResolve)(this, specifier, fromFile);
+    nodeResolve(specifier, fromFile) {
+        let resolution = this.resolveSync(new NodeModuleRequest(specifier, fromFile, false, undefined), request => {
+            if (request.isVirtual) {
+                return {
+                    type: 'found',
+                    result: {
+                        type: 'virtual',
+                        content: (0, virtual_content_1.virtualContent)(request.specifier, this),
+                        filename: request.specifier,
+                    },
+                };
+            }
+            try {
+                let filename = resolve_1.default.sync(request.specifier, {
+                    basedir: (0, path_1.dirname)(request.fromFile),
+                    extensions: this.options.resolvableExtensions,
+                });
+                return { type: 'found', result: { type: 'real', filename } };
+            }
+            catch (err) {
+                if (err.code !== 'MODULE_NOT_FOUND') {
+                    throw err;
+                }
+                return { type: 'not_found', err };
+            }
+        });
+        switch (resolution.type) {
+            case 'not_found':
+                return resolution;
+            case 'found':
+                return resolution.result;
+            default:
+                throw (0, assert_never_1.default)(resolution);
+        }
     }
     get packageCache() {
         return shared_internals_2.RewrittenPackageCache.shared('embroider', this.options.appRoot);
@@ -150,9 +201,6 @@ class Resolver {
         return owningPackage;
     }
     generateFastbootSwitch(request) {
-        if (isTerminal(request)) {
-            return request;
-        }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!pkg) {
             return request;
@@ -189,9 +237,6 @@ class Resolver {
     }
     handleFastbootSwitch(request) {
         var _a;
-        if (isTerminal(request)) {
-            return request;
-        }
         let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
         if (!match) {
             return request;
@@ -230,15 +275,12 @@ class Resolver {
             }
             let entry = (_a = this.getEntryFromMergeMap(rel, pkg.root)) === null || _a === void 0 ? void 0 : _a.entry;
             if ((entry === null || entry === void 0 ? void 0 : entry.type) === 'both') {
-                return logTransition('matched addon entry', request, request.alias(entry[section].specifier).rehome(entry[section].fromFile));
+                return logTransition('matched addon entry', request, request.alias(entry[section].localPath).rehome((0, path_1.resolve)(entry[section].packageRoot, 'package.json')));
             }
         }
         return logTransition('failed to match in fastboot switch', request);
     }
     handleImplicitModules(request) {
-        if (isTerminal(request)) {
-            return request;
-        }
         let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
         if (!im) {
             return request;
@@ -256,10 +298,7 @@ class Resolver {
             return logTransition(`own implicit modules`, request, request.virtualize((0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`)));
         }
     }
-    async handleGlobalsCompat(request) {
-        if (isTerminal(request)) {
-            return request;
-        }
+    handleGlobalsCompat(request) {
         let match = compatPattern.exec(request.specifier);
         if (!match) {
             return request;
@@ -287,60 +326,52 @@ class Resolver {
         let target = this.parseGlobalPath(path, inEngine);
         return logTransition('resolveHelper', request, request.alias(`${target.packageName}/helpers/${target.memberName}`).rehome((0, path_1.resolve)(inEngine.root, 'package.json')));
     }
-    async resolveComponent(path, inEngine, request) {
+    resolveComponent(path, inEngine, request) {
         let target = this.parseGlobalPath(path, inEngine);
         let hbsModule = null;
         let jsModule = null;
         // first, the various places our template might be.
         for (let candidate of this.componentTemplateCandidates(target.packageName)) {
-            let candidateSpecifier = `${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`;
-            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from).withMeta({
-                runtimeFallback: false,
-            }));
-            if (resolution.type === 'found') {
-                hbsModule = resolution;
+            let resolution = this.nodeResolve(`${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`, target.from);
+            if (resolution.type === 'real') {
+                hbsModule = resolution.filename;
                 break;
             }
         }
         // then the various places our javascript might be.
         for (let candidate of this.componentJSCandidates(target.packageName)) {
-            let candidateSpecifier = `${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`;
-            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from).withMeta({
-                runtimeFallback: false,
-            }));
+            let resolution = this.nodeResolve(`${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`, target.from);
             // .hbs is a resolvable extension for us, so we need to exclude it here.
             // It matches as a priority lower than .js, so finding an .hbs means
             // there's definitely not a .js.
-            if (resolution.type === 'found' && !resolution.filename.endsWith('.hbs')) {
-                jsModule = resolution;
+            if (resolution.type === 'real' && !resolution.filename.endsWith('.hbs')) {
+                jsModule = resolution.filename;
                 break;
             }
         }
         if (hbsModule) {
-            return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize((0, virtual_content_1.virtualPairComponent)(hbsModule.filename, jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename)));
+            return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize((0, virtual_content_1.virtualPairComponent)(hbsModule, jsModule)));
         }
         else if (jsModule) {
-            return logTransition(`resolving to resolveComponent found only JS`, request, request.resolveTo(jsModule));
+            return logTransition(`resolveComponent found only JS`, request, request.alias(jsModule).rehome(target.from));
         }
         else {
             return logTransition(`resolveComponent failed`, request);
         }
     }
-    async resolveHelperOrComponent(path, inEngine, request) {
+    resolveHelperOrComponent(path, inEngine, request) {
         // resolveHelper just rewrites our request to one that should target the
         // component, so here to resolve the ambiguity we need to actually resolve
         // that candidate to see if it works.
         let helperCandidate = this.resolveHelper(path, inEngine, request);
-        let helperMatch = await this.resolve(request.alias(helperCandidate.specifier).rehome(helperCandidate.fromFile).withMeta({
-            runtimeFallback: false,
-        }));
-        if (helperMatch.type === 'found') {
-            return logTransition('resolve to ambiguous case matched a helper', request, request.resolveTo(helperMatch));
+        let helperMatch = this.nodeResolve(helperCandidate.specifier, helperCandidate.fromFile);
+        if (helperMatch.type === 'real') {
+            return logTransition('ambiguous case matched a helper', request, helperCandidate);
         }
         // unlike resolveHelper, resolveComponent already does pre-resolution in
         // order to deal with its own internal ambiguity around JS vs HBS vs
         // colocation.≥
-        let componentMatch = await this.resolveComponent(path, inEngine, request);
+        let componentMatch = this.resolveComponent(path, inEngine, request);
         if (componentMatch !== request) {
             return logTransition('ambiguous case matched a cmoponent', request, componentMatch);
         }
@@ -365,7 +396,6 @@ class Resolver {
     }
     *componentJSCandidates(inPackageName) {
         yield { prefix: '/components/', suffix: '' };
-        yield { prefix: '/components/', suffix: '/index' };
         yield { prefix: '/components/', suffix: '/component' };
         let pods = this.podPrefix(inPackageName);
         if (pods) {
@@ -384,10 +414,10 @@ class Resolver {
     parseGlobalPath(path, inEngine) {
         let parts = path.split('@');
         if (parts.length > 1 && parts[0].length > 0) {
-            return { packageName: parts[0], memberName: parts[1], from: (0, path_1.resolve)(inEngine.root, 'package.json') };
+            return { packageName: parts[0], memberName: parts[1], from: (0, path_1.resolve)(inEngine.root, 'pacakge.json') };
         }
         else {
-            return { packageName: inEngine.packageName, memberName: path, from: (0, path_1.resolve)(inEngine.root, 'package.json') };
+            return { packageName: inEngine.packageName, memberName: path, from: (0, path_1.resolve)(inEngine.root, 'pacakge.json') };
         }
     }
     engineConfig(packageName) {
@@ -419,8 +449,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'app-only',
                                     'app-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
-                                        fromFile: addonConfig.canResolveFromFile,
+                                        localPath: inAddonName,
+                                        packageRoot: addon.root,
                                         fromPackageName: addon.name,
                                     },
                                 });
@@ -433,8 +463,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'app-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
-                                        fromFile: addonConfig.canResolveFromFile,
+                                        localPath: inAddonName,
+                                        packageRoot: addon.root,
                                         fromPackageName: addon.name,
                                     },
                                     'fastboot-js': prevEntry['fastboot-js'],
@@ -458,8 +488,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'fastboot-only',
                                     'fastboot-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
-                                        fromFile: addonConfig.canResolveFromFile,
+                                        localPath: inAddonName,
+                                        packageRoot: addon.root,
                                         fromPackageName: addon.name,
                                     },
                                 });
@@ -472,8 +502,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'fastboot-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
-                                        fromFile: addonConfig.canResolveFromFile,
+                                        localPath: inAddonName,
+                                        packageRoot: addon.root,
                                         fromPackageName: addon.name,
                                     },
                                     'app-js': prevEntry['app-js'],
@@ -495,7 +525,7 @@ class Resolver {
         return owningEngine;
     }
     handleRewrittenPackages(request) {
-        if (isTerminal(request)) {
+        if (request.isVirtual) {
             return request;
         }
         let requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -514,6 +544,10 @@ class Resolver {
                 targetPkg = this.packageCache.resolve(packageName, requestingPkg);
             }
             catch (err) {
+                // this is not the place to report resolution failures. If the thing
+                // doesn't resolve, we're just not interested in redirecting it for
+                // backward-compat, that's all. The rest of the system will take care of
+                // reporting a failure to resolve (or handling it a different way)
                 if (err.code !== 'MODULE_NOT_FOUND') {
                     throw err;
                 }
@@ -529,26 +563,14 @@ class Resolver {
             return logTransition('request targets a moved package', request, this.resolveWithinMovedPackage(request, targetPkg));
         }
         else if (originalRequestingPkg !== requestingPkg) {
-            if (targetPkg) {
-                // in this case, the requesting package is moved but its destination is
-                // not, so we need to rehome the request back to the original location.
-                return logTransition('outbound request from moved package', request, request
-                    // setting meta here because if this fails, we want the fallback
-                    // logic to revert our rehome and continue from the *moved* package.
-                    .withMeta({ originalFromFile: request.fromFile })
-                    .rehome((0, path_1.resolve)(originalRequestingPkg.root, 'package.json')));
-            }
-            else {
-                // requesting package was moved and we failed to find its target. We
-                // can't let that accidentally succeed in the defaultResolve because we
-                // could escape the moved package system.
-                return logTransition('missing outbound request from moved package', request, request.notFound());
-            }
+            // in this case, the requesting package is moved but its destination is
+            // not, so we need to rehome the request back to the original location.
+            return logTransition('outbound request from moved package', request, request.withMeta({ wasMovedTo: request.fromFile }).rehome((0, path_1.resolve)(originalRequestingPkg.root, 'package.json')));
         }
         return request;
     }
     handleRenaming(request) {
-        if (isTerminal(request)) {
+        if (request.isVirtual) {
             return request;
         }
         let packageName = (0, shared_internals_1.packageName)(request.specifier);
@@ -581,34 +603,12 @@ class Resolver {
                 return logTransition(`renamePackages`, request, request.alias(request.specifier.replace(packageName, this.options.renamePackages[packageName])));
             }
         }
-        if (pkg.name === packageName) {
-            // we found a self-import
-            if (pkg.meta['auto-upgraded']) {
-                // auto-upgraded packages always get automatically adjusted. They never
-                // supported fancy package.json exports features so this direct mapping
-                // to the root is always right.
-                // "my-package/foo" -> "./foo"
-                // "my-package" -> "./" (this can't be just "." because node's require.resolve doesn't reliable support that)
-                let selfImportPath = request.specifier === pkg.name ? './' : request.specifier.replace(pkg.name, '.');
-                return logTransition(`v1 self-import`, request, request.alias(selfImportPath).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
-            }
-            else {
-                // v2 packages are supposed to use package.json `exports` to enable
-                // self-imports, but not all build tools actually follow the spec. This
-                // is a workaround for badly behaved packagers.
-                //
-                // Known upstream bugs this works around:
-                // - https://github.com/vitejs/vite/issues/9731
-                if (pkg.packageJSON.exports) {
-                    let found = (0, resolve_exports_1.exports)(pkg.packageJSON, request.specifier, {
-                        browser: true,
-                        conditions: ['default', 'imports'],
-                    });
-                    if (found === null || found === void 0 ? void 0 : found[0]) {
-                        return logTransition(`v2 self-import with package.json exports`, request, request.alias(found === null || found === void 0 ? void 0 : found[0]).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
-                    }
-                }
-            }
+        if (pkg.meta['auto-upgraded'] && pkg.name === packageName) {
+            // we found a self-import, resolve it for them. Only auto-upgraded
+            // packages get this help, v2 packages are natively supposed to make their
+            // own modules resolvable, and we want to push them all to do that
+            // correctly.
+            return logTransition(`v1 self-import`, request, request.alias(request.specifier.replace(pkg.name, '.')).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
         }
         return request;
     }
@@ -617,17 +617,16 @@ class Resolver {
         if (pkg.name.startsWith('@')) {
             levels.push('..');
         }
-        let originalFromFile = request.fromFile;
         let newRequest = request.rehome((0, path_1.resolve)(pkg.root, ...levels, 'moved-package-target.js'));
         if (newRequest === request) {
             return request;
         }
-        // setting meta because if this fails, we want the fallback to pick up back
-        // in the original requesting package.
-        return newRequest.withMeta({ originalFromFile });
+        return newRequest.withMeta({
+            resolvedWithinPackage: pkg.root,
+        });
     }
     preHandleExternal(request) {
-        if (isTerminal(request)) {
+        if (request.isVirtual) {
             return request;
         }
         let { specifier, fromFile } = request;
@@ -660,15 +659,7 @@ class Resolver {
             // engine
             let logicalLocation = this.reverseSearchAppTree(pkg, request.fromFile);
             if (logicalLocation) {
-                return logTransition('beforeResolve: relative import in app-js', request, request
-                    .alias('./' + path_1.posix.join((0, path_1.dirname)(logicalLocation.inAppName), request.specifier))
-                    // it's important that we're rehoming this to the root of the engine
-                    // (which we know really exists), and not to a subdir like
-                    // logicalLocation.inAppName (which might not physically exist),
-                    // because some environments (including node's require.resolve) will
-                    // refuse to do resolution from a notional path that doesn't
-                    // physically exist.
-                    .rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, 'package.json')));
+                return logTransition('beforeResolve: relative import in app-js', request, request.rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, logicalLocation.inAppName)));
             }
             return request;
         }
@@ -683,11 +674,11 @@ class Resolver {
         if (shared_internals_1.emberVirtualPeerDeps.has(packageName) && !pkg.hasDependency(packageName)) {
             // addons (whether auto-upgraded or not) may use the app's
             // emberVirtualPeerDeps, like "@glimmer/component" etc.
-            let addon = this.locateActiveAddon(packageName);
-            if (!addon) {
-                throw new Error(`${pkg.name} is trying to import the emberVirtualPeerDep "${packageName}", but it seems to be missing`);
+            if (!this.options.activeAddons[packageName]) {
+                throw new Error(`${pkg.name} is trying to import the app's ${packageName} package, but it seems to be missing`);
             }
-            return logTransition(`emberVirtualPeerDeps`, request, request.rehome(addon.canResolveFromFile));
+            let newHome = (0, path_1.resolve)(this.packageCache.maybeMoved(this.packageCache.get(this.options.appRoot)).root, 'package.json');
+            return logTransition(`emberVirtualPeerDeps in v2 addon`, request, request.rehome(newHome));
         }
         // if this file is part of an addon's app-js, it's really the logical
         // package to which it belongs (normally the app) that affects some policy
@@ -718,22 +709,6 @@ class Resolver {
         }
         return request;
     }
-    locateActiveAddon(packageName) {
-        if (packageName === this.options.modulePrefix) {
-            // the app itself is something that addon's can classically resolve if they know it's name.
-            return {
-                root: this.options.appRoot,
-                canResolveFromFile: (0, path_1.resolve)(this.packageCache.maybeMoved(this.packageCache.get(this.options.appRoot)).root, 'package.json'),
-            };
-        }
-        for (let engine of this.options.engines) {
-            for (let addon of engine.activeAddons) {
-                if (addon.name === packageName) {
-                    return addon;
-                }
-            }
-        }
-    }
     external(label, request, specifier) {
         if (this.options.amdCompatibility === 'cjs') {
             let filename = (0, virtual_content_1.virtualExternalCJSModule)(specifier);
@@ -766,11 +741,8 @@ class Resolver {
             throw new Error(`Embroider's amdCompatibility option is disabled, but something tried to use it to access "${request.specifier}"`);
         }
     }
-    async fallbackResolve(request) {
+    fallbackResolve(request) {
         var _a, _b, _c;
-        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');
-        }
         if (request.specifier === '@embroider/macros') {
             // the macros package is always handled directly within babel (not
             // necessarily as a real resolvable package), so we should not mess with it.
@@ -778,7 +750,8 @@ class Resolver {
             // why we need to know about it.
             return logTransition('fallback early exit', request);
         }
-        if (compatPattern.test(request.specifier)) {
+        let { specifier, fromFile } = request;
+        if (compatPattern.test(specifier)) {
             // Some kinds of compat requests get rewritten into other things
             // deterministically. For example, "#embroider_compat/helpers/whatever"
             // means only "the-current-engine/helpers/whatever", and if that doesn't
@@ -794,33 +767,39 @@ class Resolver {
             // here.
             return request;
         }
-        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (fromFile.endsWith('moved-package-target.js')) {
+            if (!((_a = request.meta) === null || _a === void 0 ? void 0 : _a.resolvedWithinPackage)) {
+                throw new Error(`bug: embroider resolver's meta is not propagating`);
+            }
+            fromFile = (0, path_1.resolve)((_b = request.meta) === null || _b === void 0 ? void 0 : _b.resolvedWithinPackage, 'package.json');
+        }
+        let pkg = this.packageCache.ownerOfFile(fromFile);
         if (!pkg) {
             return logTransition('no identifiable owningPackage', 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
+        // if we rehomed this request to its un-rewritten location in order to try
+        // to do the defaultResolve from there, now we refer back to the rewritten
+        // location because that's what we want to use when asking things like
+        // isV2Ember()
         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') {
+            if (!((_c = request.meta) === null || _c === void 0 ? void 0 : _c.wasMovedTo)) {
                 throw new Error(`bug: embroider resolver's meta is not propagating`);
             }
-            request = request.rehome(originalFromFile);
+            fromFile = request.meta.wasMovedTo;
             pkg = movedPkg;
         }
         if (!pkg.isV2Ember()) {
             return logTransition('fallbackResolve: not in an ember package', request);
         }
-        let packageName = (0, shared_internals_1.packageName)(request.specifier);
+        let packageName = (0, shared_internals_1.packageName)(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 appJSMatch = await this.searchAppTree(request, withinEngine, (0, shared_internals_2.explicitRelative)(pkg.root, (0, path_1.resolve)((0, path_1.dirname)(request.fromFile), request.specifier)));
+                let appJSMatch = this.searchAppTree(request, withinEngine, (0, shared_internals_2.explicitRelative)(pkg.root, (0, path_1.resolve)((0, path_1.dirname)(fromFile), specifier)));
                 if (appJSMatch) {
                     return logTransition('fallbackResolve: relative appJsMatch', request, appJSMatch);
                 }
@@ -834,49 +813,40 @@ class Resolver {
             }
         }
         // auto-upgraded packages can fall back to the set of known active addons
-        if (pkg.meta['auto-upgraded']) {
-            let addon = this.locateActiveAddon(packageName);
-            if (addon) {
-                const rehomed = request.rehome(addon.canResolveFromFile);
-                if (rehomed !== request) {
-                    return logTransition(`activeAddons`, request, rehomed);
-                }
+        if (pkg.meta['auto-upgraded'] && this.options.activeAddons[packageName]) {
+            const rehomed = this.resolveWithinMovedPackage(request, this.packageCache.get(this.options.activeAddons[packageName]));
+            if (rehomed !== request) {
+                return logTransition(`activeAddons`, request, rehomed);
             }
         }
-        let logicalLocation = this.reverseSearchAppTree(pkg, request.fromFile);
+        let logicalLocation = this.reverseSearchAppTree(pkg, fromFile);
         if (logicalLocation) {
             // the requesting file is in an addon's appTree. We didn't succeed in
             // resolving this (non-relative) request from inside the actual addon, so
             // next try to resolve it from the corresponding logical location in the
             // app.
-            return logTransition('fallbackResolve: retry from logical home of app-js file', request, 
-            // it might look more precise to rehome into logicalLocation.inAppName
-            // rather than package.json. But that logical location may not actually
-            // exist, and some systems (including node's require.resolve) will be
-            // mad about trying to resolve from notional paths that don't really
-            // exist.
-            request.rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, 'package.json')));
+            return logTransition('fallbackResolve: retry from logical home of app-js file', request, request.rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, logicalLocation.inAppName)));
         }
         let targetingEngine = this.engineConfig(packageName);
         if (targetingEngine) {
-            let appJSMatch = await this.searchAppTree(request, targetingEngine, request.specifier.replace(packageName, '.'));
+            let appJSMatch = this.searchAppTree(request, targetingEngine, specifier.replace(packageName, '.'));
             if (appJSMatch) {
                 return logTransition('fallbackResolve: non-relative appJsMatch', request, appJSMatch);
             }
         }
-        if (pkg.meta['auto-upgraded'] && ((_c = (_b = request.meta) === null || _b === void 0 ? void 0 : _b.runtimeFallback) !== null && _c !== void 0 ? _c : true)) {
+        if (pkg.meta['auto-upgraded']) {
             // 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
             // externals.
-            return this.external('v1 catch-all fallback', request, request.specifier);
+            return this.external('v1 catch-all fallback', request, specifier);
         }
         else {
             // native v2 packages don't automatically externalize *everything* the way
             // auto-upgraded packages do, but they still externalize known and approved
             // ember virtual packages (like @ember/component)
             if (shared_internals_1.emberVirtualPackages.has(packageName)) {
-                return this.external('emberVirtualPackages', request, request.specifier);
+                return this.external('emberVirtualPackages', request, specifier);
             }
         }
         // this is falling through with the original specifier which was
@@ -903,20 +873,22 @@ class Resolver {
             }
         }
     }
-    async searchAppTree(request, engine, inEngineSpecifier) {
+    searchAppTree(request, engine, inEngineSpecifier) {
         let matched = this.getEntryFromMergeMap(inEngineSpecifier, engine.root);
         switch (matched === null || matched === void 0 ? void 0 : matched.entry.type) {
             case undefined:
                 return undefined;
             case 'app-only':
-                return request.alias(matched.entry['app-js'].specifier).rehome(matched.entry['app-js'].fromFile);
+                return request
+                    .alias(matched.entry['app-js'].localPath)
+                    .rehome((0, path_1.resolve)(matched.entry['app-js'].packageRoot, 'package.json'));
             case 'fastboot-only':
-                return request.alias(matched.entry['fastboot-js'].specifier).rehome(matched.entry['fastboot-js'].fromFile);
+                return request
+                    .alias(matched.entry['fastboot-js'].localPath)
+                    .rehome((0, path_1.resolve)(matched.entry['fastboot-js'].packageRoot, 'package.json'));
             case 'both':
-                let foundAppJS = await this.resolve(request.alias(matched.entry['app-js'].specifier).rehome(matched.entry['app-js'].fromFile).withMeta({
-                    runtimeFallback: false,
-                }));
-                if (foundAppJS.type !== 'found') {
+                let foundAppJS = this.nodeResolve(matched.entry['app-js'].localPath, (0, path_1.resolve)(matched.entry['app-js'].packageRoot, 'package.json'));
+                if (foundAppJS.type !== 'real') {
                     throw new Error(`${matched.entry['app-js'].fromPackageName} declared ${inEngineSpecifier} in packageJSON.ember-addon.app-js, but that module does not exist`);
                 }
                 let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)(foundAppJS.filename, 'utf8'), {});