@teambit/merging 0.0.178 → 0.0.179

package/dist/merging.main.runtime.d.ts

@@ -8,6 +8,7 @@ import { LaneId } from '@teambit/lane-id';
 import { Lane, Version } from '@teambit/legacy/dist/scope/models';
 import { Ref } from '@teambit/legacy/dist/scope/objects';
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
+import { Logger, LoggerMain } from '@teambit/logger';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
 import { CheckoutMain } from '@teambit/checkout';
 import { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';
@@ -31,8 +32,9 @@ export declare class MergingMain {
     private install;
     private snapping;
     private checkout;
+    private logger;
     private consumer;
-    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain);
+    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger);
     /**
      * merge components according to the "values" param.
      * if the first param is a version, then merge the component ids to that version.
@@ -87,12 +89,13 @@ export declare class MergingMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping, checkout, install]: [
+    static provider([cli, workspace, snapping, checkout, install, loggerMain]: [
         CLIMain,
         Workspace,
         SnappingMain,
         CheckoutMain,
-        InstallMain
+        InstallMain,
+        LoggerMain
     ]): Promise<MergingMain>;
 }
 export {};

package/dist/merging.main.runtime.js

@@ -151,16 +151,6 @@ function _laneId() {
   return data;
 }
 
-function _logger() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/logger/logger"));
-
-  _logger = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _getDivergeData() {
   const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
 
@@ -221,6 +211,16 @@ function _manyComponentsWriter() {
   return data;
 }
 
+function _logger() {
+  const data = require("@teambit/logger");
+
+  _logger = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _checkoutVersion() {
   const data = require("@teambit/legacy/dist/consumer/versions-ops/checkout-version");
 
@@ -306,13 +306,14 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 class MergingMain {
-  constructor(workspace, install, snapping, checkout) {
+  constructor(workspace, install, snapping, checkout, logger) {
     var _this$workspace;
 
     this.workspace = workspace;
     this.install = install;
     this.snapping = snapping;
     this.checkout = checkout;
+    this.logger = logger;
     (0, _defineProperty2().default)(this, "consumer", void 0);
     this.consumer = (_this$workspace = this.workspace) === null || _this$workspace === void 0 ? void 0 : _this$workspace.consumer;
   }
@@ -428,21 +429,25 @@ class MergingMain {
         resolvedUnrelated
       });
     });
-    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';
-
-    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {
-      await this.install.install(undefined, {
-        dedupe: true,
-        updateExisting: false,
-        import: false
-      });
-    }
-
     if (localLane) consumer.scope.objects.add(localLane);
     await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads
 
     await consumer.scope.objects.unmergedComponents.write();
     await consumer.writeBitMap();
+    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';
+
+    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {
+      try {
+        await this.install.install(undefined, {
+          dedupe: true,
+          updateExisting: false,
+          import: false
+        });
+      } catch (err) {
+        this.logger.error(`failed installing packages`, err);
+        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);
+      }
+    }
 
     const getSnapOrTagResults = async () => {
       // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged
@@ -882,9 +887,7 @@ class MergingMain {
 
   async snapResolvedComponents(consumer, snapMessage, build) {
     const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();
-
-    _logger().default.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);
-
+    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);
     if (!unmergedComponents.length) return null;
 
     const ids = _bitId().BitIds.fromArray(unmergedComponents.map(r => new (_bitId().BitId)(r.id)));
@@ -900,9 +903,7 @@ class MergingMain {
     const ids = idsToTag.map(id => {
       return id.toStringWithoutVersion();
     });
-
-    _logger().default.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);
-
+    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);
     return this.snapping.tag({
       ids,
       build,
@@ -938,8 +939,9 @@ class MergingMain {
     return ids.map(id => consumer.getParsedId(id));
   }
 
-  static async provider([cli, workspace, snapping, checkout, install]) {
-    const merging = new MergingMain(workspace, install, snapping, checkout);
+  static async provider([cli, workspace, snapping, checkout, install, loggerMain]) {
+    const logger = loggerMain.createLogger(_merging().MergingAspect.id);
+    const merging = new MergingMain(workspace, install, snapping, checkout, logger);
     cli.register(new (_mergeCmd().MergeCmd)(merging));
     return merging;
   }
@@ -948,7 +950,7 @@ class MergingMain {
 
 exports.MergingMain = MergingMain;
 (0, _defineProperty2().default)(MergingMain, "slots", []);
-(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect]);
+(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect, _logger().LoggerAspect]);
 (0, _defineProperty2().default)(MergingMain, "runtime", _cli().MainRuntime);
 
 _merging().MergingAspect.addRuntime(MergingMain);

package/dist/merging.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","writeBitMap","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","err","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.install.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\n      });\n    }\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData(repo, modelComponent, mainHead, hashToCompare, false);\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(localHead);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain\n  ]) {\n    const merging = new MergingMain(workspace, install, snapping, checkout);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","writeBitMap","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: BitId[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, null, false);\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData(repo, modelComponent, mainHead, hashToCompare, false);\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(localHead);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.178",
+  "version": "0.0.179",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.178"
+    "version": "0.0.179"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,13 +17,14 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.574",
-    "@teambit/checkout": "0.0.32",
+    "@teambit/cli": "0.0.575",
+    "@teambit/checkout": "0.0.33",
     "@teambit/component-id": "0.0.417",
-    "@teambit/install": "0.0.11",
-    "@teambit/lane-id": "0.0.92",
-    "@teambit/snapping": "0.0.178",
-    "@teambit/workspace": "0.0.863"
+    "@teambit/install": "0.0.12",
+    "@teambit/lane-id": "0.0.93",
+    "@teambit/logger": "0.0.668",
+    "@teambit/snapping": "0.0.179",
+    "@teambit/workspace": "0.0.864"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -35,7 +36,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.355",
+    "@teambit/legacy": "1.0.356",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },