@teambit/merge-lanes 1.0.122 → 1.0.123

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,6 @@ export declare class MergeAbortLaneCmd implements Command {
12
12
  options: CommandOptions;
13
13
  loader: boolean;
14
14
  private: boolean;
15
- migration: boolean;
16
15
  remoteOp: boolean;
17
16
  constructor(mergeLanes: MergeLanesMain);
18
17
  report(_: any, { skipDependencyInstallation, verbose, silent, }: {
@@ -33,7 +33,6 @@ also, checkout the workspace components according to the restored lane state`);
33
33
  _defineProperty(this, "options", [['', 'verbose', "show details of components that didn't need to be merged"], ['s', 'silent', 'skip confirmation'], ['x', 'skip-dependency-installation', 'do not install packages of the imported components']]);
34
34
  _defineProperty(this, "loader", true);
35
35
  _defineProperty(this, "private", true);
36
- _defineProperty(this, "migration", true);
37
36
  _defineProperty(this, "remoteOp", true);
38
37
  }
39
38
  async report(_, {
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeAbortLaneCmd","constructor","mergeLanes","report","_","skipDependencyInstallation","verbose","silent","checkoutProps","reset","all","skipNpmInstall","mergeAbortOpts","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsTitle","green","restoredItemsOutput","map","item","join","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { CheckoutProps, checkoutOutput } from '@teambit/checkout';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport type MergeAbortOpts = {\n silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeAbortLaneCmd implements Command {\n name = 'merge-abort';\n description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n extendedDescription = `restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state`;\n alias = '';\n options = [\n ['', 'verbose', \"show details of components that didn't need to be merged\"],\n ['s', 'silent', 'skip confirmation'],\n ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\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 _,\n {\n skipDependencyInstallation = false,\n verbose = false,\n silent = false,\n }: {\n skipDependencyInstallation?: boolean;\n verbose?: boolean;\n silent?: boolean;\n }\n ): Promise<string> {\n const checkoutProps: CheckoutProps = {\n reset: true,\n all: true,\n verbose,\n skipNpmInstall: skipDependencyInstallation,\n };\n const mergeAbortOpts = { silent };\n const { checkoutResults, restoredItems, checkoutError } = await this.mergeLanes.abortLaneMerge(\n checkoutProps,\n mergeAbortOpts\n );\n\n const getCheckoutErrorStr = () => {\n if (!checkoutError) return '';\n const errMsg = `\\n\\nFailed to change component files to the pre-merge state due to an error:\n${checkoutError.message}\nplease fix the error and then run \"bit checkout reset --all\" to revert the components to the pre-merge state`;\n return chalk.red(errMsg);\n };\n\n const checkoutOutputStr = checkoutResults ? checkoutOutput(checkoutResults, checkoutProps) : '';\n const restoredItemsTitle = chalk.green('The following have been restored successfully:');\n const restoredItemsOutput = restoredItems.map((item) => `[√] ${item}`).join('\\n');\n\n return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}${getCheckoutErrorStr()}`;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeAbortLaneCmd","constructor","mergeLanes","report","_","skipDependencyInstallation","verbose","silent","checkoutProps","reset","all","skipNpmInstall","mergeAbortOpts","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsTitle","green","restoredItemsOutput","map","item","join","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { CheckoutProps, checkoutOutput } from '@teambit/checkout';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport type MergeAbortOpts = {\n silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeAbortLaneCmd implements Command {\n name = 'merge-abort';\n description = `abort the recent lane-merge. revert the lane object and checkout accordingly`;\n extendedDescription = `restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state`;\n alias = '';\n options = [\n ['', 'verbose', \"show details of components that didn't need to be merged\"],\n ['s', 'silent', 'skip confirmation'],\n ['x', 'skip-dependency-installation', 'do not install packages of the imported components'],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n _,\n {\n skipDependencyInstallation = false,\n verbose = false,\n silent = false,\n }: {\n skipDependencyInstallation?: boolean;\n verbose?: boolean;\n silent?: boolean;\n }\n ): Promise<string> {\n const checkoutProps: CheckoutProps = {\n reset: true,\n all: true,\n verbose,\n skipNpmInstall: skipDependencyInstallation,\n };\n const mergeAbortOpts = { silent };\n const { checkoutResults, restoredItems, checkoutError } = await this.mergeLanes.abortLaneMerge(\n checkoutProps,\n mergeAbortOpts\n );\n\n const getCheckoutErrorStr = () => {\n if (!checkoutError) return '';\n const errMsg = `\\n\\nFailed to change component files to the pre-merge state due to an error:\n${checkoutError.message}\nplease fix the error and then run \"bit checkout reset --all\" to revert the components to the pre-merge state`;\n return chalk.red(errMsg);\n };\n\n const checkoutOutputStr = checkoutResults ? checkoutOutput(checkoutResults, checkoutProps) : '';\n const restoredItemsTitle = chalk.green('The following have been restored successfully:');\n const restoredItemsOutput = restoredItems.map((item) => `[√] ${item}`).join('\\n');\n\n return `${checkoutOutputStr}\\n\\n${restoredItemsTitle}\\n${restoredItemsOutput}${getCheckoutErrorStr()}`;\n }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,UAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAkE,SAAAC,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAQ3D,MAAMW,iBAAiB,CAAoB;EAehDC,WAAWA,CAASC,UAA0B,EAAE;IAAA,KAA5BA,UAA0B,GAA1BA,UAA0B;IAAAtB,eAAA,eAdvC,aAAa;IAAAA,eAAA,sBACL,8EAA6E;IAAAA,eAAA,8BACrE;AACzB,6EAA6E;IAAAA,eAAA,gBACnE,EAAE;IAAAA,eAAA,kBACA,CACR,CAAC,EAAE,EAAE,SAAS,EAAE,0DAA0D,CAAC,EAC3E,CAAC,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,EACpC,CAAC,GAAG,EAAE,8BAA8B,EAAE,oDAAoD,CAAC,CAC5F;IAAAA,eAAA,iBACQ,IAAI;IAAAA,eAAA,kBACH,IAAI;IAAAA,eAAA,mBACH,IAAI;EAEkC;EAEjD,MAAMuB,MAAMA,CACVC,CAAC,EACD;IACEC,0BAA0B,GAAG,KAAK;IAClCC,OAAO,GAAG,KAAK;IACfC,MAAM,GAAG;EAKX,CAAC,EACgB;IACjB,MAAMC,aAA4B,GAAG;MACnCC,KAAK,EAAE,IAAI;MACXC,GAAG,EAAE,IAAI;MACTJ,OAAO;MACPK,cAAc,EAAEN;IAClB,CAAC;IACD,MAAMO,cAAc,GAAG;MAAEL;IAAO,CAAC;IACjC,MAAM;MAAEM,eAAe;MAAEC,aAAa;MAAEC;IAAc,CAAC,GAAG,MAAM,IAAI,CAACb,UAAU,CAACc,cAAc,CAC5FR,aAAa,EACbI,cACF,CAAC;IAED,MAAMK,mBAAmB,GAAGA,CAAA,KAAM;MAChC,IAAI,CAACF,aAAa,EAAE,OAAO,EAAE;MAC7B,MAAMG,MAAM,GAAI;AACtB,EAAEH,aAAa,CAACI,OAAQ;AACxB,6GAA6G;MACvG,OAAOC,gBAAK,CAACC,GAAG,CAACH,MAAM,CAAC;IAC1B,CAAC;IAED,MAAMI,iBAAiB,GAAGT,eAAe,GAAG,IAAAU,0BAAc,EAACV,eAAe,EAAEL,aAAa,CAAC,GAAG,EAAE;IAC/F,MAAMgB,kBAAkB,GAAGJ,gBAAK,CAACK,KAAK,CAAC,gDAAgD,CAAC;IACxF,MAAMC,mBAAmB,GAAGZ,aAAa,CAACa,GAAG,CAAEC,IAAI,IAAM,OAAMA,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;IAEjF,OAAQ,GAAEP,iBAAkB,OAAME,kBAAmB,KAAIE,mBAAoB,GAAET,mBAAmB,CAAC,CAAE,EAAC;EACxG;AACF;AAACa,OAAA,CAAA9B,iBAAA,GAAAA,iBAAA"}
@@ -25,7 +25,6 @@ export declare class MergeLaneFromScopeCmd implements Command {
25
25
  options: CommandOptions;
26
26
  loader: boolean;
27
27
  private: boolean;
28
- migration: boolean;
29
28
  remoteOp: boolean;
30
29
  constructor(mergeLanes: MergeLanesMain);
31
30
  report([fromLane, toLane]: [string, string], { pattern, push, keepReadme, noSquash, includeDeps, title, titleBase64 }: Flags): Promise<string>;
@@ -58,7 +58,6 @@ the lane must be up-to-date with the other lane, otherwise, conflicts might occu
58
58
  _defineProperty(this, "options", [['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'], ['', 'title <string>', 'if provided, it replaces the original message with this title and append squashed snaps messages'], ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'], ['', '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']]);
59
59
  _defineProperty(this, "loader", true);
60
60
  _defineProperty(this, "private", true);
61
- _defineProperty(this, "migration", true);
62
61
  _defineProperty(this, "remoteOp", true);
63
62
  }
64
63
  async report([fromLane, toLane], {
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_utils","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","title","titleBase64","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","mergedPreviously","exportedIds","mergeFromScope","snapMessage","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","err","error","message","exports"],"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 { fromBase64 } from '@teambit/legacy/dist/utils';\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 title?: string;\n titleBase64?: string;\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 [\n '',\n 'title <string>',\n 'if provided, it replaces the original message with this title and append squashed snaps messages',\n ],\n ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\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, title, titleBase64 }: 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 titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\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 snapMessage: titleBase64Decoded || title,\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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"}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_utils","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","push","keepReadme","noSquash","includeDeps","title","titleBase64","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","mergedPreviously","exportedIds","mergeFromScope","snapMessage","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","err","error","message","exports"],"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 { fromBase64 } from '@teambit/legacy/dist/utils';\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 title?: string;\n titleBase64?: string;\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 [\n '',\n 'title <string>',\n 'if provided, it replaces the original message with this title and append squashed snaps messages',\n ],\n ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\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 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, title, titleBase64 }: 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 titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\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 snapMessage: titleBase64Decoded || title,\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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"}
@@ -15,7 +15,6 @@ export declare class MergeLaneCmd implements Command {
15
15
  options: CommandOptions;
16
16
  loader: boolean;
17
17
  private: boolean;
18
- migration: boolean;
19
18
  remoteOp: boolean;
20
19
  constructor(mergeLanes: MergeLanesMain, globalConfig: GlobalConfigMain);
21
20
  report([name, pattern]: [string, string], { ours, theirs, manual, autoMergeResolve, build, workspace: existingOnWorkspaceOnly, squash, noSnap, tag, message: snapMessage, keepReadme, noSquash, skipDependencyInstallation, skipFetch, includeDeps, resolveUnrelated, ignoreConfigChanges, verbose, excludeNonLaneComps, }: {
@@ -78,7 +78,6 @@ Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
78
78
  _defineProperty(this, "options", [['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-snap', 'do not auto snap after merge completed without conflicts'], ['', 'tag', 'auto-tag all lane components after merging into main (or 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 squashes all lane snaps'], ['', 'squash', 'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "--pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)'], ['', 'exclude-non-lane-comps', 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)']]);
79
79
  _defineProperty(this, "loader", true);
80
80
  _defineProperty(this, "private", true);
81
- _defineProperty(this, "migration", true);
82
81
  _defineProperty(this, "remoteOp", true);
83
82
  }
84
83
  async report([name, pattern], {
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\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 to the current 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 merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n },\n {\n name: 'pattern',\n description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n },\n ];\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n [\n '',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n ['', 'workspace', 'merge only lane components that are in the current workspace'],\n ['', 'no-snap', 'do not auto snap after merge completed without conflicts'],\n ['', 'tag', 'auto-tag all lane components after merging into main (or 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 squashes all lane snaps'],\n [\n '',\n 'squash',\n 'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash',\n ],\n [\n '',\n 'ignore-config-changes',\n 'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n ],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n [\n '',\n 'include-deps',\n 'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the specified components',\n ],\n [\n '',\n 'resolve-unrelated [merge-strategy]',\n 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n ],\n [\n '',\n 'include-non-lane-comps',\n 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n ],\n [\n '',\n 'exclude-non-lane-comps',\n 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n ],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain, private globalConfig: GlobalConfigMain) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n ours,\n theirs,\n manual,\n autoMergeResolve,\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 excludeNonLaneComps = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: string;\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 excludeNonLaneComps?: boolean;\n }\n ): Promise<string> {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs || manual) {\n throw new BitError(\n 'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n );\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n const mergeStrategy = autoMergeResolve;\n if (noSnap && snapMessage) throw new BitError('unable to use \"no-snap\" 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 ours,\n theirs,\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 excludeNonLaneComps,\n });\n\n const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n deleteResults.remoteResult || []\n ).map((item) => removeTemplate(item, true))}${\n (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n }\\n`;\n return mergeResult + deleteOutput;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLane","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { mergeReport } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\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 to the current 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 merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n },\n {\n name: 'pattern',\n description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n },\n ];\n alias = '';\n options = [\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n ['', 'manual', 'DEPRECATED. use --auto-merge-resolve'],\n [\n '',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n ['', 'workspace', 'merge only lane components that are in the current workspace'],\n ['', 'no-snap', 'do not auto snap after merge completed without conflicts'],\n ['', 'tag', 'auto-tag all lane components after merging into main (or 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 squashes all lane snaps'],\n [\n '',\n 'squash',\n 'EXPERIMENTAL. relevant for merging a lane into another non-main lane, which by default does not squash',\n ],\n [\n '',\n 'ignore-config-changes',\n 'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n ],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n [\n '',\n 'include-deps',\n 'relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the specified components',\n ],\n [\n '',\n 'resolve-unrelated [merge-strategy]',\n 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n ],\n [\n '',\n 'include-non-lane-comps',\n 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n ],\n [\n '',\n 'exclude-non-lane-comps',\n 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n ],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain, private globalConfig: GlobalConfigMain) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n ours,\n theirs,\n manual,\n autoMergeResolve,\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 excludeNonLaneComps = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: string;\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 excludeNonLaneComps?: boolean;\n }\n ): Promise<string> {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs || manual) {\n throw new BitError(\n 'the \"--ours\", \"--theirs\" and \"--manual\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n );\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n const mergeStrategy = autoMergeResolve;\n if (noSnap && snapMessage) throw new BitError('unable to use \"no-snap\" 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 ours,\n theirs,\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 excludeNonLaneComps,\n });\n\n const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n deleteResults.remoteResult || []\n ).map((item) => removeTemplate(item, true))}${\n (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n }\\n`;\n return mergeResult + deleteOutput;\n }\n}\n"],"mappings":"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"}
@@ -338,7 +338,9 @@ class MergeLanesMain {
338
338
  let deleteResults = {};
339
339
  if (!keepReadme && otherLane && otherLane.readmeComponent && mergedSuccessfully) {
340
340
  const readmeComponentId = otherLane.readmeComponent.id.changeVersion(otherLane.readmeComponent?.head?.hash);
341
- deleteResults = await this.remove.removeLocallyByIds([readmeComponentId]);
341
+ deleteResults = await this.remove.removeLocallyByIds([readmeComponentId], {
342
+ reasonForRemoval: 'lane-merge'
343
+ });
342
344
  } else if (otherLane && !otherLane.readmeComponent) {
343
345
  deleteResults = {
344
346
  readmeResult: ''
@@ -1 +1 @@
1
- {"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_snapping","_componentId","_pMapSeries","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_getDivergeData","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","undefined","getBitIds","modelComponents","Promise","all","map","id","legacyScope","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toBitIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","readmeResult","configMergeResults","configMergeResult","onDestroy","name","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","includeNonLaneComps","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","bitIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\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, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/snapping';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\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 CheckoutAspect, { CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { BitObject, Ref } 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';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean;\n theirs?: boolean;\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 excludeNonLaneComps?: boolean;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n readonly logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain,\n private importer: ImporterMain,\n private checkout: CheckoutMain\n ) {}\n\n // eslint-disable-next-line complexity\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 excludeNonLaneComps,\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 if (isDefaultLane) {\n if (!skipFetch) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n await this.importer.importObjectsFromMainIfExist(compIdList);\n }\n }\n let laneToFetchArtifactsFrom: Lane | undefined;\n const getOtherLane = async () => {\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 laneToFetchArtifactsFrom = otherLane;\n lane = await consumer.scope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = isDefaultLane ? undefined : await getOtherLane();\n const getBitIds = async () => {\n if (isDefaultLane) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\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.toComponentId().changeVersion(c.head.toString());\n })\n );\n }\n if (!otherLane) throw new Error(`lane must be defined for non-default`);\n return otherLane.toBitIds();\n };\n const idsToMerge = await getBitIds();\n this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n let allComponentsStatus = await this.merging.getMergeStatus(idsToMerge, currentLane, otherLane, {\n resolveUnrelated,\n ignoreConfigChanges,\n shouldSquash,\n });\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsToMerge);\n const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n idsToMerge.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `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))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n idsToMerge.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({\n id: bitId,\n unchangedLegitimately: true,\n unchangedMessage: `not in the workspace`,\n });\n }\n });\n }\n\n throwForFailures(allComponentsStatus);\n\n if (shouldSquash) {\n await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\n\n if (laneToFetchArtifactsFrom) {\n const ids = allComponentsStatus.map((c) => c.id);\n await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n }\n\n const lastMerged = new LastMerged(this.scope, consumer, this.logger);\n const snapshot = await lastMerged.takeSnapshot(currentLane);\n\n const mergeResults = await this.merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n\n await lastMerged.persistSnapshot(snapshot);\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: '' };\n }\n const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n await this.workspace.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n }\n\n async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n const currentLane = await this.lanes.getCurrentLane();\n const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n await this.workspace._reloadConsumer();\n\n this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n const configMergeFile = this.workspace.getConflictMergeFile();\n await configMergeFile.delete();\n\n let checkoutResults: ApplyVersionResults | undefined;\n let checkoutError: Error | undefined;\n checkoutProps.ids = await this.workspace.listIds();\n checkoutProps.restoreMissingComponents = true;\n try {\n checkoutResults = await this.checkout.checkout(checkoutProps);\n } catch (err: any) {\n this.logger.error(`merge-abort got an error during the checkout stage`, err);\n checkoutError = err;\n }\n\n const restoredItems = [\n `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n `${path.basename(this.workspace.consumer.config.path)} file`,\n ];\n if (compDirsToRemove.length) {\n restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n }\n if (currentLane) {\n restoredItems.push(`${currentLane.id()} lane object`);\n }\n\n return { checkoutResults, restoredItems, checkoutError };\n }\n\n private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true) {\n if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n const laneIds = lane.toBitIds();\n const ids = laneIds.filter((id) => this.scope.isExported(id));\n if (includeNonLaneComps) {\n if (!this.workspace) {\n throw new BitError(`getMainIdsToMerge needs workspace`);\n }\n const workspaceIds = await this.workspace.listIds();\n const mainNotOnLane = workspaceIds.filter(\n (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n );\n ids.push(...mainNotOnLane);\n }\n return ids;\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<ComponentIdList> => {\n if (!options.pattern) return fromLaneBitIds;\n const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n const ids = await this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n return ComponentIdList.fromArray(ids.map((id) => id));\n };\n const idsToMerge = await getIdsToMerge();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: fromLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n reason: `of \"from\" lane (${fromLaneId.name}) for lane-merge to get all version-history`,\n });\n\n // get their main/to-lane as well\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: toLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n reason: `of \"to\" lane (${toLaneId.name}) for lane-merge to get all version-history`,\n });\n await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, 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: ComponentID[] = [];\n const mergedNow: ComponentID[] = [];\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\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: toLaneHead,\n targetHead: fromLaneHead,\n throwForNoCommonSnap: true,\n });\n const modifiedVersion = shouldSquash\n ? await squashOneComp(\n DEFAULT_LANE,\n fromLaneId,\n id,\n divergeData,\n log,\n this.scope.legacyScope,\n fromVersionObj,\n options.snapMessage\n )\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 = ComponentIdList.fromArray(ids);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: shouldSquash ? bitIds : new ComponentIdList(),\n idsWithFutureScope: shouldSquash ? bitIds : new ComponentIdList(),\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 exportOrigin: 'lane-merge',\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 CheckoutAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n\n static async provider([\n lanes,\n cli,\n workspace,\n merging,\n loggerMain,\n remove,\n scope,\n exporter,\n importer,\n checkout,\n globalConfig,\n ]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(\n workspace,\n merging,\n lanes,\n logger,\n remove,\n scope,\n exporter,\n importer,\n checkout\n );\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: ComponentID[],\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 = ComponentIdList.fromArray(compIdsToKeep);\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: ComponentID[] = [];\n const missingDepsFromHead = {};\n const missingDepsFromHistory: string[] = [];\n\n const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unchangedMessage) {\n return undefined;\n }\n if (!otherLane) {\n // if merging main, no need to check whether the deps are included in the pattern.\n return undefined;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n if (!targetVersions.length) {\n return undefined;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId);\n if (shouldSquash) {\n // no need to check all versions, we merge only the head\n const headOnTarget = otherLane ? otherLane.getComponent(compId)?.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 return { compId, targetVersions, modelComponent };\n });\n\n // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n const toImport = compact(versionsToCheckPerId)\n .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n .flat();\n await workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: otherLane,\n cache: true,\n includeVersionHistory: false,\n reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n });\n\n await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\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: ComponentID[] = [];\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 depsToAdd.push(...depsOnLane);\n } else {\n const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n if (headOnTarget?.isEqual(remoteVersion)) {\n depsOnLaneStr.forEach((dep) => {\n (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n });\n } else {\n missingDepsFromHistory.push(...depsOnLaneStr);\n }\n }\n });\n });\n if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n }\n\n if (depsToAdd.length) {\n // remove the version, otherwise, the uniq gives duplicate components with different versions.\n const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n depsUniqWithoutVersion.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.unchangedMessage);\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 = await squashOneComp(\n currentLaneName,\n otherLaneId,\n id,\n divergeData,\n log,\n consumer.scope,\n componentFromModel\n );\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 */\nasync function squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: ComponentID,\n divergeData: SnapsDistance,\n log: Log,\n scope: LegacyScope,\n componentFromModel?: Version,\n messageTitle?: string\n): Promise<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 const getAllMessages = async () => {\n if (!messageTitle) return [];\n await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n return compact(versionObjects).map((v) => v.log.message);\n };\n const getFinalMessage = async (): Promise<string | undefined> => {\n if (!messageTitle) return undefined;\n const allMessage = await getAllMessages();\n const allMessageStr = compact(allMessage)\n .map((m) => `[*] ${m}`)\n .join('\\n');\n return `${messageTitle}\\n${allMessageStr}`;\n };\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n const currentParents = componentFromModel.parents;\n\n // if the remote has only one snap, there is nothing to squash.\n // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n return undefined;\n }\n\n const doSquash = async () => {\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n return;\n }\n if (currentLaneName !== DEFAULT_LANE) {\n // when squashing into lane, we have to take main into account\n const modelComponent = await scope.getModelComponentIfExist(id);\n if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n if (modelComponent.head) {\n componentFromModel.addAsOnlyParent(modelComponent.head);\n return;\n }\n }\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\n await doSquash();\n\n const finalMessage = await getFinalMessage();\n componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
1
+ {"version":3,"names":["_bitError","data","require","_path","_interopRequireDefault","_cli","_importer","_lanes","_merging","_workspace","_interopRequireWildcard","_snapping","_componentId","_pMapSeries","_scope","_scopeComponentsImporter","_laneId","_logger","_checkout","_remove","_lodash","_export","_globalConfig","_getDivergeData","_mergeLanes","_mergeLane","_mergeLaneFromScope","_missingCompsToMerge","_mergeAbort","_lastMerged","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergeLanesMain","constructor","workspace","merging","lanes","logger","remove","scope","exporter","importer","checkout","mergeLane","laneName","options","BitError","consumer","mergeStrategy","noSnap","tag","snapMessage","existingOnWorkspaceOnly","build","keepReadme","squash","noSquash","pattern","includeDeps","skipDependencyInstallation","resolveUnrelated","ignoreConfigChanges","skipFetch","excludeNonLaneComps","currentLaneId","getCurrentLaneId","isDefault","toString","otherLaneId","getParsedLaneId","isEqual","currentLane","loadLane","isDefaultLane","ids","getMainIdsToMerge","compIdList","ComponentIdList","fromArray","toVersionLatest","importObjectsFromMainIfExist","laneToFetchArtifactsFrom","getOtherLane","lane","shouldFetch","isNew","otherLane","fetchLaneWithItsComponents","undefined","getBitIds","modelComponents","Promise","all","map","id","legacyScope","getModelComponent","compact","c","head","toComponentId","changeVersion","Error","toBitIds","idsToMerge","debug","shouldSquash","allComponentsStatus","getMergeStatus","componentIds","resolveMultipleComponentIds","compIdsFromPattern","filterIdsFromPoolIdsByPattern","filterComponentsStatus","bitId","find","isEqualWithoutVersion","unchangedLegitimately","unchangedMessage","workspaceIds","listIds","throwForFailures","squashSnaps","importHeadArtifactsFromLane","lastMerged","LastMerged","snapshot","takeSnapshot","mergeResults","mergeSnaps","persistSnapshot","mergedSuccessfully","failedComponents","every","failedComponent","deleteResults","readmeComponent","readmeComponentId","hash","removeLocallyByIds","reasonForRemoval","readmeResult","configMergeResults","configMergeResult","onDestroy","name","abortLaneMerge","checkoutProps","mergeAbortOpts","OutsideWorkspaceError","lastMerge","getCurrentLane","compDirsToRemove","restoreFromLastMerged","_reloadConsumer","objects","unmergedComponents","removeAllComponents","write","configMergeFile","getConflictMergeFile","delete","checkoutResults","checkoutError","restoreMissingComponents","err","error","restoredItems","path","basename","bitMap","mapPath","config","join","includeNonLaneComps","DEFAULT_LANE","laneIds","isExported","mainNotOnLane","laneId","mergeFromScope","fromLane","toLane","fromLaneId","LaneId","parse","fromLaneObj","importLaneObject","toLaneId","getDefaultLaneId","toLaneObj","fromLaneBitIds","getIdsToMerge","laneCompIds","scopeComponentsImporter","ScopeComponentsImporter","getInstance","importWithoutDeps","cache","ignoreMissingHead","includeVersionHistory","reason","throwIfNotUpToDate","repo","mergedPreviously","mergedNow","log","getLogForSquash","bitObjectsPerComp","pMapSeries","modelComponent","fromVersionObj","loadVersion","version","isRemoved","fromLaneHead","getRef","toLaneHead","getComponent","divergeData","getDivergeData","sourceHead","targetHead","throwForNoCommonSnap","modifiedVersion","squashOneComp","addComponent","setHead","bitObjects","b","bitObjectsFlat","flat","writeObjectsToTheFS","exportedIds","bitIds","exported","exportMany","idsWithFutureScope","laneObject","allVersions","exportHeadsOnly","ignoreMissingExternalArtifacts","exportOrigin","status","diffStatus","skipChanges","compsNotUpToDate","componentsStatus","s","upToDate","componentId","provider","cli","loggerMain","globalConfig","createLogger","MergeLanesAspect","lanesCommand","getCommand","mergeLanesMain","commands","MergeLaneCmd","MergeAbortLaneCmd","register","MergeLaneFromScopeCmd","exports","LanesAspect","CLIAspect","WorkspaceAspect","MergingAspect","LoggerAspect","RemoveAspect","ScopeAspect","ExportAspect","ImporterAspect","CheckoutAspect","GlobalConfigAspect","MainRuntime","compIdsToKeep","allBitIds","bitIdsFromPattern","bitIdsNotFromPattern","hasWithoutVersion","filteredComponentStatus","depsToAdd","missingDepsFromHead","missingDepsFromHistory","versionsToCheckPerId","compId","fromStatus","targetVersions","snapsOnTargetOnly","headOnTarget","toImport","v","scopeImporter","remoteVersion","versionObj","flattenedDeps","getAllFlattenedDependencies","depsNotIncludeInPattern","depsOnLane","dep","isOnLane","isIdOnLane","depsOnLaneStr","toStringWithoutVersion","MissingCompsToMerge","uniq","depsWithoutVersion","d","depsUniqWithoutVersion","uniqFromArray","basicLog","getBasicLog","message","currentLaneName","succeededComponents","componentFromModel","modifiedComp","add","versionHistory","updateRebasedVersionHistory","messageTitle","isDiverged","isSourceAhead","isTargetAhead","remoteSnaps","getAllMessages","importManyObjects","versionObjects","load","getFinalMessage","allMessage","allMessageStr","m","currentParents","parents","commonSnapBeforeDiverge","doSquash","addAsOnlyParent","getModelComponentIfExist","ref","removeParent","finalMessage","setSquashed","previousParents","addRuntime","_default"],"sources":["merge-lanes.main.runtime.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport path from 'path';\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, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { getBasicLog } from '@teambit/snapping';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { Log } from '@teambit/legacy/dist/scope/models/version';\nimport pMapSeries from 'p-map-series';\nimport { Scope as LegacyScope } from '@teambit/legacy/dist/scope';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport ScopeComponentsImporter from '@teambit/legacy/dist/scope/component-ops/scope-components-importer';\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 CheckoutAspect, { CheckoutMain, CheckoutProps, throwForFailures } from '@teambit/checkout';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { compact, uniq } from 'lodash';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { BitObject, Ref } 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';\nimport { MissingCompsToMerge } from './exceptions/missing-comps-to-merge';\nimport { MergeAbortLaneCmd, MergeAbortOpts } from './merge-abort.cmd';\nimport { LastMerged } from './last-merged';\n\nexport type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean;\n theirs?: boolean;\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 excludeNonLaneComps?: boolean;\n};\n\nexport class MergeLanesMain {\n constructor(\n private workspace: Workspace | undefined,\n private merging: MergingMain,\n private lanes: LanesMain,\n readonly logger: Logger,\n private remove: RemoveMain,\n private scope: ScopeMain,\n private exporter: ExportMain,\n private importer: ImporterMain,\n private checkout: CheckoutMain\n ) {}\n\n // eslint-disable-next-line complexity\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 excludeNonLaneComps,\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 if (isDefaultLane) {\n if (!skipFetch) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\n const compIdList = ComponentIdList.fromArray(ids).toVersionLatest();\n await this.importer.importObjectsFromMainIfExist(compIdList);\n }\n }\n let laneToFetchArtifactsFrom: Lane | undefined;\n const getOtherLane = async () => {\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 laneToFetchArtifactsFrom = otherLane;\n lane = await consumer.scope.loadLane(otherLaneId);\n }\n return lane;\n };\n const otherLane = isDefaultLane ? undefined : await getOtherLane();\n const getBitIds = async () => {\n if (isDefaultLane) {\n const ids = await this.getMainIdsToMerge(currentLane, !excludeNonLaneComps);\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.toComponentId().changeVersion(c.head.toString());\n })\n );\n }\n if (!otherLane) throw new Error(`lane must be defined for non-default`);\n return otherLane.toBitIds();\n };\n const idsToMerge = await getBitIds();\n this.logger.debug(`merging the following ids: ${idsToMerge.toString()}`);\n\n const shouldSquash = squash || (currentLaneId.isDefault() && !noSquash);\n let allComponentsStatus = await this.merging.getMergeStatus(idsToMerge, currentLane, otherLane, {\n resolveUnrelated,\n ignoreConfigChanges,\n shouldSquash,\n });\n\n if (pattern) {\n const componentIds = await this.workspace.resolveMultipleComponentIds(idsToMerge);\n const compIdsFromPattern = await this.workspace.filterIdsFromPoolIdsByPattern(pattern, componentIds);\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n idsToMerge.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({ id: bitId, unchangedLegitimately: true, unchangedMessage: `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))\n );\n allComponentsStatus = await filterComponentsStatus(\n allComponentsStatus,\n compIdsFromPattern,\n idsToMerge,\n this.workspace,\n includeDeps,\n otherLane || undefined,\n shouldSquash\n );\n idsToMerge.forEach((bitId) => {\n if (!allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(bitId))) {\n allComponentsStatus.push({\n id: bitId,\n unchangedLegitimately: true,\n unchangedMessage: `not in the workspace`,\n });\n }\n });\n }\n\n throwForFailures(allComponentsStatus);\n\n if (shouldSquash) {\n await squashSnaps(allComponentsStatus, otherLaneId, consumer);\n }\n\n if (laneToFetchArtifactsFrom) {\n const ids = allComponentsStatus.map((c) => c.id);\n await this.importer.importHeadArtifactsFromLane(laneToFetchArtifactsFrom, ids, true);\n }\n\n const lastMerged = new LastMerged(this.scope, consumer, this.logger);\n const snapshot = await lastMerged.takeSnapshot(currentLane);\n\n const mergeResults = await this.merging.mergeSnaps({\n mergeStrategy,\n allComponentsStatus,\n otherLaneId,\n currentLane,\n noSnap,\n tag,\n snapMessage,\n build,\n skipDependencyInstallation,\n });\n\n await lastMerged.persistSnapshot(snapshot);\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], { reasonForRemoval: 'lane-merge' });\n } else if (otherLane && !otherLane.readmeComponent) {\n deleteResults = { readmeResult: '' };\n }\n const configMergeResults = allComponentsStatus.map((c) => c.configMergeResult);\n\n await this.workspace.consumer.onDestroy(`lane-merge (${otherLaneId.name})`);\n\n return { mergeResults, deleteResults, configMergeResults: compact(configMergeResults) };\n }\n\n async abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts) {\n if (!this.workspace) throw new OutsideWorkspaceError();\n const lastMerge = new LastMerged(this.scope, this.workspace.consumer, this.logger);\n const currentLane = await this.lanes.getCurrentLane();\n const { compDirsToRemove } = await lastMerge.restoreFromLastMerged(mergeAbortOpts, currentLane);\n\n await this.workspace._reloadConsumer();\n\n this.workspace.consumer.scope.objects.unmergedComponents.removeAllComponents();\n await this.workspace.consumer.scope.objects.unmergedComponents.write();\n\n const configMergeFile = this.workspace.getConflictMergeFile();\n await configMergeFile.delete();\n\n let checkoutResults: ApplyVersionResults | undefined;\n let checkoutError: Error | undefined;\n checkoutProps.ids = await this.workspace.listIds();\n checkoutProps.restoreMissingComponents = true;\n try {\n checkoutResults = await this.checkout.checkout(checkoutProps);\n } catch (err: any) {\n this.logger.error(`merge-abort got an error during the checkout stage`, err);\n checkoutError = err;\n }\n\n const restoredItems = [\n `${path.basename(this.workspace.consumer.bitMap.mapPath)} file`,\n `${path.basename(this.workspace.consumer.config.path)} file`,\n ];\n if (compDirsToRemove.length) {\n restoredItems.push(`deleted components directories: ${compDirsToRemove.join(', ')}`);\n }\n if (currentLane) {\n restoredItems.push(`${currentLane.id()} lane object`);\n }\n\n return { checkoutResults, restoredItems, checkoutError };\n }\n\n private async getMainIdsToMerge(lane?: Lane | null, includeNonLaneComps = true) {\n if (!lane) throw new Error(`unable to merge ${DEFAULT_LANE}, the current lane was not found`);\n const laneIds = lane.toBitIds();\n const ids = laneIds.filter((id) => this.scope.isExported(id));\n if (includeNonLaneComps) {\n if (!this.workspace) {\n throw new BitError(`getMainIdsToMerge needs workspace`);\n }\n const workspaceIds = await this.workspace.listIds();\n const mainNotOnLane = workspaceIds.filter(\n (id) => !laneIds.find((laneId) => laneId.isEqualWithoutVersion(id)) && this.scope.isExported(id)\n );\n ids.push(...mainNotOnLane);\n }\n return ids;\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<ComponentIdList> => {\n if (!options.pattern) return fromLaneBitIds;\n const laneCompIds = await this.scope.resolveMultipleComponentIds(fromLaneBitIds);\n const ids = await this.scope.filterIdsFromPoolIdsByPattern(options.pattern, laneCompIds);\n return ComponentIdList.fromArray(ids.map((id) => id));\n };\n const idsToMerge = await getIdsToMerge();\n const scopeComponentsImporter = ScopeComponentsImporter.getInstance(this.scope.legacyScope);\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: fromLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n reason: `of \"from\" lane (${fromLaneId.name}) for lane-merge to get all version-history`,\n });\n\n // get their main/to-lane as well\n await scopeComponentsImporter.importWithoutDeps(idsToMerge.toVersionLatest(), {\n cache: false,\n lane: toLaneObj,\n ignoreMissingHead: true,\n includeVersionHistory: true,\n reason: `of \"to\" lane (${toLaneId.name}) for lane-merge to get all version-history`,\n });\n await this.importer.importHeadArtifactsFromLane(fromLaneObj, undefined, 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: ComponentID[] = [];\n const mergedNow: ComponentID[] = [];\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\n const divergeData = await getDivergeData({\n repo,\n modelComponent,\n sourceHead: toLaneHead,\n targetHead: fromLaneHead,\n throwForNoCommonSnap: true,\n });\n const modifiedVersion = shouldSquash\n ? await squashOneComp(\n DEFAULT_LANE,\n fromLaneId,\n id,\n divergeData,\n log,\n this.scope.legacyScope,\n fromVersionObj,\n options.snapMessage\n )\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 = ComponentIdList.fromArray(ids);\n const { exported } = await this.exporter.exportMany({\n scope: this.scope.legacyScope,\n ids: shouldSquash ? bitIds : new ComponentIdList(),\n idsWithFutureScope: shouldSquash ? bitIds : new ComponentIdList(),\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 exportOrigin: 'lane-merge',\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 CheckoutAspect,\n GlobalConfigAspect,\n ];\n static runtime = MainRuntime;\n\n static async provider([\n lanes,\n cli,\n workspace,\n merging,\n loggerMain,\n remove,\n scope,\n exporter,\n importer,\n checkout,\n globalConfig,\n ]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n ]) {\n const logger = loggerMain.createLogger(MergeLanesAspect.id);\n const lanesCommand = cli.getCommand('lane');\n const mergeLanesMain = new MergeLanesMain(\n workspace,\n merging,\n lanes,\n logger,\n remove,\n scope,\n exporter,\n importer,\n checkout\n );\n lanesCommand?.commands?.push(new MergeLaneCmd(mergeLanesMain, globalConfig));\n lanesCommand?.commands?.push(new MergeAbortLaneCmd(mergeLanesMain));\n cli.register(new MergeLaneFromScopeCmd(mergeLanesMain));\n return mergeLanesMain;\n }\n}\n\nasync function filterComponentsStatus(\n allComponentsStatus: ComponentMergeStatus[],\n compIdsToKeep: ComponentID[],\n allBitIds: ComponentID[],\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 = ComponentIdList.fromArray(compIdsToKeep);\n const bitIdsNotFromPattern = allBitIds.filter((bitId) => !bitIdsFromPattern.hasWithoutVersion(bitId));\n const filteredComponentStatus: ComponentMergeStatus[] = [];\n const depsToAdd: ComponentID[] = [];\n const missingDepsFromHead = {};\n const missingDepsFromHistory: string[] = [];\n\n const versionsToCheckPerId = await pMapSeries(compIdsToKeep, async (compId) => {\n const fromStatus = allComponentsStatus.find((c) => c.id.isEqualWithoutVersion(compId));\n if (!fromStatus) {\n throw new Error(`filterComponentsStatus: unable to find ${compId.toString()} in component-status`);\n }\n filteredComponentStatus.push(fromStatus);\n if (fromStatus.unchangedMessage) {\n return undefined;\n }\n if (!otherLane) {\n // if merging main, no need to check whether the deps are included in the pattern.\n return undefined;\n }\n const { divergeData } = fromStatus;\n if (!divergeData) {\n throw new Error(`filterComponentsStatus: unable to find divergeData for ${compId.toString()}`);\n }\n let targetVersions: Ref[] = divergeData.snapsOnTargetOnly;\n if (!targetVersions.length) {\n return undefined;\n }\n const modelComponent = await workspace.consumer.scope.getModelComponent(compId);\n if (shouldSquash) {\n // no need to check all versions, we merge only the head\n const headOnTarget = otherLane ? otherLane.getComponent(compId)?.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 return { compId, targetVersions, modelComponent };\n });\n\n // all these versions needs to be imported to load them later and check whether they have dependencies on the target lane\n const toImport = compact(versionsToCheckPerId)\n .map((c) => c.targetVersions.map((v) => c.compId.changeVersion(v.toString())))\n .flat();\n await workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n lane: otherLane,\n cache: true,\n includeVersionHistory: false,\n reason: 'import all history of given patterns components to check whether they have dependencies on the lane',\n });\n\n await pMapSeries(compact(versionsToCheckPerId), async ({ compId, targetVersions, modelComponent }) => {\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: ComponentID[] = [];\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 depsToAdd.push(...depsOnLane);\n } else {\n const headOnTarget = otherLane ? otherLane.getComponent(compId)?.head : modelComponent.head;\n const depsOnLaneStr = depsOnLane.map((dep) => dep.toStringWithoutVersion());\n if (headOnTarget?.isEqual(remoteVersion)) {\n depsOnLaneStr.forEach((dep) => {\n (missingDepsFromHead[dep] ||= []).push(compId.toStringWithoutVersion());\n });\n } else {\n missingDepsFromHistory.push(...depsOnLaneStr);\n }\n }\n });\n });\n if (Object.keys(missingDepsFromHead).length || missingDepsFromHistory.length) {\n throw new MissingCompsToMerge(missingDepsFromHead, uniq(missingDepsFromHistory));\n }\n\n if (depsToAdd.length) {\n // remove the version, otherwise, the uniq gives duplicate components with different versions.\n const depsWithoutVersion = depsToAdd.map((d) => d.changeVersion(undefined));\n const depsUniqWithoutVersion = ComponentIdList.uniqFromArray(depsWithoutVersion);\n depsUniqWithoutVersion.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.unchangedMessage);\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 = await squashOneComp(\n currentLaneName,\n otherLaneId,\n id,\n divergeData,\n log,\n consumer.scope,\n componentFromModel\n );\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 */\nasync function squashOneComp(\n currentLaneName: string,\n otherLaneId: LaneId,\n id: ComponentID,\n divergeData: SnapsDistance,\n log: Log,\n scope: LegacyScope,\n componentFromModel?: Version,\n messageTitle?: string\n): Promise<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 const getAllMessages = async () => {\n if (!messageTitle) return [];\n await scope.scopeImporter.importManyObjects({ [otherLaneId.scope]: remoteSnaps.map((s) => s.toString()) });\n const versionObjects = (await Promise.all(remoteSnaps.map((s) => scope.objects.load(s)))) as Version[];\n return compact(versionObjects).map((v) => v.log.message);\n };\n const getFinalMessage = async (): Promise<string | undefined> => {\n if (!messageTitle) return undefined;\n const allMessage = await getAllMessages();\n const allMessageStr = compact(allMessage)\n .map((m) => `[*] ${m}`)\n .join('\\n');\n return `${messageTitle}\\n${allMessageStr}`;\n };\n if (!componentFromModel) {\n throw new Error('unable to squash, the componentFromModel is missing');\n }\n const currentParents = componentFromModel.parents;\n\n // if the remote has only one snap, there is nothing to squash.\n // other checks here is to make sure `componentFromModel.addAsOnlyParent` call is not needed.\n if (remoteSnaps.length === 1 && divergeData.commonSnapBeforeDiverge && currentParents.length === 1) {\n return undefined;\n }\n\n const doSquash = async () => {\n if (divergeData.commonSnapBeforeDiverge) {\n componentFromModel.addAsOnlyParent(divergeData.commonSnapBeforeDiverge);\n return;\n }\n if (currentLaneName !== DEFAULT_LANE) {\n // when squashing into lane, we have to take main into account\n const modelComponent = await scope.getModelComponentIfExist(id);\n if (!modelComponent) throw new Error(`missing ModelComponent for ${id.toString()}`);\n if (modelComponent.head) {\n componentFromModel.addAsOnlyParent(modelComponent.head);\n return;\n }\n }\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\n await doSquash();\n\n const finalMessage = await getFinalMessage();\n componentFromModel.setSquashed({ previousParents: currentParents, laneId: otherLaneId }, log, finalMessage);\n return componentFromModel;\n}\n\nMergeLanesAspect.addRuntime(MergeLanesMain);\n\nexport default MergeLanesMain;\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.122",
3
+ "version": "1.0.123",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "1.0.122"
9
+ "version": "1.0.123"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -19,18 +19,18 @@
19
19
  "@teambit/lane-id": "0.0.311",
20
20
  "@teambit/harmony": "0.4.6",
21
21
  "@teambit/component-id": "1.2.0",
22
- "@teambit/logger": "0.0.937",
23
- "@teambit/scope": "1.0.122",
24
- "@teambit/checkout": "1.0.122",
25
- "@teambit/cli": "0.0.844",
26
- "@teambit/global-config": "0.0.847",
27
- "@teambit/merging": "1.0.122",
28
- "@teambit/remove": "1.0.122",
29
- "@teambit/export": "1.0.122",
30
- "@teambit/importer": "1.0.122",
31
- "@teambit/lanes": "1.0.122",
32
- "@teambit/snapping": "1.0.122",
33
- "@teambit/workspace": "1.0.122"
22
+ "@teambit/logger": "0.0.938",
23
+ "@teambit/scope": "1.0.123",
24
+ "@teambit/checkout": "1.0.123",
25
+ "@teambit/cli": "0.0.845",
26
+ "@teambit/global-config": "0.0.848",
27
+ "@teambit/merging": "1.0.123",
28
+ "@teambit/remove": "1.0.123",
29
+ "@teambit/export": "1.0.123",
30
+ "@teambit/importer": "1.0.123",
31
+ "@teambit/lanes": "1.0.123",
32
+ "@teambit/snapping": "1.0.123",
33
+ "@teambit/workspace": "1.0.123"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@types/fs-extra": "9.0.7",