mostly fixed

packages/core/src/module-resolver.ts

@@ -960,6 +960,13 @@ export class Resolver {
       levels.push('..');
     }
     let originalFromFile = request.fromFile;
+    if (pkg.isV2App()) {
+      let newRequest = request.rehome(resolve(pkg.root, ...levels, 'moved-package-target.js'));
+
+      // setting meta because if this fails, we want the fallback to pick up back
+      // in the original requesting package.
+      return newRequest.withMeta({ originalFromFile });
+    }
     let root = resolve(pkg.root, ...levels, ...levels, '..');
     let specifier = resolve(pkg.root, ...levels, request.specifier);
     specifier = specifier.replace(root, '@embroider/rewritten-packages');
@@ -1227,6 +1234,10 @@ export class Resolver {
       let addon = this.locateActiveAddon(packageName);
       if (addon) {
         const rehomed = request.rehome(addon.canResolveFromFile);
+        const targetPkg = this.packageCache.get(addon.root);
+        if (!targetPkg.isV2Addon()) {
+          return rehomed;
+        }
         if (rehomed !== request) {
           let levels = ['..'];
           if (request.specifier.startsWith('@')) {