@teambit/git 1.0.938 → 1.0.940

package/dist/merge-bitmaps.cmd.js

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MergeBitmapsCmd = void 0;
-function _chalk() {
-  const data = _interopRequireDefault(require("chalk"));
-  _chalk = function () {
+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 + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -37,9 +36,9 @@ class MergeBitmapsCmd {
   async report([ancestor, current, other]) {
     const res = await this.git.mergeBitmaps(ancestor, current, other);
     if (res) {
-      return _chalk().default.green('git merge driver was successfully set');
+      return (0, _cli().formatSuccessSummary)('bitmap files merged successfully');
     }
-    return _chalk().default.red('git merge driver was not set');
+    return `${_cli().errorSymbol} bitmap merge failed`;
   }
 }
 exports.MergeBitmapsCmd = MergeBitmapsCmd;

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","COMMAND_NAME","MergeBitmapsCmd","constructor","git","report","ancestor","current","other","res","mergeBitmaps","chalk","green","red","exports"],"sources":["merge-bitmaps.cmd.ts"],"sourcesContent":["import type { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport type { GitMain } from './git.main.runtime';\n\nconst COMMAND_NAME = 'merge-bitmaps';\n\n// - `%O`: ancestor’s version of the conflicting file\n// - `%A`: current version of the conflicting file\n// - `%B`: other branch's version of the conflicting file\n\nexport class MergeBitmapsCmd implements Command {\n  name = `${COMMAND_NAME} <ancestor> <current> <other>`;\n  alias = '';\n  description = `a special command to merge conflicting bitmap files during git merge`;\n  options = [] as CommandOptions;\n  group = 'workspace-tools';\n  commands: Command[] = [];\n  private = true;\n  // helpUrl = '';\n\n  constructor(private git: GitMain) {}\n\n  async report([ancestor, current, other]: string[]) {\n    const res = await this.git.mergeBitmaps(ancestor, current, other);\n    if (res) {\n      return chalk.green('git merge driver was successfully set');\n    }\n    return chalk.red('git merge driver was not set');\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0B,SAAAC,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAG1B,MAAMgB,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAArB,eAAA,eATzB,GAAGkB,YAAY,+BAA+B;IAAAlB,eAAA,gBAC7C,EAAE;IAAAA,eAAA,sBACI,sEAAsE;IAAAA,eAAA,kBAC1E,EAAE;IAAAA,eAAA,gBACJ,iBAAiB;IAAAA,eAAA,mBACH,EAAE;IAAAA,eAAA,kBACd,IAAI;EAGqB;EAEnC,MAAMsB,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACL,GAAG,CAACM,YAAY,CAACJ,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAC;IACjE,IAAIC,GAAG,EAAE;MACP,OAAOE,gBAAK,CAACC,KAAK,CAAC,uCAAuC,CAAC;IAC7D;IACA,OAAOD,gBAAK,CAACE,GAAG,CAAC,8BAA8B,CAAC;EAClD;AACF;AAACC,OAAA,CAAAZ,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_cli","data","require","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","COMMAND_NAME","MergeBitmapsCmd","constructor","git","report","ancestor","current","other","res","mergeBitmaps","formatSuccessSummary","errorSymbol","exports"],"sources":["merge-bitmaps.cmd.ts"],"sourcesContent":["import type { Command, CommandOptions } from '@teambit/cli';\nimport { formatSuccessSummary, errorSymbol } from '@teambit/cli';\nimport type { GitMain } from './git.main.runtime';\n\nconst COMMAND_NAME = 'merge-bitmaps';\n\n// - `%O`: ancestor’s version of the conflicting file\n// - `%A`: current version of the conflicting file\n// - `%B`: other branch's version of the conflicting file\n\nexport class MergeBitmapsCmd implements Command {\n  name = `${COMMAND_NAME} <ancestor> <current> <other>`;\n  alias = '';\n  description = `a special command to merge conflicting bitmap files during git merge`;\n  options = [] as CommandOptions;\n  group = 'workspace-tools';\n  commands: Command[] = [];\n  private = true;\n  // helpUrl = '';\n\n  constructor(private git: GitMain) {}\n\n  async report([ancestor, current, other]: string[]) {\n    const res = await this.git.mergeBitmaps(ancestor, current, other);\n    if (res) {\n      return formatSuccessSummary('bitmap files merged successfully');\n    }\n    return `${errorSymbol} bitmap merge failed`;\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiE,SAAAE,gBAAAC,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAD,CAAA,GAAAI,MAAA,CAAAC,cAAA,CAAAL,CAAA,EAAAC,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAT,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAG,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAb,CAAA,QAAAU,CAAA,GAAAV,CAAA,CAAAc,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAGjE,MAAMgB,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAtB,eAAA,eATzB,GAAGmB,YAAY,+BAA+B;IAAAnB,eAAA,gBAC7C,EAAE;IAAAA,eAAA,sBACI,sEAAsE;IAAAA,eAAA,kBAC1E,EAAE;IAAAA,eAAA,gBACJ,iBAAiB;IAAAA,eAAA,mBACH,EAAE;IAAAA,eAAA,kBACd,IAAI;EAGqB;EAEnC,MAAMuB,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACL,GAAG,CAACM,YAAY,CAACJ,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAC;IACjE,IAAIC,GAAG,EAAE;MACP,OAAO,IAAAE,2BAAoB,EAAC,kCAAkC,CAAC;IACjE;IACA,OAAO,GAAGC,kBAAW,sBAAsB;EAC7C;AACF;AAACC,OAAA,CAAAX,eAAA,GAAAA,eAAA","ignoreList":[]}

package/dist/set-git-merge-driver.cmd.js

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SetGitMergeDriverCmd = void 0;
-function _chalk() {
-  const data = _interopRequireDefault(require("chalk"));
-  _chalk = function () {
+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 + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -31,9 +30,9 @@ class SetGitMergeDriverCmd {
   async report(_args, flags) {
     const res = await this.git.setGitMergeDriver(flags);
     if (res) {
-      return _chalk().default.green('git merge driver was successfully set');
+      return (0, _cli().formatSuccessSummary)('git merge driver was set');
     }
-    return _chalk().default.red('git merge driver was not set');
+    return `${_cli().errorSymbol} git merge driver was not set`;
   }
 }
 exports.SetGitMergeDriverCmd = SetGitMergeDriverCmd;

package/dist/set-git-merge-driver.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","report","_args","flags","res","setGitMergeDriver","chalk","green","red","exports"],"sources":["set-git-merge-driver.cmd.ts"],"sourcesContent":["import type { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport type { GitMain } from './git.main.runtime';\n\nconst COMMAND_NAME = 'set-merge-driver';\n\ntype SetGitMergeDriverFlags = {\n  global?: boolean;\n};\n\nexport class SetGitMergeDriverCmd implements Command {\n  name = COMMAND_NAME;\n  alias = 'smd';\n  description = `setup bit's git merge driver for bitmap files`;\n  options = [['g', 'global', 'set the git merge driver globally']] as CommandOptions;\n  group = 'workspace-tools';\n  commands: Command[] = [];\n  // helpUrl = '';\n\n  constructor(private git: GitMain) {}\n\n  async report(_args, flags: SetGitMergeDriverFlags) {\n    const res = await this.git.setGitMergeDriver(flags);\n    if (res) {\n      return chalk.green('git merge driver was successfully set');\n    }\n    return chalk.red('git merge driver was not set');\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA0B,SAAAC,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAG1B,MAAMgB,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAArB,eAAA,eARzBkB,YAAY;IAAAlB,eAAA,gBACX,KAAK;IAAAA,eAAA,sBACC,+CAA+C;IAAAA,eAAA,kBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAAA,eAAA,gBACxD,iBAAiB;IAAAA,eAAA,mBACH,EAAE;EAGW;EAEnC,MAAMsB,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACJ,GAAG,CAACK,iBAAiB,CAACF,KAAK,CAAC;IACnD,IAAIC,GAAG,EAAE;MACP,OAAOE,gBAAK,CAACC,KAAK,CAAC,uCAAuC,CAAC;IAC7D;IACA,OAAOD,gBAAK,CAACE,GAAG,CAAC,8BAA8B,CAAC;EAClD;AACF;AAACC,OAAA,CAAAX,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_cli","data","require","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","report","_args","flags","res","setGitMergeDriver","formatSuccessSummary","errorSymbol","exports"],"sources":["set-git-merge-driver.cmd.ts"],"sourcesContent":["import type { Command, CommandOptions } from '@teambit/cli';\nimport { formatSuccessSummary, errorSymbol } from '@teambit/cli';\nimport type { GitMain } from './git.main.runtime';\n\nconst COMMAND_NAME = 'set-merge-driver';\n\ntype SetGitMergeDriverFlags = {\n  global?: boolean;\n};\n\nexport class SetGitMergeDriverCmd implements Command {\n  name = COMMAND_NAME;\n  alias = 'smd';\n  description = `setup bit's git merge driver for bitmap files`;\n  options = [['g', 'global', 'set the git merge driver globally']] as CommandOptions;\n  group = 'workspace-tools';\n  commands: Command[] = [];\n  // helpUrl = '';\n\n  constructor(private git: GitMain) {}\n\n  async report(_args, flags: SetGitMergeDriverFlags) {\n    const res = await this.git.setGitMergeDriver(flags);\n    if (res) {\n      return formatSuccessSummary('git merge driver was set');\n    }\n    return `${errorSymbol} git merge driver was not set`;\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiE,SAAAE,gBAAAC,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAD,CAAA,GAAAI,MAAA,CAAAC,cAAA,CAAAL,CAAA,EAAAC,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAT,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAG,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAb,CAAA,QAAAU,CAAA,GAAAV,CAAA,CAAAc,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAGjE,MAAMgB,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAtB,eAAA,eARzBmB,YAAY;IAAAnB,eAAA,gBACX,KAAK;IAAAA,eAAA,sBACC,+CAA+C;IAAAA,eAAA,kBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAAA,eAAA,gBACxD,iBAAiB;IAAAA,eAAA,mBACH,EAAE;EAGW;EAEnC,MAAMuB,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACJ,GAAG,CAACK,iBAAiB,CAACF,KAAK,CAAC;IACnD,IAAIC,GAAG,EAAE;MACP,OAAO,IAAAE,2BAAoB,EAAC,0BAA0B,CAAC;IACzD;IACA,OAAO,GAAGC,kBAAW,+BAA+B;EACtD;AACF;AAACC,OAAA,CAAAV,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/git",
-  "version": "1.0.938",
+  "version": "1.0.940",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.938"
+    "version": "1.0.940"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -14,8 +14,8 @@
     "fs-extra": "10.0.0",
     "@teambit/harmony": "0.4.7",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.1314",
-    "@teambit/workspace": "1.0.938"
+    "@teambit/cli": "0.0.1315",
+    "@teambit/workspace": "1.0.940"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",