merge defaults in even for authored v2 apps, for now

embroider-build · Aug 9, 2024 · 610e409 · 610e409
1 parent 9892ac6
commit 610e409
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/packages/compat/src/compat-app-builder.ts b/packages/compat/src/compat-app-builder.ts
@@ -494,23 +494,25 @@ export class CompatAppBuilder {
       pkgLayers.push(fastbootConfig.packageJSON);
     }
 
+    let meta: AppMeta = {
+      type: 'app',
+      version: 2,
+      assets: assetPaths,
+      babel: {
+        filename: '_babel_config_.js',
+        isParallelSafe: true, // TODO
+        majorVersion: this.compatApp.babelMajorVersion(),
+        fileFilter: '_babel_filter_.js',
+      },
+      'root-url': this.rootURL(),
+    };
+
     if ((this.origAppPackage.packageJSON['ember-addon']?.version ?? 0) < 2) {
-      // the app has no v2 metdata, so we must be auto-upgrading it
-      let meta: AppMeta = {
-        type: 'app',
-        version: 2,
-        assets: assetPaths,
-        babel: {
-          filename: '_babel_config_.js',
-          isParallelSafe: true, // TODO
-          majorVersion: this.compatApp.babelMajorVersion(),
-          fileFilter: '_babel_filter_.js',
-        },
-        'root-url': this.rootURL(),
-        'auto-upgraded': true,
-      };
-      pkgLayers.push({ 'ember-addon': meta });
+      meta['auto-upgraded'] = true;
     }
+
+    pkgLayers.push({ 'ember-addon': meta });
+
     return combinePackageJSON(...pkgLayers);
   }