@teambit/merge-lanes 0.0.240 → 0.0.242

package/dist/merge-lane.cmd.d.ts

@@ -16,7 +16,7 @@ export declare class MergeLaneCmd implements Command {
     migration: boolean;
     remoteOp: boolean;
     constructor(mergeLanes: MergeLanesMain);
-    report([name, pattern]: [string, string], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, }: {
+    report([name, pattern]: [string, string], { ours, theirs, manual, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, }: {
         ours: boolean;
         theirs: boolean;
         manual: boolean;
@@ -26,6 +26,7 @@ export declare class MergeLaneCmd implements Command {
         tag: boolean;
         message: string;
         keepReadme?: boolean;
+        squash?: boolean;
         noSquash: boolean;
         skipDependencyInstallation?: boolean;
         skipFetch: boolean;

package/dist/merge-lane.cmd.js

@@ -76,7 +76,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
       description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
     }]);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern" and "--workspace". merge also dependencies of the given components'], ['', 'resolve-unrelated [merge-strategy]', 'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs"']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'ours', 'in case of a conflict, override the used version with the current modification'], ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'], ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'], ['', 'workspace', 'merge only components in a lane that exist in the workspace'], ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'], ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when component are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged legitimately'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components'], ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern" and "--workspace". merge also dependencies of the given components'], ['', 'resolve-unrelated [merge-strategy]', 'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs"']]);
     (0, _defineProperty2().default)(this, "loader", true);
     (0, _defineProperty2().default)(this, "private", true);
     (0, _defineProperty2().default)(this, "migration", true);
@@ -88,6 +88,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
     manual = false,
     build,
     workspace: existingOnWorkspaceOnly = false,
+    squash = false,
     noSnap = false,
     tag = false,
     message: snapMessage = '',
@@ -129,6 +130,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
       noSnap,
       snapMessage,
       keepReadme,
+      squash,
       noSquash,
       tag,
       pattern,

package/dist/merge-lane.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteResult","localResult","paintRemoved","remoteResult","map","item","readmeResult","chalk","yellow"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { getMergeStrategy, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'workspace', 'merge only components in a lane that exist in the workspace'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteResult = `${deleteResults.localResult ? paintRemoved(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => paintRemoved(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteResult;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["MergeLaneCmd","constructor","mergeLanes","name","description","report","pattern","ours","theirs","manual","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteResult","localResult","paintRemoved","remoteResult","map","item","readmeResult","chalk","yellow"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { getMergeStrategy, MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { BUILD_ON_CI, isFeatureEnabled } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport paintRemoved from '@teambit/legacy/dist/cli/templates/remove-template';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n  name = 'merge <lane> [pattern]';\n  description = `merge a local or a remote lane`;\n  extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead`;\n  arguments = [\n    {\n      name: 'lane',\n      description: 'lane-name or lane-id (if not exists locally) to merge to the current lane',\n    },\n    {\n      name: 'pattern',\n      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'workspace', 'merge only components in a lane that exist in the workspace'],\n    ['', 'no-snap', 'do not auto snap in case the merge completed without conflicts'],\n    ['', 'tag', 'tag all lane components after merging into main (also tag-merge in case of snap-merge)'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['m', 'message <message>', 'override the default message for the auto snap'],\n    ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n    ['', 'no-squash', 'relevant for merging lanes into main, which by default squash'],\n    ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another lane, which by default does not squash'],\n    [\n      '',\n      'ignore-config-changes',\n      'allow merging when component are modified due to config changes (such as dependencies) only and not files',\n    ],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['', 'skip-fetch', 'use the current target-lane if exits locally without updating it from the remote'],\n    [\n      '',\n      'include-deps',\n      'EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components',\n    ],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      'EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  private = true;\n  migration = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [name, pattern]: [string, string],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      build,\n      workspace: existingOnWorkspaceOnly = false,\n      squash = false,\n      noSnap = false,\n      tag = false,\n      message: snapMessage = '',\n      keepReadme = false,\n      noSquash = false,\n      skipDependencyInstallation = false,\n      skipFetch = false,\n      includeDeps = false,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      verbose = false,\n    }: {\n      ours: boolean;\n      theirs: boolean;\n      manual: boolean;\n      workspace?: boolean;\n      build?: boolean;\n      noSnap: boolean;\n      tag: boolean;\n      message: string;\n      keepReadme?: boolean;\n      squash?: boolean;\n      noSquash: boolean;\n      skipDependencyInstallation?: boolean;\n      skipFetch: boolean;\n      includeDeps?: boolean;\n      resolveUnrelated?: string | boolean;\n      ignoreConfigChanges?: boolean;\n      verbose?: boolean;\n    }\n  ): Promise<string> {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (noSnap && snapMessage) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n    }\n    const getResolveUnrelated = (): MergeStrategy | undefined => {\n      if (!resolveUnrelated) return undefined;\n      if (typeof resolveUnrelated === 'boolean') return 'ours';\n      if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n        throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n      }\n      return resolveUnrelated;\n    };\n    if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n      resolveUnrelated = 'ours';\n    }\n    const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLane(name, {\n      build,\n      // @ts-ignore\n      mergeStrategy,\n      existingOnWorkspaceOnly,\n      noSnap,\n      snapMessage,\n      keepReadme,\n      squash,\n      noSquash,\n      tag,\n      pattern,\n      skipDependencyInstallation,\n      skipFetch,\n      resolveUnrelated: getResolveUnrelated(),\n      ignoreConfigChanges,\n      includeDeps,\n    });\n\n    const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n    const deleteResult = `${deleteResults.localResult ? paintRemoved(deleteResults.localResult, false) : ''}${(\n      deleteResults.remoteResult || []\n    ).map((item) => paintRemoved(item, true))}${\n      (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n    }\\n`;\n    return mergeResult + deleteResult;\n  }\n}\n"],"mappings":"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"}

package/dist/merge-lanes.main.runtime.d.ts

@@ -15,6 +15,7 @@ export declare type MergeLaneOptions = {
     existingOnWorkspaceOnly: boolean;
     build: boolean;
     keepReadme: boolean;
+    squash?: boolean;
     noSquash: boolean;
     tag?: boolean;
     pattern?: string;

package/dist/merge-lanes.main.runtime.js

@@ -189,6 +189,7 @@ class MergeLanesMain {
       existingOnWorkspaceOnly,
       build,
       keepReadme,
+      squash,
       noSquash,
       pattern,
       includeDeps,
@@ -242,7 +243,7 @@ class MergeLanesMain {
       resolveUnrelated,
       ignoreConfigChanges
     });
-    const shouldSquash = currentLaneId.isDefault() && !noSquash;
+    const shouldSquash = squash || currentLaneId.isDefault() && !noSquash;
     if (pattern) {
       const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);
       const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);

