@teambit/merge-lanes 0.0.267 → 0.0.269

package/dist/merge-lane-from-scope.cmd.js

@@ -54,7 +54,7 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
       description: `lane-id to merge to. default is "${_laneId().DEFAULT_LANE}"`
     }]);
     (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
+    (0, _defineProperty2().default)(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
     (0, _defineProperty2().default)(this, "loader", true);
     (0, _defineProperty2().default)(this, "private", true);
     (0, _defineProperty2().default)(this, "migration", true);

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

@@ -1 +1 @@
-{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: 'lane-id to merge from',\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\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    ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['j', 'json', 'output as json format'],\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    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n\n    const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(\n      `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n    );\n    const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + exportedOutput;\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: any;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      });\n      return {\n        code: 0,\n        data: results,\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n  pattern?: string;\n  push?: boolean;\n  keepReadme?: boolean;\n  noSquash: boolean;\n  includeDeps?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n  name = '_merge-lane <from-lane> [to-lane]';\n  description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n  extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n  arguments = [\n    {\n      name: 'from-lane',\n      description: 'lane-id to merge from',\n    },\n    {\n      name: 'to-lane',\n      description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n    },\n  ];\n  alias = '';\n  options = [\n    ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n    ['', 'push', 'export the updated objects to the original scopes once done'],\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    ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n    ['j', 'json', 'output as json format'],\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    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ): Promise<string> {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n\n    const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(\n      fromLane,\n      toLane || DEFAULT_LANE,\n      {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      }\n    );\n\n    const mergedTitle = chalk.green(\n      `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n    );\n    const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n    const nonMergedTitle = chalk.bold(\n      `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n    );\n    const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n    const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n    const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n    return mergedOutput + nonMergedOutput + exportedOutput;\n  }\n  async json(\n    [fromLane, toLane]: [string, string],\n    { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false }: Flags\n  ) {\n    if (includeDeps && !pattern) {\n      throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n    }\n    let results: any;\n    try {\n      results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n        push,\n        keepReadme,\n        noSquash,\n        pattern,\n        includeDeps,\n      });\n      return {\n        code: 0,\n        data: results,\n      };\n    } catch (err: any) {\n      return {\n        code: 1,\n        error: err.message,\n      };\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/merge-lane.cmd.js

@@ -73,10 +73,10 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
       description: 'lane-name or lane-id (if not exists locally) to merge to the current lane'
     }, {
       name: 'pattern',
-      description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
+      description: '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', '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, "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', 'relevant for "--pattern" and "--workspace". merge also dependencies of the given components'], ['', 'resolve-unrelated [merge-strategy]', '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);

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","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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"}
+{"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: '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    ['', 'include-deps', 'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components'],\n    [\n      '',\n      'resolve-unrelated [merge-strategy]',\n      '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":";;;;;;;;;;;;;;;;AAAA;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;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAA8E;AAAA;AAGvE,MAAMA,YAAY,CAAoB;EAmD3CC,WAAW,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAA,8CAlDvC,wBAAwB;IAAA,qDAChB,gCAA+B;IAAA,6DACvB;AACzB;AACA;AACA;AACA,6GAA6G;IAAA,mDAC/F,CACV;MACEC,IAAI,EAAE,MAAM;MACZC,WAAW,EAAE;IACf,CAAC,EACD;MACED,IAAI,EAAE,SAAS;MACfC,WAAW,EAAE;IACf,CAAC,CACF;IAAA,+CACO,EAAE;IAAA,iDACA,CACR,CAAC,EAAE,EAAE,MAAM,EAAE,gFAAgF,CAAC,EAC9F,CAAC,EAAE,EAAE,QAAQ,EAAE,qFAAqF,CAAC,EACrG,CAAC,EAAE,EAAE,QAAQ,EAAE,6FAA6F,CAAC,EAC7G,CAAC,EAAE,EAAE,WAAW,EAAE,6DAA6D,CAAC,EAChF,CAAC,EAAE,EAAE,SAAS,EAAE,gEAAgE,CAAC,EACjF,CAAC,EAAE,EAAE,KAAK,EAAE,wFAAwF,CAAC,EACrG,CAAC,EAAE,EAAE,OAAO,EAAE,wFAAwF,CAAC,EACvG,CAAC,GAAG,EAAE,mBAAmB,EAAE,gDAAgD,CAAC,EAC5E,CAAC,EAAE,EAAE,aAAa,EAAE,uDAAuD,CAAC,EAC5E,CAAC,EAAE,EAAE,WAAW,EAAE,+DAA+D,CAAC,EAClF,CAAC,EAAE,EAAE,QAAQ,EAAE,+FAA+F,CAAC,EAC/G,CACE,EAAE,EACF,uBAAuB,EACvB,2GAA2G,CAC5G,EACD,CAAC,EAAE,EAAE,SAAS,EAAE,8DAA8D,CAAC,EAC/E,CAAC,GAAG,EAAE,8BAA8B,EAAE,oDAAoD,CAAC,EAC3F,CAAC,EAAE,EAAE,YAAY,EAAE,kFAAkF,CAAC,EACtG,CAAC,EAAE,EAAE,cAAc,EAAE,6FAA6F,CAAC,EACnH,CACE,EAAE,EACF,oCAAoC,EACpC,yIAAyI,CAC1I,CACF;IAAA,gDACQ,IAAI;IAAA,iDACH,IAAI;IAAA,mDACF,IAAI;IAAA,kDACL,IAAI;EAEkC;EAEjD,MAAMC,MAAM,CACV,CAACF,IAAI,EAAEG,OAAO,CAAmB,EACjC;IACEC,IAAI,GAAG,KAAK;IACZC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,KAAK;IACLC,SAAS,EAAEC,uBAAuB,GAAG,KAAK;IAC1CC,MAAM,GAAG,KAAK;IACdC,MAAM,GAAG,KAAK;IACdC,GAAG,GAAG,KAAK;IACXC,OAAO,EAAEC,WAAW,GAAG,EAAE;IACzBC,UAAU,GAAG,KAAK;IAClBC,QAAQ,GAAG,KAAK;IAChBC,0BAA0B,GAAG,KAAK;IAClCC,SAAS,GAAG,KAAK;IACjBC,WAAW,GAAG,KAAK;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,OAAO,GAAG;EAmBZ,CAAC,EACgB;IACjBf,KAAK,GAAG,IAAAgB,iCAAgB,EAACC,4BAAW,CAAC,GAAGC,OAAO,CAAClB,KAAK,CAAC,GAAG,IAAI;IAC7D,MAAMmB,aAAa,GAAG,IAAAC,gCAAgB,EAACvB,IAAI,EAAEC,MAAM,EAAEC,MAAM,CAAC;IAC5D,IAAIK,MAAM,IAAIG,WAAW,EAAE,MAAM,KAAIc,oBAAQ,EAAC,qDAAqD,CAAC;IACpG,IAAIT,WAAW,IAAI,CAAChB,OAAO,IAAI,CAACM,uBAAuB,EAAE;MACvD,MAAM,KAAImB,oBAAQ,EAAE,4EAA2E,CAAC;IAClG;IACA,MAAMC,mBAAmB,GAAG,MAAiC;MAC3D,IAAI,CAACT,gBAAgB,EAAE,OAAOU,SAAS;MACvC,IAAI,OAAOV,gBAAgB,KAAK,SAAS,EAAE,OAAO,MAAM;MACxD,IAAIA,gBAAgB,KAAK,MAAM,IAAIA,gBAAgB,KAAK,QAAQ,IAAIA,gBAAgB,KAAK,QAAQ,EAAE;QACjG,MAAM,IAAIW,KAAK,CAAC,0EAA0E,CAAC;MAC7F;MACA,OAAOX,gBAAgB;IACzB,CAAC;IACD,IAAIA,gBAAgB,IAAI,OAAOA,gBAAgB,KAAK,SAAS,EAAE;MAC7DA,gBAAgB,GAAG,MAAM;IAC3B;IACA,MAAM;MAAEY,YAAY;MAAEC,aAAa;MAAEC;IAAmB,CAAC,GAAG,MAAM,IAAI,CAACnC,UAAU,CAACoC,SAAS,CAACnC,IAAI,EAAE;MAChGO,KAAK;MACL;MACAmB,aAAa;MACbjB,uBAAuB;MACvBE,MAAM;MACNG,WAAW;MACXC,UAAU;MACVL,MAAM;MACNM,QAAQ;MACRJ,GAAG;MACHT,OAAO;MACPc,0BAA0B;MAC1BC,SAAS;MACTE,gBAAgB,EAAES,mBAAmB,EAAE;MACvCR,mBAAmB;MACnBF;IACF,CAAC,CAAC;IAEF,MAAMiB,WAAW,GAAG,IAAAC,sBAAW,kCAAML,YAAY;MAAEE,kBAAkB;MAAEZ;IAAO,GAAG;IACjF,MAAMgB,YAAY,GAAI,GAAEL,aAAa,CAACM,WAAW,GAAG,IAAAC,yBAAY,EAACP,aAAa,CAACM,WAAW,EAAE,KAAK,CAAC,GAAG,EAAG,GAAE,CACxGN,aAAa,CAACQ,YAAY,IAAI,EAAE,EAChCC,GAAG,CAAEC,IAAI,IAAK,IAAAH,yBAAY,EAACG,IAAI,EAAE,IAAI,CAAC,CAAE,GACvCV,aAAa,CAACW,YAAY,IAAIC,gBAAK,CAACC,MAAM,CAACb,aAAa,CAACW,YAAY,CAAC,IAAK,EAC7E,IAAG;IACJ,OAAOR,WAAW,GAAGE,YAAY;EACnC;AACF;AAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "0.0.267",
+  "version": "0.0.269",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "0.0.267"
+    "version": "0.0.269"
   },
   "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.732",
-    "@teambit/lane-id": "0.0.249",
-    "@teambit/merging": "0.0.405",
-    "@teambit/export": "0.0.1090",
-    "@teambit/importer": "0.0.519",
-    "@teambit/lanes": "0.0.662",
-    "@teambit/logger": "0.0.825",
-    "@teambit/remove": "0.0.267",
-    "@teambit/scope": "0.0.1090",
-    "@teambit/snapping": "0.0.405",
-    "@teambit/workspace": "0.0.1090"
+    "@teambit/cli": "0.0.733",
+    "@teambit/lane-id": "0.0.250",
+    "@teambit/merging": "0.0.407",
+    "@teambit/export": "0.0.1092",
+    "@teambit/importer": "0.0.521",
+    "@teambit/lanes": "0.0.664",
+    "@teambit/logger": "0.0.826",
+    "@teambit/remove": "0.0.269",
+    "@teambit/scope": "0.0.1092",
+    "@teambit/snapping": "0.0.407",
+    "@teambit/workspace": "0.0.1092"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -40,7 +40,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.513",
+    "@teambit/legacy": "1.0.514",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },