Merge pull request #1940 from embroider-build/v2-addon-registration

only register v2 addons with parent addons
embroider-build · May 22, 2024 · 45f521c · 45f521c
2 parents 5422cfd + 100e322
commit 45f521c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/addon-shim/src/index.ts b/packages/addon-shim/src/index.ts
@@ -163,9 +163,12 @@ export function addonV1Shim(directory: string, options: ShimOptions = {}) {
         }
         autoImport.instance.registerV2Addon(name, root);
       } else {
-        // if we're being used by a v2 addon, it also has this shim and will
-        // forward our registration onward to ember-auto-import
-        (this.parent as EAI2Instance).registerV2Addon(name, root);
+        // This should only be done if we're being consumed by an addon
+        if (this.parent.pkg['ember-addon'].type === 'addon') {
+          // if we're being used by a v2 addon, it also has this shim and will
+          // forward our registration onward to ember-auto-import
+          (this.parent as EAI2Instance).registerV2Addon(name, root);
+        }
       }
     },
   };