adjust moved-package-target for namespaced packages

I don't think this was actually breaking anything but it produced more confusing error messages when a module is missing.
embroider-build · Nov 14, 2023 · 6ceae64 · 6ceae64
1 parent ded6329
commit 6ceae64
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/compat/src/standalone-addon-build.ts b/packages/compat/src/standalone-addon-build.ts
@@ -52,7 +52,12 @@ ${summarizePeerDepViolations(violations)}
   });
 
   let fakeTargets = Object.values(index.packages).map(dir => {
-    return writeFile(join(dir, '..', 'moved-package-target.js'), '');
+    let segments = dir.split('/');
+    while (segments[segments.length - 1] && segments[segments.length - 1] !== 'node_modules') {
+      segments.pop();
+    }
+    segments.push('moved-package-target.js');
+    return writeFile(join(...segments), '');
   });
 
   return broccoliMergeTrees([

diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
@@ -830,7 +830,11 @@ export class Resolver {
   }
 
   private resolveWithinMovedPackage<R extends ModuleRequest>(request: R, pkg: Package): R {
-    return request.rehome(resolve(pkg.root, '..', 'moved-package-target.js')).withMeta({
+    let levels = ['..'];
+    if (pkg.name.startsWith('@')) {
+      levels.push('..');
+    }
+    return request.rehome(resolve(pkg.root, ...levels, 'moved-package-target.js')).withMeta({
       resolvedWithinPackage: pkg.root,
     });
   }