@embroider/core 3.4.18 → 3.4.20-unstable.0aa8fc6

package/src/module-resolver.js

@@ -15,64 +15,61 @@ 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 resolve_1 = __importDefault(require("resolve"));
+const reverse_exports_1 = require("@embroider/reverse-exports");
+const resolve_exports_1 = require("resolve.exports");
 const virtual_content_1 = require("./virtual-content");
 const typescript_memoize_1 = require("typescript-memoize");
 const describe_exports_1 = require("./describe-exports");
 const fs_1 = require("fs");
+const node_resolve_1 = require("./node-resolve");
+const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
 const semver_1 = require("semver");
 const 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(`virtualized %s in %s because %s`, before.specifier, before.fromFile, reason);
+        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);
     }
     else if (before.specifier !== after.specifier) {
         if (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);
+            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);
         }
         else {
-            debug(`aliased: %s to %s in %s because`, before.specifier, after.specifier, before.fromFile, reason);
+            debug(`[%s:aliased] %s to %s\n  because %s`, before.debugType, before.specifier, after.specifier, reason);
         }
     }
     else if (before.fromFile !== after.fromFile) {
-        debug(`rehomed: %s from %s to %s because`, before.specifier, before.fromFile, after.fromFile, reason);
+        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);
     }
     else {
-        debug(`unchanged: %s in %s because %s`, before.specifier, before.fromFile, reason);
+        debug(`[%s:unchanged] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
     }
     return after;
 }
-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);
-    }
+function isTerminal(request) {
+    return request.isVirtual || request.isNotFound || Boolean(request.resolvedTo);
 }
+const compatPattern = /@embroider\/virtual\/(?<type>[^\/]+)\/(?<rest>.*)/;
 class Resolver {
     constructor(options) {
         this.options = options;
     }
-    beforeResolve(request) {
+    async 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.
@@ -81,9 +78,15 @@ class Resolver {
             return logTransition('early exit', request);
         }
         request = this.handleFastbootSwitch(request);
-        request = this.handleGlobalsCompat(request);
+        request = await this.handleGlobalsCompat(request);
         request = this.handleImplicitModules(request);
+        request = this.handleImplicitTestScripts(request);
+        request = this.handleVendorStyles(request);
+        request = this.handleTestSupportStyles(request);
+        request = this.handleEntrypoint(request);
+        request = this.handleRouteEntrypoint(request);
         request = this.handleRenaming(request);
+        request = this.handleVendor(request);
         // we expect the specifier to be app relative at this point - must be after handleRenaming
         request = this.generateFastbootSwitch(request);
         request = this.preHandleExternal(request);
@@ -97,95 +100,45 @@ 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.
-    //
-    // 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);
+    async resolve(request) {
+        request = await this.beforeResolve(request);
+        if (request.resolvedTo) {
+            return request.resolvedTo;
+        }
+        let resolution = await request.defaultResolve();
         switch (resolution.type) {
             case 'found':
+            case 'ignored':
                 return resolution;
             case 'not_found':
                 break;
             default:
                 throw (0, assert_never_1.default)(resolution);
         }
-        let nextRequest = this.fallbackResolve(request);
+        let nextRequest = await 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) {
-            // 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);
+        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();
         }
-        return yield* this.internalResolve(nextRequest, defaultResolve);
+        return this.resolve(nextRequest);
     }
     // 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".
-    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);
-        }
+    async nodeResolve(specifier, fromFile) {
+        return (0, node_resolve_1.nodeResolve)(this, specifier, fromFile);
     }
     get packageCache() {
         return shared_internals_2.RewrittenPackageCache.shared('embroider', this.options.appRoot);
@@ -202,6 +155,9 @@ class Resolver {
         return owningPackage;
     }
     generateFastbootSwitch(request) {
+        if (isTerminal(request)) {
+            return request;
+        }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!pkg) {
             return request;
@@ -219,7 +175,9 @@ class Resolver {
                 let fastbootFile = engineConfig.fastbootFiles[candidate];
                 if (fastbootFile) {
                     if (fastbootFile.shadowedFilename) {
-                        let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)((0, path_1.resolve)(pkg.root, fastbootFile.shadowedFilename), 'utf8'), {});
+                        let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)((0, path_1.resolve)(pkg.root, fastbootFile.shadowedFilename), 'utf8'), {
+                            configFile: false,
+                        });
                         let switchFile = (0, virtual_content_1.fastbootSwitch)(candidate, (0, path_1.resolve)(pkg.root, 'package.json'), names);
                         if (switchFile === request.fromFile) {
                             return logTransition('internal lookup from fastbootSwitch', request);
@@ -238,6 +196,9 @@ class Resolver {
     }
     handleFastbootSwitch(request) {
         var _a;
+        if (isTerminal(request)) {
+            return request;
+        }
         let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
         if (!match) {
             return request;
@@ -276,12 +237,15 @@ 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].localPath).rehome((0, path_1.resolve)(entry[section].packageRoot, 'package.json')));
+                return logTransition('matched addon entry', request, request.alias(entry[section].specifier).rehome(entry[section].fromFile));
             }
         }
         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;
@@ -299,7 +263,97 @@ class Resolver {
             return logTransition(`own implicit modules`, request, request.virtualize((0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`)));
         }
     }
