@embroider/core 3.1.4-unstable.1cdd50c → 3.1.4-unstable.2c0e2bd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.1.4-unstable.1cdd50c",
+  "version": "3.1.4-unstable.2c0e2bd",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -23,10 +23,10 @@
     "@babel/core": "^7.14.5",
     "@babel/parser": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.12.4-unstable.1cdd50c",
-    "@embroider/shared-internals": "2.2.4-unstable.1cdd50c",
+    "@embroider/macros": "1.12.4-unstable.2c0e2bd",
+    "@embroider/shared-internals": "2.2.4-unstable.2c0e2bd",
     "assert-never": "^1.2.1",
-    "babel-plugin-ember-template-compilation": "^2.0.0",
+    "babel-plugin-ember-template-compilation": "^2.1.1",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",

package/src/index.d.ts

@@ -8,6 +8,7 @@ export { default as WaitForTrees, OutputPaths } from './wait-for-trees';
 export { compile as jsHandlebarsCompile } from './js-handlebars';
 export { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';
 export { Resolver, Options as ResolverOptions, ModuleRequest, Resolution, ResolverFunction, SyncResolverFunction, } from './module-resolver';
+export { ResolverLoader } from './resolver-loader';
 export { virtualContent } from './virtual-content';
 export type { Engine } from './app-files';
 export * from '@embroider/shared-internals';

package/src/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.virtualContent = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.toBroccoliPlugin = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
+exports.virtualContent = exports.ResolverLoader = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.toBroccoliPlugin = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
 var packager_1 = require("./packager");
 Object.defineProperty(exports, "applyVariantToBabelConfig", { enumerable: true, get: function () { return packager_1.applyVariantToBabelConfig; } });
 Object.defineProperty(exports, "getAppMeta", { enumerable: true, get: function () { return packager_1.getAppMeta; } });
@@ -41,6 +41,8 @@ Object.defineProperty(exports, "expectWarning", { enumerable: true, get: functio
 Object.defineProperty(exports, "throwOnWarnings", { enumerable: true, get: function () { return messages_1.throwOnWarnings; } });
 var module_resolver_1 = require("./module-resolver");
 Object.defineProperty(exports, "Resolver", { enumerable: true, get: function () { return module_resolver_1.Resolver; } });
+var resolver_loader_1 = require("./resolver-loader");
+Object.defineProperty(exports, "ResolverLoader", { enumerable: true, get: function () { return resolver_loader_1.ResolverLoader; } });
 var virtual_content_1 = require("./virtual-content");
 Object.defineProperty(exports, "virtualContent", { enumerable: true, get: function () { return virtual_content_1.virtualContent; } });
 // this is reexported because we already make users manage a peerDep from some

package/src/index.js.map

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

package/src/module-resolver.d.ts

@@ -1,4 +1,5 @@
-import { Package } from '@embroider/shared-internals';
+import { Package, RewrittenPackageCache } from '@embroider/shared-internals';
+import UserOptions from './options';
 export interface Options {
     renamePackages: {
         [fromName: string]: string;
@@ -14,6 +15,7 @@ export interface Options {
     engines: EngineConfig[];
     modulePrefix: string;
     podModulePrefix?: string;
+    amdCompatibility: Required<UserOptions['amdCompatibility']>;
 }
 interface EngineConfig {
     packageName: string;
@@ -30,12 +32,14 @@ interface EngineConfig {
     root: string;
 }
 export interface ModuleRequest {
-    specifier: string;
-    fromFile: string;
-    isVirtual: boolean;
+    readonly specifier: string;
+    readonly fromFile: string;
+    readonly isVirtual: boolean;
+    readonly meta: Record<string, unknown> | undefined;
     alias(newSpecifier: string): this;
     rehome(newFromFile: string): this;
     virtualize(virtualFilename: string): this;
+    withMeta(meta: Record<string, any> | undefined): this;
 }
 export type Resolution<T = unknown, E = unknown> = {
     type: 'found';
@@ -47,7 +51,7 @@ export type Resolution<T = unknown, E = unknown> = {
 export type ResolverFunction<R extends ModuleRequest = ModuleRequest, Res extends Resolution = Resolution> = (request: R) => Promise<Res>;
 export type SyncResolverFunction<R extends ModuleRequest = ModuleRequest, Res extends Resolution = Resolution> = (request: R) => Res;
 export declare class Resolver {
-    private options;
+    readonly options: Options;
     constructor(options: Options);
     beforeResolve<R extends ModuleRequest>(request: R): R;
     resolve<Req extends ModuleRequest, Res extends Resolution>(request: Req, defaultResolve: ResolverFunction<Req, Res>): Promise<Res>;
@@ -64,11 +68,11 @@ export declare class Resolver {
         type: 'not_found';
         err: Error;
     };
-    private get packageCache();
-    owningPackage(fromFile: string): Package | undefined;
+    get packageCache(): RewrittenPackageCache;
     private logicalPackage;
     private generateFastbootSwitch;
     private handleFastbootSwitch;
+    private handleImplicitModules;
     private handleGlobalsCompat;
     private resolveHelper;
     private resolveComponent;
@@ -85,6 +89,7 @@ export declare class Resolver {
     private handleRenaming;
     private resolveWithinPackage;
     private preHandleExternal;
+    private external;
     fallbackResolve<R extends ModuleRequest>(request: R): R;
     private getEntryFromMergeMap;
     private withResolvableExtensions;

package/src/module-resolver.js

@@ -43,24 +43,28 @@ function logTransition(reason, before, after = before) {
 }
 const compatPattern = /#embroider_compat\/(?<type>[^\/]+)\/(?<rest>.*)/;
 class NodeModuleRequest {
-    constructor(specifier, fromFile, isVirtual = false) {
+    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);
+        return new NodeModuleRequest(specifier, this.fromFile, false, this.meta);
     }
     rehome(fromFile) {
         if (this.fromFile === fromFile) {
             return this;
         }
         else {
-            return new NodeModuleRequest(this.specifier, fromFile);
+            return new NodeModuleRequest(this.specifier, fromFile, false, this.meta);
         }
     }
     virtualize(filename) {
-        return new NodeModuleRequest(filename, this.fromFile, true);
+        return new NodeModuleRequest(filename, this.fromFile, true, this.meta);
+    }
+    withMeta(meta) {
+        return new NodeModuleRequest(this.specifier, this.fromFile, this.isVirtual, meta);
     }
 }
 class Resolver {
@@ -77,6 +81,7 @@ class Resolver {
         }
         request = this.handleFastbootSwitch(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
         request = this.generateFastbootSwitch(request);
@@ -144,13 +149,13 @@ class Resolver {
     // 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), request => {
+        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),
+                        content: (0, virtual_content_1.virtualContent)(request.specifier, this),
                         filename: request.specifier,
                     },
                 };
@@ -181,9 +186,6 @@ class Resolver {
     get packageCache() {
         return shared_internals_2.RewrittenPackageCache.shared('embroider', this.options.appRoot);
     }
-    owningPackage(fromFile) {
-        return this.packageCache.ownerOfFile(fromFile);
-    }
     logicalPackage(owningPackage, file) {
         let logicalLocation = this.reverseSearchAppTree(owningPackage, file);
         if (logicalLocation) {
@@ -196,7 +198,7 @@ class Resolver {
         return owningPackage;
     }
     generateFastbootSwitch(request) {
-        let pkg = this.owningPackage(request.fromFile);
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!pkg) {
             return request;
         }
@@ -246,7 +248,7 @@ class Resolver {
         if (!section) {
             return logTransition('non-special import in fastboot switch', request);
         }
-        let pkg = this.owningPackage(match.filename);
+        let pkg = this.packageCache.ownerOfFile(match.filename);
         if (pkg) {
             let rel = (0, shared_internals_2.explicitRelative)(pkg.root, match.filename);
             let engineConfig = this.engineConfig(pkg.name);
@@ -275,13 +277,31 @@ class Resolver {
         }
         return logTransition('failed to match in fastboot switch', request);
     }
+    handleImplicitModules(request) {
+        let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
+        if (!im) {
+            return request;
+        }
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
+        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+            throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
+        }
+        let packageName = (0, shared_internals_1.packageName)(im.fromFile);
+        if (packageName) {
+            let dep = this.packageCache.resolve(packageName, pkg);
+            return logTransition(`dep's implicit modules`, request, request.virtualize((0, path_1.resolve)(dep.root, `-embroider-${im.type}.js`)));
+        }
+        else {
+            return logTransition(`own implicit modules`, request, request.virtualize((0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`)));
+        }
+    }
     handleGlobalsCompat(request) {
         let match = compatPattern.exec(request.specifier);
         if (!match) {
             return request;
         }
         let { type, rest } = match.groups;
-        let fromPkg = this.owningPackage(request.fromFile);
+        let fromPkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!(fromPkg === null || fromPkg === void 0 ? void 0 : fromPkg.isV2Ember())) {
             return request;
         }
@@ -502,7 +522,10 @@ class Resolver {
         return owningEngine;
     }
     handleRewrittenPackages(request) {
-        let requestingPkg = this.owningPackage(request.fromFile);
+        if (request.isVirtual) {
+            return request;
+        }
+        let requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!requestingPkg) {
             return request;
         }
@@ -539,7 +562,7 @@ class Resolver {
         else if (originalRequestingPkg) {
             // 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.rehome((0, path_1.resolve)(originalRequestingPkg.root, request.fromFile.slice(requestingPkg.root.length + 1))));
+            return logTransition('outbound request from moved package', request, request.withMeta({ wasMovedTo: request.fromFile }).rehome((0, path_1.resolve)(originalRequestingPkg.root, 'package.json')));
         }
         return request;
     }
@@ -551,7 +574,7 @@ class Resolver {
         if (!packageName) {
             return request;
         }
-        let pkg = this.owningPackage(request.fromFile);
+        let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!pkg || !pkg.isV2Ember()) {
             return request;
         }
@@ -603,7 +626,7 @@ class Resolver {
             return request;
         }
         let { specifier, fromFile } = request;
-        let pkg = this.owningPackage(fromFile);
+        let pkg = this.packageCache.ownerOfFile(fromFile);
         if (!pkg || !pkg.isV2Ember()) {
             return request;
         }
@@ -625,7 +648,7 @@ class Resolver {
             let packageRelativeSpecifier = (0, shared_internals_2.explicitRelative)(pkg.root, absoluteSpecifier);
             if (isExplicitlyExternal(packageRelativeSpecifier, pkg)) {
                 let publicSpecifier = absoluteSpecifier.replace(pkg.root, pkg.name);
-                return external('beforeResolve', request, publicSpecifier);
+                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
@@ -639,10 +662,10 @@ class Resolver {
         // absolute package imports can also be explicitly external based on their
         // full specifier name
         if (isExplicitlyExternal(specifier, pkg)) {
-            return external('beforeResolve', request, specifier);
+            return this.external('beforeResolve', request, specifier);
         }
         if (shared_internals_1.emberVirtualPackages.has(packageName) && !pkg.hasDependency(packageName)) {
-            return external('beforeResolve emberVirtualPackages', request, specifier);
+            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
@@ -663,7 +686,7 @@ class Resolver {
                 if (!dep.isEmberPackage()) {
                     // classic ember addons can only import non-ember dependencies if they
                     // have ember-auto-import.
-                    return external('v1 package without auto-import', request, specifier);
+                    return this.external('v1 package without auto-import', request, specifier);
                 }
             }
             catch (err) {
@@ -682,7 +705,40 @@ class Resolver {
         }
         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));
+        }
+        else {
+            throw new Error(`Embroider's amdCompatibility option is disabled, but something tried to use it to access "${request.specifier}"`);
+        }
+    }
     fallbackResolve(request) {
+        var _a;
         let { specifier, fromFile } = request;
         if (compatPattern.test(specifier)) {
             // Some kinds of compat requests get rewritten into other things
@@ -700,7 +756,7 @@ class Resolver {
             // here.
             return request;
         }
-        let pkg = this.owningPackage(fromFile);
+        let pkg = this.packageCache.ownerOfFile(fromFile);
         if (!pkg) {
             return logTransition('no identifiable owningPackage', request);
         }
@@ -710,7 +766,10 @@ class Resolver {
         // isV2Ember()
         let movedPkg = this.packageCache.maybeMoved(pkg);
         if (movedPkg !== pkg) {
-            fromFile = (0, path_1.resolve)(movedPkg.root, request.fromFile.slice(pkg.root.length + 1));
+            if (!((_a = request.meta) === null || _a === void 0 ? void 0 : _a.wasMovedTo)) {
+                throw new Error(`bug: embroider resolver's meta is not propagating`);
+            }
+            fromFile = request.meta.wasMovedTo;
             pkg = movedPkg;
         }
         if (!pkg.isV2Ember()) {
@@ -732,22 +791,6 @@ class Resolver {
                 }
             }
             else {
-                if (pkg.meta['auto-upgraded'] && (0, path_1.dirname)(request.fromFile) === pkg.root) {
-                    let otherRoot = this.options.activeAddons[pkg.name];
-                    if (otherRoot && otherRoot !== pkg.root) {
-                        // This provides some backward-compatibility with the way things
-                        // would have resolved in earlier embroider versions, where the
-                        // final fallback was always the activeAddons. These requests now
-                        // end up getting converted to relative requests inside a particular
-                        // moved package, which is why we need to handle them here.
-                        //
-                        // TODO: We shouldn't need this if we generate notional per-package
-                        // entrypoints that pull in all the implicit-modules, so that the
-                        // imports for implicit-modules happen in places with normal
-                        // dependency resolvability.
-                        return logTransition('fallbackResolve: relative path falling through to activeAddons', request, request.rehome((0, path_1.resolve)(otherRoot, 'package.json')));
-                    }
-                }
                 // nothing else to do for relative imports
                 return logTransition('fallbackResolve: relative failure', request);
             }
@@ -779,14 +822,14 @@ class Resolver {
             // runtime. Native v2 packages can only get this behavior in the
             // isExplicitlyExternal case above because they need to explicitly ask for
             // externals.
-            return external('v1 catch-all fallback', 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 external('emberVirtualPackages', request, specifier);
+                return this.external('emberVirtualPackages', request, specifier);
             }
         }
         // this is falling through with the original specifier which was
@@ -858,7 +901,7 @@ class Resolver {
     // check if this file is resolvable as a global component, and if so return
     // its dasherized name
     reverseComponentLookup(filename) {
-        const owningPackage = this.owningPackage(filename);
+        const owningPackage = this.packageCache.ownerOfFile(filename);
         if (!(owningPackage === null || owningPackage === void 0 ? void 0 : owningPackage.isV2Ember())) {
             return;
         }
@@ -921,8 +964,4 @@ function reliablyResolvable(pkg, packageName) {
 function appImportInAppTree(inPackage, inLogicalPackage, importedPackageName) {
     return inPackage !== inLogicalPackage && importedPackageName === inLogicalPackage.name;
 }
-function external(label, request, specifier) {
-    let filename = (0, virtual_content_1.virtualExternalModule)(specifier);
-    return logTransition(label, request, request.virtualize(filename));
-}
 //# sourceMappingURL=module-resolver.js.map