@teambit/git 1.0.108 → 1.0.109

package/artifacts/preview/teambit_git_git-preview.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["teambit.git/git-preview"]=t():e["teambit.git/git-preview"]=t()}(self,(()=>(()=>{"use strict";var e={d:(t,o)=>{for(var i in o)e.o(o,i)&&!e.o(t,i)&&Object.defineProperty(t,i,{enumerable:!0,get:o[i]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};e.r(t),e.d(t,{compositions:()=>o,compositions_metadata:()=>r,overview:()=>i});const o=[],i=[],r={compositions:[]};return t})()));

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/git",
-  "version": "1.0.108",
+  "version": "1.0.109",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.108"
+    "version": "1.0.109"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -14,15 +14,15 @@
     "gitconfig": "2.0.8",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.840",
-    "@teambit/workspace": "1.0.108"
+    "@teambit/cli": "0.0.841",
+    "@teambit/workspace": "1.0.109"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/mocha": "9.1.0",
     "@types/jest": "^29.2.2",
     "@types/testing-library__jest-dom": "^5.9.5",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.13"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.14"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.624"

package/git.aspect.ts

@@ -1,5 +0,0 @@
-import { Aspect } from '@teambit/harmony';
-
-export const GitAspect = Aspect.create({
-  id: 'teambit.git/git',
-});

package/git.cmd.ts

@@ -1,20 +0,0 @@
-import { Command } from '@teambit/cli';
-import chalk from 'chalk';
-
-const COMMAND_NAME = 'git';
-
-export class GitCmd implements Command {
-  name = `${COMMAND_NAME} <sub-command>`;
-  alias = '';
-  description = 'perform git operations';
-  options = [];
-  group = 'git';
-  commands: Command[] = [];
-  // helpUrl = '';
-
-  async report([unrecognizedSubcommand]: [string]) {
-    return chalk.red(
-      `"${unrecognizedSubcommand}" is not a subcommand of "git", please run "bit git --help" to list the subcommands`
-    );
-  }
-}

package/git.main.runtime.ts

@@ -1,133 +0,0 @@
-import fs from 'fs-extra';
-import { BitError } from '@teambit/bit-error';
-import { homedir } from 'os';
-import { join } from 'path';
-import gitconfig from 'gitconfig';
-import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';
-import { WorkspaceAspect, Workspace, BitmapMergeOptions } from '@teambit/workspace';
-import { GitAspect } from './git.aspect';
-import { MergeBitmapsCmd } from './merge-bitmaps.cmd';
-import { SetGitMergeDriverCmd } from './set-git-merge-driver.cmd';
-import { GitCmd } from './git.cmd';
-
-type SetGitMergeDriverOpts = {
-  global?: boolean;
-};
-
-const GIT_BASE_KEY = 'merge.bitmap-driver';
-const GIT_NAME_KEY = `${GIT_BASE_KEY}.name`;
-const GIT_DRIVER_KEY = `${GIT_BASE_KEY}.driver`;
-
-const GIT_NAME_VALUE = 'A custom merge driver used to resolve conflicts in .bitmap files';
-// const binName = process.argv[1];
-const GIT_DRIVER_VALUE = 'bd git merge-bitmaps %O %A %B';
-
-const GIT_ATTRIBUTES = '.bitmap merge=bitmap-driver';
-
-export interface GitExtWorkspaceConfig {
-  mergeStrategy: 'ours' | 'theirs' | 'manual';
-}
-export class GitMain {
-  constructor(
-    private workspace: Workspace,
-    /**
-     * Git extension configuration.
-     */
-    readonly config: GitExtWorkspaceConfig
-  ) {}
-
-  async mergeBitmaps(ancestor: string, current: string, other: string) {
-    const encoding = 'utf-8';
-    // const ancestorContent = this.stripBom(fs.readFileSync(ancestor, encoding));
-    const currentContent = this.stripBom(fs.readFileSync(current, encoding));
-    const otherContent = this.stripBom(fs.readFileSync(other, encoding));
-    const opts: BitmapMergeOptions = {
-      mergeStrategy: this.config.mergeStrategy || 'manual',
-    };
-    const merged = this.workspace.bitMap.mergeBitmaps(currentContent, otherContent, opts);
-    await fs.outputFile(current, merged);
-    return merged;
-  }
-
-  async setGitMergeDriver(opts: SetGitMergeDriverOpts) {
-    await this.setGitConfig(opts);
-    await this.setGitAttributes(opts);
-    return true;
-  }
-
-  private async setGitConfig(opts: SetGitMergeDriverOpts) {
-    const isGit = await fs.pathExists('.git');
-    if (!isGit && !opts.global) {
-      throw new BitError('This is not a git repository');
-    }
-    const location = opts.global ? 'global' : 'local';
-    let gitVal;
-    try {
-      gitVal = await gitconfig.get(GIT_NAME_KEY, { location });
-    } catch {
-      // do nothing, it just means that there is no config yet which is fine
-    }
-    if (gitVal) {
-      return; // already set
-    }
-    await gitconfig.set(GIT_NAME_KEY, GIT_NAME_VALUE, { location });
-    await gitconfig.set(GIT_DRIVER_KEY, GIT_DRIVER_VALUE, { location });
-  }
-
-  private async setGitAttributes(opts: SetGitMergeDriverOpts) {
-    const attributesPath = await this.getGitAttributesPath(opts.global);
-    const isGit = await fs.pathExists('.git');
-    if (!isGit && !opts.global) {
-      throw new BitError('This is not a git repository');
-    }
-    const fileExist = await fs.pathExists(attributesPath);
-    if (!fileExist) {
-      await fs.writeFile(attributesPath, GIT_ATTRIBUTES);
-    } else {
-      const gitAttributes = await fs.readFile(attributesPath, 'utf8');
-      if (gitAttributes.includes(GIT_ATTRIBUTES)) {
-        return; // already set
-      }
-      await fs.appendFile(attributesPath, `\n${GIT_ATTRIBUTES}`);
-    }
-  }
-
-  private async getGitAttributesPath(global = false) {
-    const fromConfig = await gitconfig.get('core.attributesFile', { location: global ? 'global' : 'local' });
-    if (fromConfig) {
-      return fromConfig;
-    }
-    if (!global) {
-      return '.gitattributes';
-    }
-    const xdgConfigHome = process.env.XDG_CONFIG_HOME;
-    if (xdgConfigHome) {
-      return join(xdgConfigHome, 'git', 'attributes');
-    }
-    return join(homedir(), '.config', 'git', 'attributes');
-  }
-
-  private stripBom(str) {
-    return str[0] === '\uFEFF' ? str.slice(1) : str;
-  }
-
-  static slots = [];
-  // define your aspect dependencies here.
-  // in case you need to use another aspect API.
-  static dependencies = [CLIAspect, WorkspaceAspect];
-
-  static runtime = MainRuntime;
-
-  static async provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig) {
-    const gitMain = new GitMain(workspace, config);
-    const gitCmd = new GitCmd();
-    gitCmd.commands = [new SetGitMergeDriverCmd(gitMain), new MergeBitmapsCmd(gitMain)];
-    cli.register(gitCmd);
-    cli.registerGroup('git', 'Git');
-    return gitMain;
-  }
-}
-
-GitAspect.addRuntime(GitMain);
-
-export default GitMain;

package/index.ts

@@ -1,5 +0,0 @@
-import { GitAspect } from './git.aspect';
-
-export type { GitMain } from './git.main.runtime';
-export default GitAspect;
-export { GitAspect };

package/merge-bitmaps.cmd.ts

@@ -1,30 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import chalk from 'chalk';
-import { GitMain } from './git.main.runtime';
-
-const COMMAND_NAME = 'merge-bitmaps';
-
-// - `%O`: ancestor’s version of the conflicting file
-// - `%A`: current version of the conflicting file
-// - `%B`: other branch's version of the conflicting file
-
-export class MergeBitmapsCmd implements Command {
-  name = `${COMMAND_NAME} <ancestor> <current> <other>`;
-  alias = '';
-  description = `a special command to merge conflicting bitmap files during git merge`;
-  options = [] as CommandOptions;
-  group = 'git';
-  commands: Command[] = [];
-  private = true;
-  // helpUrl = '';
-
-  constructor(private git: GitMain) {}
-
-  async report([ancestor, current, other]: string[]) {
-    const res = await this.git.mergeBitmaps(ancestor, current, other);
-    if (res) {
-      return chalk.green('git merge driver was successfully set');
-    }
-    return chalk.red('git merge driver was not set');
-  }
-}

package/set-git-merge-driver.cmd.ts

@@ -1,29 +0,0 @@
-import { Command, CommandOptions } from '@teambit/cli';
-import chalk from 'chalk';
-import { GitMain } from './git.main.runtime';
-
-const COMMAND_NAME = 'set-merge-driver';
-
-type SetGitMergeDriverFlags = {
-  global?: boolean;
-};
-
-export class SetGitMergeDriverCmd implements Command {
-  name = COMMAND_NAME;
-  alias = 'smd';
-  description = `setup bit's git merge driver for bitmap files`;
-  options = [['g', 'global', 'set the git merge driver globally']] as CommandOptions;
-  group = 'git';
-  commands: Command[] = [];
-  // helpUrl = '';
-
-  constructor(private git: GitMain) {}
-
-  async report(_args, flags: SetGitMergeDriverFlags) {
-    const res = await this.git.setGitMergeDriver(flags);
-    if (res) {
-      return chalk.green('git merge driver was successfully set');
-    }
-    return chalk.red('git merge driver was not set');
-  }
-}