don't overload ModuleRequest#alias

embroider-build · Feb 13, 2023 · 237fa4b · 237fa4b
1 parent aacd1a1
commit 237fa4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
@@ -34,7 +34,7 @@ export interface ModuleRequest {
   specifier: string;
   fromFile: string;
   isVirtual: boolean;
-  alias(newSpecifier: string, newFromFile?: string): this;
+  alias(newSpecifier: string): this;
   rehome(newFromFile: string): this;
   virtualize(virtualFilename: string): this;
 }
@@ -266,7 +266,7 @@ export class Resolver {
       return request.rehome(resolve(pkg.root, 'package.json'));
     } else {
       // otherwise we need to just assume that internal naming is simple
-      return request.alias(request.specifier.replace(pkg.name, '.'), resolve(pkg.root, 'package.json'));
+      return request.alias(request.specifier.replace(pkg.name, '.')).rehome(resolve(pkg.root, 'package.json'));
     }
   }
 

diff --git a/packages/webpack/src/webpack-resolver-plugin.ts b/packages/webpack/src/webpack-resolver-plugin.ts
@@ -135,12 +135,8 @@ class WebpackModuleRequest implements ModuleRequest {
     this.fromFile = state.contextInfo.issuer;
   }
 
-  alias(newSpecifier: string, newFromFile?: string) {
+  alias(newSpecifier: string) {
     this.state.request = newSpecifier;
-    if (newFromFile) {
-      this.state.contextInfo.issuer = newFromFile;
-      this.state.context = dirname(newFromFile);
-    }
     return new WebpackModuleRequest(this.state) as this;
   }
   rehome(newFromFile: string) {