@embroider/core 3.4.20-unstable.7195610 → 3.4.20-unstable.78dd1bb

package/src/module-resolver.js

@@ -36,10 +36,7 @@ debug_1.default.formatters.p = (s) => {
     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) {
+    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) {
@@ -53,17 +50,11 @@ function logTransition(reason, before, after = before) {
     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);
-    }
     else {
         debug(`[%s:unchanged] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
     }
     return after;
 }
-function isTerminal(request) {
-    return request.isVirtual || request.isNotFound || Boolean(request.resolvedTo);
-}
 const compatPattern = /@embroider\/virtual\/(?<type>[^\/]+)\/(?<rest>.*)/;
 class Resolver {
     constructor(options) {
@@ -77,9 +68,6 @@ 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.handleImplicitModules(request);
@@ -105,10 +93,18 @@ class Resolver {
     // rules.
     async resolve(request) {
         request = await this.beforeResolve(request);
+        let resolution;
         if (request.resolvedTo) {
-            return request.resolvedTo;
+            if (typeof request.resolvedTo === 'function') {
+                resolution = await request.resolvedTo();
+            }
+            else {
+                resolution = request.resolvedTo;
+            }
+        }
+        else {
+            resolution = await request.defaultResolve();
         }
-        let resolution = await request.defaultResolve();
         switch (resolution.type) {
             case 'found':
             case 'ignored':
@@ -118,23 +114,23 @@ class Resolver {
             default:
                 throw (0, assert_never_1.default)(resolution);
         }
+        request = request.clone();
         let nextRequest = await this.fallbackResolve(request);
         if (nextRequest === request) {
             // no additional fallback is available.
             return resolution;
         }
         if (nextRequest.resolvedTo) {
-            return nextRequest.resolvedTo;
+            if (typeof nextRequest.resolvedTo === 'function') {
+                return await nextRequest.resolvedTo();
+            }
+            else {
+                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();
-        }
         return this.resolve(nextRequest);
     }
     // Use standard NodeJS resolving, with our required compatibility rules on
@@ -158,7 +154,7 @@ class Resolver {
         return owningPackage;
     }
     generateFastbootSwitch(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -199,7 +195,7 @@ class Resolver {
     }
     handleFastbootSwitch(request) {
         var _a;
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
@@ -246,7 +242,7 @@ class Resolver {
         return logTransition('failed to match in fastboot switch', request);
     }
     handleImplicitModules(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
@@ -268,7 +264,7 @@ class Resolver {
     }
     handleEntrypoint(request) {
         var _a;
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         //TODO move the extra forwardslash handling out into the vite plugin
@@ -304,7 +300,7 @@ class Resolver {
         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)) {
+        if (request.resolvedTo) {
             return request;
         }
         let routeName = (0, virtual_route_entrypoint_1.decodePublicRouteEntrypoint)(request.specifier);
@@ -354,7 +350,7 @@ class Resolver {
         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)) {
+        if (request.resolvedTo) {
             return request;
         }
         let match = compatPattern.exec(request.specifier);
@@ -434,7 +430,7 @@ class Resolver {
         }
         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.filename, jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename)));
         }
@@ -634,7 +630,7 @@ class Resolver {
         });
     }
     handleRewrittenPackages(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -687,7 +683,7 @@ class Resolver {
         return request;
     }
     handleRenaming(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let packageName = (0, shared_internals_1.packageName)(request.specifier);
@@ -789,7 +785,7 @@ class Resolver {
         return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let { specifier, fromFile } = request;
@@ -799,11 +795,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
@@ -812,11 +803,6 @@ 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.
@@ -826,14 +812,6 @@ class Resolver {
             }
             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.
@@ -853,7 +831,7 @@ class Resolver {
                 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) {
@@ -886,42 +864,9 @@ class Resolver {
             }
         }
     }
-    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(`[${request.debugType}] 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));
-        }
-        else {
-            throw new Error(`Embroider's amdCompatibility option is disabled, but something tried to use it to access "${request.specifier}"`);
-        }
-    }
     async fallbackResolve(request) {
-        var _a, _b;
-        if (request.isVirtual) {
-            throw new Error('Build tool bug detected! Fallback resolve should never see a virtual request. It is expected that the defaultResolve for your bundler has already resolved this request');
+        if (request.resolvedTo) {
+            throw new Error('Build tool bug detected! Fallback resolve should never see an already-resolved request.');
         }
         if (request.specifier === '@embroider/macros') {
             // the macros package is always handled directly within babel (not
@@ -997,21 +942,6 @@ class Resolver {
                 return logTransition('fallbackResolve: non-relative appJsMatch', request, appJSMatch);
             }
         }
-        if (pkg.needsLooseResolving() && ((_b = (_a = request.meta) === null || _a === void 0 ? void 0 : _a.runtimeFallback) !== null && _b !== void 0 ? _b : true)) {
-            // auto-upgraded packages can fall back to attempting to find dependencies at
-            // runtime. Native v2 packages can only get this behavior in the
-            // isExplicitlyExternal case above because they need to explicitly ask for
-            // externals.
-            return this.external('v1 catch-all fallback', request, 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);
-            }
-        }
         // 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);
@@ -1165,9 +1095,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