@teambit/git 0.0.13 → 0.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/git.aspect.js.map +1 -1
- package/dist/git.cmd.js.map +1 -1
- package/dist/git.main.runtime.js +2 -0
- package/dist/git.main.runtime.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/merge-bitmaps.cmd.js.map +1 -1
- package/dist/set-git-merge-driver.cmd.js.map +1 -1
- package/package-tar/teambit-git-0.0.15.tgz +0 -0
- package/package.json +4 -4
- package/package-tar/teambit-git-0.0.13.tgz +0 -0
- /package/dist/{preview-1689563727913.js → preview-1689736586631.js} +0 -0
package/dist/git.aspect.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["GitAspect","Aspect","create","id"],"sources":["git.aspect.ts"],"sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const GitAspect = Aspect.create({\n id: 'teambit.git/git',\n});\n"],"mappings":";;;;;;AAAA;EAAA;
|
1
|
+
{"version":3,"names":["_harmony","data","require","GitAspect","Aspect","create","id","exports"],"sources":["git.aspect.ts"],"sourcesContent":["import { Aspect } from '@teambit/harmony';\n\nexport const GitAspect = Aspect.create({\n id: 'teambit.git/git',\n});\n"],"mappings":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,SAAS,GAAGC,iBAAM,CAACC,MAAM,CAAC;EACrCC,EAAE,EAAE;AACN,CAAC,CAAC;AAACC,OAAA,CAAAJ,SAAA,GAAAA,SAAA"}
|
package/dist/git.cmd.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["COMMAND_NAME","GitCmd","report","unrecognizedSubcommand","chalk","red"],"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;EAAA;
|
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"}
|
package/dist/git.main.runtime.js
CHANGED
@@ -189,6 +189,8 @@ class GitMain {
|
|
189
189
|
}
|
190
190
|
exports.GitMain = GitMain;
|
191
191
|
(0, _defineProperty2().default)(GitMain, "slots", []);
|
192
|
+
// define your aspect dependencies here.
|
193
|
+
// in case you need to use another aspect API.
|
192
194
|
(0, _defineProperty2().default)(GitMain, "dependencies", [_cli().CLIAspect, _workspace().WorkspaceAspect]);
|
193
195
|
(0, _defineProperty2().default)(GitMain, "runtime", _cli().MainRuntime);
|
194
196
|
_git().GitAspect.addRuntime(GitMain);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["GIT_BASE_KEY","GIT_NAME_KEY","GIT_DRIVER_KEY","GIT_NAME_VALUE","GIT_DRIVER_VALUE","GIT_ATTRIBUTES","GitMain","constructor","workspace","mergeBitmaps","ancestor","current","other","encoding","currentContent","stripBom","fs","readFileSync","otherContent","merged","bitMap","outputFile","setGitMergeDriver","opts","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","CLIAspect","WorkspaceAspect","MainRuntime","GitAspect","addRuntime"],"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 } 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 = 'bit git merge-bitmaps %O %A %B';\n\nconst GIT_ATTRIBUTES = '.bitmap merge=bitmap-driver';\n\nexport class GitMain {\n constructor(private workspace: Workspace) {}\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 merged = this.workspace.bitMap.mergeBitmaps(currentContent, otherContent);\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]) {\n const gitMain = new GitMain(workspace);\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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"}
|
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","mergeBitmaps","ancestor","current","other","encoding","currentContent","stripBom","fs","readFileSync","otherContent","merged","bitMap","outputFile","setGitMergeDriver","opts","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 } 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 = 'bit git merge-bitmaps %O %A %B';\n\nconst GIT_ATTRIBUTES = '.bitmap merge=bitmap-driver';\n\nexport class GitMain {\n constructor(private workspace: Workspace) {}\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 merged = this.workspace.bitMap.mergeBitmaps(currentContent, otherContent);\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]) {\n const gitMain = new GitMain(workspace);\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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"}
|
package/dist/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["GitAspect"],"sources":["index.ts"],"sourcesContent":["import { GitAspect } from './git.aspect';\n\nexport type { GitMain } from './git.main.runtime';\nexport default GitAspect;\nexport { GitAspect };\n"],"mappings":";;;;;;;;;;;;AAAA;EAAA;
|
1
|
+
{"version":3,"names":["_git","data","require","_default","GitAspect","exports","default"],"sources":["index.ts"],"sourcesContent":["import { GitAspect } from './git.aspect';\n\nexport type { GitMain } from './git.main.runtime';\nexport default GitAspect;\nexport { GitAspect };\n"],"mappings":";;;;;;;;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAyC,IAAAE,QAAA,GAG1BC,gBAAS;AAAAC,OAAA,CAAAC,OAAA,GAAAH,QAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["COMMAND_NAME","MergeBitmapsCmd","constructor","git","report","ancestor","current","other","res","mergeBitmaps","chalk","green","red"],"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;EAAA;
|
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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","report","_args","flags","res","setGitMergeDriver","chalk","green","red"],"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;EAAA;
|
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"}
|
Binary file
|
package/package.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@teambit/git",
|
3
|
-
"version": "0.0.
|
3
|
+
"version": "0.0.15",
|
4
4
|
"homepage": "https://bit.cloud/teambit/git/git",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"componentId": {
|
7
7
|
"scope": "teambit.git",
|
8
8
|
"name": "git",
|
9
|
-
"version": "0.0.
|
9
|
+
"version": "0.0.15"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
12
|
"chalk": "2.4.2",
|
@@ -15,9 +15,9 @@
|
|
15
15
|
"core-js": "^3.0.0",
|
16
16
|
"@babel/runtime": "7.20.0",
|
17
17
|
"@teambit/harmony": "0.4.6",
|
18
|
-
"@teambit/cli": "0.0.
|
18
|
+
"@teambit/cli": "0.0.742",
|
19
19
|
"@teambit/bit-error": "0.0.402",
|
20
|
-
"@teambit/workspace": "0.0.
|
20
|
+
"@teambit/workspace": "0.0.1110"
|
21
21
|
},
|
22
22
|
"devDependencies": {
|
23
23
|
"@types/fs-extra": "9.0.7",
|
Binary file
|
File without changes
|