Merge pull request #618 from embroider-build/reuse-in-repo-addons

allow REUSE_WORKSPACE with in repo addons
embroider-build · Nov 18, 2020 · 873aeca · 873aeca
2 parents 58736a9 + b108e17
commit 873aeca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/compat/src/prebuilt-addons.ts b/packages/compat/src/prebuilt-addons.ts
@@ -34,7 +34,7 @@ class RehomedPackageCache extends PackageCache {
   constructor(private appSrcDir: string, private appDestDir: string) {
     super();
   }
-  protected basedir(pkg: Package): string {
+  basedir(pkg: Package): string {
     if (pkg.root === this.appSrcDir) {
       return this.appDestDir;
     }

diff --git a/packages/core/src/package-cache.ts b/packages/core/src/package-cache.ts
@@ -44,7 +44,7 @@ export default class PackageCache {
   protected rootCache: Map<string, Package> = new Map();
   protected resolutionCache: Map<Package, Map<string, Package | null>> = new Map();
 
-  protected basedir(pkg: Package): string {
+  basedir(pkg: Package): string {
     return pkg.root;
   }
 

diff --git a/packages/core/src/package.ts b/packages/core/src/package.ts
@@ -140,7 +140,7 @@ export default class Package {
             // stop you.
             let pkg;
             try {
-              pkg = this.packageCache.get(join(this.root, path));
+              pkg = this.packageCache.get(join(this.packageCache.basedir(this), path));
             } catch (err) {
               // package was missing or had invalid package.json
               return false;
@@ -153,7 +153,7 @@ export default class Package {
               main = `${main}.js`;
             }
 
-            let mainPath = join(this.root, path, main);
+            let mainPath = join(this.packageCache.basedir(this), path, main);
             if (!existsSync(mainPath)) {
               // package has no valid main
               return false;