-    handleGlobalsCompat(request) {
+    handleEntrypoint(request) {
+        var _a;
+        if (isTerminal(request)) {
+            return request;
+        }
+        //TODO move the extra forwardslash handling out into the vite plugin
+        const candidates = [
+            '@embroider/virtual/compat-modules',
+            '/@embroider/virtual/compat-modules',
+            './@embroider/virtual/compat-modules',
+        ];
+        if (!candidates.some(c => request.specifier.startsWith(c + '/') || request.specifier === c)) {
+            return request;
+        }
+        const result = /\.?\/?@embroider\/virtual\/compat-modules(?:\/(?<packageName>.*))?/.exec(request.specifier);
+        if (!result) {
+            // TODO make a better error
+            throw new Error('entrypoint does not match pattern' + request.specifier);
+        }
+        const { packageName } = result.groups;
+        const requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (!(requestingPkg === null || requestingPkg === void 0 ? void 0 : requestingPkg.isV2Ember())) {
+            throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
+        }
+        let pkg;
+        if (packageName) {
+            pkg = this.packageCache.resolve(packageName, requestingPkg);
+        }
+        else {
+            pkg = requestingPkg;
+        }
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        return logTransition('entrypoint', request, request.virtualize((0, path_1.resolve)(pkg.root, (_a = matched === null || matched === void 0 ? void 0 : matched[0]) !== null && _a !== void 0 ? _a : '-embroider-entrypoint.js')));
+    }
+    handleRouteEntrypoint(request) {
+        if (isTerminal(request)) {
+            return request;
+        }
+        let routeName = (0, virtual_route_entrypoint_1.decodePublicRouteEntrypoint)(request.specifier);
+        if (!routeName) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+            throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
+        }
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-route-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        return logTransition('route entrypoint', request, request.virtualize((0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg.root, matched === null || matched === void 0 ? void 0 : matched[0], routeName)));
+    }
+    handleImplicitTestScripts(request) {
+        //TODO move the extra forwardslash handling out into the vite plugin
+        const candidates = [
+            '@embroider/virtual/test-support.js',
+            '/@embroider/virtual/test-support.js',
+            './@embroider/virtual/test-support.js',
+        ];
+        if (!candidates.includes(request.specifier)) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+            throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/test-support.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
+        }
+        return logTransition('test-support', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-test-support.js')));
+    }
+    handleTestSupportStyles(request) {
+        //TODO move the extra forwardslash handling out into the vite plugin
+        const candidates = [
+            '@embroider/virtual/test-support.css',
+            '/@embroider/virtual/test-support.css',
+            './@embroider/virtual/test-support.css',
+        ];
+        if (!candidates.includes(request.specifier)) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+            throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/test-support.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
+        }
+        return logTransition('test-support-styles', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-test-support-styles.css')));
+    }
+    async handleGlobalsCompat(request) {
+        if (isTerminal(request)) {
+            return request;
+        }
         let match = compatPattern.exec(request.specifier);
         if (!match) {
             return request;
@@ -320,62 +374,92 @@ class Resolver {
             case 'ambiguous':
                 return this.resolveHelperOrComponent(rest, engine, request);
             default:
-                throw new Error(`bug: unexepected #embroider_compat specifier: ${request.specifier}`);
+                throw new Error(`bug: unexepected @embroider/virtual specifier: ${request.specifier}`);
         }
     }
+    handleVendorStyles(request) {
+        //TODO move the extra forwardslash handling out into the vite plugin
+        const candidates = [
+            '@embroider/virtual/vendor.css',
+            '/@embroider/virtual/vendor.css',
+            './@embroider/virtual/vendor.css',
+        ];
+        if (!candidates.includes(request.specifier)) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (!pkg || !this.options.engines.some(e => e.root === (pkg === null || pkg === void 0 ? void 0 : pkg.root))) {
+            throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app or Engine. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
+        }
+        return logTransition('vendor-styles', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-vendor-styles.css')));
+    }
     resolveHelper(path, inEngine, request) {
         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')));
     }
-    resolveComponent(path, inEngine, request) {
+    async 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 resolution = this.nodeResolve(`${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`, target.from);
-            if (resolution.type === 'real') {
-                hbsModule = resolution.filename;
+            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;
                 break;
             }
         }
         // then the various places our javascript might be.
         for (let candidate of this.componentJSCandidates(target.packageName)) {
-            let resolution = this.nodeResolve(`${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`, target.from);
+            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 === 'ignored') {
+                return logTransition(`resolving to ignored component`, request, request.resolveTo(resolution));
+            }
             // .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 === 'real' && !resolution.filename.endsWith('.hbs')) {
-                jsModule = resolution.filename;
+            if (resolution.type === 'found' && !resolution.filename.endsWith('.hbs')) {
+                jsModule = resolution;
                 break;
             }
         }
         if (hbsModule) {
             if (!this.emberVersionSupportsSeparateTemplates) {
-                throw new Error(`Components with separately resolved templates were removed at Ember 6.0. Migrate to either co-located js/ts + hbs files or to gjs/gts. https://deprecations.emberjs.com/id/component-template-resolving/. Bad template was: ${hbsModule}.`);
+                throw new Error(`Components with separately resolved templates were removed at Ember 6.0. Migrate to either co-located js/ts + hbs files or to gjs/gts. https://deprecations.emberjs.com/id/component-template-resolving/. Bad template was: ${hbsModule.filename}.`);
             }
-            return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize((0, virtual_content_1.virtualPairComponent)(hbsModule, jsModule)));
+            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)));
         }
         else if (jsModule) {
-            return logTransition(`resolveComponent found only JS`, request, request.alias(jsModule).rehome(target.from));
+            return logTransition(`resolving to resolveComponent found only JS`, request, request.resolveTo(jsModule));
         }
         else {
             return logTransition(`resolveComponent failed`, request);
         }
     }
