@teambit/workspace 1.0.260 → 1.0.261

package/dist/{preview-1714620113654.js → preview-1714706485042.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.260/dist/workspace.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.260/dist/workspace.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.261/dist/workspace.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.workspace_workspace@1.0.261/dist/workspace.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/workspace.d.ts

@@ -312,6 +312,7 @@ export declare class Workspace implements ComponentFactory {
     getDefaultExtensions(): ExtensionDataList;
     getComponentConfigVinylFile(id: ComponentID, options: EjectConfOptions, excludeLocalChanges?: boolean): Promise<JsonVinyl>;
     ejectMultipleConfigs(ids: ComponentID[], options: EjectConfOptions): Promise<EjectConfResult[]>;
+    getAspectConfigForComponent(id: ComponentID, aspectId: string): Promise<object | undefined>;
     getExtensionsFromScopeAndSpecific(id: ComponentID, excludeComponentJson?: boolean): Promise<ExtensionDataList>;
     /**
      * @deprecated use `this.idsByPattern` instead for consistency. also, it supports negation and list of patterns.

package/dist/workspace.js

@@ -1060,6 +1060,11 @@ it's possible that the version ${component.id.version} belong to ${idStr.split('
     await this.bitMap.write(`eject-conf (${ids.length} component(s))`);
     return EjectConfResult;
   }
+  async getAspectConfigForComponent(id, aspectId) {
+    const extensions = await this.getExtensionsFromScopeAndSpecific(id);
+    const obj = extensions.toConfigObject();
+    return obj[aspectId];
+  }
   async getExtensionsFromScopeAndSpecific(id, excludeComponentJson = false) {
     const componentFromScope = await this.scope.get(id);
     const exclude = ['WorkspaceVariants'];
@@ -1520,9 +1525,8 @@ the following envs are used in this workspace: ${availableEnvs.join(', ')}`);
       });
     } else {
       if (shouldMergeWithPrevious) {
-        const extensions = await this.getExtensionsFromScopeAndSpecific(id);
-        const obj = extensions.toConfigObject();
-        config = obj[aspectId] ? (0, _lodash().merge)(obj[aspectId], config) : config;
+        const existingConfig = await this.getAspectConfigForComponent(id, aspectId);
+        config = existingConfig ? (0, _lodash().merge)(existingConfig, config) : config;
       }
       this.bitMap.addComponentConfig(id, aspectId, config, shouldMergeWithExisting);
     }