@embroider/core 3.4.15-unstable.eb93cd5 → 3.4.16-unstable.2ff89c0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.15-unstable.eb93cd5",
+  "version": "3.4.16-unstable.2ff89c0",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -21,7 +21,7 @@
     "@babel/parser": "^7.14.5",
     "@babel/traverse": "^7.14.5",
     "assert-never": "^1.2.1",
-    "babel-plugin-ember-template-compilation": "^2.1.1",
+    "babel-plugin-ember-template-compilation": "^2.3.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",
@@ -41,9 +41,9 @@
     "resolve.exports": "^2.0.2",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.6-unstable.eb93cd5",
-    "@embroider/reverse-exports": "0.1.1-unstable.eb93cd5",
-    "@embroider/shared-internals": "2.6.3-unstable.eb93cd5"
+    "@embroider/macros": "1.16.7-unstable.2ff89c0",
+    "@embroider/reverse-exports": "0.1.1-unstable.2ff89c0",
+    "@embroider/shared-internals": "2.6.4-unstable.2ff89c0"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",
@@ -61,8 +61,8 @@
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "^5.4.5",
-    "@embroider/sample-transforms": "0.0.0",
-    "@embroider/test-support": "0.36.0"
+    "@embroider/test-support": "0.36.0",
+    "@embroider/sample-transforms": "0.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/module-resolver.d.ts

@@ -17,6 +17,7 @@ export interface Options {
     amdCompatibility: Required<UserOptions['amdCompatibility']>;
     autoRun: boolean;
     staticAppPaths: string[];
+    emberVersion: string;
 }
 export interface EngineConfig {
     packageName: string;
@@ -108,6 +109,9 @@ export declare class Resolver {
     private locateActiveAddon;
     private external;
     private fallbackResolve;
+    private restoreRehomedRequest;
+    private relativeFallbackResolve;
+    private maybeFallbackToActiveAddon;
     private getEntryFromMergeMap;
     private withResolvableExtensions;
     private searchAppTree;

package/src/module-resolver.js

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