@teambit/git 0.0.63 → 0.0.65

package/dist/git.cmd.js

@@ -1,19 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GitCmd = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
   _chalk = function () {
@@ -21,15 +11,19 @@ function _chalk() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const COMMAND_NAME = 'git';
 class GitCmd {
   constructor() {
-    (0, _defineProperty2().default)(this, "name", `${COMMAND_NAME} <sub-command>`);
-    (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "description", 'perform git operations');
-    (0, _defineProperty2().default)(this, "options", []);
-    (0, _defineProperty2().default)(this, "group", 'git');
-    (0, _defineProperty2().default)(this, "commands", []);
+    _defineProperty(this, "name", `${COMMAND_NAME} <sub-command>`);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "description", 'perform git operations');
+    _defineProperty(this, "options", []);
+    _defineProperty(this, "group", 'git');
+    _defineProperty(this, "commands", []);
   }
   // helpUrl = '';
 

package/dist/git.cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","COMMAND_NAME","GitCmd","constructor","_defineProperty2","default","report","unrecognizedSubcommand","chalk","red","exports"],"sources":["git.cmd.ts"],"sourcesContent":["import { Command } from '@teambit/cli';\nimport chalk from 'chalk';\n\nconst COMMAND_NAME = 'git';\n\nexport class GitCmd implements Command {\n  name = `${COMMAND_NAME} <sub-command>`;\n  alias = '';\n  description = 'perform git operations';\n  options = [];\n  group = 'git';\n  commands: Command[] = [];\n  // helpUrl = '';\n\n  async report([unrecognizedSubcommand]: [string]) {\n    return chalk.red(\n      `\"${unrecognizedSubcommand}\" is not a subcommand of \"git\", please run \"bit git --help\" to list the subcommands`\n    );\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;AAEA,MAAMG,YAAY,GAAG,KAAK;AAEnB,MAAMC,MAAM,CAAoB;EAAAC,YAAA;IAAA,IAAAC,gBAAA,GAAAC,OAAA,gBAC7B,GAAEJ,YAAa,gBAAe;IAAA,IAAAG,gBAAA,GAAAC,OAAA,iBAC9B,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,uBACI,wBAAwB;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBAC5B,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,iBACJ,KAAK;IAAA,IAAAD,gBAAA,GAAAC,OAAA,oBACS,EAAE;EAAA;EACxB;;EAEA,MAAMC,MAAMA,CAAC,CAACC,sBAAsB,CAAW,EAAE;IAC/C,OAAOC,gBAAK,CAACC,GAAG,CACb,IAAGF,sBAAuB,qFAC7B,CAAC;EACH;AACF;AAACG,OAAA,CAAAR,MAAA,GAAAA,MAAA"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","COMMAND_NAME","GitCmd","constructor","report","unrecognizedSubcommand","chalk","red","exports"],"sources":["git.cmd.ts"],"sourcesContent":["import { Command } from '@teambit/cli';\nimport chalk from 'chalk';\n\nconst COMMAND_NAME = 'git';\n\nexport class GitCmd implements Command {\n  name = `${COMMAND_NAME} <sub-command>`;\n  alias = '';\n  description = 'perform git operations';\n  options = [];\n  group = 'git';\n  commands: Command[] = [];\n  // helpUrl = '';\n\n  async report([unrecognizedSubcommand]: [string]) {\n    return chalk.red(\n      `\"${unrecognizedSubcommand}\" is not a subcommand of \"git\", please run \"bit git --help\" to list the subcommands`\n    );\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,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,GAAA,QAAAR,GAAA,GAAAS,YAAA,CAAAD,GAAA,2BAAAR,GAAA,gBAAAA,GAAA,GAAAU,MAAA,CAAAV,GAAA;AAAA,SAAAS,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAAK,IAAA,CAAAP,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAE,SAAA,4DAAAP,IAAA,gBAAAF,MAAA,GAAAU,MAAA,EAAAT,KAAA;AAE1B,MAAMU,YAAY,GAAG,KAAK;AAEnB,MAAMC,MAAM,CAAoB;EAAAC,YAAA;IAAAxB,eAAA,eAC7B,GAAEsB,YAAa,gBAAe;IAAAtB,eAAA,gBAC9B,EAAE;IAAAA,eAAA,sBACI,wBAAwB;IAAAA,eAAA,kBAC5B,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;EAAA;EACxB;;EAEA,MAAMyB,MAAMA,CAAC,CAACC,sBAAsB,CAAW,EAAE;IAC/C,OAAOC,gBAAK,CAACC,GAAG,CACb,IAAGF,sBAAuB,qFAC7B,CAAC;EACH;AACF;AAACG,OAAA,CAAAN,MAAA,GAAAA,MAAA"}

package/dist/git.main.runtime.js

@@ -1,19 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.GitMain = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _fsExtra() {
   const data = _interopRequireDefault(require("fs-extra"));
   _fsExtra = function () {
@@ -91,6 +81,10 @@ function _git2() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const GIT_BASE_KEY = 'merge.bitmap-driver';
 const GIT_NAME_KEY = `${GIT_BASE_KEY}.name`;
 const GIT_DRIVER_KEY = `${GIT_BASE_KEY}.driver`;
@@ -135,7 +129,7 @@ class GitMain {
       gitVal = await _gitconfig().default.get(GIT_NAME_KEY, {
         location
       });
-    } catch (_unused) {
+    } catch {
       // do nothing, it just means that there is no config yet which is fine
     }
     if (gitVal) {
@@ -196,11 +190,11 @@ class GitMain {
   }
 }
 exports.GitMain = GitMain;
-(0, _defineProperty2().default)(GitMain, "slots", []);
+_defineProperty(GitMain, "slots", []);
 // define your aspect dependencies here.
 // in case you need to use another aspect API.
-(0, _defineProperty2().default)(GitMain, "dependencies", [_cli().CLIAspect, _workspace().WorkspaceAspect]);
-(0, _defineProperty2().default)(GitMain, "runtime", _cli().MainRuntime);
+_defineProperty(GitMain, "dependencies", [_cli().CLIAspect, _workspace().WorkspaceAspect]);
+_defineProperty(GitMain, "runtime", _cli().MainRuntime);
 _git().GitAspect.addRuntime(GitMain);
 var _default = GitMain;
 exports.default = _default;

package/dist/git.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_fsExtra","data","_interopRequireDefault","require","_bitError","_os","_path","_gitconfig","_cli","_workspace","_git","_mergeBitmaps","_setGitMergeDriver","_git2","GIT_BASE_KEY","GIT_NAME_KEY","GIT_DRIVER_KEY","GIT_NAME_VALUE","GIT_DRIVER_VALUE","GIT_ATTRIBUTES","GitMain","constructor","workspace","config","mergeBitmaps","ancestor","current","other","encoding","currentContent","stripBom","fs","readFileSync","otherContent","opts","mergeStrategy","merged","bitMap","outputFile","setGitMergeDriver","setGitConfig","setGitAttributes","isGit","pathExists","global","BitError","location","gitVal","gitconfig","get","_unused","set","attributesPath","getGitAttributesPath","fileExist","writeFile","gitAttributes","readFile","includes","appendFile","fromConfig","xdgConfigHome","process","env","XDG_CONFIG_HOME","join","homedir","str","slice","provider","cli","gitMain","gitCmd","GitCmd","commands","SetGitMergeDriverCmd","MergeBitmapsCmd","register","registerGroup","exports","_defineProperty2","default","CLIAspect","WorkspaceAspect","MainRuntime","GitAspect","addRuntime","_default"],"sources":["git.main.runtime.ts"],"sourcesContent":["import fs from 'fs-extra';\nimport { BitError } from '@teambit/bit-error';\nimport { homedir } from 'os';\nimport { join } from 'path';\nimport gitconfig from 'gitconfig';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, Workspace, BitmapMergeOptions } from '@teambit/workspace';\nimport { GitAspect } from './git.aspect';\nimport { MergeBitmapsCmd } from './merge-bitmaps.cmd';\nimport { SetGitMergeDriverCmd } from './set-git-merge-driver.cmd';\nimport { GitCmd } from './git.cmd';\n\ntype SetGitMergeDriverOpts = {\n  global?: boolean;\n};\n\nconst GIT_BASE_KEY = 'merge.bitmap-driver';\nconst GIT_NAME_KEY = `${GIT_BASE_KEY}.name`;\nconst GIT_DRIVER_KEY = `${GIT_BASE_KEY}.driver`;\n\nconst GIT_NAME_VALUE = 'A custom merge driver used to resolve conflicts in .bitmap files';\n// const binName = process.argv[1];\nconst GIT_DRIVER_VALUE = 'bd git merge-bitmaps %O %A %B';\n\nconst GIT_ATTRIBUTES = '.bitmap merge=bitmap-driver';\n\nexport interface GitExtWorkspaceConfig {\n  mergeStrategy: 'ours' | 'theirs' | 'manual';\n}\nexport class GitMain {\n  constructor(\n    private workspace: Workspace,\n    /**\n     * Git extension configuration.\n     */\n    readonly config: GitExtWorkspaceConfig\n  ) {}\n\n  async mergeBitmaps(ancestor: string, current: string, other: string) {\n    const encoding = 'utf-8';\n    // const ancestorContent = this.stripBom(fs.readFileSync(ancestor, encoding));\n    const currentContent = this.stripBom(fs.readFileSync(current, encoding));\n    const otherContent = this.stripBom(fs.readFileSync(other, encoding));\n    const opts: BitmapMergeOptions = {\n      mergeStrategy: this.config.mergeStrategy || 'manual',\n    };\n    const merged = this.workspace.bitMap.mergeBitmaps(currentContent, otherContent, opts);\n    await fs.outputFile(current, merged);\n    return merged;\n  }\n\n  async setGitMergeDriver(opts: SetGitMergeDriverOpts) {\n    await this.setGitConfig(opts);\n    await this.setGitAttributes(opts);\n    return true;\n  }\n\n  private async setGitConfig(opts: SetGitMergeDriverOpts) {\n    const isGit = await fs.pathExists('.git');\n    if (!isGit && !opts.global) {\n      throw new BitError('This is not a git repository');\n    }\n    const location = opts.global ? 'global' : 'local';\n    let gitVal;\n    try {\n      gitVal = await gitconfig.get(GIT_NAME_KEY, { location });\n    } catch {\n      // do nothing, it just means that there is no config yet which is fine\n    }\n    if (gitVal) {\n      return; // already set\n    }\n    await gitconfig.set(GIT_NAME_KEY, GIT_NAME_VALUE, { location });\n    await gitconfig.set(GIT_DRIVER_KEY, GIT_DRIVER_VALUE, { location });\n  }\n\n  private async setGitAttributes(opts: SetGitMergeDriverOpts) {\n    const attributesPath = await this.getGitAttributesPath(opts.global);\n    const isGit = await fs.pathExists('.git');\n    if (!isGit && !opts.global) {\n      throw new BitError('This is not a git repository');\n    }\n    const fileExist = await fs.pathExists(attributesPath);\n    if (!fileExist) {\n      await fs.writeFile(attributesPath, GIT_ATTRIBUTES);\n    } else {\n      const gitAttributes = await fs.readFile(attributesPath, 'utf8');\n      if (gitAttributes.includes(GIT_ATTRIBUTES)) {\n        return; // already set\n      }\n      await fs.appendFile(attributesPath, `\\n${GIT_ATTRIBUTES}`);\n    }\n  }\n\n  private async getGitAttributesPath(global = false) {\n    const fromConfig = await gitconfig.get('core.attributesFile', { location: global ? 'global' : 'local' });\n    if (fromConfig) {\n      return fromConfig;\n    }\n    if (!global) {\n      return '.gitattributes';\n    }\n    const xdgConfigHome = process.env.XDG_CONFIG_HOME;\n    if (xdgConfigHome) {\n      return join(xdgConfigHome, 'git', 'attributes');\n    }\n    return join(homedir(), '.config', 'git', 'attributes');\n  }\n\n  private stripBom(str) {\n    return str[0] === '\\uFEFF' ? str.slice(1) : str;\n  }\n\n  static slots = [];\n  // define your aspect dependencies here.\n  // in case you need to use another aspect API.\n  static dependencies = [CLIAspect, WorkspaceAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig) {\n    const gitMain = new GitMain(workspace, config);\n    const gitCmd = new GitCmd();\n    gitCmd.commands = [new SetGitMergeDriverCmd(gitMain), new MergeBitmapsCmd(gitMain)];\n    cli.register(gitCmd);\n    cli.registerGroup('git', 'Git');\n    return gitMain;\n  }\n}\n\nGitAspect.addRuntime(GitMain);\n\nexport default GitMain;\n"],"mappings":"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"}
+{"version":3,"names":["_fsExtra","data","_interopRequireDefault","require","_bitError","_os","_path","_gitconfig","_cli","_workspace","_git","_mergeBitmaps","_setGitMergeDriver","_git2","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","GIT_BASE_KEY","GIT_NAME_KEY","GIT_DRIVER_KEY","GIT_NAME_VALUE","GIT_DRIVER_VALUE","GIT_ATTRIBUTES","GitMain","constructor","workspace","config","mergeBitmaps","ancestor","current","other","encoding","currentContent","stripBom","fs","readFileSync","otherContent","opts","mergeStrategy","merged","bitMap","outputFile","setGitMergeDriver","setGitConfig","setGitAttributes","isGit","pathExists","global","BitError","location","gitVal","gitconfig","get","set","attributesPath","getGitAttributesPath","fileExist","writeFile","gitAttributes","readFile","includes","appendFile","fromConfig","xdgConfigHome","process","env","XDG_CONFIG_HOME","join","homedir","str","slice","provider","cli","gitMain","gitCmd","GitCmd","commands","SetGitMergeDriverCmd","MergeBitmapsCmd","register","registerGroup","exports","CLIAspect","WorkspaceAspect","MainRuntime","GitAspect","addRuntime","_default"],"sources":["git.main.runtime.ts"],"sourcesContent":["import fs from 'fs-extra';\nimport { BitError } from '@teambit/bit-error';\nimport { homedir } from 'os';\nimport { join } from 'path';\nimport gitconfig from 'gitconfig';\nimport { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, Workspace, BitmapMergeOptions } from '@teambit/workspace';\nimport { GitAspect } from './git.aspect';\nimport { MergeBitmapsCmd } from './merge-bitmaps.cmd';\nimport { SetGitMergeDriverCmd } from './set-git-merge-driver.cmd';\nimport { GitCmd } from './git.cmd';\n\ntype SetGitMergeDriverOpts = {\n  global?: boolean;\n};\n\nconst GIT_BASE_KEY = 'merge.bitmap-driver';\nconst GIT_NAME_KEY = `${GIT_BASE_KEY}.name`;\nconst GIT_DRIVER_KEY = `${GIT_BASE_KEY}.driver`;\n\nconst GIT_NAME_VALUE = 'A custom merge driver used to resolve conflicts in .bitmap files';\n// const binName = process.argv[1];\nconst GIT_DRIVER_VALUE = 'bd git merge-bitmaps %O %A %B';\n\nconst GIT_ATTRIBUTES = '.bitmap merge=bitmap-driver';\n\nexport interface GitExtWorkspaceConfig {\n  mergeStrategy: 'ours' | 'theirs' | 'manual';\n}\nexport class GitMain {\n  constructor(\n    private workspace: Workspace,\n    /**\n     * Git extension configuration.\n     */\n    readonly config: GitExtWorkspaceConfig\n  ) {}\n\n  async mergeBitmaps(ancestor: string, current: string, other: string) {\n    const encoding = 'utf-8';\n    // const ancestorContent = this.stripBom(fs.readFileSync(ancestor, encoding));\n    const currentContent = this.stripBom(fs.readFileSync(current, encoding));\n    const otherContent = this.stripBom(fs.readFileSync(other, encoding));\n    const opts: BitmapMergeOptions = {\n      mergeStrategy: this.config.mergeStrategy || 'manual',\n    };\n    const merged = this.workspace.bitMap.mergeBitmaps(currentContent, otherContent, opts);\n    await fs.outputFile(current, merged);\n    return merged;\n  }\n\n  async setGitMergeDriver(opts: SetGitMergeDriverOpts) {\n    await this.setGitConfig(opts);\n    await this.setGitAttributes(opts);\n    return true;\n  }\n\n  private async setGitConfig(opts: SetGitMergeDriverOpts) {\n    const isGit = await fs.pathExists('.git');\n    if (!isGit && !opts.global) {\n      throw new BitError('This is not a git repository');\n    }\n    const location = opts.global ? 'global' : 'local';\n    let gitVal;\n    try {\n      gitVal = await gitconfig.get(GIT_NAME_KEY, { location });\n    } catch {\n      // do nothing, it just means that there is no config yet which is fine\n    }\n    if (gitVal) {\n      return; // already set\n    }\n    await gitconfig.set(GIT_NAME_KEY, GIT_NAME_VALUE, { location });\n    await gitconfig.set(GIT_DRIVER_KEY, GIT_DRIVER_VALUE, { location });\n  }\n\n  private async setGitAttributes(opts: SetGitMergeDriverOpts) {\n    const attributesPath = await this.getGitAttributesPath(opts.global);\n    const isGit = await fs.pathExists('.git');\n    if (!isGit && !opts.global) {\n      throw new BitError('This is not a git repository');\n    }\n    const fileExist = await fs.pathExists(attributesPath);\n    if (!fileExist) {\n      await fs.writeFile(attributesPath, GIT_ATTRIBUTES);\n    } else {\n      const gitAttributes = await fs.readFile(attributesPath, 'utf8');\n      if (gitAttributes.includes(GIT_ATTRIBUTES)) {\n        return; // already set\n      }\n      await fs.appendFile(attributesPath, `\\n${GIT_ATTRIBUTES}`);\n    }\n  }\n\n  private async getGitAttributesPath(global = false) {\n    const fromConfig = await gitconfig.get('core.attributesFile', { location: global ? 'global' : 'local' });\n    if (fromConfig) {\n      return fromConfig;\n    }\n    if (!global) {\n      return '.gitattributes';\n    }\n    const xdgConfigHome = process.env.XDG_CONFIG_HOME;\n    if (xdgConfigHome) {\n      return join(xdgConfigHome, 'git', 'attributes');\n    }\n    return join(homedir(), '.config', 'git', 'attributes');\n  }\n\n  private stripBom(str) {\n    return str[0] === '\\uFEFF' ? str.slice(1) : str;\n  }\n\n  static slots = [];\n  // define your aspect dependencies here.\n  // in case you need to use another aspect API.\n  static dependencies = [CLIAspect, WorkspaceAspect];\n\n  static runtime = MainRuntime;\n\n  static async provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig) {\n    const gitMain = new GitMain(workspace, config);\n    const gitCmd = new GitCmd();\n    gitCmd.commands = [new SetGitMergeDriverCmd(gitMain), new MergeBitmapsCmd(gitMain)];\n    cli.register(gitCmd);\n    cli.registerGroup('git', 'Git');\n    return gitMain;\n  }\n}\n\nGitAspect.addRuntime(GitMain);\n\nexport default GitMain;\n"],"mappings":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,QAAA,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;AACA,SAAAI,IAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,GAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,MAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,KAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,WAAA;EAAA,MAAAN,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAI,UAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,KAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,IAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,WAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,UAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,KAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,IAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,cAAA;EAAA,MAAAV,IAAA,GAAAE,OAAA;EAAAQ,aAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,mBAAA;EAAA,MAAAX,IAAA,GAAAE,OAAA;EAAAS,kBAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,MAAA;EAAA,MAAAZ,IAAA,GAAAE,OAAA;EAAAU,KAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAmC,SAAAC,uBAAAY,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,GAAA,QAAAR,GAAA,GAAAS,YAAA,CAAAD,GAAA,2BAAAR,GAAA,gBAAAA,GAAA,GAAAU,MAAA,CAAAV,GAAA;AAAA,SAAAS,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAAK,IAAA,CAAAP,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAE,SAAA,4DAAAP,IAAA,gBAAAF,MAAA,GAAAU,MAAA,EAAAT,KAAA;AAMnC,MAAMU,YAAY,GAAG,qBAAqB;AAC1C,MAAMC,YAAY,GAAI,GAAED,YAAa,OAAM;AAC3C,MAAME,cAAc,GAAI,GAAEF,YAAa,SAAQ;AAE/C,MAAMG,cAAc,GAAG,kEAAkE;AACzF;AACA,MAAMC,gBAAgB,GAAG,+BAA+B;AAExD,MAAMC,cAAc,GAAG,6BAA6B;AAK7C,MAAMC,OAAO,CAAC;EACnBC,WAAWA,CACDC,SAAoB;EAC5B;AACJ;AACA;EACaC,MAA6B,EACtC;IAAA,KALQD,SAAoB,GAApBA,SAAoB;IAAA,KAInBC,MAA6B,GAA7BA,MAA6B;EACrC;EAEH,MAAMC,YAAYA,CAACC,QAAgB,EAAEC,OAAe,EAAEC,KAAa,EAAE;IACnE,MAAMC,QAAQ,GAAG,OAAO;IACxB;IACA,MAAMC,cAAc,GAAG,IAAI,CAACC,QAAQ,CAACC,kBAAE,CAACC,YAAY,CAACN,OAAO,EAAEE,QAAQ,CAAC,CAAC;IACxE,MAAMK,YAAY,GAAG,IAAI,CAACH,QAAQ,CAACC,kBAAE,CAACC,YAAY,CAACL,KAAK,EAAEC,QAAQ,CAAC,CAAC;IACpE,MAAMM,IAAwB,GAAG;MAC/BC,aAAa,EAAE,IAAI,CAACZ,MAAM,CAACY,aAAa,IAAI;IAC9C,CAAC;IACD,MAAMC,MAAM,GAAG,IAAI,CAACd,SAAS,CAACe,MAAM,CAACb,YAAY,CAACK,cAAc,EAAEI,YAAY,EAAEC,IAAI,CAAC;IACrF,MAAMH,kBAAE,CAACO,UAAU,CAACZ,OAAO,EAAEU,MAAM,CAAC;IACpC,OAAOA,MAAM;EACf;EAEA,MAAMG,iBAAiBA,CAACL,IAA2B,EAAE;IACnD,MAAM,IAAI,CAACM,YAAY,CAACN,IAAI,CAAC;IAC7B,MAAM,IAAI,CAACO,gBAAgB,CAACP,IAAI,CAAC;IACjC,OAAO,IAAI;EACb;EAEA,MAAcM,YAAYA,CAACN,IAA2B,EAAE;IACtD,MAAMQ,KAAK,GAAG,MAAMX,kBAAE,CAACY,UAAU,CAAC,MAAM,CAAC;IACzC,IAAI,CAACD,KAAK,IAAI,CAACR,IAAI,CAACU,MAAM,EAAE;MAC1B,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;IACpD;IACA,MAAMC,QAAQ,GAAGZ,IAAI,CAACU,MAAM,GAAG,QAAQ,GAAG,OAAO;IACjD,IAAIG,MAAM;IACV,IAAI;MACFA,MAAM,GAAG,MAAMC,oBAAS,CAACC,GAAG,CAAClC,YAAY,EAAE;QAAE+B;MAAS,CAAC,CAAC;IAC1D,CAAC,CAAC,MAAM;MACN;IAAA;IAEF,IAAIC,MAAM,EAAE;MACV,OAAO,CAAC;IACV;;IACA,MAAMC,oBAAS,CAACE,GAAG,CAACnC,YAAY,EAAEE,cAAc,EAAE;MAAE6B;IAAS,CAAC,CAAC;IAC/D,MAAME,oBAAS,CAACE,GAAG,CAAClC,cAAc,EAAEE,gBAAgB,EAAE;MAAE4B;IAAS,CAAC,CAAC;EACrE;EAEA,MAAcL,gBAAgBA,CAACP,IAA2B,EAAE;IAC1D,MAAMiB,cAAc,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAAClB,IAAI,CAACU,MAAM,CAAC;IACnE,MAAMF,KAAK,GAAG,MAAMX,kBAAE,CAACY,UAAU,CAAC,MAAM,CAAC;IACzC,IAAI,CAACD,KAAK,IAAI,CAACR,IAAI,CAACU,MAAM,EAAE;MAC1B,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;IACpD;IACA,MAAMQ,SAAS,GAAG,MAAMtB,kBAAE,CAACY,UAAU,CAACQ,cAAc,CAAC;IACrD,IAAI,CAACE,SAAS,EAAE;MACd,MAAMtB,kBAAE,CAACuB,SAAS,CAACH,cAAc,EAAEhC,cAAc,CAAC;IACpD,CAAC,MAAM;MACL,MAAMoC,aAAa,GAAG,MAAMxB,kBAAE,CAACyB,QAAQ,CAACL,cAAc,EAAE,MAAM,CAAC;MAC/D,IAAII,aAAa,CAACE,QAAQ,CAACtC,cAAc,CAAC,EAAE;QAC1C,OAAO,CAAC;MACV;;MACA,MAAMY,kBAAE,CAAC2B,UAAU,CAACP,cAAc,EAAG,KAAIhC,cAAe,EAAC,CAAC;IAC5D;EACF;EAEA,MAAciC,oBAAoBA,CAACR,MAAM,GAAG,KAAK,EAAE;IACjD,MAAMe,UAAU,GAAG,MAAMX,oBAAS,CAACC,GAAG,CAAC,qBAAqB,EAAE;MAAEH,QAAQ,EAAEF,MAAM,GAAG,QAAQ,GAAG;IAAQ,CAAC,CAAC;IACxG,IAAIe,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;IACA,IAAI,CAACf,MAAM,EAAE;MACX,OAAO,gBAAgB;IACzB;IACA,MAAMgB,aAAa,GAAGC,OAAO,CAACC,GAAG,CAACC,eAAe;IACjD,IAAIH,aAAa,EAAE;MACjB,OAAO,IAAAI,YAAI,EAACJ,aAAa,EAAE,KAAK,EAAE,YAAY,CAAC;IACjD;IACA,OAAO,IAAAI,YAAI,EAAC,IAAAC,aAAO,EAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC;EACxD;EAEQnC,QAAQA,CAACoC,GAAG,EAAE;IACpB,OAAOA,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,GAAGA,GAAG,CAACC,KAAK,CAAC,CAAC,CAAC,GAAGD,GAAG;EACjD;EASA,aAAaE,QAAQA,CAAC,CAACC,GAAG,EAAE/C,SAAS,CAAuB,EAAEC,MAA6B,EAAE;IAC3F,MAAM+C,OAAO,GAAG,IAAIlD,OAAO,CAACE,SAAS,EAAEC,MAAM,CAAC;IAC9C,MAAMgD,MAAM,GAAG,KAAIC,cAAM,EAAC,CAAC;IAC3BD,MAAM,CAACE,QAAQ,GAAG,CAAC,KAAIC,yCAAoB,EAACJ,OAAO,CAAC,EAAE,KAAIK,+BAAe,EAACL,OAAO,CAAC,CAAC;IACnFD,GAAG,CAACO,QAAQ,CAACL,MAAM,CAAC;IACpBF,GAAG,CAACQ,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC;IAC/B,OAAOP,OAAO;EAChB;AACF;AAACQ,OAAA,CAAA1D,OAAA,GAAAA,OAAA;AAAA5B,eAAA,CAnGY4B,OAAO,WAoFH,EAAE;AACjB;AACA;AAAA5B,eAAA,CAtFW4B,OAAO,kBAuFI,CAAC2D,gBAAS,EAAEC,4BAAe,CAAC;AAAAxF,eAAA,CAvFvC4B,OAAO,aAyFD6D,kBAAW;AAY9BC,gBAAS,CAACC,UAAU,CAAC/D,OAAO,CAAC;AAAC,IAAAgE,QAAA,GAEfhE,OAAO;AAAA0D,OAAA,CAAAvF,OAAA,GAAA6F,QAAA"}

package/dist/merge-bitmaps.cmd.js

@@ -1,19 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MergeBitmapsCmd = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
   _chalk = function () {
@@ -21,6 +11,10 @@ function _chalk() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const COMMAND_NAME = 'merge-bitmaps';
 
 // - `%O`: ancestor’s version of the conflicting file
@@ -32,13 +26,13 @@ class MergeBitmapsCmd {
 
   constructor(git) {
     this.git = git;
-    (0, _defineProperty2().default)(this, "name", `${COMMAND_NAME} <ancestor> <current> <other>`);
-    (0, _defineProperty2().default)(this, "alias", '');
-    (0, _defineProperty2().default)(this, "description", `a special command to merge conflicting bitmap files during git merge`);
-    (0, _defineProperty2().default)(this, "options", []);
-    (0, _defineProperty2().default)(this, "group", 'git');
-    (0, _defineProperty2().default)(this, "commands", []);
-    (0, _defineProperty2().default)(this, "private", true);
+    _defineProperty(this, "name", `${COMMAND_NAME} <ancestor> <current> <other>`);
+    _defineProperty(this, "alias", '');
+    _defineProperty(this, "description", `a special command to merge conflicting bitmap files during git merge`);
+    _defineProperty(this, "options", []);
+    _defineProperty(this, "group", 'git');
+    _defineProperty(this, "commands", []);
+    _defineProperty(this, "private", true);
   }
   async report([ancestor, current, other]) {
     const res = await this.git.mergeBitmaps(ancestor, current, other);

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","COMMAND_NAME","MergeBitmapsCmd","constructor","git","_defineProperty2","default","report","ancestor","current","other","res","mergeBitmaps","chalk","green","red","exports"],"sources":["merge-bitmaps.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { 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 = 'git';\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;AAGA,MAAMG,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAA,IAAAC,gBAAA,GAAAC,OAAA,gBATxB,GAAEL,YAAa,+BAA8B;IAAA,IAAAI,gBAAA,GAAAC,OAAA,iBAC7C,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,uBACK,sEAAqE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBAC1E,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,iBACJ,KAAK;IAAA,IAAAD,gBAAA,GAAAC,OAAA,oBACS,EAAE;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBACd,IAAI;EAGqB;EAEnC,MAAMC,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACP,GAAG,CAACQ,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,CAAAd,eAAA,GAAAA,eAAA"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","COMMAND_NAME","MergeBitmapsCmd","constructor","git","report","ancestor","current","other","mergeBitmaps","chalk","green","red","exports"],"sources":["merge-bitmaps.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { 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 = 'git';\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,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,GAAA,QAAAR,GAAA,GAAAS,YAAA,CAAAD,GAAA,2BAAAR,GAAA,gBAAAA,GAAA,GAAAU,MAAA,CAAAV,GAAA;AAAA,SAAAS,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAAK,IAAA,CAAAP,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAE,SAAA,4DAAAP,IAAA,gBAAAF,MAAA,GAAAU,MAAA,EAAAT,KAAA;AAG1B,MAAMU,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAzB,eAAA,eATxB,GAAEsB,YAAa,+BAA8B;IAAAtB,eAAA,gBAC7C,EAAE;IAAAA,eAAA,sBACK,sEAAqE;IAAAA,eAAA,kBAC1E,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;IAAAA,eAAA,kBACd,IAAI;EAGqB;EAEnC,MAAM0B,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMX,GAAG,GAAG,MAAM,IAAI,CAACO,GAAG,CAACK,YAAY,CAACH,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAC;IACjE,IAAIX,GAAG,EAAE;MACP,OAAOa,gBAAK,CAACC,KAAK,CAAC,uCAAuC,CAAC;IAC7D;IACA,OAAOD,gBAAK,CAACE,GAAG,CAAC,8BAA8B,CAAC;EAClD;AACF;AAACC,OAAA,CAAAX,eAAA,GAAAA,eAAA"}

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

@@ -1,18 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SetGitMergeDriverCmd = void 0;
-function _defineProperty2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-  _defineProperty2 = function () {
-    return data;
-  };
-  return data;
-}
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
   _chalk = function () {
@@ -20,18 +11,22 @@ function _chalk() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const COMMAND_NAME = 'set-merge-driver';
 class SetGitMergeDriverCmd {
   // helpUrl = '';
 
   constructor(git) {
     this.git = git;
-    (0, _defineProperty2().default)(this, "name", COMMAND_NAME);
-    (0, _defineProperty2().default)(this, "alias", 'smd');
-    (0, _defineProperty2().default)(this, "description", `setup bit's git merge driver for bitmap files`);
-    (0, _defineProperty2().default)(this, "options", [['g', 'global', 'set the git merge driver globally']]);
-    (0, _defineProperty2().default)(this, "group", 'git');
-    (0, _defineProperty2().default)(this, "commands", []);
+    _defineProperty(this, "name", COMMAND_NAME);
+    _defineProperty(this, "alias", 'smd');
+    _defineProperty(this, "description", `setup bit's git merge driver for bitmap files`);
+    _defineProperty(this, "options", [['g', 'global', 'set the git merge driver globally']]);
+    _defineProperty(this, "group", 'git');
+    _defineProperty(this, "commands", []);
   }
   async report(_args, flags) {
     const res = await this.git.setGitMergeDriver(flags);

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

@@ -1 +1 @@
-{"version":3,"names":["_chalk","data","_interopRequireDefault","require","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","_defineProperty2","default","report","_args","flags","res","setGitMergeDriver","chalk","green","red","exports"],"sources":["set-git-merge-driver.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { 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 = 'git';\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;AAGA,MAAMG,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAA,IAAAC,gBAAA,GAAAC,OAAA,gBARzBL,YAAY;IAAA,IAAAI,gBAAA,GAAAC,OAAA,iBACX,KAAK;IAAA,IAAAD,gBAAA,GAAAC,OAAA,uBACE,+CAA8C;IAAA,IAAAD,gBAAA,GAAAC,OAAA,mBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAA,IAAAD,gBAAA,GAAAC,OAAA,iBACxD,KAAK;IAAA,IAAAD,gBAAA,GAAAC,OAAA,oBACS,EAAE;EAGW;EAEnC,MAAMC,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACN,GAAG,CAACO,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,CAAAb,oBAAA,GAAAA,oBAAA"}
+{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","report","_args","flags","setGitMergeDriver","chalk","green","red","exports"],"sources":["set-git-merge-driver.cmd.ts"],"sourcesContent":["import { Command, CommandOptions } from '@teambit/cli';\nimport chalk from 'chalk';\nimport { 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 = 'git';\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,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,GAAA,QAAAR,GAAA,GAAAS,YAAA,CAAAD,GAAA,2BAAAR,GAAA,gBAAAA,GAAA,GAAAU,MAAA,CAAAV,GAAA;AAAA,SAAAS,aAAAE,KAAA,EAAAC,IAAA,eAAAD,KAAA,iBAAAA,KAAA,kBAAAA,KAAA,MAAAE,IAAA,GAAAF,KAAA,CAAAG,MAAA,CAAAC,WAAA,OAAAF,IAAA,KAAAG,SAAA,QAAAC,GAAA,GAAAJ,IAAA,CAAAK,IAAA,CAAAP,KAAA,EAAAC,IAAA,2BAAAK,GAAA,sBAAAA,GAAA,YAAAE,SAAA,4DAAAP,IAAA,gBAAAF,MAAA,GAAAU,MAAA,EAAAT,KAAA;AAG1B,MAAMU,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAzB,eAAA,eARzBsB,YAAY;IAAAtB,eAAA,gBACX,KAAK;IAAAA,eAAA,sBACE,+CAA8C;IAAAA,eAAA,kBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAAA,eAAA,gBACxD,KAAK;IAAAA,eAAA,mBACS,EAAE;EAGW;EAEnC,MAAM0B,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMV,GAAG,GAAG,MAAM,IAAI,CAACO,GAAG,CAACI,iBAAiB,CAACD,KAAK,CAAC;IACnD,IAAIV,GAAG,EAAE;MACP,OAAOY,gBAAK,CAACC,KAAK,CAAC,uCAAuC,CAAC;IAC7D;IACA,OAAOD,gBAAK,CAACE,GAAG,CAAC,8BAA8B,CAAC;EAClD;AACF;AAACC,OAAA,CAAAV,oBAAA,GAAAA,oBAAA"}

package/package.json

@@ -1,23 +1,21 @@
 {
   "name": "@teambit/git",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "0.0.63"
+    "version": "0.0.65"
   },
   "dependencies": {
     "chalk": "2.4.2",
     "fs-extra": "10.0.0",
     "gitconfig": "2.0.8",
-    "core-js": "^3.0.0",
-    "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.772",
+    "@teambit/cli": "0.0.774",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/workspace": "0.0.1158"
+    "@teambit/workspace": "0.0.1160"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -29,7 +27,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.557",
+    "@teambit/legacy": "1.0.559",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },