fix(config-merge): mark an aspect with minus when it needs to be removed (teambit#6831)

davidfirst · web-flow · commit 16c6ec9722d5 · 2022-12-24T22:22:06.000-05:00
diff --git a/scopes/component/merging/config-merger.ts b/scopes/component/merging/config-merger.ts
@@ -111,8 +111,8 @@ export class ConfigMerger {
       // exist in other but not in current and base, so it got created on other.
       return { id, mergedConfig: this.getConfig(otherExt) };
     });
-    const envResult = this.envStrategy();
-    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, envResult]));
+    const envResult = [this.envStrategy()] || [];
+    return new ConfigMergeResult(this.compIdStr, compact([...results, ...otherAspectsNotHandledResults, ...envResult]));
   }
 
   private populateEnvs() {
@@ -137,19 +137,19 @@ export class ConfigMerger {
     if (currentEnvAspect) {
       this.handledExtIds.push(currentEnvAspect.stringId);
       this.currentEnv.version = currentEnvAspect.extensionId?.version;
-      this.currentEnv.config = currentEnvAspect.rawConfig;
+      this.currentEnv.config = this.getConfig(currentEnvAspect);
     }
     const otherEnvAspect = this.otherAspects.findExtension(otherEnv, true);
     if (otherEnvAspect) {
       this.handledExtIds.push(otherEnvAspect.stringId);
       this.otherEnv.version = otherEnvAspect.extensionId?.version;
-      this.otherEnv.config = otherEnvAspect.rawConfig;
+      this.otherEnv.config = this.getConfig(otherEnvAspect);
     }
     if (this.baseEnv) {
       const baseEnvAspect = this.baseAspects.findExtension(baseEnv, true);
       if (baseEnvAspect) {
         this.baseEnv.version = baseEnvAspect.extensionId?.version;
-        this.baseEnv.config = baseEnvAspect.rawConfig;
+        this.baseEnv.config = this.getConfig(baseEnvAspect);
       }
     }
   }
@@ -222,13 +222,15 @@ export class ConfigMerger {
     let conflict: string;
     if (currentConfig === '-') {
       conflict = `${'<'.repeat(7)} ${this.currentLabel}
+"${id}": "-"
 =======
 "${id}": ${JSON.stringify(otherConfig, undefined, 2)}
 ${'>'.repeat(7)} ${this.otherLabel}`;
     } else if (otherConfig === '-') {
       conflict = `${'<'.repeat(7)} ${this.currentLabel}
-"${id}": ${JSON.stringify(otherConfig, undefined, 2)}
+"${id}": ${JSON.stringify(currentConfig, undefined, 2)}
 =======
+"${id}": "-"
 ${'>'.repeat(7)} ${this.otherLabel}`;
     } else {
       const formatConfig = (conf: GenericConfigOrRemoved) => {
@@ -519,7 +521,7 @@ ${'>'.repeat(7)} ${this.otherLabel}`;
     return id === this.currentEnv.id || id === this.otherEnv.id;
   }
 
-  private getConfig(ext: ExtensionDataEntry) {
+  private getConfig(ext: ExtensionDataEntry): GenericConfigOrRemoved {
     if (ext.rawConfig === '-') return ext.rawConfig;
     return omit(ext.rawConfig, ['__specific']);
   }
