@teambit/merge-lanes 1.0.953 → 1.0.955

package/dist/merge-abort.cmd.js

@@ -18,6 +18,13 @@ function _checkout() {
   };
   return data;
 }
+function _cli() {
+  const data = require("@teambit/cli");
+  _cli = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -62,9 +69,8 @@ please fix the error and then run "bit checkout reset --all" to revert the compo
       return _chalk().default.red(errMsg);
     };
     const checkoutOutputStr = checkoutResults ? (0, _checkout().checkoutOutput)(checkoutResults, checkoutProps) : '';
-    const restoredItemsTitle = _chalk().default.green('The following have been restored successfully:');
-    const restoredItemsOutput = restoredItems.map(item => `[√] ${item}`).join('\n');
-    return `${checkoutOutputStr}\n\n${restoredItemsTitle}\n${restoredItemsOutput}${getCheckoutErrorStr()}`;
+    const restoredItemsOutput = restoredItems.map(item => (0, _cli().formatItem)(item)).join('\n');
+    return (0, _cli().joinSections)([checkoutOutputStr, `${(0, _cli().formatSuccessSummary)('The following have been restored successfully')}\n${restoredItemsOutput}`, getCheckoutErrorStr()]);
   }
 }
 exports.MergeAbortLaneCmd = MergeAbortLaneCmd;

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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 type { CheckoutProps } from '@teambit/checkout';\nimport { checkoutOutput } from '@teambit/checkout';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport type { 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":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_checkout","_cli","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeAbortLaneCmd","constructor","mergeLanes","report","_","skipDependencyInstallation","verbose","silent","checkoutProps","reset","all","skipNpmInstall","mergeAbortOpts","checkoutResults","restoredItems","checkoutError","abortLaneMerge","getCheckoutErrorStr","errMsg","message","chalk","red","checkoutOutputStr","checkoutOutput","restoredItemsOutput","map","item","formatItem","join","joinSections","formatSuccessSummary","exports"],"sources":["merge-abort.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { CheckoutProps } from '@teambit/checkout';\nimport { checkoutOutput } from '@teambit/checkout';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { formatItem, formatSuccessSummary, joinSections } from '@teambit/cli';\nimport type { 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 restoredItemsOutput = restoredItems.map((item) => formatItem(item)).join('\\n');\n\n    return joinSections([\n      checkoutOutputStr,\n      `${formatSuccessSummary('The following have been restored successfully')}\\n${restoredItemsOutput}`,\n      getCheckoutErrorStr(),\n    ]);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merge-move.cmd.js

@@ -11,6 +11,13 @@ function _chalk() {
   };
   return data;
 }
+function _cli() {
+  const data = require("@teambit/cli");
+  _cli = function () {
+    return data;
+  };
+  return data;
+}
 function _bitError() {
   const data = require("@teambit/bit-error");
   _bitError = function () {
@@ -49,9 +56,9 @@ in order to move all local merge changes to a new lane, you can simply create a
       scope
     });
     const remoteScopeOrDefaultScope = scope ? `the remote scope ${_chalk().default.bold(scope)}` : `the default-scope ${_chalk().default.bold(result.laneId.scope)}. you can change the lane's scope, before it is exported, with the "bit lane change-scope" command`;