-    resolveHelperOrComponent(path, inEngine, request) {
+    async 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 = this.nodeResolve(helperCandidate.specifier, helperCandidate.fromFile);
-        if (helperMatch.type === 'real') {
-            return logTransition('ambiguous case matched a helper', request, helperCandidate);
+        let helperMatch = await this.resolve(request.alias(helperCandidate.specifier).rehome(helperCandidate.fromFile).withMeta({
+            runtimeFallback: false,
+        }));
+        // for the case of 'ignored' that means that esbuild found this helper in an external
+        // package so it should be considered found in this case and we should not look for a
+        // component with this name
+        if (helperMatch.type === 'found' || helperMatch.type === 'ignored') {
+            return logTransition('resolve to ambiguous case matched a helper', request, request.resolveTo(helperMatch));
         }
         // unlike resolveHelper, resolveComponent already does pre-resolution in
         // order to deal with its own internal ambiguity around JS vs HBS vs
         // colocation.≥
-        let componentMatch = this.resolveComponent(path, inEngine, request);
+        let componentMatch = await this.resolveComponent(path, inEngine, request);
         if (componentMatch !== request) {
             return logTransition('ambiguous case matched a cmoponent', request, componentMatch);
         }
@@ -400,6 +484,7 @@ 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) {
@@ -418,10 +503,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, 'pacakge.json') };
+            return { packageName: parts[0], memberName: parts[1], from: (0, path_1.resolve)(inEngine.root, 'package.json') };
         }
         else {
-            return { packageName: inEngine.packageName, memberName: path, from: (0, path_1.resolve)(inEngine.root, 'pacakge.json') };
+            return { packageName: inEngine.packageName, memberName: path, from: (0, path_1.resolve)(inEngine.root, 'package.json') };
         }
     }
     engineConfig(packageName) {
@@ -447,14 +532,18 @@ class Resolver {
                         if (!inAddonName.startsWith('./')) {
                             throw new Error(`addon ${addon.name} declares app-js in its package.json with the illegal name "${inAddonName}". It must start with "./" to make it clear that it's relative to the addon`);
                         }
+                        let specifier = (0, reverse_exports_1.externalName)(addon.packageJSON, inAddonName);
+                        if (!specifier) {
+                            throw new Error(`${addon.name}'s package.json app-js refers to ${inAddonName}, but that module is not accessible from outside the package`);
+                        }
                         let prevEntry = engineModules.get(inEngineName);
                         switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'app-only',
                                     'app-js': {
-                                        localPath: inAddonName,
-                                        packageRoot: addon.root,
+                                        specifier,
+                                        fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
                                 });
@@ -467,8 +556,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'app-js': {
-                                        localPath: inAddonName,
-                                        packageRoot: addon.root,
+                                        specifier,
+                                        fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
                                     'fastboot-js': prevEntry['fastboot-js'],
@@ -486,14 +575,18 @@ class Resolver {
                         if (!inAddonName.startsWith('./')) {
                             throw new Error(`addon ${addon.name} declares fastboot-js in its package.json with the illegal name "${inAddonName}". It must start with "./" to make it clear that it's relative to the addon`);
                         }
+                        let specifier = (0, reverse_exports_1.externalName)(addon.packageJSON, inAddonName);
+                        if (!specifier) {
+                            throw new Error(`${addon.name}'s package.json fastboot-js refers to ${inAddonName}, but that module is not accessible from outside the package`);
+                        }
                         let prevEntry = engineModules.get(inEngineName);
                         switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'fastboot-only',
                                     'fastboot-js': {
-                                        localPath: inAddonName,
-                                        packageRoot: addon.root,
+                                        specifier,
+                                        fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
                                 });
@@ -506,8 +599,8 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'fastboot-js': {
-                                        localPath: inAddonName,
-                                        packageRoot: addon.root,
+                                        specifier,
+                                        fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
                                     'app-js': prevEntry['app-js'],
@@ -538,7 +631,7 @@ class Resolver {
         });
     }
     handleRewrittenPackages(request) {
-        if (request.isVirtual) {
+        if (isTerminal(request)) {
             return request;
         }
         let requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -557,10 +650,6 @@ 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;
                 }
@@ -576,14 +665,26 @@ class Resolver {
             return logTransition('request targets a moved package', request, this.resolveWithinMovedPackage(request, targetPkg));
         }
         else if (originalRequestingPkg !== requestingPkg) {
-            // 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')));
+            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());
+            }
         }
         return request;
     }
     handleRenaming(request) {
-        if (request.isVirtual) {
+        if (isTerminal(request)) {
             return request;
         }
         let packageName = (0, shared_internals_1.packageName)(request.specifier);
@@ -591,14 +692,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.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));
@@ -616,30 +714,79 @@ class Resolver {
                 return logTransition(`renamePackages`, request, request.alias(request.specifier.replace(packageName, this.options.renamePackages[packageName])));
             }
         }