package/dist/merge-lanes.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","importHeadArtifactsFromLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n\n        await this.importer.importHeadArtifactsFromLane(otherLane, true);\n\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = currentLaneId.isDefault() && !noSquash;\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\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  }\n\n  private async getMainIdsToMerge(lane: Lane) {\n    const laneIds = lane.toBitIds();\n    if (!this.workspace) {\n      throw new BitError(`getMainIdsToMerge needs workspace`);\n    }\n    const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n    const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n    const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n    });\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n      lane: toLaneObj,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n      // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n      });\n      const modifiedVersion = shouldSquash\n        ? squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, log, fromVersionObj)\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (!includeDeps) {\n        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, componentFromModel);\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  log: Log,\n  componentFromModel?: Version\n): Version | undefined {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\n\n  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  }\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAMA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAGA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAoE;AAAA;AAmB7D,MAAMA,cAAc,CAAC;EAC1BC,WAAW,CACDC,SAAgC,EAChCC,OAAoB,EACpBC,KAAgB,EAChBC,MAAc,EACdC,MAAkB,EAClBC,KAAgB,EAChBC,QAAoB,EACpBC,QAAsB,EAC9B;IAAA,KARQP,SAAgC,GAAhCA,SAAgC;IAAA,KAChCC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,MAAc,GAAdA,MAAc;IAAA,KACdC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,QAAoB,GAApBA,QAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;EAC7B;EAEH,MAAMC,SAAS,CACbC,QAAgB,EAChBC,OAAyB,EACoF;IAC7G,IAAI,CAAC,IAAI,CAACV,SAAS,EAAE;MACnB,MAAM,KAAIW,oBAAQ,EAAE,iDAAgD,CAAC;IACvE;IACA,MAAMC,QAAQ,GAAG,IAAI,CAACZ,SAAS,CAACY,QAAQ;IAExC,MAAM;MACJC,aAAa;MACbC,MAAM;MACNC,GAAG;MACHC,WAAW;MACXC,uBAAuB;MACvBC,KAAK;MACLC,UAAU;MACVC,QAAQ;MACRC,OAAO;MACPC,WAAW;MACXC,0BAA0B;MAC1BC,gBAAgB;MAChBC,mBAAmB;MACnBC;IACF,CAAC,GAAGhB,OAAO;IAEX,MAAMiB,aAAa,GAAGf,QAAQ,CAACgB,gBAAgB,EAAE;IACjD,IAAIb,GAAG,IAAI,CAACY,aAAa,CAACE,SAAS,EAAE,EAAE;MACrC,MAAM,KAAIlB,oBAAQ,EAAE,8DAA6DgB,aAAa,CAACG,QAAQ,EAAG,EAAC,CAAC;IAC9G;IACA,MAAMC,WAAW,GAAG,MAAMnB,QAAQ,CAACoB,eAAe,CAACvB,QAAQ,CAAC;IAC5D,IAAIsB,WAAW,CAACE,OAAO,CAACN,aAAa,CAAC,EAAE;MACtC,MAAM,KAAIhB,oBAAQ,EACf,yBAAwBoB,WAAW,CAACD,QAAQ,EAAG,gFAA+E,CAChI;IACH;IACA,IAAIN,gBAAgB,IAAIG,aAAa,CAACE,SAAS,EAAE,EAAE;MACjD,MAAM,KAAIlB,oBAAQ,EACf,uDAAsDoB,WAAW,CAACD,QAAQ,EAAG,oDAAmD,CAClI;IACH;IACA,MAAMI,WAAW,GAAGP,aAAa,CAACE,SAAS,EAAE,GAAG,IAAI,GAAG,MAAMjB,QAAQ,CAACP,KAAK,CAAC8B,QAAQ,CAACR,aAAa,CAAC;IACnG,MAAMS,aAAa,GAAGL,WAAW,CAACF,SAAS,EAAE;IAC7C,MAAMQ,YAAY,GAAG,YAAY;MAC/B,IAAID,aAAa,EAAE;QACjB,IAAI,CAACV,SAAS,EAAE;UACd,MAAM,IAAI,CAACnB,QAAQ,CAAC+B,4BAA4B,CAAC,CAAAJ,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEK,QAAQ,EAAE,CAACC,eAAe,EAAE,KAAI,EAAE,CAAC;QACnG;QACA,OAAOC,SAAS;MAClB;MACA,IAAIC,IAAI,GAAG,MAAM9B,QAAQ,CAACP,KAAK,CAAC8B,QAAQ,CAACJ,WAAW,CAAC;MACrD,MAAMY,WAAW,GAAG,CAACD,IAAI,IAAK,CAAChB,SAAS,IAAI,CAACgB,IAAI,CAACE,KAAM;MACxD,IAAID,WAAW,EAAE;QACf;QACA,MAAME,SAAS,GAAG,MAAM,IAAI,CAAC3C,KAAK,CAAC4C,0BAA0B,CAACf,WAAW,CAAC;QAE1E,MAAM,IAAI,CAACxB,QAAQ,CAACwC,2BAA2B,CAACF,SAAS,EAAE,IAAI,CAAC;QAEhEH,IAAI,GAAG,MAAM9B,QAAQ,CAACP,KAAK,CAAC8B,QAAQ,CAACJ,WAAW,CAAC;MACnD;MACA,OAAOW,IAAI;IACb,CAAC;IACD,MAAMG,SAAS,GAAG,MAAMR,YAAY,EAAE;IACtC,MAAMW,SAAS,GAAG,YAAY;MAC5B,IAAIZ,aAAa,EAAE;QACjB,IAAI,CAACF,WAAW,EAAE,MAAM,IAAIe,KAAK,CAAE,mBAAkBC,sBAAa,kCAAiC,CAAC;QACpG,OAAO,IAAI,CAACC,iBAAiB,CAACjB,WAAW,CAAC;MAC5C;MACA,IAAI,CAACW,SAAS,EAAE,MAAM,IAAII,KAAK,CAAE,sCAAqC,CAAC;MACvE,OAAOJ,SAAS,CAACN,QAAQ,EAAE;IAC7B,CAAC;IACD,MAAMa,MAAM,GAAG,MAAMJ,SAAS,EAAE;IAChC,IAAI,CAAC7C,MAAM,CAACkD,KAAK,CAAE,iCAAgCD,MAAM,CAACtB,QAAQ,EAAG,EAAC,CAAC;IAEvE,IAAIwB,mBAAmB,GAAG,MAAM,IAAI,CAACrD,OAAO,CAACsD,cAAc,CAACH,MAAM,EAAElB,WAAW,EAAEW,SAAS,EAAE;MAC1FrB,gBAAgB;MAChBC;IACF,CAAC,CAAC;IACF,MAAM+B,YAAY,GAAG7B,aAAa,CAACE,SAAS,EAAE,IAAI,CAACT,QAAQ;IAE3D,IAAIC,OAAO,EAAE;MACX,MAAMoC,YAAY,GAAG,MAAM,IAAI,CAACzD,SAAS,CAAC0D,2BAA2B,CAACN,MAAM,CAAC;MAC7E,MAAMO,kBAAkB,GAAG,IAAI,CAAC3D,SAAS,CAACK,KAAK,CAACuD,6BAA6B,CAACvC,OAAO,EAAEoC,YAAY,CAAC;MACpGH,mBAAmB,GAAG,MAAMO,sBAAsB,CAChDP,mBAAmB,EACnBK,kBAAkB,EAClBP,MAAM,EACN,IAAI,CAACpD,SAAS,EACdsB,WAAW,EACXuB,SAAS,IAAIJ,SAAS,EACtBe,YAAY,CACb;MACDJ,MAAM,CAACU,OAAO,CAAEC,KAAK,IAAK;QACxB,IAAI,CAACT,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACJ,KAAK,CAAC,CAAC,EAAE;UACvET,mBAAmB,CAACc,IAAI,CAAC;YAAEF,EAAE,EAAEH,KAAK;YAAEM,oBAAoB,EAAE,IAAI;YAAEC,eAAe,EAAG;UAAqB,CAAC,CAAC;QAC7G;MACF,CAAC,CAAC;IACJ;IACA,IAAIrD,uBAAuB,EAAE;MAC3B,MAAMsD,YAAY,GAAG,MAAM,IAAI,CAACvE,SAAS,CAACwE,OAAO,EAAE;MACnD,MAAMb,kBAAkB,GAAGY,YAAY,CAACE,MAAM,CAAEP,EAAE,IAChDZ,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACD,EAAE,CAACQ,OAAO,CAAC,CAAC,CACxE;MACDpB,mBAAmB,GAAG,MAAMO,sBAAsB,CAChDP,mBAAmB,EACnBK,kBAAkB,EAClBP,MAAM,EACN,IAAI,CAACpD,SAAS,EACdsB,WAAW,EACXuB,SAAS,IAAIJ,SAAS,EACtBe,YAAY,CACb;MACDJ,MAAM,CAACU,OAAO,CAAEC,KAAK,IAAK;QACxB,IAAI,CAACT,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACJ,KAAK,CAAC,CAAC,EAAE;UACvET,mBAAmB,CAACc,IAAI,CAAC;YAAEF,EAAE,EAAEH,KAAK;YAAEM,oBAAoB,EAAE,IAAI;YAAEC,eAAe,EAAG;UAAsB,CAAC,CAAC;QAC9G;MACF,CAAC,CAAC;IACJ;IAEAK,gBAAgB,EAAE;IAElB,IAAInB,YAAY,EAAE;MAChB,MAAMoB,WAAW,CAACtB,mBAAmB,EAAEvB,WAAW,EAAEnB,QAAQ,CAAC;IAC/D;IAEA,MAAMiE,YAAY,GAAG,MAAM,IAAI,CAAC5E,OAAO,CAAC6E,UAAU,CAAC;MACjDjE,aAAa;MACbyC,mBAAmB;MACnByB,MAAM,EAAEhD,WAAW;MACnBiD,SAAS,EAAE9C,WAAW;MACtBpB,MAAM;MACNC,GAAG;MACHC,WAAW;MACXE,KAAK;MACLK;IACF,CAAC,CAAC;IAEF,MAAM0D,kBAAkB,GACtB,CAACJ,YAAY,CAACK,gBAAgB,IAC9BL,YAAY,CAACK,gBAAgB,CAACC,MAAM,KAAK,CAAC,IAC1CN,YAAY,CAACK,gBAAgB,CAACE,KAAK,CAAEC,eAAe,IAAKA,eAAe,CAACC,qBAAqB,CAAC;IAEjG,IAAIC,aAAa,GAAG,CAAC,CAAC;IAEtB,IAAI,CAACpE,UAAU,IAAI0B,SAAS,IAAIA,SAAS,CAAC2C,eAAe,IAAIP,kBAAkB,EAAE;MAAA;MAC/E,MAAMQ,iBAAiB,GAAG5C,SAAS,CAAC2C,eAAe,CAACtB,EAAE,CAACwB,aAAa,0BAAC7C,SAAS,CAAC2C,eAAe,oFAAzB,sBAA2BG,IAAI,2DAA/B,uBAAiCC,IAAI,CAAC;MAC3GL,aAAa,GAAG,MAAM,IAAI,CAACnF,MAAM,CAACyF,kBAAkB,CAAC,CAACJ,iBAAiB,CAAC,CAAC;IAC3E,CAAC,MAAM,IAAI5C,SAAS,IAAI,CAACA,SAAS,CAAC2C,eAAe,EAAE;MAClDD,aAAa,GAAG;QAAEO,YAAY,EAAG,UAASjD,SAAS,CAACkD,IAAK;MAAkC,CAAC;IAC9F;IACA,MAAMC,kBAAkB,GAAG1C,mBAAmB,CAAC2C,GAAG,CAAEhC,CAAC,IAAKA,CAAC,CAACiC,iBAAiB,CAAC;IAE9E,MAAM,IAAI,CAAClG,SAAS,CAACY,QAAQ,CAACuF,SAAS,EAAE;IAEzC,OAAO;MAAEtB,YAAY;MAAEU,aAAa;MAAES,kBAAkB,EAAE,IAAAI,iBAAO,EAACJ,kBAAkB;IAAE,CAAC;IAEvF,SAASrB,gBAAgB,GAAG;MAC1B,MAAMO,gBAAgB,GAAG5B,mBAAmB,CAACmB,MAAM,CAAER,CAAC,IAAKA,CAAC,CAACK,eAAe,IAAI,CAACL,CAAC,CAACI,oBAAoB,CAAC;MACxG,IAAIa,gBAAgB,CAACC,MAAM,EAAE;QAC3B,MAAMkB,WAAW,GAAGnB,gBAAgB,CACjCe,GAAG,CACDZ,eAAe,IACb,GAAEiB,gBAAK,CAACC,IAAI,CAAClB,eAAe,CAACnB,EAAE,CAACpC,QAAQ,EAAE,CAAE,MAAKwE,gBAAK,CAACE,GAAG,CAACnB,eAAe,CAACf,eAAe,CAAY,EAAC,CAC3G,CACAmC,IAAI,CAAC,IAAI,CAAC;QACb,MAAM,KAAI9F,oBAAQ,EAAE,mDAAkD0F,WAAY,EAAC,CAAC;MACtF;IACF;EACF;EAEA,MAAclD,iBAAiB,CAACT,IAAU,EAAE;IAC1C,MAAMgE,OAAO,GAAGhE,IAAI,CAACH,QAAQ,EAAE;IAC/B,IAAI,CAAC,IAAI,CAACvC,SAAS,EAAE;MACnB,MAAM,KAAIW,oBAAQ,EAAE,mCAAkC,CAAC;IACzD;IACA,MAAM4D,YAAY,GAAG,CAAC,MAAM,IAAI,CAACvE,SAAS,CAACwE,OAAO,EAAE,EAAEyB,GAAG,CAAE/B,EAAE,IAAKA,EAAE,CAACQ,OAAO,CAAC;IAC7E,MAAMiC,aAAa,GAAGpC,YAAY,CAACE,MAAM,CAAEP,EAAE,IAAK,CAACwC,OAAO,CAAC1C,IAAI,CAAEe,MAAM,IAAKA,MAAM,CAACZ,qBAAqB,CAACD,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM0C,GAAG,GAAG,CAAC,GAAGF,OAAO,EAAE,GAAGC,aAAa,CAAC,CAAClC,MAAM,CAAEP,EAAE,IAAKA,EAAE,CAAC2C,QAAQ,EAAE,CAAC;IACxE,MAAMC,eAAe,GAAG,MAAMC,OAAO,CAACC,GAAG,CAACJ,GAAG,CAACX,GAAG,CAAE/B,EAAE,IAAK,IAAI,CAAC7D,KAAK,CAAC4G,WAAW,CAACC,iBAAiB,CAAChD,EAAE,CAAC,CAAC,CAAC;IACxG,OAAO,IAAAkC,iBAAO,EACZU,eAAe,CAACb,GAAG,CAAEhC,CAAC,IAAK;MACzB,IAAI,CAACA,CAAC,CAAC0B,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;MAC1B,OAAO1B,CAAC,CAACkD,OAAO,EAAE,CAACzB,aAAa,CAACzB,CAAC,CAAC0B,IAAI,CAAC7D,QAAQ,EAAE,CAAC;IACrD,CAAC,CAAC,CACH;EACH;EAEA,MAAMsF,cAAc,CAClBC,QAAgB,EAChBC,MAAc,EACd5G,OAAuD,EAKtD;IACD,IAAI,IAAI,CAACV,SAAS,EAAE;MAClB,MAAM,KAAIW,oBAAQ,EACf,mGAAkG,CACpG;IACH;IACA,MAAM4G,UAAU,GAAGC,gBAAM,CAACC,KAAK,CAACJ,QAAQ,CAAC;IACzC,MAAMK,WAAW,GAAG,MAAM,IAAI,CAACxH,KAAK,CAACyH,gBAAgB,CAACJ,UAAU,CAAC;IACjE,MAAMK,QAAQ,GAAGN,MAAM,KAAKpE,sBAAY,GAAG,IAAI,CAAChD,KAAK,CAAC2H,gBAAgB,EAAE,GAAGL,gBAAM,CAACC,KAAK,CAACH,MAAM,CAAC;IAC/F,MAAMQ,SAAS,GAAGF,QAAQ,CAAC/F,SAAS,EAAE,GAAGY,SAAS,GAAG,MAAM,IAAI,CAACvC,KAAK,CAACyH,gBAAgB,CAACC,QAAQ,CAAC;IAChG,MAAMG,cAAc,GAAGL,WAAW,CAACnF,QAAQ,EAAE;IAC7C,MAAMyF,aAAa,GAAG,YAA6B;MACjD,IAAI,CAACtH,OAAO,CAACW,OAAO,EAAE,OAAO0G,cAAc;MAC3C,MAAME,WAAW,GAAG,MAAM,IAAI,CAAC5H,KAAK,CAACqD,2BAA2B,CAACqE,cAAc,CAAC;MAChF,MAAMnB,GAAG,GAAG,IAAI,CAACvG,KAAK,CAACuD,6BAA6B,CAAClD,OAAO,CAACW,OAAO,EAAE4G,WAAW,CAAC;MAClF,OAAOC,eAAM,CAACC,SAAS,CAACvB,GAAG,CAACX,GAAG,CAAE/B,EAAE,IAAKA,EAAE,CAACQ,OAAO,CAAC,CAAC;IACtD,CAAC;IACD,MAAM0D,UAAU,GAAG,MAAMJ,aAAa,EAAE;IACxC,MAAMK,uBAAuB,GAAGC,kCAAuB,CAACC,WAAW,CAAC,IAAI,CAAClI,KAAK,CAAC4G,WAAW,CAAC;IAC3F,MAAMoB,uBAAuB,CAACG,0BAA0B,CAAC;MACvD5B,GAAG,EAAEwB,UAAU;MACfK,QAAQ,EAAE,IAAI;MACd/F,IAAI,EAAEgF,WAAW;MACjBgB,iBAAiB,EAAE;IACrB,CAAC,CAAC;IACF;IACA,MAAML,uBAAuB,CAACG,0BAA0B,CAAC;MACvD5B,GAAG,EAAEwB,UAAU,CAAC5F,eAAe,EAAE;MACjCiG,QAAQ,EAAE,IAAI;MACdC,iBAAiB,EAAE,IAAI;MACvBhG,IAAI,EAAEoF;IACR,CAAC,CAAC;IACF,MAAM,IAAI,CAACvH,QAAQ,CAACwC,2BAA2B,CAAC2E,WAAW,EAAE,IAAI,CAAC;IAClE,MAAM,IAAI,CAACiB,kBAAkB,CAACpB,UAAU,EAAEK,QAAQ,CAAC;IACnD,MAAMgB,IAAI,GAAG,IAAI,CAACvI,KAAK,CAAC4G,WAAW,CAAC4B,OAAO;IAC3C;IACA;IACA;IACA,MAAMC,gBAAyB,GAAG,EAAE;IACpC,MAAMC,SAAkB,GAAG,EAAE;IAC7B,MAAMvF,YAAY,GAAG,CAACsE,SAAS,IAAI,CAACpH,OAAO,CAACU,QAAQ,CAAC,CAAC;IACtD,MAAM4H,GAAG,GAAG,MAAMC,eAAe,CAAC1B,UAAU,CAAC;IAC7C,MAAM2B,iBAAiB,GAAG,MAAM,IAAAC,qBAAU,EAACf,UAAU,EAAE,MAAOlE,EAAE,IAAK;MAAA;MACnE,MAAMkF,cAAc,GAAG,MAAM,IAAI,CAAC/I,KAAK,CAAC4G,WAAW,CAACC,iBAAiB,CAAChD,EAAE,CAAC;MACzE,MAAMmF,cAAc,GAAG,MAAMD,cAAc,CAACE,WAAW,CAACpF,EAAE,CAACqF,OAAO,EAAYX,IAAI,CAAC;MACnF,IAAIS,cAAc,CAACG,SAAS,EAAE,EAAE,OAAO/G,SAAS;MAChD,MAAMgH,YAAY,GAAGL,cAAc,CAACM,MAAM,CAACxF,EAAE,CAACqF,OAAO,CAAW;MAChE,IAAI,CAACE,YAAY,EAAE,MAAM,IAAIxG,KAAK,CAAE,iCAAgCiB,EAAE,CAACpC,QAAQ,EAAG,EAAC,CAAC;MACpF,MAAM6H,UAAU,GAAG7B,SAAS,4BAAGA,SAAS,CAAC8B,YAAY,CAAC1F,EAAE,CAAC,0DAA1B,sBAA4ByB,IAAI,GAAGyD,cAAc,CAACzD,IAAI,IAAI,IAAI;MAC7F,IAAIgE,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAE1H,OAAO,CAACwH,YAAY,CAAC,EAAE;QACrCX,gBAAgB,CAAC1E,IAAI,CAACF,EAAE,CAAC;QACzB,OAAOzB,SAAS;MAClB;MACA;MACA;MACA;MACA,MAAMoH,WAAW,GAAG,MAAM,IAAAC,gCAAc,EAAC;QACvClB,IAAI;QACJQ,cAAc;QACdW,UAAU,EAAEJ,UAAU;QACtBK,UAAU,EAAEP;MACd,CAAC,CAAC;MACF,MAAMQ,eAAe,GAAGzG,YAAY,GAChC0G,aAAa,CAAChH,sBAAY,EAAEqE,UAAU,EAAErD,EAAE,EAAE2F,WAAW,EAAEb,GAAG,EAAEK,cAAc,CAAC,GAC7E5G,SAAS;MACb,MAAMoG,OAAoB,GAAG,EAAE;MAC/B,IAAIoB,eAAe,EAAEpB,OAAO,CAACzE,IAAI,CAAC6F,eAAe,CAAC;MAClD,IAAInC,SAAS,EAAE;QACbA,SAAS,CAACqC,YAAY,CAAC;UAAEjG,EAAE,EAAEA,EAAE,CAACwB,aAAa,CAACjD,SAAS,CAAC;UAAEkD,IAAI,EAAE8D;QAAa,CAAC,CAAC;MACjF,CAAC,MAAM;QACLL,cAAc,CAACgB,OAAO,CAACX,YAAY,CAAC;QACpCZ,OAAO,CAACzE,IAAI,CAACgF,cAAc,CAAC;MAC9B;MACAL,SAAS,CAAC3E,IAAI,CAACF,EAAE,CAAC;MAClB,OAAO;QAAEA,EAAE;QAAE2E;MAAQ,CAAC;IACxB,CAAC,CAAC;IACF,MAAMwB,UAAU,GAAG,IAAAjE,iBAAO,EAAC8C,iBAAiB,CAAC,CAACjD,GAAG,CAAEqE,CAAC,IAAKA,CAAC,CAACzB,OAAO,CAAC;IACnE,MAAM0B,cAAc,GAAGF,UAAU,CAACG,IAAI,EAAE;IACxC,IAAI1C,SAAS,EAAEyC,cAAc,CAACnG,IAAI,CAAC0D,SAAS,CAAC;IAC7C,MAAMc,IAAI,CAAC6B,mBAAmB,CAACF,cAAc,CAAC;IAC9C,IAAIG,WAAqB,GAAG,EAAE;IAC9B,IAAIhK,OAAO,CAAC0D,IAAI,EAAE;MAChB,MAAMwC,GAAG,GAAG,IAAAR,iBAAO,EAAC8C,iBAAiB,CAAC,CAACjD,GAAG,CAAEqE,CAAC,IAAKA,CAAC,CAACpG,EAAE,CAAC;MACvD,MAAMd,MAAM,GAAG8E,eAAM,CAACC,SAAS,CAACvB,GAAG,CAAC;MACpC,MAAM;QAAE+D;MAAS,CAAC,GAAG,MAAM,IAAI,CAACrK,QAAQ,CAACsK,UAAU,CAAC;QAClDvK,KAAK,EAAE,IAAI,CAACA,KAAK,CAAC4G,WAAW;QAC7BL,GAAG,EAAEpD,YAAY,GAAGJ,MAAM,GAAG,KAAI8E,eAAM,GAAE;QACzC2C,kBAAkB,EAAErH,YAAY,GAAGJ,MAAM,GAAG,KAAI8E,eAAM,GAAE;QACxD4C,UAAU,EAAEhD,SAAS;QACrBiD,WAAW,EAAE,KAAK;QAClB;QACA;QACAC,eAAe,EAAExH,YAAY;QAC7B;QACA;QACAyH,8BAA8B,EAAE;MAClC,CAAC,CAAC;MACFP,WAAW,GAAGC,QAAQ,CAAC1E,GAAG,CAAE/B,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;IACnD;IAEA,OAAO;MACLgH,gBAAgB,EAAEA,gBAAgB,CAAC7C,GAAG,CAAE/B,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;MAC7DiH,SAAS,EAAEA,SAAS,CAAC9C,GAAG,CAAE/B,EAAE,IAAKA,EAAE,CAACpC,QAAQ,EAAE,CAAC;MAC/C4I;IACF,CAAC;EACH;EACA,MAAc/B,kBAAkB,CAACpB,UAAkB,EAAEK,QAAgB,EAAE;IACrE,MAAMsD,MAAM,GAAG,MAAM,IAAI,CAAChL,KAAK,CAACiL,UAAU,CAAC5D,UAAU,EAAEK,QAAQ,EAAE;MAAEwD,WAAW,EAAE;IAAK,CAAC,CAAC;IACvF,MAAMC,gBAAgB,GAAGH,MAAM,CAACI,gBAAgB,CAAC7G,MAAM,CAAE8G,CAAC,IAAK,CAACA,CAAC,CAACC,QAAQ,CAAC;IAC3E,IAAIH,gBAAgB,CAAClG,MAAM,EAAE;MAC3B,MAAM,IAAIlC,KAAK,CAAE;AACvB,EAAEoI,gBAAgB,CAACpF,GAAG,CAAEsF,CAAC,IAAKA,CAAC,CAACE,WAAW,CAAC3J,QAAQ,EAAE,CAAC,CAAC2E,IAAI,CAAC,IAAI,CAAE,EAAC,CAAC;IACjE;EACF;EAgBA,aAAaiF,QAAQ,CAAC,CAACxL,KAAK,EAAEyL,GAAG,EAAE3L,SAAS,EAAEC,OAAO,EAAE2L,UAAU,EAAExL,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,CAUnG,EAAE;IAAA;IACD,MAAMJ,MAAM,GAAGyL,UAAU,CAACC,YAAY,CAACC,8BAAgB,CAAC5H,EAAE,CAAC;IAC3D,MAAM6H,YAAY,GAAGJ,GAAG,CAACK,UAAU,CAAC,MAAM,CAAC;IAC3C,MAAMC,cAAc,GAAG,IAAInM,cAAc,CAACE,SAAS,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAEC,QAAQ,CAAC;IAC/GwL,YAAY,aAAZA,YAAY,gDAAZA,YAAY,CAAEG,QAAQ,0DAAtB,sBAAwB9H,IAAI,CAAC,KAAI+H,yBAAY,EAACF,cAAc,CAAC,CAAC;IAC9DN,GAAG,CAACS,QAAQ,CAAC,KAAIC,2CAAqB,EAACJ,cAAc,CAAC,CAAC;IACvD,OAAOA,cAAc;EACvB;AACF;AAAC;AAAA,gCAlWYnM,cAAc,WAkUV,EAAE;AAAA,gCAlUNA,cAAc,kBAmUH,CACpBwM,oBAAW,EACXC,gBAAS,EACTC,oBAAe,EACfC,kBAAa,EACbC,sBAAY,EACZC,sBAAY,EACZC,oBAAW,EACXC,sBAAY,EACZC,mBAAc,CACf;AAAA,gCA7UUhN,cAAc,aA8URiN,kBAAW;AAsB9B,eAAelJ,sBAAsB,CACnCP,mBAA2C,EAC3C0J,aAA4B,EAC5BC,SAAkB,EAClBjN,SAAoB,EACpBsB,WAAW,GAAG,KAAK,EACnBuB,SAAgB;AAAE;AAClBW,YAAsB,EACW;EACjC,MAAM0J,iBAAiB,GAAGhF,eAAM,CAACC,SAAS,CAAC6E,aAAa,CAAC/G,GAAG,CAAEhC,CAAC,IAAKA,CAAC,CAACS,OAAO,CAAC,CAAC;EAC/E,MAAMyI,oBAAoB,GAAGF,SAAS,CAACxI,MAAM,CAAEV,KAAK,IAAK,CAACmJ,iBAAiB,CAACE,iBAAiB,CAACrJ,KAAK,CAAC,CAAC;EACrG,MAAMsJ,uBAA+C,GAAG,EAAE;EAC1D,MAAMC,SAAkB,GAAG,EAAE;EAC7B,MAAM,IAAAnE,qBAAU,EAAC6D,aAAa,EAAE,MAAOO,MAAM,IAAK;IAChD,MAAMC,UAAU,GAAGlK,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACoJ,MAAM,CAAC7I,OAAO,CAAC,CAAC;IAC9F,IAAI,CAAC8I,UAAU,EAAE;MACf,MAAM,IAAIvK,KAAK,CAAE,0CAAyCsK,MAAM,CAACzL,QAAQ,EAAG,sBAAqB,CAAC;IACpG;IACAuL,uBAAuB,CAACjJ,IAAI,CAACoJ,UAAU,CAAC;IACxC,IAAIA,UAAU,CAAClJ,eAAe,EAAE;MAC9B;IACF;IACA,IAAI,CAACzB,SAAS,EAAE;MACd;MACA;IACF;IACA,MAAM;MAAEgH;IAAY,CAAC,GAAG2D,UAAU;IAClC,IAAI,CAAC3D,WAAW,EAAE;MAChB,MAAM,IAAI5G,KAAK,CAAE,0DAAyDsK,MAAM,CAACzL,QAAQ,EAAG,EAAC,CAAC;IAChG;IACA,IAAI2L,cAAc,GAAG5D,WAAW,CAAC6D,iBAAiB;IAClD,IAAI,CAACD,cAAc,CAACtI,MAAM,EAAE;MAC1B;IACF;IACA,MAAMiE,cAAc,GAAG,MAAMpJ,SAAS,CAACY,QAAQ,CAACP,KAAK,CAAC6G,iBAAiB,CAACqG,MAAM,CAAC7I,OAAO,CAAC;IACvF,IAAIlB,YAAY,EAAE;MAAA;MAChB;MACA,MAAMmK,YAAY,GAAG9K,SAAS,4BAAGA,SAAS,CAAC+G,YAAY,CAAC2D,MAAM,CAAC7I,OAAO,CAAC,0DAAtC,sBAAwCiB,IAAI,GAAGyD,cAAc,CAACzD,IAAI;MACnG,IAAI,CAACgI,YAAY,EAAE;QACjB,MAAM,IAAI1K,KAAK,CAAE,mDAAkDsK,MAAM,CAACzL,QAAQ,EAAG,EAAC,CAAC;MACzF;MACA2L,cAAc,GAAG,CAACE,YAAY,CAAC;IACjC;IAEA,MAAM,IAAAxE,qBAAU,EAACsE,cAAc,EAAE,MAAOG,aAAa,IAAK;MACxD,MAAMC,UAAU,GAAG,MAAMzE,cAAc,CAACE,WAAW,CAACsE,aAAa,CAAC9L,QAAQ,EAAE,EAAE9B,SAAS,CAACY,QAAQ,CAACP,KAAK,CAACwI,OAAO,CAAC;MAC/G,MAAMiF,aAAa,GAAGD,UAAU,CAACE,2BAA2B,EAAE;MAC9D,MAAMC,uBAAuB,GAAGF,aAAa,CAACrJ,MAAM,CAAEP,EAAE,IACtDiJ,oBAAoB,CAACnJ,IAAI,CAAED,KAAK,IAAKA,KAAK,CAACI,qBAAqB,CAACD,EAAE,CAAC,CAAC,CACtE;MACD,IAAI,CAAC8J,uBAAuB,CAAC7I,MAAM,EAAE;QACnC;MACF;MACA,MAAM8I,UAAmB,GAAG,EAAE;MAC9B,MAAMlH,OAAO,CAACC,GAAG,CACfgH,uBAAuB,CAAC/H,GAAG,CAAC,MAAOiI,GAAG,IAAK;QACzC,MAAMC,QAAQ,GAAG,MAAMnO,SAAS,CAACY,QAAQ,CAACP,KAAK,CAAC+N,UAAU,CAACF,GAAG,EAAErL,SAAS,CAAC;QAC1E,IAAIsL,QAAQ,EAAE;UACZF,UAAU,CAAC7J,IAAI,CAAC8J,GAAG,CAAC;QACtB;MACF,CAAC,CAAC,CACH;MACD,IAAI,CAACD,UAAU,CAAC9I,MAAM,EAAE;QACtB;MACF;MACA,IAAI,CAAC7D,WAAW,EAAE;QAChB,MAAM,KAAIX,oBAAQ,EAAE,mBAAkB4M,MAAM,CAACzL,QAAQ,EAAG;AAChE,qBAAqB8L,aAAa,CAAC9L,QAAQ,EAAG;AAC9C,EAAEmM,UAAU,CAAChI,GAAG,CAAEoI,CAAC,IAAKA,CAAC,CAACvM,QAAQ,EAAE,CAAC,CAAC2E,IAAI,CAAC,IAAI,CAAE,EAAC,CAAC;MAC7C;MACA6G,SAAS,CAAClJ,IAAI,CAAC,GAAG6J,UAAU,CAAC;IAC/B,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,IAAIX,SAAS,CAACnI,MAAM,EAAE;IACpB,MAAMmJ,QAAQ,GAAGpG,eAAM,CAACqG,aAAa,CAACjB,SAAS,CAAC;IAChDgB,QAAQ,CAACxK,OAAO,CAAEI,EAAE,IAAK;MACvB,MAAMsJ,UAAU,GAAGlK,mBAAmB,CAACU,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,EAAE,CAACC,qBAAqB,CAACD,EAAE,CAAC,CAAC;MAClF,IAAI,CAACsJ,UAAU,EAAE;QACf,MAAM,IAAIvK,KAAK,CAAE,0CAAyCiB,EAAE,CAACpC,QAAQ,EAAG,sBAAqB,CAAC;MAChG;MACAuL,uBAAuB,CAACjJ,IAAI,CAACoJ,UAAU,CAAC;IAC1C,CAAC,CAAC;EACJ;EACA,OAAOH,uBAAuB;AAChC;AAEA,eAAepE,eAAe,CAAClH,WAAmB,EAAE;EAClD,MAAMyM,QAAQ,GAAG,MAAM,IAAAC,uBAAW,GAAE;EACpC,MAAMzF,GAAG,mCACJwF,QAAQ;IACXE,OAAO,EAAG,8BAA6B3M,WAAW,CAACD,QAAQ,EAAG;EAAC,EAChE;EACD,OAAOkH,GAAG;AACZ;AAEA,eAAepE,WAAW,CAACtB,mBAA2C,EAAEvB,WAAmB,EAAEnB,QAAkB,EAAE;EAC/G,MAAM+N,eAAe,GAAG/N,QAAQ,CAACgB,gBAAgB,EAAE,CAACmE,IAAI;EACxD,MAAM6I,mBAAmB,GAAGtL,mBAAmB,CAACmB,MAAM,CAAER,CAAC,IAAK,CAACA,CAAC,CAACK,eAAe,CAAC;EACjF,MAAM0E,GAAG,GAAG,MAAMC,eAAe,CAAClH,WAAW,CAAC;EAE9C,MAAMgF,OAAO,CAACC,GAAG,CACf4H,mBAAmB,CAAC3I,GAAG,CAAC,OAAO;IAAE/B,EAAE;IAAE2F,WAAW;IAAEgF;EAAmB,CAAC,KAAK;IACzE,IAAI,CAAChF,WAAW,EAAE;MAChB,MAAM,IAAI5G,KAAK,CAAE,iDAAgDiB,EAAE,CAACpC,QAAQ,EAAG,EAAC,CAAC;IACnF;IAEA,MAAMgN,YAAY,GAAG5E,aAAa,CAACyE,eAAe,EAAE5M,WAAW,EAAEmC,EAAE,EAAE2F,WAAW,EAAEb,GAAG,EAAE6F,kBAAkB,CAAC;IAC1G,IAAIC,YAAY,EAAE;MAChBlO,QAAQ,CAACP,KAAK,CAACwI,OAAO,CAACkG,GAAG,CAACD,YAAY,CAAC;MACxC,MAAM1F,cAAc,GAAG,MAAMxI,QAAQ,CAACP,KAAK,CAAC6G,iBAAiB,CAAChD,EAAE,CAAC;MACjE,MAAM8K,cAAc,GAAG,MAAM5F,cAAc,CAAC6F,2BAA2B,CAACrO,QAAQ,CAACP,KAAK,CAACwI,OAAO,EAAE,CAACiG,YAAY,CAAC,CAAC;MAC/G,IAAIE,cAAc,EAAEpO,QAAQ,CAACP,KAAK,CAACwI,OAAO,CAACkG,GAAG,CAACC,cAAc,CAAC;IAChE;EACF,CAAC,CAAC,CACH;AACH;;AAEA;AACA;AACA;AACA,SAAS9E,aAAa,CACpByE,eAAuB,EACvB5M,WAAmB,EACnBmC,EAAS,EACT2F,WAA0B,EAC1Bb,GAAQ,EACR6F,kBAA4B,EACP;EACrB,IAAIhF,WAAW,CAACqF,UAAU,EAAE,EAAE;IAC5B,MAAM,KAAIvO,oBAAQ,EAAE,4BAA2BuD,EAAE,CAACpC,QAAQ,EAAG;AACjE,yBACMC,WAAW,CAACgE,IACb,qBAAoB4I,eAAgB,8BAA6BA,eAAgB,kBAChF5M,WAAW,CAACgE,IACb;AACL,uEAAuEhE,WAAW,CAACgE,IAAK,GAAE,CAAC;EACzF;EACA,IAAI8D,WAAW,CAACsF,aAAa,EAAE,EAAE;IAC/B;IACA,OAAO1M,SAAS;EAClB;EACA,IAAI,CAACoH,WAAW,CAACuF,aAAa,EAAE,EAAE;IAChC;IACA,OAAO3M,SAAS;EAClB;EACA;EACA,MAAM4M,WAAW,GAAGxF,WAAW,CAAC6D,iBAAiB;EACjD,IAAI2B,WAAW,CAAClK,MAAM,KAAK,CAAC,EAAE;IAC5B,MAAM,IAAIlC,KAAK,CAAE,sDAAqD,CAAC;EACzE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,IAAI,CAAC4L,kBAAkB,EAAE;IACvB,MAAM,IAAI5L,KAAK,CAAC,qDAAqD,CAAC;EACxE;EAEA,MAAMqM,cAAc,GAAGT,kBAAkB,CAACU,OAAO;;EAEjD;EACA,IAAI1F,WAAW,CAAC2F,uBAAuB,EAAE;IACvCX,kBAAkB,CAACY,eAAe,CAAC5F,WAAW,CAAC2F,uBAAuB,CAAC;EACzE,CAAC,MAAM;IACL;IACAX,kBAAkB,CAACU,OAAO,CAACzL,OAAO,CAAE4L,GAAG,IAAKb,kBAAkB,CAACc,YAAY,CAACD,GAAG,CAAC,CAAC;EACnF;EACAb,kBAAkB,CAACe,WAAW,CAAC;IAAEC,eAAe,EAAEP,cAAc;IAAEvK,MAAM,EAAEhD;EAAY,CAAC,EAAEiH,GAAG,CAAC;EAC7F,OAAO6F,kBAAkB;AAC3B;AAEA/C,8BAAgB,CAACgE,UAAU,CAAChQ,cAAc,CAAC;AAAC,eAE7BA,cAAc;AAAA"}
+{"version":3,"names":["MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","getOtherLane","importObjectsFromMainIfExist","toBitIds","toVersionLatest","undefined","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","importHeadArtifactsFromLane","getBitIds","Error","DEFAULT_LANE","getMainIdsToMerge","bitIds","debug","allComponentsStatus","getMergeStatus","shouldSquash","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","forEach","bitId","find","c","id","isEqualWithoutVersion","push","unmergedLegitimately","unmergedMessage","workspaceIds","listIds","filter","_legacy","throwForFailures","squashSnaps","mergeResults","mergeSnaps","laneId","localLane","mergedSuccessfully","failedComponents","length","every","failedComponent","unchangedLegitimately","deleteResults","readmeComponent","readmeComponentId","changeVersion","head","hash","removeLocallyByIds","readmeResult","name","configMergeResults","map","configMergeResult","onDestroy","compact","failureMsgs","chalk","bold","red","join","laneIds","mainNotOnLane","ids","hasScope","modelComponents","Promise","all","legacyScope","getModelComponent","toBitId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","BitIds","fromArray","idsToMerge","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importManyDeltaWithoutDeps","fromHead","ignoreMissingHead","throwIfNotUpToDate","repo","objects","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","register","MergeLaneFromScopeCmd","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","d","depsUniq","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","currentParents","parents","commonSnapBeforeDiverge","addAsOnlyParent","ref","removeParent","setSquashed","previousParents","addRuntime"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport MergingAspect, {\n  MergingMain,\n  ComponentMergeStatus,\n  ConfigMergeResult,\n  ApplyVersionResults,\n} from '@teambit/merging';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport chalk from 'chalk';\nimport { getBasicLog } from '@teambit/snapping';\nimport { BitId } from '@teambit/legacy-bit-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { BitIds } from '@teambit/legacy/dist/bit-id';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\nimport { ComponentID } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { BitObject } from '@teambit/legacy/dist/scope/objects';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeLaneCmd } from './merge-lane.cmd';\nimport { MergeLaneFromScopeCmd } from './merge-lane-from-scope.cmd';\n\nexport type MergeLaneOptions = {\n  mergeStrategy: MergeStrategy;\n  noSnap: boolean;\n  snapMessage: string;\n  existingOnWorkspaceOnly: boolean;\n  build: boolean;\n  keepReadme: boolean;\n  squash?: boolean;\n  noSquash: boolean;\n  tag?: boolean;\n  pattern?: string;\n  includeDeps?: boolean;\n  skipDependencyInstallation?: boolean;\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  skipFetch?: boolean;\n};\n\nexport class MergeLanesMain {\n  constructor(\n    private workspace: Workspace | undefined,\n    private merging: MergingMain,\n    private lanes: LanesMain,\n    private logger: Logger,\n    private remove: RemoveMain,\n    private scope: ScopeMain,\n    private exporter: ExportMain,\n    private importer: ImporterMain\n  ) {}\n\n  async mergeLane(\n    laneName: string,\n    options: MergeLaneOptions\n  ): Promise<{ mergeResults: ApplyVersionResults; deleteResults: any; configMergeResults: ConfigMergeResult[] }> {\n    if (!this.workspace) {\n      throw new BitError(`unable to merge a lane outside of Bit workspace`);\n    }\n    const consumer = this.workspace.consumer;\n\n    const {\n      mergeStrategy,\n      noSnap,\n      tag,\n      snapMessage,\n      existingOnWorkspaceOnly,\n      build,\n      keepReadme,\n      squash,\n      noSquash,\n      pattern,\n      includeDeps,\n      skipDependencyInstallation,\n      resolveUnrelated,\n      ignoreConfigChanges,\n      skipFetch,\n    } = options;\n\n    const currentLaneId = consumer.getCurrentLaneId();\n    if (tag && !currentLaneId.isDefault()) {\n      throw new BitError(`--tag only possible when on main. currently checked out to ${currentLaneId.toString()}`);\n    }\n    const otherLaneId = await consumer.getParsedLaneId(laneName);\n    if (otherLaneId.isEqual(currentLaneId)) {\n      throw new BitError(\n        `unable to merge lane \"${otherLaneId.toString()}\", you're already at this lane. to get updates, simply run \"bit checkout head\"`\n      );\n    }\n    if (resolveUnrelated && currentLaneId.isDefault()) {\n      throw new BitError(\n        `unable to resolve unrelated when on main. switch to ${otherLaneId.toString()} and run \"bit lane merge main --resolve-unrelated\"`\n      );\n    }\n    const currentLane = currentLaneId.isDefault() ? null : await consumer.scope.loadLane(currentLaneId);\n    const isDefaultLane = otherLaneId.isDefault();\n    const getOtherLane = async () => {\n      if (isDefaultLane) {\n        if (!skipFetch) {\n          await this.importer.importObjectsFromMainIfExist(currentLane?.toBitIds().toVersionLatest() || []);\n        }\n        return undefined;\n      }\n      let lane = await consumer.scope.loadLane(otherLaneId);\n      const shouldFetch = !lane || (!skipFetch && !lane.isNew);\n      if (shouldFetch) {\n        // don't assign `lane` to the result of this command. otherwise, if you have local snaps, it'll ignore them and use the remote-lane.\n        const otherLane = await this.lanes.fetchLaneWithItsComponents(otherLaneId);\n\n        await this.importer.importHeadArtifactsFromLane(otherLane, true);\n\n        lane = await consumer.scope.loadLane(otherLaneId);\n      }\n      return lane;\n    };\n    const otherLane = await getOtherLane();\n    const getBitIds = async () => {\n      if (isDefaultLane) {\n        if (!currentLane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n        return this.getMainIdsToMerge(currentLane);\n      }\n      if (!otherLane) throw new Error(`lane must be defined for non-default`);\n      return otherLane.toBitIds();\n    };\n    const bitIds = await getBitIds();\n    this.logger.debug(`merging the following bitIds: ${bitIds.toString()}`);\n\n    let allComponentsStatus = await this.merging.getMergeStatus(bitIds, currentLane, otherLane, {\n      resolveUnrelated,\n      ignoreConfigChanges,\n    });\n    const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n\n    if (pattern) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(bitIds);\n      const compIdsFromPattern = this.workspace.scope.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `excluded by pattern` });\n        }\n      });\n    }\n    if (existingOnWorkspaceOnly) {\n      const workspaceIds = await this.workspace.listIds();\n      const compIdsFromPattern = workspaceIds.filter((id) =>\n        allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id._legacy))\n      );\n      allComponentsStatus = await filterComponentsStatus(\n        allComponentsStatus,\n        compIdsFromPattern,\n        bitIds,\n        this.workspace,\n        includeDeps,\n        otherLane || undefined,\n        shouldSquash\n      );\n      bitIds.forEach((bitId) => {\n        if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n          allComponentsStatus.push({ id: bitId, unmergedLegitimately: true, unmergedMessage: `not in the workspace` });\n        }\n      });\n    }\n\n    throwForFailures();\n\n    if (shouldSquash) {\n      await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n    }\n\n    const mergeResults = await this.merging.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: otherLaneId,\n      localLane: currentLane,\n      noSnap,\n      tag,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n\n    const mergedSuccessfully =\n      !mergeResults.failedComponents ||\n      mergeResults.failedComponents.length === 0 ||\n      mergeResults.failedComponents.every((failedComponent) => failedComponent.unchangedLegitimately);\n\n    let deleteResults = {};\n\n    if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {\n      const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);\n      deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);\n    } else if (otherLane && !otherLane.readmeComponent) {\n      deleteResults = { readmeResult: `\\nlane ${otherLane.name} doesn't have a readme component` };\n    }\n    const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n    await this.workspace.consumer.onDestroy();\n\n    return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n\n    function throwForFailures() {\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  }\n\n  private async getMainIdsToMerge(lane: Lane) {\n    const laneIds = lane.toBitIds();\n    if (!this.workspace) {\n      throw new BitError(`getMainIdsToMerge needs workspace`);\n    }\n    const workspaceIds = (await this.workspace.listIds()).map((id) => id._legacy);\n    const mainNotOnLane = workspaceIds.filter((id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)));\n    const ids = [...laneIds, ...mainNotOnLane].filter((id) => id.hasScope());\n    const modelComponents = await Promise.all(ids.map((id) => this.scope.legacyScope.getModelComponent(id)));\n    return compact(\n      modelComponents.map((c) => {\n        if (!c.head) return null; // probably the component was never merged to main\n        return c.toBitId().changeVersion(c.head.toString());\n      })\n    );\n  }\n\n  async mergeFromScope(\n    fromLane: string,\n    toLane: string,\n    options: Partial<MergeLaneOptions> & { push?: boolean }\n  ): Promise<{\n    mergedPreviously: string[];\n    mergedNow: string[];\n    exportedIds: string[];\n  }> {\n    if (this.workspace) {\n      throw new BitError(\n        `unable to run this command from a workspace, please create a new bare-scope and run it from there`\n      );\n    }\n    const fromLaneId = LaneId.parse(fromLane);\n    const fromLaneObj = await this.lanes.importLaneObject(fromLaneId);\n    const toLaneId = toLane === DEFAULT_LANE ? this.lanes.getDefaultLaneId() : LaneId.parse(toLane);\n    const toLaneObj = toLaneId.isDefault() ? undefined : await this.lanes.importLaneObject(toLaneId);\n    const fromLaneBitIds = fromLaneObj.toBitIds();\n    const getIdsToMerge = async (): Promise<BitIds> => {\n      if (!options.pattern) return fromLaneBitIds;\n      const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n      const ids = this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n      return BitIds.fromArray(ids.map((id) => id._legacy));\n    };\n    const idsToMerge = await getIdsToMerge();\n    const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge,\n      fromHead: true,\n      lane: fromLaneObj,\n      ignoreMissingHead: true,\n    });\n    // get their main/to-lane as well\n    await scopeComponentsImporter.importManyDeltaWithoutDeps({\n      ids: idsToMerge.toVersionLatest(),\n      fromHead: true,\n      ignoreMissingHead: true,\n      lane: toLaneObj,\n    });\n    await this.importer.importHeadArtifactsFromLane(fromLaneObj, true);\n    await this.throwIfNotUpToDate(fromLaneId, toLaneId);\n    const repo = this.scope.legacyScope.objects;\n    // loop through all components, make sure they're all ahead of main (it might not be on main yet).\n    // then, change the version object to include an extra parent to point to the main.\n    // then, change the component object head to point to this changed version\n    const mergedPreviously: BitId[] = [];\n    const mergedNow: BitId[] = [];\n    const shouldSquash = !toLaneObj && !options.noSquash; // only when merging to main we squash.\n    const log = await getLogForSquash(fromLaneId);\n    const bitObjectsPerComp = await pMapSeries(idsToMerge, async (id) => {\n      const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n      const fromVersionObj = await modelComponent.loadVersion(id.version as string, repo);\n      if (fromVersionObj.isRemoved()) return undefined;\n      const fromLaneHead = modelComponent.getRef(id.version as string);\n      if (!fromLaneHead) throw new Error(`lane head must be defined for ${id.toString()}`);\n      const toLaneHead = toLaneObj ? toLaneObj.getComponent(id)?.head : modelComponent.head || null;\n      if (toLaneHead?.isEqual(fromLaneHead)) {\n        mergedPreviously.push(id);\n        return undefined;\n      }\n      // this might be confusing, we pass the toLaneHead as the sourceHead and the fromLaneHead as the targetHead.\n      // this is because normally, in the workspace, we merge another lane (target) into the current lane (source).\n      // so effectively, in the workspace, we merge fromLane=target into toLane=source.\n      const divergeData = await getDivergeData({\n        repo,\n        modelComponent,\n        sourceHead: toLaneHead,\n        targetHead: fromLaneHead,\n      });\n      const modifiedVersion = shouldSquash\n        ? squashOneComp(DEFAULT_LANE, fromLaneId, id, divergeData, log, fromVersionObj)\n        : undefined;\n      const objects: BitObject[] = [];\n      if (modifiedVersion) objects.push(modifiedVersion);\n      if (toLaneObj) {\n        toLaneObj.addComponent({ id: id.changeVersion(undefined), head: fromLaneHead });\n      } else {\n        modelComponent.setHead(fromLaneHead);\n        objects.push(modelComponent);\n      }\n      mergedNow.push(id);\n      return { id, objects };\n    });\n    const bitObjects = compact(bitObjectsPerComp).map((b) => b.objects);\n    const bitObjectsFlat = bitObjects.flat();\n    if (toLaneObj) bitObjectsFlat.push(toLaneObj);\n    await repo.writeObjectsToTheFS(bitObjectsFlat);\n    let exportedIds: string[] = [];\n    if (options.push) {\n      const ids = compact(bitObjectsPerComp).map((b) => b.id);\n      const bitIds = BitIds.fromArray(ids);\n      const { exported } = await this.exporter.exportMany({\n        scope: this.scope.legacyScope,\n        ids: shouldSquash ? bitIds : new BitIds(),\n        idsWithFutureScope: shouldSquash ? bitIds : new BitIds(),\n        laneObject: toLaneObj,\n        allVersions: false,\n        // no need to export anything else other than the head. the normal calculation of what to export won't apply here\n        // as it is done from the scope.\n        exportHeadsOnly: shouldSquash,\n        // all artifacts must be pushed. they're all considered \"external\" in this case, because it's running from a\n        // bare-scope, but we don't want to ignore them, otherwise, they'll be missing from the component-scopes.\n        ignoreMissingExternalArtifacts: false,\n      });\n      exportedIds = exported.map((id) => id.toString());\n    }\n\n    return {\n      mergedPreviously: mergedPreviously.map((id) => id.toString()),\n      mergedNow: mergedNow.map((id) => id.toString()),\n      exportedIds,\n    };\n  }\n  private async throwIfNotUpToDate(fromLaneId: LaneId, toLaneId: LaneId) {\n    const status = await this.lanes.diffStatus(fromLaneId, toLaneId, { skipChanges: true });\n    const compsNotUpToDate = status.componentsStatus.filter((s) => !s.upToDate);\n    if (compsNotUpToDate.length) {\n      throw new Error(`unable to merge, the following components are not up-to-date:\n${compsNotUpToDate.map((s) => s.componentId.toString()).join('\\n')}`);\n    }\n  }\n\n  static slots = [];\n  static dependencies = [\n    LanesAspect,\n    CLIAspect,\n    WorkspaceAspect,\n    MergingAspect,\n    LoggerAspect,\n    RemoveAspect,\n    ScopeAspect,\n    ExportAspect,\n    ImporterAspect,\n  ];\n  static runtime = MainRuntime;\n\n  static async provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer]: [\n    LanesMain,\n    CLIMain,\n    Workspace,\n    MergingMain,\n    LoggerMain,\n    RemoveMain,\n    ScopeMain,\n    ExportMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergeLanesAspect.id);\n    const lanesCommand = cli.getCommand('lane');\n    const mergeLanesMain = new MergeLanesMain(workspace, merging, lanes, logger, remove, scope, exporter, importer);\n    lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain));\n    cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n    return mergeLanesMain;\n  }\n}\n\nasync function filterComponentsStatus(\n  allComponentsStatus: ComponentMergeStatus[],\n  compIdsToKeep: ComponentID[],\n  allBitIds: BitId[],\n  workspace: Workspace,\n  includeDeps = false,\n  otherLane?: Lane, // lane that gets merged into the current lane. if not provided, it's main that gets merged into the current lane\n  shouldSquash?: boolean\n): Promise<ComponentMergeStatus[]> {\n  const bitIdsFromPattern = BitIds.fromArray(compIdsToKeep.map((c) => c._legacy));\n  const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n  const filteredComponentStatus: ComponentMergeStatus[] = [];\n  const depsToAdd: BitId[] = [];\n  await pMapSeries(compIdsToKeep, async (compId) => {\n    const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId._legacy));\n    if (!fromStatus) {\n      throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n    }\n    filteredComponentStatus.push(fromStatus);\n    if (fromStatus.unmergedMessage) {\n      return;\n    }\n    if (!otherLane) {\n      // if merging main, no need to check whether the deps are included in the pattern.\n      return;\n    }\n    const { divergeData } = fromStatus;\n    if (!divergeData) {\n      throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n    }\n    let targetVersions = divergeData.snapsOnTargetOnly;\n    if (!targetVersions.length) {\n      return;\n    }\n    const modelComponent = await workspace.consumer.scope.getModelComponent(compId._legacy);\n    if (shouldSquash) {\n      // no need to check all versions, we merge only the head\n      const headOnTarget = otherLane ? otherLane.getComponent(compId._legacy)?.head : modelComponent.head;\n      if (!headOnTarget) {\n        throw new Error(`filterComponentsStatus: unable to find head for ${compId.toString()}`);\n      }\n      targetVersions = [headOnTarget];\n    }\n\n    await pMapSeries(targetVersions, async (remoteVersion) => {\n      const versionObj = await modelComponent.loadVersion(remoteVersion.toString(), workspace.consumer.scope.objects);\n      const flattenedDeps = versionObj.getAllFlattenedDependencies();\n      const depsNotIncludeInPattern = flattenedDeps.filter((id) =>\n        bitIdsNotFromPattern.find((bitId) => bitId.isEqualWithoutVersion(id))\n      );\n      if (!depsNotIncludeInPattern.length) {\n        return;\n      }\n      const depsOnLane: BitId[] = [];\n      await Promise.all(\n        depsNotIncludeInPattern.map(async (dep) => {\n          const isOnLane = await workspace.consumer.scope.isIdOnLane(dep, otherLane);\n          if (isOnLane) {\n            depsOnLane.push(dep);\n          }\n        })\n      );\n      if (!depsOnLane.length) {\n        return;\n      }\n      if (!includeDeps) {\n        throw new BitError(`unable to merge ${compId.toString()}.\nit has (in version ${remoteVersion.toString()}) the following dependencies which were not included in the pattern. consider adding \"--include-deps\" flag\n${depsOnLane.map((d) => d.toString()).join('\\n')}`);\n      }\n      depsToAdd.push(...depsOnLane);\n    });\n  });\n  if (depsToAdd.length) {\n    const depsUniq = BitIds.uniqFromArray(depsToAdd);\n    depsUniq.forEach((id) => {\n      const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(id));\n      if (!fromStatus) {\n        throw new Error(`filterComponentsStatus: unable to find ${id.toString()} in component-status`);\n      }\n      filteredComponentStatus.push(fromStatus);\n    });\n  }\n  return filteredComponentStatus;\n}\n\nasync function getLogForSquash(otherLaneId: LaneId) {\n  const basicLog = await getBasicLog();\n  const log = {\n    ...basicLog,\n    message: `squashed during merge from ${otherLaneId.toString()}`,\n  };\n  return log;\n}\n\nasync function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer) {\n  const currentLaneName = consumer.getCurrentLaneId().name;\n  const succeededComponents = allComponentsStatus.filter((c) => !c.unmergedMessage);\n  const log = await getLogForSquash(otherLaneId);\n\n  await Promise.all(\n    succeededComponents.map(async ({ id, divergeData, componentFromModel }) => {\n      if (!divergeData) {\n        throw new Error(`unable to squash. divergeData is missing from ${id.toString()}`);\n      }\n\n      const modifiedComp = squashOneComp(currentLaneName, otherLaneId, id, divergeData, log, componentFromModel);\n      if (modifiedComp) {\n        consumer.scope.objects.add(modifiedComp);\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const versionHistory = await modelComponent.updateRebasedVersionHistory(consumer.scope.objects, [modifiedComp]);\n        if (versionHistory) consumer.scope.objects.add(versionHistory);\n      }\n    })\n  );\n}\n\n/**\n * returns Version object if it was modified. otherwise, returns undefined\n */\nfunction squashOneComp(\n  currentLaneName: string,\n  otherLaneId: LaneId,\n  id: BitId,\n  divergeData: SnapsDistance,\n  log: Log,\n  componentFromModel?: Version\n): Version | undefined {\n  if (divergeData.isDiverged()) {\n    throw new BitError(`unable to squash because ${id.toString()} is diverged in history.\nconsider switching to \"${\n      otherLaneId.name\n    }\" first, merging \"${currentLaneName}\", then switching back to \"${currentLaneName}\" and merging \"${\n      otherLaneId.name\n    }\"\nalternatively, use \"--no-squash\" flag to keep the entire history of \"${otherLaneId.name}\"`);\n  }\n  if (divergeData.isSourceAhead()) {\n    // nothing to do. current is ahead, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  if (!divergeData.isTargetAhead()) {\n    // nothing to do. current and remote are the same, nothing to merge. (it was probably filtered out already as a \"failedComponent\")\n    return undefined;\n  }\n  // remote is ahead and was not diverge.\n  const remoteSnaps = divergeData.snapsOnTargetOnly;\n  if (remoteSnaps.length === 0) {\n    throw new Error(`remote is ahead but it has no snaps. it's impossible`);\n  }\n  // no need to check this case. even if it has only one snap ahead, we want to do the \"squash\", and run \"addAsOnlyParent\"\n  // to make sure it doesn't not have two parents.\n  // if (remoteSnaps.length === 1) {\n  //   // nothing to squash. it has only one commit.\n  //   return;\n  // }\n  if (!componentFromModel) {\n    throw new Error('unable to squash, the componentFromModel is missing');\n  }\n\n  const currentParents = componentFromModel.parents;\n\n  // do the squash.\n  if (divergeData.commonSnapBeforeDiverge) {\n    componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n  } else {\n    // there is no commonSnapBeforeDiverge. the local has no snaps, all are remote, no need for parents. keep only head.\n    componentFromModel.parents.forEach((ref) => componentFromModel.removeParent(ref));\n  }\n  componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log);\n  return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.240",
+  "version": "0.0.242",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.240"
+    "version": "0.0.242"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -18,17 +18,17 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/legacy-bit-id": "0.0.423",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.716",
-    "@teambit/lane-id": "0.0.233",
-    "@teambit/merging": "0.0.378",
-    "@teambit/export": "0.0.1063",
-    "@teambit/importer": "0.0.492",
-    "@teambit/lanes": "0.0.635",
-    "@teambit/logger": "0.0.809",
-    "@teambit/remove": "0.0.240",
-    "@teambit/scope": "0.0.1063",
-    "@teambit/snapping": "0.0.378",
-    "@teambit/workspace": "0.0.1063"
+    "@teambit/cli": "0.0.718",
+    "@teambit/lane-id": "0.0.235",
+    "@teambit/merging": "0.0.380",
+    "@teambit/export": "0.0.1065",
+    "@teambit/importer": "0.0.494",
+    "@teambit/lanes": "0.0.637",
+    "@teambit/logger": "0.0.811",
+    "@teambit/remove": "0.0.242",
+    "@teambit/scope": "0.0.1065",
+    "@teambit/snapping": "0.0.380",
+    "@teambit/workspace": "0.0.1065"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -40,7 +40,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.496",
+    "@teambit/legacy": "1.0.498",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },