@teambit/git 1.0.227 → 1.0.229

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.227" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.git/git@1.0.229" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -48,7 +48,11 @@
                     "line": 32,
                     "character": 24
                   },
-                  "name": "Workspace"
+                  "name": "Workspace",
+                  "componentId": {
+                    "scope": "teambit.workspace",
+                    "name": "workspace"
+                  }
                 },
                 "isOptional": false,
                 "isSpread": false
@@ -68,7 +72,8 @@
                     "line": 36,
                     "character": 22
                   },
-                  "name": "GitExtWorkspaceConfig"
+                  "name": "GitExtWorkspaceConfig",
+                  "internalFilePath": "git.main.runtime.ts"
                 },
                 "isOptional": false,
                 "isSpread": false
@@ -194,7 +199,8 @@
                     "line": 52,
                     "character": 33
                   },
-                  "name": "SetGitMergeDriverOpts"
+                  "name": "SetGitMergeDriverOpts",
+                  "internalFilePath": "git.main.runtime.ts"
                 },
                 "isOptional": false,
                 "isSpread": false
@@ -309,7 +315,11 @@
                         "line": 121,
                         "character": 44
                       },
-                      "name": "CLIMain"
+                      "name": "CLIMain",
+                      "componentId": {
+                        "scope": "teambit.harmony",
+                        "name": "cli"
+                      }
                     },
                     {
                       "__schema": "TypeRefSchema",
@@ -318,7 +328,11 @@
                         "line": 121,
                         "character": 53
                       },
-                      "name": "Workspace"
+                      "name": "Workspace",
+                      "componentId": {
+                        "scope": "teambit.workspace",
+                        "name": "workspace"
+                      }
                     }
                   ]
                 },
@@ -340,7 +354,8 @@
                     "line": 121,
                     "character": 73
                   },
-                  "name": "GitExtWorkspaceConfig"
+                  "name": "GitExtWorkspaceConfig",
+                  "internalFilePath": "git.main.runtime.ts"
                 },
                 "isOptional": false,
                 "isSpread": false
@@ -508,7 +523,11 @@
                       "line": 32,
                       "character": 24
                     },
-                    "name": "Workspace"
+                    "name": "Workspace",
+                    "componentId": {
+                      "scope": "teambit.workspace",
+                      "name": "workspace"
+                    }
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -528,7 +547,8 @@
                       "line": 36,
                       "character": 22
                     },
-                    "name": "GitExtWorkspaceConfig"
+                    "name": "GitExtWorkspaceConfig",
+                    "internalFilePath": "git.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -654,7 +674,8 @@
                       "line": 52,
                       "character": 33
                     },
-                    "name": "SetGitMergeDriverOpts"
+                    "name": "SetGitMergeDriverOpts",
+                    "internalFilePath": "git.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -769,7 +790,11 @@
                           "line": 121,
                           "character": 44
                         },
-                        "name": "CLIMain"
+                        "name": "CLIMain",
+                        "componentId": {
+                          "scope": "teambit.harmony",
+                          "name": "cli"
+                        }
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -778,7 +803,11 @@
                           "line": 121,
                           "character": 53
                         },
-                        "name": "Workspace"
+                        "name": "Workspace",
+                        "componentId": {
+                          "scope": "teambit.workspace",
+                          "name": "workspace"
+                        }
                       }
                     ]
                   },
@@ -800,7 +829,8 @@
                       "line": 121,
                       "character": 73
                     },
-                    "name": "GitExtWorkspaceConfig"
+                    "name": "GitExtWorkspaceConfig",
+                    "internalFilePath": "git.main.runtime.ts"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -1121,7 +1151,7 @@
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.227"
+    "version": "1.0.229"
   },
   "taggedModuleExports": []
 }

package/dist/git.aspect.d.ts

@@ -0,0 +1,2 @@
+import { Aspect } from '@teambit/harmony';
+export declare const GitAspect: Aspect;

package/dist/git.cmd.d.ts

@@ -0,0 +1,10 @@
+import { Command } from '@teambit/cli';
+export declare class GitCmd implements Command {
+    name: string;
+    alias: string;
+    description: string;
+    options: never[];
+    group: string;
+    commands: Command[];
+    report([unrecognizedSubcommand]: [string]): Promise<string>;
+}

package/dist/git.main.runtime.d.ts

@@ -0,0 +1,31 @@
+import { CLIMain } from '@teambit/cli';
+import { Workspace } from '@teambit/workspace';
+type SetGitMergeDriverOpts = {
+    global?: boolean;
+};
+export interface GitExtWorkspaceConfig {
+    mergeStrategy: 'ours' | 'theirs' | 'manual';
+}
+export declare class GitMain {
+    private workspace;
+    /**
+     * Git extension configuration.
+     */
+    readonly config: GitExtWorkspaceConfig;
+    constructor(workspace: Workspace, 
+    /**
+     * Git extension configuration.
+     */
+    config: GitExtWorkspaceConfig);
+    mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>;
+    setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>;
+    private setGitConfig;
+    private setGitAttributes;
+    private getGitAttributesPath;
+    private stripBom;
+    static slots: never[];
+    static dependencies: import("@teambit/harmony").Aspect[];
+    static runtime: import("@teambit/harmony").RuntimeDefinition;
+    static provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>;
+}
+export default GitMain;

package/dist/index.d.ts

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

package/dist/merge-bitmaps.cmd.d.ts

@@ -0,0 +1,14 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { GitMain } from './git.main.runtime';
+export declare class MergeBitmapsCmd implements Command {
+    private git;
+    name: string;
+    alias: string;
+    description: string;
+    options: CommandOptions;
+    group: string;
+    commands: Command[];
+    private: boolean;
+    constructor(git: GitMain);
+    report([ancestor, current, other]: string[]): Promise<string>;
+}

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

@@ -0,0 +1,17 @@
+import { Command, CommandOptions } from '@teambit/cli';
+import { GitMain } from './git.main.runtime';
+type SetGitMergeDriverFlags = {
+    global?: boolean;
+};
+export declare class SetGitMergeDriverCmd implements Command {
+    private git;
+    name: string;
+    alias: string;
+    description: string;
+    options: CommandOptions;
+    group: string;
+    commands: Command[];
+    constructor(git: GitMain);
+    report(_args: any, flags: SetGitMergeDriverFlags): Promise<string>;
+}
+export {};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/git",
-  "version": "1.0.227",
+  "version": "1.0.229",
   "homepage": "https://bit.cloud/teambit/git/git",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.git",
     "name": "git",
-    "version": "1.0.227"
+    "version": "1.0.229"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -14,14 +14,14 @@
     "gitconfig": "2.0.8",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.404",
-    "@teambit/cli": "0.0.860",
-    "@teambit/workspace": "1.0.227"
+    "@teambit/cli": "0.0.862",
+    "@teambit/workspace": "1.0.229"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
     "@types/mocha": "9.1.0",
     "chai": "4.3.0",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.30"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.33"
   },
   "peerDependencies": {
     "@teambit/legacy": "1.0.624"

package/tsconfig.json

@@ -20,8 +20,7 @@
     "emitDeclarationOnly": true,
     "strict": true,
     "strictPropertyInitialization": false,
-    "noImplicitAny": false,
-    "composite": true
+    "noImplicitAny": false
   },
   "exclude": [
     "artifacts",
@@ -36,13 +35,5 @@
   "include": [
     "**/*",
     "**/*.json"
-  ],
-  "references": [
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.860"
-    },
-    {
-      "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.227"
-    }
   ]
 }