-        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')));
+        if (!pkg || !pkg.isV2Ember()) {
+            return request;
+        }
+        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-app/foo" -> "./foo" from app's package.json
+                // "my-addon/foo" -> "my-addon/foo" from a package that's guaranteed to be able to resolve my-addon
+                let owningEngine = this.owningEngine(pkg);
+                let addonConfig = owningEngine.activeAddons.find(a => a.root === pkg.root);
+                if (addonConfig) {
+                    // auto-upgraded addons get special support for self-resolving here.
+                    return logTransition(`v1 addon self-import`, request, request.rehome(addonConfig.canResolveFromFile));
+                }
+                else {
+                    // auto-upgraded apps will necessarily have packageJSON.exports
+                    // because we insert them, so for that support we can fall through to
+                    // that support below.
+                }
+            }
+            // 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')));
+                }
+            }
         }
         return request;
     }
+    handleVendor(request) {
+        //TODO move the extra forwardslash handling out into the vite plugin
+        const candidates = [
+            '@embroider/virtual/vendor.js',
+            '/@embroider/virtual/vendor.js',
+            './@embroider/virtual/vendor.js',
+        ];
+        if (!candidates.includes(request.specifier)) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+            throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
+        }
+        return logTransition('vendor', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-vendor.js')));
+    }
     resolveWithinMovedPackage(request, pkg) {
         let levels = ['..'];
         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;
         }
