@teambit/git 1.0.515 → 1.0.516

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.git/git@1.0.515" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.git/git@1.0.516" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -464,7 +464,7 @@
                 "line": 28,
                 "character": 3
               },
-              "signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
+              "signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
               "name": "mergeStrategy",
               "type": {
                 "__schema": "TypeUnionSchema",
@@ -1171,7 +1171,7 @@
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.515"
+    "version": "1.0.516"
   },
   "taggedModuleExports": []
 }

package/dist/git.main.runtime.js

@@ -33,7 +33,7 @@ function _path() {
   return data;
 }
 function _gitconfig() {
-  const data = _interopRequireDefault(require("gitconfig"));
+  const data = _interopRequireDefault(require("@teambit/gitconfig"));
   _gitconfig = function () {
     return data;
   };

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","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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":"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","ignoreList":[]}
+{"version":3,"names":["_fsExtra","data","_interopRequireDefault","require","_bitError","_os","_path","_gitconfig","_cli","_workspace","_git","_mergeBitmaps","_setGitMergeDriver","_git2","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","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 '@teambit/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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","ignoreList":[]}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@teambit/git",
-  "version": "1.0.515",
+  "version": "1.0.516",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.515"
+    "version": "1.0.516"
   },
   "dependencies": {
     "chalk": "2.4.2",
+    "@teambit/gitconfig": "2.0.10",
     "fs-extra": "10.0.0",
-    "gitconfig": "2.0.8",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.1092",
-    "@teambit/workspace": "1.0.515"
+    "@teambit/cli": "0.0.1093",
+    "@teambit/workspace": "1.0.516"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",