prioritize fastboot differently in package.json merge

Now that the fastboot-specific package.json output includes `type: 'addon'` within the ember metadata, it needs to come after the app's own ember metadata. Otherwise the app gets labeled as an addon.
embroider-build · Sep 24, 2021 · 7be3a2b · 7be3a2b
1 parent a8eb6ae
commit 7be3a2b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
@@ -910,11 +910,14 @@ export class AppBuilder<TreeNames> {
   }
 
   private combinePackageJSON(meta: AppMeta): object {
-    let pkgLayers = [this.app.packageJSON, { keywords: ['ember-addon'], 'ember-addon': meta }];
+    let pkgLayers: any[] = [this.app.packageJSON];
     let fastbootConfig = this.fastbootConfig;
     if (fastbootConfig) {
+      // fastboot-specific package.json output is allowed to add to our original package.json
       pkgLayers.push(fastbootConfig.packageJSON);
     }
+    // but our own new v2 app metadata takes precedence over both
+    pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
     return combinePackageJSON(...pkgLayers);
   }