-        return newRequest.withMeta({
-            resolvedWithinPackage: pkg.root,
-        });
+        // setting meta because if this fails, we want the fallback to pick up back
+        // in the original requesting package.
+        return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
-        if (request.isVirtual) {
+        if (isTerminal(request)) {
             return request;
         }
         let { specifier, fromFile } = request;
@@ -649,11 +796,6 @@ class Resolver {
         }
         let packageName = (0, shared_internals_1.packageName)(specifier);
         if (!packageName) {
-            // This is a relative import. We don't automatically externalize those
-            // because it's rare, and by keeping them static we give better errors. But
-            // we do allow them to be explicitly externalized by the package author (or
-            // a compat adapter). In the metadata, they would be listed in
-            // package-relative form, so we need to convert this specifier to that.
             let absoluteSpecifier = (0, path_1.resolve)((0, path_1.dirname)(fromFile), specifier);
             if (!absoluteSpecifier.startsWith(pkg.root)) {
                 // this relative path escape its package. So it's not really using
@@ -662,36 +804,23 @@ class Resolver {
                 // references to runtime utilities, like we do in @embroider/macros.
                 return logTransition('beforeResolve: relative path escapes its package', request);
             }
-            let packageRelativeSpecifier = (0, shared_internals_2.explicitRelative)(pkg.root, absoluteSpecifier);
-            if (isExplicitlyExternal(packageRelativeSpecifier, pkg)) {
-                let publicSpecifier = absoluteSpecifier.replace(pkg.root, pkg.name);
-                return this.external('beforeResolve', request, publicSpecifier);
-            }
             // if the requesting file is in an addon's app-js, the relative request
             // should really be understood as a request for a module in the containing
-            // engine
+            // engine.
             let logicalLocation = this.reverseSearchAppTree(pkg, request.fromFile);
             if (logicalLocation) {
-                return logTransition('beforeResolve: relative import in app-js', request, request.rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, logicalLocation.inAppName)));
+                return logTransition('beforeResolve: relative import in app-js', request, request.alias(path_1.posix.join(logicalLocation.owningEngine.packageName, (0, path_1.dirname)(logicalLocation.inAppName), request.specifier)));
             }
             return request;
         }
-        // absolute package imports can also be explicitly external based on their
-        // full specifier name
-        if (isExplicitlyExternal(specifier, pkg)) {
-            return this.external('beforeResolve', request, specifier);
-        }
-        if (shared_internals_1.emberVirtualPackages.has(packageName) && !pkg.hasDependency(packageName)) {
-            return this.external('beforeResolve emberVirtualPackages', request, specifier);
-        }
         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.
-            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`);
+            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`);
             }
-            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));
+            return logTransition(`emberVirtualPeerDeps`, request, request.rehome(addon.canResolveFromFile));
         }
         // 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
