@teambit/workspace 0.0.937 → 0.0.939

package/exceptions/merge-config-conflict.ts

@@ -0,0 +1,7 @@
+import { BitError } from '@teambit/bit-error';
+
+export class MergeConfigConflict extends BitError {
+  constructor(filePath: string) {
+    super(`unable to parse the merge-config file ${filePath} as it has unresolved conflicts`);
+  }
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.937",
+  "version": "0.0.939",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.937"
+    "version": "0.0.939"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -35,48 +35,48 @@
     "@teambit/base-ui.surfaces.split-pane.split-pane": "1.0.0",
     "@teambit/bit-error": "0.0.402",
     "@teambit/component-id": "0.0.425",
-    "@teambit/lane-id": "0.0.146",
-    "@teambit/component": "0.0.937",
-    "@teambit/dependency-resolver": "0.0.937",
-    "@teambit/logger": "0.0.721",
-    "@teambit/scope": "0.0.937",
-    "@teambit/graph": "0.0.937",
-    "@teambit/cli": "0.0.628",
-    "@teambit/isolator": "0.0.937",
-    "@teambit/component-tree": "0.0.725",
+    "@teambit/lane-id": "0.0.147",
+    "@teambit/component": "0.0.939",
+    "@teambit/dependency-resolver": "0.0.939",
+    "@teambit/logger": "0.0.722",
+    "@teambit/scope": "0.0.939",
+    "@teambit/graph": "0.0.939",
+    "@teambit/cli": "0.0.629",
+    "@teambit/isolator": "0.0.939",
+    "@teambit/component-tree": "0.0.727",
     "@teambit/component.ui.component-status-resolver": "0.0.503",
-    "@teambit/lanes.hooks.use-lanes": "0.0.91",
+    "@teambit/lanes.hooks.use-lanes": "0.0.93",
     "@teambit/harmony.modules.resolved-component": "0.0.491",
-    "@teambit/compiler": "0.0.937",
-    "@teambit/graphql": "0.0.937",
-    "@teambit/aspect-loader": "0.0.937",
-    "@teambit/bundler": "0.0.937",
-    "@teambit/envs": "0.0.937",
-    "@teambit/pubsub": "0.0.937",
-    "@teambit/ui": "0.0.937",
-    "@teambit/variants": "0.0.733",
-    "@teambit/component-issues": "0.0.83",
-    "@teambit/config": "0.0.641",
+    "@teambit/compiler": "0.0.939",
+    "@teambit/graphql": "0.0.939",
+    "@teambit/aspect-loader": "0.0.939",
+    "@teambit/bundler": "0.0.939",
+    "@teambit/envs": "0.0.939",
+    "@teambit/pubsub": "0.0.939",
+    "@teambit/ui": "0.0.939",
+    "@teambit/variants": "0.0.734",
+    "@teambit/component-issues": "0.0.84",
+    "@teambit/config": "0.0.642",
     "@teambit/harmony.modules.requireable-component": "0.0.491",
     "@teambit/legacy-bit-id": "0.0.421",
     "@teambit/workspace.modules.match-pattern": "0.0.498",
-    "@teambit/component.ui.component-drawer": "0.0.185",
+    "@teambit/component.ui.component-drawer": "0.0.187",
     "@teambit/design.ui.tree": "0.0.15",
-    "@teambit/lanes.hooks.use-lane-components": "0.0.90",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.702",
-    "@teambit/command-bar": "0.0.937",
-    "@teambit/component.ui.component-filters.component-filter-context": "0.0.60",
-    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.60",
-    "@teambit/component.ui.component-filters.env-filter": "0.0.66",
-    "@teambit/component.ui.component-filters.show-main-filter": "0.0.53",
-    "@teambit/sidebar": "0.0.937",
+    "@teambit/lanes.hooks.use-lane-components": "0.0.92",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.704",
+    "@teambit/command-bar": "0.0.939",
+    "@teambit/component.ui.component-filters.component-filter-context": "0.0.62",
+    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.62",
+    "@teambit/component.ui.component-filters.env-filter": "0.0.68",
+    "@teambit/component.ui.component-filters.show-main-filter": "0.0.55",
+    "@teambit/sidebar": "0.0.939",
     "@teambit/ui-foundation.ui.main-dropdown": "0.0.497",
     "@teambit/ui-foundation.ui.menu": "0.0.497",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.501",
     "@teambit/ui-foundation.ui.tree.drawer": "0.0.510",
     "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.500",
-    "@teambit/component-descriptor": "0.0.198",
-    "@teambit/deprecation": "0.0.937",
+    "@teambit/component-descriptor": "0.0.199",
+    "@teambit/deprecation": "0.0.939",
     "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.498",
     "@teambit/ui-foundation.ui.buttons.collapser": "0.0.206",
     "@teambit/ui-foundation.ui.corner": "0.0.507",
@@ -103,7 +103,7 @@
   "peerDependencies": {
     "react-router-dom": "^6.0.0",
     "@apollo/client": "^3.6.0",
-    "@teambit/legacy": "1.0.409",
+    "@teambit/legacy": "1.0.410",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },

package/workspace-component/workspace-component-loader.ts

@@ -8,7 +8,7 @@ import { MissingBitMapComponent } from '@teambit/legacy/dist/consumer/bit-map/ex
 import { getLatestVersionNumber } from '@teambit/legacy/dist/utils';
 import { IssuesClasses } from '@teambit/component-issues';
 import { ComponentNotFound } from '@teambit/legacy/dist/scope/exceptions';
-import { DependencyList, DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';
+import { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';
 import { Logger } from '@teambit/logger';
 import { EnvsAspect, EnvsMain } from '@teambit/envs';
 import { ExtensionDataEntry } from '@teambit/legacy/dist/consumer/config';
@@ -18,6 +18,7 @@ import ComponentNotFoundInPath from '@teambit/legacy/dist/consumer/component/exc
 import { ComponentLoadOptions } from '@teambit/legacy/dist/consumer/component/component-loader';
 import { Workspace } from '../workspace';
 import { WorkspaceComponent } from './workspace-component';
+import { MergeConfigConflict } from '../exceptions/merge-config-conflict';
 
 export class WorkspaceComponentLoader {
   private componentsCache: InMemoryCache<Component>; // cache loaded components
@@ -145,7 +146,11 @@ export class WorkspaceComponentLoader {
       if (!componentFromScope) throw new MissingBitMapComponent(id.toString());
       return componentFromScope;
     }
-    const { extensions } = await this.workspace.componentExtensions(id, componentFromScope);
+    const { extensions, errors } = await this.workspace.componentExtensions(id, componentFromScope);
+    if (errors?.some((err) => err instanceof MergeConfigConflict)) {
+      consumerComponent.issues.getOrCreate(IssuesClasses.MergeConfigHasConflict).data = true;
+    }
+
     const extensionsFromConsumerComponent = consumerComponent.extensions || new ExtensionDataList();
     // Merge extensions added by the legacy code in memory (for example data of dependency resolver)
     const extensionDataList = ExtensionDataList.mergeConfigs([
@@ -245,19 +250,9 @@ export class WorkspaceComponentLoader {
       component.state._consumer.files
     );
     const dependenciesList = await this.dependencyResolver.extractDepsFromLegacy(component, policy);
-    let dependenciesFromUnmergedHead;
-    // Get dependencies from unmerged head if needed
-    // we take it from there, as they might not be installed yet and we need to get their versions from the model
-    const unmergedComponent = await this.workspace.getUnmergedComponent(component.id);
-    if (unmergedComponent) {
-      dependenciesFromUnmergedHead = await this.dependencyResolver.extractDepsFromLegacy(unmergedComponent, policy);
-    }
-    const mergedDependencies = dependenciesFromUnmergedHead
-      ? DependencyList.merge([dependenciesList, dependenciesFromUnmergedHead])
-      : dependenciesList;
 
     const depResolverData = {
-      dependencies: mergedDependencies.serialize(),
+      dependencies: dependenciesList.serialize(),
       policy: policy.serialize(),
     };