@teambit/git 1.0.227 → 1.0.229
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/artifacts/__bit_junit.xml +1 -1
- package/artifacts/schema.json +43 -13
- package/dist/git.aspect.d.ts +2 -0
- package/dist/git.cmd.d.ts +10 -0
- package/dist/git.main.runtime.d.ts +31 -0
- package/dist/index.d.ts +4 -0
- package/dist/merge-bitmaps.cmd.d.ts +14 -0
- package/dist/set-git-merge-driver.cmd.d.ts +17 -0
- package/package.json +5 -5
- package/tsconfig.json +1 -10
- /package/dist/{preview-1712719054377.js → preview-1712822929999.js} +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="0" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.git/git@1.0.
|
|
3
|
+
<testsuite name="teambit.git/git@1.0.229" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -48,7 +48,11 @@
|
|
|
48
48
|
"line": 32,
|
|
49
49
|
"character": 24
|
|
50
50
|
},
|
|
51
|
-
"name": "Workspace"
|
|
51
|
+
"name": "Workspace",
|
|
52
|
+
"componentId": {
|
|
53
|
+
"scope": "teambit.workspace",
|
|
54
|
+
"name": "workspace"
|
|
55
|
+
}
|
|
52
56
|
},
|
|
53
57
|
"isOptional": false,
|
|
54
58
|
"isSpread": false
|
|
@@ -68,7 +72,8 @@
|
|
|
68
72
|
"line": 36,
|
|
69
73
|
"character": 22
|
|
70
74
|
},
|
|
71
|
-
"name": "GitExtWorkspaceConfig"
|
|
75
|
+
"name": "GitExtWorkspaceConfig",
|
|
76
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
72
77
|
},
|
|
73
78
|
"isOptional": false,
|
|
74
79
|
"isSpread": false
|
|
@@ -194,7 +199,8 @@
|
|
|
194
199
|
"line": 52,
|
|
195
200
|
"character": 33
|
|
196
201
|
},
|
|
197
|
-
"name": "SetGitMergeDriverOpts"
|
|
202
|
+
"name": "SetGitMergeDriverOpts",
|
|
203
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
198
204
|
},
|
|
199
205
|
"isOptional": false,
|
|
200
206
|
"isSpread": false
|
|
@@ -309,7 +315,11 @@
|
|
|
309
315
|
"line": 121,
|
|
310
316
|
"character": 44
|
|
311
317
|
},
|
|
312
|
-
"name": "CLIMain"
|
|
318
|
+
"name": "CLIMain",
|
|
319
|
+
"componentId": {
|
|
320
|
+
"scope": "teambit.harmony",
|
|
321
|
+
"name": "cli"
|
|
322
|
+
}
|
|
313
323
|
},
|
|
314
324
|
{
|
|
315
325
|
"__schema": "TypeRefSchema",
|
|
@@ -318,7 +328,11 @@
|
|
|
318
328
|
"line": 121,
|
|
319
329
|
"character": 53
|
|
320
330
|
},
|
|
321
|
-
"name": "Workspace"
|
|
331
|
+
"name": "Workspace",
|
|
332
|
+
"componentId": {
|
|
333
|
+
"scope": "teambit.workspace",
|
|
334
|
+
"name": "workspace"
|
|
335
|
+
}
|
|
322
336
|
}
|
|
323
337
|
]
|
|
324
338
|
},
|
|
@@ -340,7 +354,8 @@
|
|
|
340
354
|
"line": 121,
|
|
341
355
|
"character": 73
|
|
342
356
|
},
|
|
343
|
-
"name": "GitExtWorkspaceConfig"
|
|
357
|
+
"name": "GitExtWorkspaceConfig",
|
|
358
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
344
359
|
},
|
|
345
360
|
"isOptional": false,
|
|
346
361
|
"isSpread": false
|
|
@@ -508,7 +523,11 @@
|
|
|
508
523
|
"line": 32,
|
|
509
524
|
"character": 24
|
|
510
525
|
},
|
|
511
|
-
"name": "Workspace"
|
|
526
|
+
"name": "Workspace",
|
|
527
|
+
"componentId": {
|
|
528
|
+
"scope": "teambit.workspace",
|
|
529
|
+
"name": "workspace"
|
|
530
|
+
}
|
|
512
531
|
},
|
|
513
532
|
"isOptional": false,
|
|
514
533
|
"isSpread": false
|
|
@@ -528,7 +547,8 @@
|
|
|
528
547
|
"line": 36,
|
|
529
548
|
"character": 22
|
|
530
549
|
},
|
|
531
|
-
"name": "GitExtWorkspaceConfig"
|
|
550
|
+
"name": "GitExtWorkspaceConfig",
|
|
551
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
532
552
|
},
|
|
533
553
|
"isOptional": false,
|
|
534
554
|
"isSpread": false
|
|
@@ -654,7 +674,8 @@
|
|
|
654
674
|
"line": 52,
|
|
655
675
|
"character": 33
|
|
656
676
|
},
|
|
657
|
-
"name": "SetGitMergeDriverOpts"
|
|
677
|
+
"name": "SetGitMergeDriverOpts",
|
|
678
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
658
679
|
},
|
|
659
680
|
"isOptional": false,
|
|
660
681
|
"isSpread": false
|
|
@@ -769,7 +790,11 @@
|
|
|
769
790
|
"line": 121,
|
|
770
791
|
"character": 44
|
|
771
792
|
},
|
|
772
|
-
"name": "CLIMain"
|
|
793
|
+
"name": "CLIMain",
|
|
794
|
+
"componentId": {
|
|
795
|
+
"scope": "teambit.harmony",
|
|
796
|
+
"name": "cli"
|
|
797
|
+
}
|
|
773
798
|
},
|
|
774
799
|
{
|
|
775
800
|
"__schema": "TypeRefSchema",
|
|
@@ -778,7 +803,11 @@
|
|
|
778
803
|
"line": 121,
|
|
779
804
|
"character": 53
|
|
780
805
|
},
|
|
781
|
-
"name": "Workspace"
|
|
806
|
+
"name": "Workspace",
|
|
807
|
+
"componentId": {
|
|
808
|
+
"scope": "teambit.workspace",
|
|
809
|
+
"name": "workspace"
|
|
810
|
+
}
|
|
782
811
|
}
|
|
783
812
|
]
|
|
784
813
|
},
|
|
@@ -800,7 +829,8 @@
|
|
|
800
829
|
"line": 121,
|
|
801
830
|
"character": 73
|
|
802
831
|
},
|
|
803
|
-
"name": "GitExtWorkspaceConfig"
|
|
832
|
+
"name": "GitExtWorkspaceConfig",
|
|
833
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
804
834
|
},
|
|
805
835
|
"isOptional": false,
|
|
806
836
|
"isSpread": false
|
|
@@ -1121,7 +1151,7 @@
|
|
|
1121
1151
|
"componentId": {
|
|
1122
1152
|
"scope": "teambit.git",
|
|
1123
1153
|
"name": "git",
|
|
1124
|
-
"version": "1.0.
|
|
1154
|
+
"version": "1.0.229"
|
|
1125
1155
|
},
|
|
1126
1156
|
"taggedModuleExports": []
|
|
1127
1157
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Command } from '@teambit/cli';
|
|
2
|
+
export declare class GitCmd implements Command {
|
|
3
|
+
name: string;
|
|
4
|
+
alias: string;
|
|
5
|
+
description: string;
|
|
6
|
+
options: never[];
|
|
7
|
+
group: string;
|
|
8
|
+
commands: Command[];
|
|
9
|
+
report([unrecognizedSubcommand]: [string]): Promise<string>;
|
|
10
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { CLIMain } from '@teambit/cli';
|
|
2
|
+
import { Workspace } from '@teambit/workspace';
|
|
3
|
+
type SetGitMergeDriverOpts = {
|
|
4
|
+
global?: boolean;
|
|
5
|
+
};
|
|
6
|
+
export interface GitExtWorkspaceConfig {
|
|
7
|
+
mergeStrategy: 'ours' | 'theirs' | 'manual';
|
|
8
|
+
}
|
|
9
|
+
export declare class GitMain {
|
|
10
|
+
private workspace;
|
|
11
|
+
/**
|
|
12
|
+
* Git extension configuration.
|
|
13
|
+
*/
|
|
14
|
+
readonly config: GitExtWorkspaceConfig;
|
|
15
|
+
constructor(workspace: Workspace,
|
|
16
|
+
/**
|
|
17
|
+
* Git extension configuration.
|
|
18
|
+
*/
|
|
19
|
+
config: GitExtWorkspaceConfig);
|
|
20
|
+
mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>;
|
|
21
|
+
setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>;
|
|
22
|
+
private setGitConfig;
|
|
23
|
+
private setGitAttributes;
|
|
24
|
+
private getGitAttributesPath;
|
|
25
|
+
private stripBom;
|
|
26
|
+
static slots: never[];
|
|
27
|
+
static dependencies: import("@teambit/harmony").Aspect[];
|
|
28
|
+
static runtime: import("@teambit/harmony").RuntimeDefinition;
|
|
29
|
+
static provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>;
|
|
30
|
+
}
|
|
31
|
+
export default GitMain;
|
package/dist/index.d.ts
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Command, CommandOptions } from '@teambit/cli';
|
|
2
|
+
import { GitMain } from './git.main.runtime';
|
|
3
|
+
export declare class MergeBitmapsCmd implements Command {
|
|
4
|
+
private git;
|
|
5
|
+
name: string;
|
|
6
|
+
alias: string;
|
|
7
|
+
description: string;
|
|
8
|
+
options: CommandOptions;
|
|
9
|
+
group: string;
|
|
10
|
+
commands: Command[];
|
|
11
|
+
private: boolean;
|
|
12
|
+
constructor(git: GitMain);
|
|
13
|
+
report([ancestor, current, other]: string[]): Promise<string>;
|
|
14
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Command, CommandOptions } from '@teambit/cli';
|
|
2
|
+
import { GitMain } from './git.main.runtime';
|
|
3
|
+
type SetGitMergeDriverFlags = {
|
|
4
|
+
global?: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare class SetGitMergeDriverCmd implements Command {
|
|
7
|
+
private git;
|
|
8
|
+
name: string;
|
|
9
|
+
alias: string;
|
|
10
|
+
description: string;
|
|
11
|
+
options: CommandOptions;
|
|
12
|
+
group: string;
|
|
13
|
+
commands: Command[];
|
|
14
|
+
constructor(git: GitMain);
|
|
15
|
+
report(_args: any, flags: SetGitMergeDriverFlags): Promise<string>;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/git",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.229",
|
|
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": "1.0.
|
|
9
|
+
"version": "1.0.229"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -14,14 +14,14 @@
|
|
|
14
14
|
"gitconfig": "2.0.8",
|
|
15
15
|
"@teambit/harmony": "0.4.6",
|
|
16
16
|
"@teambit/bit-error": "0.0.404",
|
|
17
|
-
"@teambit/cli": "0.0.
|
|
18
|
-
"@teambit/workspace": "1.0.
|
|
17
|
+
"@teambit/cli": "0.0.862",
|
|
18
|
+
"@teambit/workspace": "1.0.229"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@types/fs-extra": "9.0.7",
|
|
22
22
|
"@types/mocha": "9.1.0",
|
|
23
23
|
"chai": "4.3.0",
|
|
24
|
-
"@teambit/harmony.envs.core-aspect-env": "0.0.
|
|
24
|
+
"@teambit/harmony.envs.core-aspect-env": "0.0.33"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"@teambit/legacy": "1.0.624"
|
package/tsconfig.json
CHANGED
|
@@ -20,8 +20,7 @@
|
|
|
20
20
|
"emitDeclarationOnly": true,
|
|
21
21
|
"strict": true,
|
|
22
22
|
"strictPropertyInitialization": false,
|
|
23
|
-
"noImplicitAny": false
|
|
24
|
-
"composite": true
|
|
23
|
+
"noImplicitAny": false
|
|
25
24
|
},
|
|
26
25
|
"exclude": [
|
|
27
26
|
"artifacts",
|
|
@@ -36,13 +35,5 @@
|
|
|
36
35
|
"include": [
|
|
37
36
|
"**/*",
|
|
38
37
|
"**/*.json"
|
|
39
|
-
],
|
|
40
|
-
"references": [
|
|
41
|
-
{
|
|
42
|
-
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.860"
|
|
43
|
-
},
|
|
44
|
-
{
|
|
45
|
-
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.227"
|
|
46
|
-
}
|
|
47
38
|
]
|
|
48
39
|
}
|
|
File without changes
|