@@ -700,10 +829,10 @@ class Resolver {
         if (logicalPackage.meta['auto-upgraded'] && !logicalPackage.hasDependency('ember-auto-import')) {
             try {
                 let dep = this.packageCache.resolve(packageName, logicalPackage);
-                if (!dep.isEmberPackage()) {
+                if (!dep.isEmberAddon()) {
                     // classic ember addons can only import non-ember dependencies if they
                     // have ember-auto-import.
-                    return this.external('v1 package without auto-import', request, specifier);
+                    return logTransition('v1 package without auto-import', request, request.notFound());
                 }
             }
             catch (err) {
@@ -713,49 +842,33 @@ class Resolver {
             }
         }
         // assertions on what native v2 addons can import
-        if (!pkg.meta['auto-upgraded']) {
-            if (!pkg.meta['auto-upgraded'] &&
-                !appImportInAppTree(pkg, logicalPackage, packageName) &&
-                !reliablyResolvable(pkg, packageName)) {
-                throw new Error(`${pkg.name} is trying to import from ${packageName} but that is not one of its explicit dependencies`);
-            }
+        if (!pkg.needsLooseResolving() &&
+            !appImportInAppTree(pkg, logicalPackage, packageName) &&
+            !reliablyResolvable(pkg, packageName)) {
+            throw new Error(`${pkg.name} is trying to import from ${packageName} but that is not one of its explicit dependencies`);
         }
         return request;
     }
-    external(label, request, specifier) {
-        if (this.options.amdCompatibility === 'cjs') {
-            let filename = (0, virtual_content_1.virtualExternalCJSModule)(specifier);
-            return logTransition(label, request, request.virtualize(filename));
-        }
-        else if (this.options.amdCompatibility) {
-            let entry = this.options.amdCompatibility.es.find(entry => entry[0] === specifier || entry[0] + '/index' === specifier);
-            if (!entry && request.specifier === 'require') {
-                entry = ['require', ['default', 'has']];
-            }
-            if (!entry) {
-                throw new Error(`A module tried to resolve "${request.specifier}" and didn't find it (${label}).
-
- - Maybe a dependency declaration is missing?
- - Remember that v1 addons can only import non-Ember-addon NPM dependencies if they include ember-auto-import in their dependencies.
- - If this dependency is available in the AMD loader (because someone manually called "define()" for it), you can configure a shim like:
-
-  amdCompatibility: {
-    es: [
-      ["${request.specifier}", ["default", "yourNamedExportsGoHere"]],
-    ]
-  }
-
-`);
-            }
-            let filename = (0, virtual_content_1.virtualExternalESModule)(specifier, entry[1]);
-            return logTransition(label, request, request.virtualize(filename));
+    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'),
+            };
         }
-        else {
-            throw new Error(`Embroider's amdCompatibility option is disabled, but something tried to use it to access "${request.specifier}"`);
+        for (let engine of this.options.engines) {
+            for (let addon of engine.activeAddons) {
+                if (addon.name === packageName) {
+                    return addon;
+                }
+            }
         }
     }
-    fallbackResolve(request) {
-        var _a, _b, _c;
+    async fallbackResolve(request) {
+        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.
@@ -763,108 +876,124 @@ class Resolver {
             // why we need to know about it.
             return logTransition('fallback early exit', request);
         }
-        let { specifier, fromFile } = request;
-        if (compatPattern.test(specifier)) {
+        if (compatPattern.test(request.specifier)) {
             // Some kinds of compat requests get rewritten into other things
-            // deterministically. For example, "#embroider_compat/helpers/whatever"
+            // deterministically. For example, "@embroider/virtual/helpers/whatever"
             // means only "the-current-engine/helpers/whatever", and if that doesn't
             // actually exist it's that path that will show up as a missing import.
             //
             // But others have an ambiguous meaning. For example,
-            // #embroider_compat/components/whatever can mean several different
+            // @embroider/virtual/components/whatever can mean several different
             // things. If we're unable to find any of them, the actual
-            // "#embroider_compat" request will fall through all the way to here.
+            // "@embroider/virtual" request will fall through all the way to here.
             //
             // In that case, we don't want to externalize that failure. We know it's
             // not a classic runtime thing. It's better to let it be a build error
             // here.
             return request;
         }
-        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);
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (pkg) {
+            ({ pkg, request } = this.restoreRehomedRequest(pkg, request));
         }
-        // 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) {
-            if (!((_c = request.meta) === null || _c === void 0 ? void 0 : _c.wasMovedTo)) {
-                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));
             }
-            fromFile = request.meta.wasMovedTo;
-            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)(specifier);
+        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 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);
-                }
-                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.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);
+        if (pkg.needsLooseResolving()) {
+            let activeAddon = this.maybeFallbackToActiveAddon(request, packageName);
+            if (activeAddon) {
+                return activeAddon;
             }
         }