-    const title = _chalk().default.green(`successfully added and checked out to the new lane ${_chalk().default.bold(result.alias || result.laneId.name)} based on lane ${_chalk().default.bold(currentLane.name)}`);
-    const remoteScopeOutput = `this lane will be exported to ${remoteScopeOrDefaultScope}`;
-    return `${title}\n${remoteScopeOutput}`;
+    const title = (0, _cli().formatSuccessSummary)(`added and checked out to the new lane ${_chalk().default.bold(result.alias || result.laneId.name)} based on lane ${_chalk().default.bold(currentLane.name)}`);
+    const remoteScopeOutput = (0, _cli().formatHint)(`this lane will be exported to ${remoteScopeOrDefaultScope}`);
+    return (0, _cli().joinSections)([title, remoteScopeOutput]);
   }
 }
 exports.MergeMoveLaneCmd = MergeMoveLaneCmd;

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeMoveLaneCmd","constructor","mergeLanes","report","newLaneName","scope","currentLane","lanes","getCurrentLane","BitError","result","mergeMove","remoteScopeOrDefaultScope","chalk","bold","laneId","title","green","alias","name","remoteScopeOutput","exports"],"sources":["merge-move.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\nimport { BitError } from '@teambit/bit-error';\n\nexport type MergeAbortOpts = {\n  silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeMoveLaneCmd implements Command {\n  name = 'merge-move <new-lane-name>';\n  description = `EXPERIMENT. move the current merge state into a new lane. the current lane will be reset`;\n  extendedDescription = `this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.`;\n  alias = '';\n  options = [\n    [\n      's',\n      'scope <scope-name>',\n      'remote scope to which this lane will be exported, default to the workspace.json\\'s defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [newLaneName]: [string],\n    {\n      scope,\n    }: {\n      scope?: string;\n    }\n  ): Promise<string> {\n    const currentLane = await this.mergeLanes.lanes.getCurrentLane();\n    if (!currentLane) {\n      throw new BitError(`this command makes sense only when checked out to a lane. otherwise, there is no lane to revert to.\nin order to move all local merge changes to a new lane, you can simply create a new lane (bit lane create)`);\n    }\n    const result = await this.mergeLanes.mergeMove(newLaneName, { scope });\n    const remoteScopeOrDefaultScope = scope\n      ? `the remote scope ${chalk.bold(scope)}`\n      : `the default-scope ${chalk.bold(\n          result.laneId.scope\n        )}. you can change the lane's scope, before it is exported, with the \"bit lane change-scope\" command`;\n    const title = chalk.green(\n      `successfully added and checked out to the new lane ${chalk.bold(\n        result.alias || result.laneId.name\n      )} based on lane ${chalk.bold(currentLane.name)}`\n    );\n    const remoteScopeOutput = `this lane will be exported to ${remoteScopeOrDefaultScope}`;\n    return `${title}\\n${remoteScopeOutput}`;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_cli","_bitError","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeMoveLaneCmd","constructor","mergeLanes","report","newLaneName","scope","currentLane","lanes","getCurrentLane","BitError","result","mergeMove","remoteScopeOrDefaultScope","chalk","bold","laneId","title","formatSuccessSummary","alias","name","remoteScopeOutput","formatHint","joinSections","exports"],"sources":["merge-move.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { formatSuccessSummary, formatHint, joinSections } from '@teambit/cli';\nimport type { MergeLanesMain } from './merge-lanes.main.runtime';\nimport { BitError } from '@teambit/bit-error';\n\nexport type MergeAbortOpts = {\n  silent?: boolean; // don't show prompt before aborting\n};\n\nexport class MergeMoveLaneCmd implements Command {\n  name = 'merge-move <new-lane-name>';\n  description = `EXPERIMENT. move the current merge state into a new lane. the current lane will be reset`;\n  extendedDescription = `this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.`;\n  alias = '';\n  options = [\n    [\n      's',\n      'scope <scope-name>',\n      'remote scope to which this lane will be exported, default to the workspace.json\\'s defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")',\n    ],\n  ] as CommandOptions;\n  loader = true;\n  remoteOp = true;\n\n  constructor(private mergeLanes: MergeLanesMain) {}\n\n  async report(\n    [newLaneName]: [string],\n    {\n      scope,\n    }: {\n      scope?: string;\n    }\n  ): Promise<string> {\n    const currentLane = await this.mergeLanes.lanes.getCurrentLane();\n    if (!currentLane) {\n      throw new BitError(`this command makes sense only when checked out to a lane. otherwise, there is no lane to revert to.\nin order to move all local merge changes to a new lane, you can simply create a new lane (bit lane create)`);\n    }\n    const result = await this.mergeLanes.mergeMove(newLaneName, { scope });\n    const remoteScopeOrDefaultScope = scope\n      ? `the remote scope ${chalk.bold(scope)}`\n      : `the default-scope ${chalk.bold(\n          result.laneId.scope\n        )}. you can change the lane's scope, before it is exported, with the \"bit lane change-scope\" command`;\n    const title = formatSuccessSummary(\n      `added and checked out to the new lane ${chalk.bold(\n        result.alias || result.laneId.name\n      )} based on lane ${chalk.bold(currentLane.name)}`\n    );\n    const remoteScopeOutput = formatHint(`this lane will be exported to ${remoteScopeOrDefaultScope}`);\n    return joinSections([title, remoteScopeOutput]);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merge-lanes",
-  "version": "1.0.953",
+  "version": "1.0.955",
   "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "merge-lanes",
-    "version": "1.0.953"
+    "version": "1.0.955"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -16,30 +16,30 @@
     "lodash": "4.17.21",
     "p-map-series": "2.1.0",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/harmony": "0.4.7",
-    "@teambit/component-id": "1.2.4",
-    "@teambit/lane-id": "0.0.312",
-    "@teambit/express": "0.0.1413",
-    "@teambit/logger": "0.0.1407",
     "@teambit/legacy.bit-map": "0.0.164",
     "@teambit/legacy.consumer": "0.0.107",
     "@teambit/legacy.scope": "0.0.107",
-    "@teambit/objects": "0.0.445",
-    "@teambit/scope": "1.0.938",
-    "@teambit/checkout": "1.0.938",
-    "@teambit/cli": "0.0.1314",
     "@teambit/component.modules.merge-helper": "0.0.50",
-    "@teambit/config-store": "0.0.194",
     "@teambit/legacy.constants": "0.0.26",
-    "@teambit/merging": "1.0.939",
-    "@teambit/remove": "1.0.938",
+    "@teambit/harmony": "0.4.7",
+    "@teambit/component-id": "1.2.4",
     "@teambit/component.snap-distance": "0.0.108",
-    "@teambit/config-merger": "0.0.805",
-    "@teambit/export": "1.0.938",
     "@teambit/harmony.modules.get-basic-log": "0.0.108",
-    "@teambit/importer": "1.0.938",
-    "@teambit/lanes": "1.0.953",
-    "@teambit/workspace": "1.0.938"
+    "@teambit/lane-id": "0.0.312",
+    "@teambit/express": "0.0.1414",
+    "@teambit/logger": "0.0.1408",
+    "@teambit/objects": "0.0.447",
+    "@teambit/scope": "1.0.940",
+    "@teambit/checkout": "1.0.940",
+    "@teambit/cli": "0.0.1315",
+    "@teambit/config-store": "0.0.195",
+    "@teambit/merging": "1.0.941",
+    "@teambit/remove": "1.0.940",
+    "@teambit/config-merger": "0.0.807",
+    "@teambit/export": "1.0.940",
+    "@teambit/importer": "1.0.940",
+    "@teambit/lanes": "1.0.955",
+    "@teambit/workspace": "1.0.940"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",