-        let logicalLocation = this.reverseSearchAppTree(pkg, fromFile);
+        let logicalLocation = this.reverseSearchAppTree(pkg, request.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, request.rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, logicalLocation.inAppName)));
+            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')));
         }
         let targetingEngine = this.engineConfig(packageName);
         if (targetingEngine) {
-            let appJSMatch = this.searchAppTree(request, targetingEngine, specifier.replace(packageName, '.'));
+            let appJSMatch = await this.searchAppTree(request, targetingEngine, request.specifier.replace(packageName, '.'));
             if (appJSMatch) {
                 return logTransition('fallbackResolve: non-relative appJsMatch', request, appJSMatch);
             }
         }
-        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, specifier);
+        // this is falling through with the original specifier which was
+        // 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 {
-            // 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, specifier);
+            // 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);
             }
         }
-        // this is falling through with the original specifier which was
-        // non-resolvable, which will presumably cause a static build error in stage3.
-        return logTransition('fallbackResolve final exit', request);
     }
     getEntryFromMergeMap(inEngineSpecifier, root) {
         var _a;
@@ -886,25 +1015,23 @@ class Resolver {
             }
         }
     }
-    searchAppTree(request, engine, inEngineSpecifier) {
+    async 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'].localPath)
-                    .rehome((0, path_1.resolve)(matched.entry['app-js'].packageRoot, 'package.json'));
+                return request.alias(matched.entry['app-js'].specifier).rehome(matched.entry['app-js'].fromFile);
             case 'fastboot-only':
-                return request
-                    .alias(matched.entry['fastboot-js'].localPath)
-                    .rehome((0, path_1.resolve)(matched.entry['fastboot-js'].packageRoot, 'package.json'));
+                return request.alias(matched.entry['fastboot-js'].specifier).rehome(matched.entry['fastboot-js'].fromFile);
             case 'both':
-                let foundAppJS = this.nodeResolve(matched.entry['app-js'].localPath, (0, path_1.resolve)(matched.entry['app-js'].packageRoot, 'package.json'));
-                if (foundAppJS.type !== 'real') {
+                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') {
                     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'), {});
+                let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)(foundAppJS.filename, 'utf8'), { configFile: false });
                 return request.virtualize((0, virtual_content_1.fastbootSwitch)(matched.matched, (0, path_1.resolve)(engine.root, 'package.json'), names));
         }
     }
@@ -939,14 +1066,10 @@ class Resolver {
         if (engineConfig) {
             // we're directly inside an engine, so we're potentially resolvable as a
             // global component
-            // this kind of mapping is not true in general for all packages, but it
-            // *is* true for all classical engines (which includes apps) since they
-            // don't support package.json `exports`. As for a future v2 engine or app:
-            // this whole method is only relevant for implementing packageRules, which
-            // should only be for classic stuff. v2 packages should do the right
-            // things from the beginning and not need packageRules about themselves.
-            let inAppName = (0, shared_internals_2.explicitRelative)(engineConfig.root, filename);
-            return this.tryReverseComponent(engineConfig.packageName, inAppName);
+            let inAppName = engineRelativeName(owningPackage, filename);
+            if (inAppName) {
+                return this.tryReverseComponent(engineConfig.packageName, inAppName);
+            }
         }
         let engineInfo = this.reverseSearchAppTree(owningPackage, filename);
         if (engineInfo) {
@@ -973,9 +1096,6 @@ __decorate([
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], Resolver.prototype, "emberVersionSupportsSeparateTemplates", null);
-function isExplicitlyExternal(specifier, fromPkg) {
-    return Boolean(fromPkg.isV2Addon() && fromPkg.meta['externals'] && fromPkg.meta['externals'].includes(specifier));
-}
 // we don't want to allow things that resolve only by accident that are likely
 // to break in other setups. For example: import your dependencies'
 // dependencies, or importing your own name from within a monorepo (which will
@@ -997,4 +1117,10 @@ function reliablyResolvable(pkg, packageName) {
 function appImportInAppTree(inPackage, inLogicalPackage, importedPackageName) {
     return inPackage !== inLogicalPackage && importedPackageName === inLogicalPackage.name;
 }
+function engineRelativeName(pkg, filename) {
+    let outsideName = (0, reverse_exports_1.externalName)(pkg.packageJSON, (0, shared_internals_2.explicitRelative)(pkg.root, filename));
+    if (outsideName) {
+        return '.' + outsideName.slice(pkg.name.length);
+    }
+}
 //# sourceMappingURL=module-resolver.js.map