@teambit/git 1.0.188 → 1.0.190
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 +1157 -0
- package/dist/git.aspect.js.map +1 -1
- package/dist/git.cmd.js.map +1 -1
- 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.json +5 -5
- /package/dist/{preview-1710040632859.js → preview-1710232535180.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.190" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
|
@@ -0,0 +1,1157 @@
|
|
|
1
|
+
{
|
|
2
|
+
"__schema": "APISchema",
|
|
3
|
+
"location": {
|
|
4
|
+
"filePath": "index.ts",
|
|
5
|
+
"line": 1,
|
|
6
|
+
"character": 1
|
|
7
|
+
},
|
|
8
|
+
"module": {
|
|
9
|
+
"__schema": "ModuleSchema",
|
|
10
|
+
"location": {
|
|
11
|
+
"filePath": "index.ts",
|
|
12
|
+
"line": 1,
|
|
13
|
+
"character": 1
|
|
14
|
+
},
|
|
15
|
+
"exports": [
|
|
16
|
+
{
|
|
17
|
+
"__schema": "ClassSchema",
|
|
18
|
+
"location": {
|
|
19
|
+
"filePath": "git.main.runtime.ts",
|
|
20
|
+
"line": 30,
|
|
21
|
+
"character": 1
|
|
22
|
+
},
|
|
23
|
+
"signature": "class GitMain",
|
|
24
|
+
"name": "GitMain",
|
|
25
|
+
"members": [
|
|
26
|
+
{
|
|
27
|
+
"__schema": "ConstructorSchema",
|
|
28
|
+
"location": {
|
|
29
|
+
"filePath": "git.main.runtime.ts",
|
|
30
|
+
"line": 31,
|
|
31
|
+
"character": 3
|
|
32
|
+
},
|
|
33
|
+
"signature": "constructor GitMain(workspace: Workspace, config: GitExtWorkspaceConfig): GitMain",
|
|
34
|
+
"name": "constructor",
|
|
35
|
+
"params": [
|
|
36
|
+
{
|
|
37
|
+
"__schema": "ParameterSchema",
|
|
38
|
+
"location": {
|
|
39
|
+
"filePath": "git.main.runtime.ts",
|
|
40
|
+
"line": 32,
|
|
41
|
+
"character": 5
|
|
42
|
+
},
|
|
43
|
+
"name": "workspace",
|
|
44
|
+
"type": {
|
|
45
|
+
"__schema": "TypeRefSchema",
|
|
46
|
+
"location": {
|
|
47
|
+
"filePath": "git.main.runtime.ts",
|
|
48
|
+
"line": 32,
|
|
49
|
+
"character": 24
|
|
50
|
+
},
|
|
51
|
+
"name": "Workspace",
|
|
52
|
+
"componentId": {
|
|
53
|
+
"scope": "teambit.workspace",
|
|
54
|
+
"name": "workspace"
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
"isOptional": false,
|
|
58
|
+
"isSpread": false
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
"__schema": "ParameterSchema",
|
|
62
|
+
"location": {
|
|
63
|
+
"filePath": "git.main.runtime.ts",
|
|
64
|
+
"line": 36,
|
|
65
|
+
"character": 5
|
|
66
|
+
},
|
|
67
|
+
"name": "config",
|
|
68
|
+
"type": {
|
|
69
|
+
"__schema": "TypeRefSchema",
|
|
70
|
+
"location": {
|
|
71
|
+
"filePath": "git.main.runtime.ts",
|
|
72
|
+
"line": 36,
|
|
73
|
+
"character": 22
|
|
74
|
+
},
|
|
75
|
+
"name": "GitExtWorkspaceConfig",
|
|
76
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
77
|
+
},
|
|
78
|
+
"isOptional": false,
|
|
79
|
+
"isSpread": false
|
|
80
|
+
}
|
|
81
|
+
],
|
|
82
|
+
"returnType": {
|
|
83
|
+
"__schema": "ThisTypeSchema",
|
|
84
|
+
"location": {
|
|
85
|
+
"filePath": "git.main.runtime.ts",
|
|
86
|
+
"line": 30,
|
|
87
|
+
"character": 1
|
|
88
|
+
},
|
|
89
|
+
"name": "GitMain"
|
|
90
|
+
},
|
|
91
|
+
"modifiers": []
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
"__schema": "FunctionLikeSchema",
|
|
95
|
+
"location": {
|
|
96
|
+
"filePath": "git.main.runtime.ts",
|
|
97
|
+
"line": 39,
|
|
98
|
+
"character": 3
|
|
99
|
+
},
|
|
100
|
+
"signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
|
|
101
|
+
"name": "mergeBitmaps",
|
|
102
|
+
"params": [
|
|
103
|
+
{
|
|
104
|
+
"__schema": "ParameterSchema",
|
|
105
|
+
"location": {
|
|
106
|
+
"filePath": "git.main.runtime.ts",
|
|
107
|
+
"line": 39,
|
|
108
|
+
"character": 22
|
|
109
|
+
},
|
|
110
|
+
"name": "ancestor",
|
|
111
|
+
"type": {
|
|
112
|
+
"__schema": "KeywordTypeSchema",
|
|
113
|
+
"location": {
|
|
114
|
+
"filePath": "git.main.runtime.ts",
|
|
115
|
+
"line": 39,
|
|
116
|
+
"character": 32
|
|
117
|
+
},
|
|
118
|
+
"name": "string"
|
|
119
|
+
},
|
|
120
|
+
"isOptional": false,
|
|
121
|
+
"isSpread": false
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
"__schema": "ParameterSchema",
|
|
125
|
+
"location": {
|
|
126
|
+
"filePath": "git.main.runtime.ts",
|
|
127
|
+
"line": 39,
|
|
128
|
+
"character": 40
|
|
129
|
+
},
|
|
130
|
+
"name": "current",
|
|
131
|
+
"type": {
|
|
132
|
+
"__schema": "KeywordTypeSchema",
|
|
133
|
+
"location": {
|
|
134
|
+
"filePath": "git.main.runtime.ts",
|
|
135
|
+
"line": 39,
|
|
136
|
+
"character": 49
|
|
137
|
+
},
|
|
138
|
+
"name": "string"
|
|
139
|
+
},
|
|
140
|
+
"isOptional": false,
|
|
141
|
+
"isSpread": false
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"__schema": "ParameterSchema",
|
|
145
|
+
"location": {
|
|
146
|
+
"filePath": "git.main.runtime.ts",
|
|
147
|
+
"line": 39,
|
|
148
|
+
"character": 57
|
|
149
|
+
},
|
|
150
|
+
"name": "other",
|
|
151
|
+
"type": {
|
|
152
|
+
"__schema": "KeywordTypeSchema",
|
|
153
|
+
"location": {
|
|
154
|
+
"filePath": "git.main.runtime.ts",
|
|
155
|
+
"line": 39,
|
|
156
|
+
"character": 64
|
|
157
|
+
},
|
|
158
|
+
"name": "string"
|
|
159
|
+
},
|
|
160
|
+
"isOptional": false,
|
|
161
|
+
"isSpread": false
|
|
162
|
+
}
|
|
163
|
+
],
|
|
164
|
+
"returnType": {
|
|
165
|
+
"__schema": "InferenceTypeSchema",
|
|
166
|
+
"location": {
|
|
167
|
+
"filePath": "git.main.runtime.ts",
|
|
168
|
+
"line": 39,
|
|
169
|
+
"character": 3
|
|
170
|
+
},
|
|
171
|
+
"type": "Promise<string>"
|
|
172
|
+
},
|
|
173
|
+
"modifiers": [
|
|
174
|
+
"async"
|
|
175
|
+
]
|
|
176
|
+
},
|
|
177
|
+
{
|
|
178
|
+
"__schema": "FunctionLikeSchema",
|
|
179
|
+
"location": {
|
|
180
|
+
"filePath": "git.main.runtime.ts",
|
|
181
|
+
"line": 52,
|
|
182
|
+
"character": 3
|
|
183
|
+
},
|
|
184
|
+
"signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
|
|
185
|
+
"name": "setGitMergeDriver",
|
|
186
|
+
"params": [
|
|
187
|
+
{
|
|
188
|
+
"__schema": "ParameterSchema",
|
|
189
|
+
"location": {
|
|
190
|
+
"filePath": "git.main.runtime.ts",
|
|
191
|
+
"line": 52,
|
|
192
|
+
"character": 27
|
|
193
|
+
},
|
|
194
|
+
"name": "opts",
|
|
195
|
+
"type": {
|
|
196
|
+
"__schema": "TypeRefSchema",
|
|
197
|
+
"location": {
|
|
198
|
+
"filePath": "git.main.runtime.ts",
|
|
199
|
+
"line": 52,
|
|
200
|
+
"character": 33
|
|
201
|
+
},
|
|
202
|
+
"name": "SetGitMergeDriverOpts",
|
|
203
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
204
|
+
},
|
|
205
|
+
"isOptional": false,
|
|
206
|
+
"isSpread": false
|
|
207
|
+
}
|
|
208
|
+
],
|
|
209
|
+
"returnType": {
|
|
210
|
+
"__schema": "InferenceTypeSchema",
|
|
211
|
+
"location": {
|
|
212
|
+
"filePath": "git.main.runtime.ts",
|
|
213
|
+
"line": 52,
|
|
214
|
+
"character": 3
|
|
215
|
+
},
|
|
216
|
+
"type": "Promise<boolean>"
|
|
217
|
+
},
|
|
218
|
+
"modifiers": [
|
|
219
|
+
"async"
|
|
220
|
+
]
|
|
221
|
+
},
|
|
222
|
+
{
|
|
223
|
+
"__schema": "VariableLikeSchema",
|
|
224
|
+
"location": {
|
|
225
|
+
"filePath": "git.main.runtime.ts",
|
|
226
|
+
"line": 114,
|
|
227
|
+
"character": 3
|
|
228
|
+
},
|
|
229
|
+
"signature": "(property) GitMain.slots: never[]",
|
|
230
|
+
"name": "slots",
|
|
231
|
+
"type": {
|
|
232
|
+
"__schema": "InferenceTypeSchema",
|
|
233
|
+
"location": {
|
|
234
|
+
"filePath": "git.main.runtime.ts",
|
|
235
|
+
"line": 114,
|
|
236
|
+
"character": 3
|
|
237
|
+
},
|
|
238
|
+
"type": "never[]"
|
|
239
|
+
},
|
|
240
|
+
"isOptional": true,
|
|
241
|
+
"defaultValue": "[]"
|
|
242
|
+
},
|
|
243
|
+
{
|
|
244
|
+
"__schema": "VariableLikeSchema",
|
|
245
|
+
"location": {
|
|
246
|
+
"filePath": "git.main.runtime.ts",
|
|
247
|
+
"line": 117,
|
|
248
|
+
"character": 3
|
|
249
|
+
},
|
|
250
|
+
"signature": "(property) GitMain.dependencies: Aspect[]",
|
|
251
|
+
"name": "dependencies",
|
|
252
|
+
"type": {
|
|
253
|
+
"__schema": "InferenceTypeSchema",
|
|
254
|
+
"location": {
|
|
255
|
+
"filePath": "git.main.runtime.ts",
|
|
256
|
+
"line": 117,
|
|
257
|
+
"character": 3
|
|
258
|
+
},
|
|
259
|
+
"type": "Aspect[]"
|
|
260
|
+
},
|
|
261
|
+
"isOptional": true,
|
|
262
|
+
"defaultValue": "[CLIAspect, WorkspaceAspect]"
|
|
263
|
+
},
|
|
264
|
+
{
|
|
265
|
+
"__schema": "VariableLikeSchema",
|
|
266
|
+
"location": {
|
|
267
|
+
"filePath": "git.main.runtime.ts",
|
|
268
|
+
"line": 119,
|
|
269
|
+
"character": 3
|
|
270
|
+
},
|
|
271
|
+
"signature": "(property) GitMain.runtime: RuntimeDefinition",
|
|
272
|
+
"name": "runtime",
|
|
273
|
+
"type": {
|
|
274
|
+
"__schema": "InferenceTypeSchema",
|
|
275
|
+
"location": {
|
|
276
|
+
"filePath": "git.main.runtime.ts",
|
|
277
|
+
"line": 119,
|
|
278
|
+
"character": 3
|
|
279
|
+
},
|
|
280
|
+
"type": "RuntimeDefinition"
|
|
281
|
+
},
|
|
282
|
+
"isOptional": true,
|
|
283
|
+
"defaultValue": "MainRuntime"
|
|
284
|
+
},
|
|
285
|
+
{
|
|
286
|
+
"__schema": "FunctionLikeSchema",
|
|
287
|
+
"location": {
|
|
288
|
+
"filePath": "git.main.runtime.ts",
|
|
289
|
+
"line": 121,
|
|
290
|
+
"character": 3
|
|
291
|
+
},
|
|
292
|
+
"signature": "(method) GitMain.provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>",
|
|
293
|
+
"name": "provider",
|
|
294
|
+
"params": [
|
|
295
|
+
{
|
|
296
|
+
"__schema": "ParameterSchema",
|
|
297
|
+
"location": {
|
|
298
|
+
"filePath": "git.main.runtime.ts",
|
|
299
|
+
"line": 121,
|
|
300
|
+
"character": 25
|
|
301
|
+
},
|
|
302
|
+
"name": "[ cli, workspace ]",
|
|
303
|
+
"type": {
|
|
304
|
+
"__schema": "TupleTypeSchema",
|
|
305
|
+
"location": {
|
|
306
|
+
"filePath": "git.main.runtime.ts",
|
|
307
|
+
"line": 121,
|
|
308
|
+
"character": 43
|
|
309
|
+
},
|
|
310
|
+
"elements": [
|
|
311
|
+
{
|
|
312
|
+
"__schema": "TypeRefSchema",
|
|
313
|
+
"location": {
|
|
314
|
+
"filePath": "git.main.runtime.ts",
|
|
315
|
+
"line": 121,
|
|
316
|
+
"character": 44
|
|
317
|
+
},
|
|
318
|
+
"name": "CLIMain",
|
|
319
|
+
"componentId": {
|
|
320
|
+
"scope": "teambit.harmony",
|
|
321
|
+
"name": "cli"
|
|
322
|
+
}
|
|
323
|
+
},
|
|
324
|
+
{
|
|
325
|
+
"__schema": "TypeRefSchema",
|
|
326
|
+
"location": {
|
|
327
|
+
"filePath": "git.main.runtime.ts",
|
|
328
|
+
"line": 121,
|
|
329
|
+
"character": 53
|
|
330
|
+
},
|
|
331
|
+
"name": "Workspace",
|
|
332
|
+
"componentId": {
|
|
333
|
+
"scope": "teambit.workspace",
|
|
334
|
+
"name": "workspace"
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
]
|
|
338
|
+
},
|
|
339
|
+
"isOptional": false,
|
|
340
|
+
"isSpread": false
|
|
341
|
+
},
|
|
342
|
+
{
|
|
343
|
+
"__schema": "ParameterSchema",
|
|
344
|
+
"location": {
|
|
345
|
+
"filePath": "git.main.runtime.ts",
|
|
346
|
+
"line": 121,
|
|
347
|
+
"character": 65
|
|
348
|
+
},
|
|
349
|
+
"name": "config",
|
|
350
|
+
"type": {
|
|
351
|
+
"__schema": "TypeRefSchema",
|
|
352
|
+
"location": {
|
|
353
|
+
"filePath": "git.main.runtime.ts",
|
|
354
|
+
"line": 121,
|
|
355
|
+
"character": 73
|
|
356
|
+
},
|
|
357
|
+
"name": "GitExtWorkspaceConfig",
|
|
358
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
359
|
+
},
|
|
360
|
+
"isOptional": false,
|
|
361
|
+
"isSpread": false
|
|
362
|
+
}
|
|
363
|
+
],
|
|
364
|
+
"returnType": {
|
|
365
|
+
"__schema": "InferenceTypeSchema",
|
|
366
|
+
"location": {
|
|
367
|
+
"filePath": "git.main.runtime.ts",
|
|
368
|
+
"line": 121,
|
|
369
|
+
"character": 3
|
|
370
|
+
},
|
|
371
|
+
"type": "Promise<GitMain>"
|
|
372
|
+
},
|
|
373
|
+
"modifiers": [
|
|
374
|
+
"static",
|
|
375
|
+
"async"
|
|
376
|
+
]
|
|
377
|
+
}
|
|
378
|
+
],
|
|
379
|
+
"extendsNodes": [],
|
|
380
|
+
"implementNodes": []
|
|
381
|
+
},
|
|
382
|
+
{
|
|
383
|
+
"__schema": "UnImplementedSchema",
|
|
384
|
+
"location": {
|
|
385
|
+
"filePath": "index.ts",
|
|
386
|
+
"line": 4,
|
|
387
|
+
"character": 16
|
|
388
|
+
},
|
|
389
|
+
"name": "GitAspect",
|
|
390
|
+
"type": "Identifier"
|
|
391
|
+
},
|
|
392
|
+
{
|
|
393
|
+
"__schema": "VariableLikeSchema",
|
|
394
|
+
"location": {
|
|
395
|
+
"filePath": "git.aspect.ts",
|
|
396
|
+
"line": 3,
|
|
397
|
+
"character": 14
|
|
398
|
+
},
|
|
399
|
+
"signature": "const GitAspect: Aspect",
|
|
400
|
+
"name": "GitAspect",
|
|
401
|
+
"type": {
|
|
402
|
+
"__schema": "TypeRefSchema",
|
|
403
|
+
"location": {
|
|
404
|
+
"filePath": "git.aspect.ts",
|
|
405
|
+
"line": 3,
|
|
406
|
+
"character": 14
|
|
407
|
+
},
|
|
408
|
+
"name": "Aspect",
|
|
409
|
+
"componentId": {
|
|
410
|
+
"scope": "teambit.harmony",
|
|
411
|
+
"name": "harmony",
|
|
412
|
+
"version": "0.4.6"
|
|
413
|
+
}
|
|
414
|
+
},
|
|
415
|
+
"isOptional": false,
|
|
416
|
+
"defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
|
|
417
|
+
}
|
|
418
|
+
],
|
|
419
|
+
"internals": []
|
|
420
|
+
},
|
|
421
|
+
"internals": [
|
|
422
|
+
{
|
|
423
|
+
"__schema": "ModuleSchema",
|
|
424
|
+
"location": {
|
|
425
|
+
"filePath": "git.main.runtime.ts",
|
|
426
|
+
"line": 1,
|
|
427
|
+
"character": 1
|
|
428
|
+
},
|
|
429
|
+
"exports": [
|
|
430
|
+
{
|
|
431
|
+
"__schema": "InterfaceSchema",
|
|
432
|
+
"location": {
|
|
433
|
+
"filePath": "git.main.runtime.ts",
|
|
434
|
+
"line": 27,
|
|
435
|
+
"character": 1
|
|
436
|
+
},
|
|
437
|
+
"signature": "interface GitExtWorkspaceConfig",
|
|
438
|
+
"name": "GitExtWorkspaceConfig",
|
|
439
|
+
"members": [
|
|
440
|
+
{
|
|
441
|
+
"__schema": "VariableLikeSchema",
|
|
442
|
+
"location": {
|
|
443
|
+
"filePath": "git.main.runtime.ts",
|
|
444
|
+
"line": 28,
|
|
445
|
+
"character": 3
|
|
446
|
+
},
|
|
447
|
+
"signature": "(property) GitExtWorkspaceConfig.mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
|
|
448
|
+
"name": "mergeStrategy",
|
|
449
|
+
"type": {
|
|
450
|
+
"__schema": "TypeUnionSchema",
|
|
451
|
+
"location": {
|
|
452
|
+
"filePath": "git.main.runtime.ts",
|
|
453
|
+
"line": 28,
|
|
454
|
+
"character": 18
|
|
455
|
+
},
|
|
456
|
+
"types": [
|
|
457
|
+
{
|
|
458
|
+
"__schema": "LiteralTypeSchema",
|
|
459
|
+
"location": {
|
|
460
|
+
"filePath": "git.main.runtime.ts",
|
|
461
|
+
"line": 28,
|
|
462
|
+
"character": 18
|
|
463
|
+
},
|
|
464
|
+
"name": "'ours'"
|
|
465
|
+
},
|
|
466
|
+
{
|
|
467
|
+
"__schema": "LiteralTypeSchema",
|
|
468
|
+
"location": {
|
|
469
|
+
"filePath": "git.main.runtime.ts",
|
|
470
|
+
"line": 28,
|
|
471
|
+
"character": 27
|
|
472
|
+
},
|
|
473
|
+
"name": "'theirs'"
|
|
474
|
+
},
|
|
475
|
+
{
|
|
476
|
+
"__schema": "LiteralTypeSchema",
|
|
477
|
+
"location": {
|
|
478
|
+
"filePath": "git.main.runtime.ts",
|
|
479
|
+
"line": 28,
|
|
480
|
+
"character": 38
|
|
481
|
+
},
|
|
482
|
+
"name": "'manual'"
|
|
483
|
+
}
|
|
484
|
+
]
|
|
485
|
+
},
|
|
486
|
+
"isOptional": false
|
|
487
|
+
}
|
|
488
|
+
],
|
|
489
|
+
"extendsNodes": []
|
|
490
|
+
},
|
|
491
|
+
{
|
|
492
|
+
"__schema": "ClassSchema",
|
|
493
|
+
"location": {
|
|
494
|
+
"filePath": "git.main.runtime.ts",
|
|
495
|
+
"line": 30,
|
|
496
|
+
"character": 1
|
|
497
|
+
},
|
|
498
|
+
"signature": "class GitMain",
|
|
499
|
+
"name": "GitMain",
|
|
500
|
+
"members": [
|
|
501
|
+
{
|
|
502
|
+
"__schema": "ConstructorSchema",
|
|
503
|
+
"location": {
|
|
504
|
+
"filePath": "git.main.runtime.ts",
|
|
505
|
+
"line": 31,
|
|
506
|
+
"character": 3
|
|
507
|
+
},
|
|
508
|
+
"signature": "constructor GitMain(workspace: Workspace, config: GitExtWorkspaceConfig): GitMain",
|
|
509
|
+
"name": "constructor",
|
|
510
|
+
"params": [
|
|
511
|
+
{
|
|
512
|
+
"__schema": "ParameterSchema",
|
|
513
|
+
"location": {
|
|
514
|
+
"filePath": "git.main.runtime.ts",
|
|
515
|
+
"line": 32,
|
|
516
|
+
"character": 5
|
|
517
|
+
},
|
|
518
|
+
"name": "workspace",
|
|
519
|
+
"type": {
|
|
520
|
+
"__schema": "TypeRefSchema",
|
|
521
|
+
"location": {
|
|
522
|
+
"filePath": "git.main.runtime.ts",
|
|
523
|
+
"line": 32,
|
|
524
|
+
"character": 24
|
|
525
|
+
},
|
|
526
|
+
"name": "Workspace",
|
|
527
|
+
"componentId": {
|
|
528
|
+
"scope": "teambit.workspace",
|
|
529
|
+
"name": "workspace"
|
|
530
|
+
}
|
|
531
|
+
},
|
|
532
|
+
"isOptional": false,
|
|
533
|
+
"isSpread": false
|
|
534
|
+
},
|
|
535
|
+
{
|
|
536
|
+
"__schema": "ParameterSchema",
|
|
537
|
+
"location": {
|
|
538
|
+
"filePath": "git.main.runtime.ts",
|
|
539
|
+
"line": 36,
|
|
540
|
+
"character": 5
|
|
541
|
+
},
|
|
542
|
+
"name": "config",
|
|
543
|
+
"type": {
|
|
544
|
+
"__schema": "TypeRefSchema",
|
|
545
|
+
"location": {
|
|
546
|
+
"filePath": "git.main.runtime.ts",
|
|
547
|
+
"line": 36,
|
|
548
|
+
"character": 22
|
|
549
|
+
},
|
|
550
|
+
"name": "GitExtWorkspaceConfig",
|
|
551
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
552
|
+
},
|
|
553
|
+
"isOptional": false,
|
|
554
|
+
"isSpread": false
|
|
555
|
+
}
|
|
556
|
+
],
|
|
557
|
+
"returnType": {
|
|
558
|
+
"__schema": "ThisTypeSchema",
|
|
559
|
+
"location": {
|
|
560
|
+
"filePath": "git.main.runtime.ts",
|
|
561
|
+
"line": 30,
|
|
562
|
+
"character": 1
|
|
563
|
+
},
|
|
564
|
+
"name": "GitMain"
|
|
565
|
+
},
|
|
566
|
+
"modifiers": []
|
|
567
|
+
},
|
|
568
|
+
{
|
|
569
|
+
"__schema": "FunctionLikeSchema",
|
|
570
|
+
"location": {
|
|
571
|
+
"filePath": "git.main.runtime.ts",
|
|
572
|
+
"line": 39,
|
|
573
|
+
"character": 3
|
|
574
|
+
},
|
|
575
|
+
"signature": "(method) GitMain.mergeBitmaps(ancestor: string, current: string, other: string): Promise<string>",
|
|
576
|
+
"name": "mergeBitmaps",
|
|
577
|
+
"params": [
|
|
578
|
+
{
|
|
579
|
+
"__schema": "ParameterSchema",
|
|
580
|
+
"location": {
|
|
581
|
+
"filePath": "git.main.runtime.ts",
|
|
582
|
+
"line": 39,
|
|
583
|
+
"character": 22
|
|
584
|
+
},
|
|
585
|
+
"name": "ancestor",
|
|
586
|
+
"type": {
|
|
587
|
+
"__schema": "KeywordTypeSchema",
|
|
588
|
+
"location": {
|
|
589
|
+
"filePath": "git.main.runtime.ts",
|
|
590
|
+
"line": 39,
|
|
591
|
+
"character": 32
|
|
592
|
+
},
|
|
593
|
+
"name": "string"
|
|
594
|
+
},
|
|
595
|
+
"isOptional": false,
|
|
596
|
+
"isSpread": false
|
|
597
|
+
},
|
|
598
|
+
{
|
|
599
|
+
"__schema": "ParameterSchema",
|
|
600
|
+
"location": {
|
|
601
|
+
"filePath": "git.main.runtime.ts",
|
|
602
|
+
"line": 39,
|
|
603
|
+
"character": 40
|
|
604
|
+
},
|
|
605
|
+
"name": "current",
|
|
606
|
+
"type": {
|
|
607
|
+
"__schema": "KeywordTypeSchema",
|
|
608
|
+
"location": {
|
|
609
|
+
"filePath": "git.main.runtime.ts",
|
|
610
|
+
"line": 39,
|
|
611
|
+
"character": 49
|
|
612
|
+
},
|
|
613
|
+
"name": "string"
|
|
614
|
+
},
|
|
615
|
+
"isOptional": false,
|
|
616
|
+
"isSpread": false
|
|
617
|
+
},
|
|
618
|
+
{
|
|
619
|
+
"__schema": "ParameterSchema",
|
|
620
|
+
"location": {
|
|
621
|
+
"filePath": "git.main.runtime.ts",
|
|
622
|
+
"line": 39,
|
|
623
|
+
"character": 57
|
|
624
|
+
},
|
|
625
|
+
"name": "other",
|
|
626
|
+
"type": {
|
|
627
|
+
"__schema": "KeywordTypeSchema",
|
|
628
|
+
"location": {
|
|
629
|
+
"filePath": "git.main.runtime.ts",
|
|
630
|
+
"line": 39,
|
|
631
|
+
"character": 64
|
|
632
|
+
},
|
|
633
|
+
"name": "string"
|
|
634
|
+
},
|
|
635
|
+
"isOptional": false,
|
|
636
|
+
"isSpread": false
|
|
637
|
+
}
|
|
638
|
+
],
|
|
639
|
+
"returnType": {
|
|
640
|
+
"__schema": "InferenceTypeSchema",
|
|
641
|
+
"location": {
|
|
642
|
+
"filePath": "git.main.runtime.ts",
|
|
643
|
+
"line": 39,
|
|
644
|
+
"character": 3
|
|
645
|
+
},
|
|
646
|
+
"type": "Promise<string>"
|
|
647
|
+
},
|
|
648
|
+
"modifiers": [
|
|
649
|
+
"async"
|
|
650
|
+
]
|
|
651
|
+
},
|
|
652
|
+
{
|
|
653
|
+
"__schema": "FunctionLikeSchema",
|
|
654
|
+
"location": {
|
|
655
|
+
"filePath": "git.main.runtime.ts",
|
|
656
|
+
"line": 52,
|
|
657
|
+
"character": 3
|
|
658
|
+
},
|
|
659
|
+
"signature": "(method) GitMain.setGitMergeDriver(opts: SetGitMergeDriverOpts): Promise<boolean>",
|
|
660
|
+
"name": "setGitMergeDriver",
|
|
661
|
+
"params": [
|
|
662
|
+
{
|
|
663
|
+
"__schema": "ParameterSchema",
|
|
664
|
+
"location": {
|
|
665
|
+
"filePath": "git.main.runtime.ts",
|
|
666
|
+
"line": 52,
|
|
667
|
+
"character": 27
|
|
668
|
+
},
|
|
669
|
+
"name": "opts",
|
|
670
|
+
"type": {
|
|
671
|
+
"__schema": "TypeRefSchema",
|
|
672
|
+
"location": {
|
|
673
|
+
"filePath": "git.main.runtime.ts",
|
|
674
|
+
"line": 52,
|
|
675
|
+
"character": 33
|
|
676
|
+
},
|
|
677
|
+
"name": "SetGitMergeDriverOpts",
|
|
678
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
679
|
+
},
|
|
680
|
+
"isOptional": false,
|
|
681
|
+
"isSpread": false
|
|
682
|
+
}
|
|
683
|
+
],
|
|
684
|
+
"returnType": {
|
|
685
|
+
"__schema": "InferenceTypeSchema",
|
|
686
|
+
"location": {
|
|
687
|
+
"filePath": "git.main.runtime.ts",
|
|
688
|
+
"line": 52,
|
|
689
|
+
"character": 3
|
|
690
|
+
},
|
|
691
|
+
"type": "Promise<boolean>"
|
|
692
|
+
},
|
|
693
|
+
"modifiers": [
|
|
694
|
+
"async"
|
|
695
|
+
]
|
|
696
|
+
},
|
|
697
|
+
{
|
|
698
|
+
"__schema": "VariableLikeSchema",
|
|
699
|
+
"location": {
|
|
700
|
+
"filePath": "git.main.runtime.ts",
|
|
701
|
+
"line": 114,
|
|
702
|
+
"character": 3
|
|
703
|
+
},
|
|
704
|
+
"signature": "(property) GitMain.slots: never[]",
|
|
705
|
+
"name": "slots",
|
|
706
|
+
"type": {
|
|
707
|
+
"__schema": "InferenceTypeSchema",
|
|
708
|
+
"location": {
|
|
709
|
+
"filePath": "git.main.runtime.ts",
|
|
710
|
+
"line": 114,
|
|
711
|
+
"character": 3
|
|
712
|
+
},
|
|
713
|
+
"type": "never[]"
|
|
714
|
+
},
|
|
715
|
+
"isOptional": true,
|
|
716
|
+
"defaultValue": "[]"
|
|
717
|
+
},
|
|
718
|
+
{
|
|
719
|
+
"__schema": "VariableLikeSchema",
|
|
720
|
+
"location": {
|
|
721
|
+
"filePath": "git.main.runtime.ts",
|
|
722
|
+
"line": 117,
|
|
723
|
+
"character": 3
|
|
724
|
+
},
|
|
725
|
+
"signature": "(property) GitMain.dependencies: Aspect[]",
|
|
726
|
+
"name": "dependencies",
|
|
727
|
+
"type": {
|
|
728
|
+
"__schema": "InferenceTypeSchema",
|
|
729
|
+
"location": {
|
|
730
|
+
"filePath": "git.main.runtime.ts",
|
|
731
|
+
"line": 117,
|
|
732
|
+
"character": 3
|
|
733
|
+
},
|
|
734
|
+
"type": "Aspect[]"
|
|
735
|
+
},
|
|
736
|
+
"isOptional": true,
|
|
737
|
+
"defaultValue": "[CLIAspect, WorkspaceAspect]"
|
|
738
|
+
},
|
|
739
|
+
{
|
|
740
|
+
"__schema": "VariableLikeSchema",
|
|
741
|
+
"location": {
|
|
742
|
+
"filePath": "git.main.runtime.ts",
|
|
743
|
+
"line": 119,
|
|
744
|
+
"character": 3
|
|
745
|
+
},
|
|
746
|
+
"signature": "(property) GitMain.runtime: RuntimeDefinition",
|
|
747
|
+
"name": "runtime",
|
|
748
|
+
"type": {
|
|
749
|
+
"__schema": "InferenceTypeSchema",
|
|
750
|
+
"location": {
|
|
751
|
+
"filePath": "git.main.runtime.ts",
|
|
752
|
+
"line": 119,
|
|
753
|
+
"character": 3
|
|
754
|
+
},
|
|
755
|
+
"type": "RuntimeDefinition"
|
|
756
|
+
},
|
|
757
|
+
"isOptional": true,
|
|
758
|
+
"defaultValue": "MainRuntime"
|
|
759
|
+
},
|
|
760
|
+
{
|
|
761
|
+
"__schema": "FunctionLikeSchema",
|
|
762
|
+
"location": {
|
|
763
|
+
"filePath": "git.main.runtime.ts",
|
|
764
|
+
"line": 121,
|
|
765
|
+
"character": 3
|
|
766
|
+
},
|
|
767
|
+
"signature": "(method) GitMain.provider([cli, workspace]: [CLIMain, Workspace], config: GitExtWorkspaceConfig): Promise<GitMain>",
|
|
768
|
+
"name": "provider",
|
|
769
|
+
"params": [
|
|
770
|
+
{
|
|
771
|
+
"__schema": "ParameterSchema",
|
|
772
|
+
"location": {
|
|
773
|
+
"filePath": "git.main.runtime.ts",
|
|
774
|
+
"line": 121,
|
|
775
|
+
"character": 25
|
|
776
|
+
},
|
|
777
|
+
"name": "[ cli, workspace ]",
|
|
778
|
+
"type": {
|
|
779
|
+
"__schema": "TupleTypeSchema",
|
|
780
|
+
"location": {
|
|
781
|
+
"filePath": "git.main.runtime.ts",
|
|
782
|
+
"line": 121,
|
|
783
|
+
"character": 43
|
|
784
|
+
},
|
|
785
|
+
"elements": [
|
|
786
|
+
{
|
|
787
|
+
"__schema": "TypeRefSchema",
|
|
788
|
+
"location": {
|
|
789
|
+
"filePath": "git.main.runtime.ts",
|
|
790
|
+
"line": 121,
|
|
791
|
+
"character": 44
|
|
792
|
+
},
|
|
793
|
+
"name": "CLIMain",
|
|
794
|
+
"componentId": {
|
|
795
|
+
"scope": "teambit.harmony",
|
|
796
|
+
"name": "cli"
|
|
797
|
+
}
|
|
798
|
+
},
|
|
799
|
+
{
|
|
800
|
+
"__schema": "TypeRefSchema",
|
|
801
|
+
"location": {
|
|
802
|
+
"filePath": "git.main.runtime.ts",
|
|
803
|
+
"line": 121,
|
|
804
|
+
"character": 53
|
|
805
|
+
},
|
|
806
|
+
"name": "Workspace",
|
|
807
|
+
"componentId": {
|
|
808
|
+
"scope": "teambit.workspace",
|
|
809
|
+
"name": "workspace"
|
|
810
|
+
}
|
|
811
|
+
}
|
|
812
|
+
]
|
|
813
|
+
},
|
|
814
|
+
"isOptional": false,
|
|
815
|
+
"isSpread": false
|
|
816
|
+
},
|
|
817
|
+
{
|
|
818
|
+
"__schema": "ParameterSchema",
|
|
819
|
+
"location": {
|
|
820
|
+
"filePath": "git.main.runtime.ts",
|
|
821
|
+
"line": 121,
|
|
822
|
+
"character": 65
|
|
823
|
+
},
|
|
824
|
+
"name": "config",
|
|
825
|
+
"type": {
|
|
826
|
+
"__schema": "TypeRefSchema",
|
|
827
|
+
"location": {
|
|
828
|
+
"filePath": "git.main.runtime.ts",
|
|
829
|
+
"line": 121,
|
|
830
|
+
"character": 73
|
|
831
|
+
},
|
|
832
|
+
"name": "GitExtWorkspaceConfig",
|
|
833
|
+
"internalFilePath": "git.main.runtime.ts"
|
|
834
|
+
},
|
|
835
|
+
"isOptional": false,
|
|
836
|
+
"isSpread": false
|
|
837
|
+
}
|
|
838
|
+
],
|
|
839
|
+
"returnType": {
|
|
840
|
+
"__schema": "InferenceTypeSchema",
|
|
841
|
+
"location": {
|
|
842
|
+
"filePath": "git.main.runtime.ts",
|
|
843
|
+
"line": 121,
|
|
844
|
+
"character": 3
|
|
845
|
+
},
|
|
846
|
+
"type": "Promise<GitMain>"
|
|
847
|
+
},
|
|
848
|
+
"modifiers": [
|
|
849
|
+
"static",
|
|
850
|
+
"async"
|
|
851
|
+
]
|
|
852
|
+
}
|
|
853
|
+
],
|
|
854
|
+
"extendsNodes": [],
|
|
855
|
+
"implementNodes": []
|
|
856
|
+
},
|
|
857
|
+
{
|
|
858
|
+
"__schema": "UnImplementedSchema",
|
|
859
|
+
"location": {
|
|
860
|
+
"filePath": "git.main.runtime.ts",
|
|
861
|
+
"line": 133,
|
|
862
|
+
"character": 16
|
|
863
|
+
},
|
|
864
|
+
"name": "GitMain",
|
|
865
|
+
"type": "Identifier"
|
|
866
|
+
}
|
|
867
|
+
],
|
|
868
|
+
"internals": [
|
|
869
|
+
{
|
|
870
|
+
"__schema": "TypeSchema",
|
|
871
|
+
"location": {
|
|
872
|
+
"filePath": "git.main.runtime.ts",
|
|
873
|
+
"line": 13,
|
|
874
|
+
"character": 1
|
|
875
|
+
},
|
|
876
|
+
"signature": "type SetGitMergeDriverOpts = {\n global?: boolean | undefined;\n}",
|
|
877
|
+
"name": "SetGitMergeDriverOpts",
|
|
878
|
+
"type": {
|
|
879
|
+
"__schema": "TypeLiteralSchema",
|
|
880
|
+
"location": {
|
|
881
|
+
"filePath": "git.main.runtime.ts",
|
|
882
|
+
"line": 13,
|
|
883
|
+
"character": 30
|
|
884
|
+
},
|
|
885
|
+
"members": [
|
|
886
|
+
{
|
|
887
|
+
"__schema": "VariableLikeSchema",
|
|
888
|
+
"location": {
|
|
889
|
+
"filePath": "git.main.runtime.ts",
|
|
890
|
+
"line": 14,
|
|
891
|
+
"character": 3
|
|
892
|
+
},
|
|
893
|
+
"signature": "(property) global?: boolean | undefined",
|
|
894
|
+
"name": "global",
|
|
895
|
+
"type": {
|
|
896
|
+
"__schema": "KeywordTypeSchema",
|
|
897
|
+
"location": {
|
|
898
|
+
"filePath": "git.main.runtime.ts",
|
|
899
|
+
"line": 14,
|
|
900
|
+
"character": 12
|
|
901
|
+
},
|
|
902
|
+
"name": "boolean"
|
|
903
|
+
},
|
|
904
|
+
"isOptional": true
|
|
905
|
+
}
|
|
906
|
+
]
|
|
907
|
+
}
|
|
908
|
+
},
|
|
909
|
+
{
|
|
910
|
+
"__schema": "ModuleSchema",
|
|
911
|
+
"location": {
|
|
912
|
+
"filePath": "git.main.runtime.ts",
|
|
913
|
+
"line": 17,
|
|
914
|
+
"character": 1
|
|
915
|
+
},
|
|
916
|
+
"exports": [
|
|
917
|
+
{
|
|
918
|
+
"__schema": "VariableLikeSchema",
|
|
919
|
+
"location": {
|
|
920
|
+
"filePath": "git.main.runtime.ts",
|
|
921
|
+
"line": 17,
|
|
922
|
+
"character": 7
|
|
923
|
+
},
|
|
924
|
+
"signature": "const GIT_BASE_KEY: \"merge.bitmap-driver\"",
|
|
925
|
+
"name": "GIT_BASE_KEY",
|
|
926
|
+
"type": {
|
|
927
|
+
"__schema": "InferenceTypeSchema",
|
|
928
|
+
"location": {
|
|
929
|
+
"filePath": "git.main.runtime.ts",
|
|
930
|
+
"line": 17,
|
|
931
|
+
"character": 7
|
|
932
|
+
},
|
|
933
|
+
"type": "\"merge.bitmap-driver\""
|
|
934
|
+
},
|
|
935
|
+
"isOptional": false,
|
|
936
|
+
"defaultValue": "'merge.bitmap-driver'"
|
|
937
|
+
}
|
|
938
|
+
],
|
|
939
|
+
"internals": []
|
|
940
|
+
},
|
|
941
|
+
{
|
|
942
|
+
"__schema": "ModuleSchema",
|
|
943
|
+
"location": {
|
|
944
|
+
"filePath": "git.main.runtime.ts",
|
|
945
|
+
"line": 18,
|
|
946
|
+
"character": 1
|
|
947
|
+
},
|
|
948
|
+
"exports": [
|
|
949
|
+
{
|
|
950
|
+
"__schema": "VariableLikeSchema",
|
|
951
|
+
"location": {
|
|
952
|
+
"filePath": "git.main.runtime.ts",
|
|
953
|
+
"line": 18,
|
|
954
|
+
"character": 7
|
|
955
|
+
},
|
|
956
|
+
"signature": "const GIT_NAME_KEY: \"merge.bitmap-driver.name\"",
|
|
957
|
+
"name": "GIT_NAME_KEY",
|
|
958
|
+
"type": {
|
|
959
|
+
"__schema": "InferenceTypeSchema",
|
|
960
|
+
"location": {
|
|
961
|
+
"filePath": "git.main.runtime.ts",
|
|
962
|
+
"line": 18,
|
|
963
|
+
"character": 7
|
|
964
|
+
},
|
|
965
|
+
"type": "\"merge.bitmap-driver.name\""
|
|
966
|
+
},
|
|
967
|
+
"isOptional": false,
|
|
968
|
+
"defaultValue": "`${GIT_BASE_KEY}.name`"
|
|
969
|
+
}
|
|
970
|
+
],
|
|
971
|
+
"internals": []
|
|
972
|
+
},
|
|
973
|
+
{
|
|
974
|
+
"__schema": "ModuleSchema",
|
|
975
|
+
"location": {
|
|
976
|
+
"filePath": "git.main.runtime.ts",
|
|
977
|
+
"line": 19,
|
|
978
|
+
"character": 1
|
|
979
|
+
},
|
|
980
|
+
"exports": [
|
|
981
|
+
{
|
|
982
|
+
"__schema": "VariableLikeSchema",
|
|
983
|
+
"location": {
|
|
984
|
+
"filePath": "git.main.runtime.ts",
|
|
985
|
+
"line": 19,
|
|
986
|
+
"character": 7
|
|
987
|
+
},
|
|
988
|
+
"signature": "const GIT_DRIVER_KEY: \"merge.bitmap-driver.driver\"",
|
|
989
|
+
"name": "GIT_DRIVER_KEY",
|
|
990
|
+
"type": {
|
|
991
|
+
"__schema": "InferenceTypeSchema",
|
|
992
|
+
"location": {
|
|
993
|
+
"filePath": "git.main.runtime.ts",
|
|
994
|
+
"line": 19,
|
|
995
|
+
"character": 7
|
|
996
|
+
},
|
|
997
|
+
"type": "\"merge.bitmap-driver.driver\""
|
|
998
|
+
},
|
|
999
|
+
"isOptional": false,
|
|
1000
|
+
"defaultValue": "`${GIT_BASE_KEY}.driver`"
|
|
1001
|
+
}
|
|
1002
|
+
],
|
|
1003
|
+
"internals": []
|
|
1004
|
+
},
|
|
1005
|
+
{
|
|
1006
|
+
"__schema": "ModuleSchema",
|
|
1007
|
+
"location": {
|
|
1008
|
+
"filePath": "git.main.runtime.ts",
|
|
1009
|
+
"line": 21,
|
|
1010
|
+
"character": 1
|
|
1011
|
+
},
|
|
1012
|
+
"exports": [
|
|
1013
|
+
{
|
|
1014
|
+
"__schema": "VariableLikeSchema",
|
|
1015
|
+
"location": {
|
|
1016
|
+
"filePath": "git.main.runtime.ts",
|
|
1017
|
+
"line": 21,
|
|
1018
|
+
"character": 7
|
|
1019
|
+
},
|
|
1020
|
+
"signature": "const GIT_NAME_VALUE: \"A custom merge driver used to resolve conflicts in .bitmap files\"",
|
|
1021
|
+
"name": "GIT_NAME_VALUE",
|
|
1022
|
+
"type": {
|
|
1023
|
+
"__schema": "InferenceTypeSchema",
|
|
1024
|
+
"location": {
|
|
1025
|
+
"filePath": "git.main.runtime.ts",
|
|
1026
|
+
"line": 21,
|
|
1027
|
+
"character": 7
|
|
1028
|
+
},
|
|
1029
|
+
"type": "\"A custom merge driver used to resolve conflicts in .bitmap files\""
|
|
1030
|
+
},
|
|
1031
|
+
"isOptional": false,
|
|
1032
|
+
"defaultValue": "'A custom merge driver used to resolve conflicts in .bitmap files'"
|
|
1033
|
+
}
|
|
1034
|
+
],
|
|
1035
|
+
"internals": []
|
|
1036
|
+
},
|
|
1037
|
+
{
|
|
1038
|
+
"__schema": "ModuleSchema",
|
|
1039
|
+
"location": {
|
|
1040
|
+
"filePath": "git.main.runtime.ts",
|
|
1041
|
+
"line": 23,
|
|
1042
|
+
"character": 1
|
|
1043
|
+
},
|
|
1044
|
+
"exports": [
|
|
1045
|
+
{
|
|
1046
|
+
"__schema": "VariableLikeSchema",
|
|
1047
|
+
"location": {
|
|
1048
|
+
"filePath": "git.main.runtime.ts",
|
|
1049
|
+
"line": 23,
|
|
1050
|
+
"character": 7
|
|
1051
|
+
},
|
|
1052
|
+
"signature": "const GIT_DRIVER_VALUE: \"bd git merge-bitmaps %O %A %B\"",
|
|
1053
|
+
"name": "GIT_DRIVER_VALUE",
|
|
1054
|
+
"type": {
|
|
1055
|
+
"__schema": "InferenceTypeSchema",
|
|
1056
|
+
"location": {
|
|
1057
|
+
"filePath": "git.main.runtime.ts",
|
|
1058
|
+
"line": 23,
|
|
1059
|
+
"character": 7
|
|
1060
|
+
},
|
|
1061
|
+
"type": "\"bd git merge-bitmaps %O %A %B\""
|
|
1062
|
+
},
|
|
1063
|
+
"isOptional": false,
|
|
1064
|
+
"defaultValue": "'bd git merge-bitmaps %O %A %B'"
|
|
1065
|
+
}
|
|
1066
|
+
],
|
|
1067
|
+
"internals": []
|
|
1068
|
+
},
|
|
1069
|
+
{
|
|
1070
|
+
"__schema": "ModuleSchema",
|
|
1071
|
+
"location": {
|
|
1072
|
+
"filePath": "git.main.runtime.ts",
|
|
1073
|
+
"line": 25,
|
|
1074
|
+
"character": 1
|
|
1075
|
+
},
|
|
1076
|
+
"exports": [
|
|
1077
|
+
{
|
|
1078
|
+
"__schema": "VariableLikeSchema",
|
|
1079
|
+
"location": {
|
|
1080
|
+
"filePath": "git.main.runtime.ts",
|
|
1081
|
+
"line": 25,
|
|
1082
|
+
"character": 7
|
|
1083
|
+
},
|
|
1084
|
+
"signature": "const GIT_ATTRIBUTES: \".bitmap merge=bitmap-driver\"",
|
|
1085
|
+
"name": "GIT_ATTRIBUTES",
|
|
1086
|
+
"type": {
|
|
1087
|
+
"__schema": "InferenceTypeSchema",
|
|
1088
|
+
"location": {
|
|
1089
|
+
"filePath": "git.main.runtime.ts",
|
|
1090
|
+
"line": 25,
|
|
1091
|
+
"character": 7
|
|
1092
|
+
},
|
|
1093
|
+
"type": "\".bitmap merge=bitmap-driver\""
|
|
1094
|
+
},
|
|
1095
|
+
"isOptional": false,
|
|
1096
|
+
"defaultValue": "'.bitmap merge=bitmap-driver'"
|
|
1097
|
+
}
|
|
1098
|
+
],
|
|
1099
|
+
"internals": []
|
|
1100
|
+
},
|
|
1101
|
+
{
|
|
1102
|
+
"__schema": "UnImplementedSchema",
|
|
1103
|
+
"location": {
|
|
1104
|
+
"filePath": "git.main.runtime.ts",
|
|
1105
|
+
"line": 131,
|
|
1106
|
+
"character": 1
|
|
1107
|
+
},
|
|
1108
|
+
"name": "GitAspect.addRuntime(GitMain);",
|
|
1109
|
+
"type": "ExpressionStatement"
|
|
1110
|
+
}
|
|
1111
|
+
]
|
|
1112
|
+
},
|
|
1113
|
+
{
|
|
1114
|
+
"__schema": "ModuleSchema",
|
|
1115
|
+
"location": {
|
|
1116
|
+
"filePath": "git.aspect.ts",
|
|
1117
|
+
"line": 1,
|
|
1118
|
+
"character": 1
|
|
1119
|
+
},
|
|
1120
|
+
"exports": [
|
|
1121
|
+
{
|
|
1122
|
+
"__schema": "VariableLikeSchema",
|
|
1123
|
+
"location": {
|
|
1124
|
+
"filePath": "git.aspect.ts",
|
|
1125
|
+
"line": 3,
|
|
1126
|
+
"character": 14
|
|
1127
|
+
},
|
|
1128
|
+
"signature": "const GitAspect: Aspect",
|
|
1129
|
+
"name": "GitAspect",
|
|
1130
|
+
"type": {
|
|
1131
|
+
"__schema": "TypeRefSchema",
|
|
1132
|
+
"location": {
|
|
1133
|
+
"filePath": "git.aspect.ts",
|
|
1134
|
+
"line": 3,
|
|
1135
|
+
"character": 14
|
|
1136
|
+
},
|
|
1137
|
+
"name": "Aspect",
|
|
1138
|
+
"componentId": {
|
|
1139
|
+
"scope": "teambit.harmony",
|
|
1140
|
+
"name": "harmony",
|
|
1141
|
+
"version": "0.4.6"
|
|
1142
|
+
}
|
|
1143
|
+
},
|
|
1144
|
+
"isOptional": false,
|
|
1145
|
+
"defaultValue": "Aspect.create({\n id: 'teambit.git/git',\n})"
|
|
1146
|
+
}
|
|
1147
|
+
],
|
|
1148
|
+
"internals": []
|
|
1149
|
+
}
|
|
1150
|
+
],
|
|
1151
|
+
"componentId": {
|
|
1152
|
+
"scope": "teambit.git",
|
|
1153
|
+
"name": "git",
|
|
1154
|
+
"version": "1.0.190"
|
|
1155
|
+
},
|
|
1156
|
+
"taggedModuleExports": []
|
|
1157
|
+
}
|
package/dist/git.aspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_harmony","data","require","GitAspect","exports","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,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAGE,iBAAM,CAACC,MAAM,CAAC;EACrCC,EAAE,EAAE;AACN,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"names":["_harmony","data","require","GitAspect","exports","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,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEO,MAAME,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAGE,iBAAM,CAACC,MAAM,CAAC;EACrCC,EAAE,EAAE;AACN,CAAC,CAAC","ignoreList":[]}
|
package/dist/git.cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","GitCmd","constructor","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAE1B,MAAMW,YAAY,GAAG,KAAK;AAEnB,MAAMC,MAAM,CAAoB;EAAAC,YAAA;IAAAtB,eAAA,eAC7B,GAAEoB,YAAa,gBAAe;IAAApB,eAAA,gBAC9B,EAAE;IAAAA,eAAA,sBACI,wBAAwB;IAAAA,eAAA,kBAC5B,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;EAAA;EACxB;;EAEA,MAAMuB,MAAMA,CAAC,CAACC,sBAAsB,CAAW,EAAE;IAC/C,OAAOC,gBAAK,CAACC,GAAG,CACb,IAAGF,sBAAuB,qFAC7B,CAAC;EACH;AACF;AAACG,OAAA,CAAAN,MAAA,GAAAA,MAAA"}
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","GitCmd","constructor","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAE1B,MAAMW,YAAY,GAAG,KAAK;AAEnB,MAAMC,MAAM,CAAoB;EAAAC,YAAA;IAAAtB,eAAA,eAC7B,GAAEoB,YAAa,gBAAe;IAAApB,eAAA,gBAC9B,EAAE;IAAAA,eAAA,sBACI,wBAAwB;IAAAA,eAAA,kBAC5B,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;EAAA;EACxB;;EAEA,MAAMuB,MAAMA,CAAC,CAACC,sBAAsB,CAAW,EAAE;IAC/C,OAAOC,gBAAK,CAACC,GAAG,CACb,IAAGF,sBAAuB,qFAC7B,CAAC;EACH;AACF;AAACG,OAAA,CAAAN,MAAA,GAAAA,MAAA","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_fsExtra","data","_interopRequireDefault","require","_bitError","_os","_path","_gitconfig","_cli","_workspace","_git","_mergeBitmaps","_setGitMergeDriver","_git2","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","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":";;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,UAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,IAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,GAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,MAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,KAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,WAAA;EAAA,MAAAN,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAI,UAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,KAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,IAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,WAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,UAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,KAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,IAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAU,cAAA;EAAA,MAAAV,IAAA,GAAAE,OAAA;EAAAQ,aAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,mBAAA;EAAA,MAAAX,IAAA,GAAAE,OAAA;EAAAS,kBAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,MAAA;EAAA,MAAAZ,IAAA,GAAAE,OAAA;EAAAU,KAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAmC,SAAAC,uBAAAY,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAMnC,MAAMW,YAAY,GAAG,qBAAqB;AAC1C,MAAMC,YAAY,GAAI,GAAED,YAAa,OAAM;AAC3C,MAAME,cAAc,GAAI,GAAEF,YAAa,SAAQ;AAE/C,MAAMG,cAAc,GAAG,kEAAkE;AACzF;AACA,MAAMC,gBAAgB,GAAG,+BAA+B;AAExD,MAAMC,cAAc,GAAG,6BAA6B;AAK7C,MAAMC,OAAO,CAAC;EACnBC,WAAWA,CACDC,SAAoB;EAC5B;AACJ;AACA;EACaC,MAA6B,EACtC;IAAA,KALQD,SAAoB,GAApBA,SAAoB;IAAA,KAInBC,MAA6B,GAA7BA,MAA6B;EACrC;EAEH,MAAMC,YAAYA,CAACC,QAAgB,EAAEC,OAAe,EAAEC,KAAa,EAAE;IACnE,MAAMC,QAAQ,GAAG,OAAO;IACxB;IACA,MAAMC,cAAc,GAAG,IAAI,CAACC,QAAQ,CAACC,kBAAE,CAACC,YAAY,CAACN,OAAO,EAAEE,QAAQ,CAAC,CAAC;IACxE,MAAMK,YAAY,GAAG,IAAI,CAACH,QAAQ,CAACC,kBAAE,CAACC,YAAY,CAACL,KAAK,EAAEC,QAAQ,CAAC,CAAC;IACpE,MAAMM,IAAwB,GAAG;MAC/BC,aAAa,EAAE,IAAI,CAACZ,MAAM,CAACY,aAAa,IAAI;IAC9C,CAAC;IACD,MAAMC,MAAM,GAAG,IAAI,CAACd,SAAS,CAACe,MAAM,CAACb,YAAY,CAACK,cAAc,EAAEI,YAAY,EAAEC,IAAI,CAAC;IACrF,MAAMH,kBAAE,CAACO,UAAU,CAACZ,OAAO,EAAEU,MAAM,CAAC;IACpC,OAAOA,MAAM;EACf;EAEA,MAAMG,iBAAiBA,CAACL,IAA2B,EAAE;IACnD,MAAM,IAAI,CAACM,YAAY,CAACN,IAAI,CAAC;IAC7B,MAAM,IAAI,CAACO,gBAAgB,CAACP,IAAI,CAAC;IACjC,OAAO,IAAI;EACb;EAEA,MAAcM,YAAYA,CAACN,IAA2B,EAAE;IACtD,MAAMQ,KAAK,GAAG,MAAMX,kBAAE,CAACY,UAAU,CAAC,MAAM,CAAC;IACzC,IAAI,CAACD,KAAK,IAAI,CAACR,IAAI,CAACU,MAAM,EAAE;MAC1B,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;IACpD;IACA,MAAMC,QAAQ,GAAGZ,IAAI,CAACU,MAAM,GAAG,QAAQ,GAAG,OAAO;IACjD,IAAIG,MAAM;IACV,IAAI;MACFA,MAAM,GAAG,MAAMC,oBAAS,CAACC,GAAG,CAAClC,YAAY,EAAE;QAAE+B;MAAS,CAAC,CAAC;IAC1D,CAAC,CAAC,MAAM;MACN;IAAA;IAEF,IAAIC,MAAM,EAAE;MACV,OAAO,CAAC;IACV;IACA,MAAMC,oBAAS,CAACE,GAAG,CAACnC,YAAY,EAAEE,cAAc,EAAE;MAAE6B;IAAS,CAAC,CAAC;IAC/D,MAAME,oBAAS,CAACE,GAAG,CAAClC,cAAc,EAAEE,gBAAgB,EAAE;MAAE4B;IAAS,CAAC,CAAC;EACrE;EAEA,MAAcL,gBAAgBA,CAACP,IAA2B,EAAE;IAC1D,MAAMiB,cAAc,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAAClB,IAAI,CAACU,MAAM,CAAC;IACnE,MAAMF,KAAK,GAAG,MAAMX,kBAAE,CAACY,UAAU,CAAC,MAAM,CAAC;IACzC,IAAI,CAACD,KAAK,IAAI,CAACR,IAAI,CAACU,MAAM,EAAE;MAC1B,MAAM,KAAIC,oBAAQ,EAAC,8BAA8B,CAAC;IACpD;IACA,MAAMQ,SAAS,GAAG,MAAMtB,kBAAE,CAACY,UAAU,CAACQ,cAAc,CAAC;IACrD,IAAI,CAACE,SAAS,EAAE;MACd,MAAMtB,kBAAE,CAACuB,SAAS,CAACH,cAAc,EAAEhC,cAAc,CAAC;IACpD,CAAC,MAAM;MACL,MAAMoC,aAAa,GAAG,MAAMxB,kBAAE,CAACyB,QAAQ,CAACL,cAAc,EAAE,MAAM,CAAC;MAC/D,IAAII,aAAa,CAACE,QAAQ,CAACtC,cAAc,CAAC,EAAE;QAC1C,OAAO,CAAC;MACV;MACA,MAAMY,kBAAE,CAAC2B,UAAU,CAACP,cAAc,EAAG,KAAIhC,cAAe,EAAC,CAAC;IAC5D;EACF;EAEA,MAAciC,oBAAoBA,CAACR,MAAM,GAAG,KAAK,EAAE;IACjD,MAAMe,UAAU,GAAG,MAAMX,oBAAS,CAACC,GAAG,CAAC,qBAAqB,EAAE;MAAEH,QAAQ,EAAEF,MAAM,GAAG,QAAQ,GAAG;IAAQ,CAAC,CAAC;IACxG,IAAIe,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;IACA,IAAI,CAACf,MAAM,EAAE;MACX,OAAO,gBAAgB;IACzB;IACA,MAAMgB,aAAa,GAAGC,OAAO,CAACC,GAAG,CAACC,eAAe;IACjD,IAAIH,aAAa,EAAE;MACjB,OAAO,IAAAI,YAAI,EAACJ,aAAa,EAAE,KAAK,EAAE,YAAY,CAAC;IACjD;IACA,OAAO,IAAAI,YAAI,EAAC,IAAAC,aAAO,EAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC;EACxD;EAEQnC,QAAQA,CAACoC,GAAG,EAAE;IACpB,OAAOA,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,GAAGA,GAAG,CAACC,KAAK,CAAC,CAAC,CAAC,GAAGD,GAAG;EACjD;EASA,aAAaE,QAAQA,CAAC,CAACC,GAAG,EAAE/C,SAAS,CAAuB,EAAEC,MAA6B,EAAE;IAC3F,MAAM+C,OAAO,GAAG,IAAIlD,OAAO,CAACE,SAAS,EAAEC,MAAM,CAAC;IAC9C,MAAMgD,MAAM,GAAG,KAAIC,cAAM,EAAC,CAAC;IAC3BD,MAAM,CAACE,QAAQ,GAAG,CAAC,KAAIC,yCAAoB,EAACJ,OAAO,CAAC,EAAE,KAAIK,+BAAe,EAACL,OAAO,CAAC,CAAC;IACnFD,GAAG,CAACO,QAAQ,CAACL,MAAM,CAAC;IACpBF,GAAG,CAACQ,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC;IAC/B,OAAOP,OAAO;EAChB;AACF;AAACQ,OAAA,CAAA1D,OAAA,GAAAA,OAAA;AAAA1B,eAAA,CAnGY0B,OAAO,WAoFH,EAAE;AACjB;AACA;AAAA1B,eAAA,CAtFW0B,OAAO,kBAuFI,CAAC2D,gBAAS,EAAEC,4BAAe,CAAC;AAAAtF,eAAA,CAvFvC0B,OAAO,aAyFD6D,kBAAW;AAY9BC,gBAAS,CAACC,UAAU,CAAC/D,OAAO,CAAC;AAAC,IAAAgE,QAAA,GAAAN,OAAA,CAAArF,OAAA,GAEf2B,OAAO"}
|
|
1
|
+
{"version":3,"names":["_fsExtra","data","_interopRequireDefault","require","_bitError","_os","_path","_gitconfig","_cli","_workspace","_git","_mergeBitmaps","_setGitMergeDriver","_git2","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","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":[]}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_git","data","require","_default","exports","default","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,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAyC,IAAAE,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAG1BC,gBAAS"}
|
|
1
|
+
{"version":3,"names":["_git","data","require","_default","exports","default","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,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAyC,IAAAE,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAG1BC,gBAAS","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","MergeBitmapsCmd","constructor","git","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAG1B,MAAMW,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAvB,eAAA,eATxB,GAAEoB,YAAa,+BAA8B;IAAApB,eAAA,gBAC7C,EAAE;IAAAA,eAAA,sBACK,sEAAqE;IAAAA,eAAA,kBAC1E,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;IAAAA,eAAA,kBACd,IAAI;EAGqB;EAEnC,MAAMwB,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACL,GAAG,CAACM,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,CAAAZ,eAAA,GAAAA,eAAA"}
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","MergeBitmapsCmd","constructor","git","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAG1B,MAAMW,YAAY,GAAG,eAAe;;AAEpC;AACA;AACA;;AAEO,MAAMC,eAAe,CAAoB;EAQ9C;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAvB,eAAA,eATxB,GAAEoB,YAAa,+BAA8B;IAAApB,eAAA,gBAC7C,EAAE;IAAAA,eAAA,sBACK,sEAAqE;IAAAA,eAAA,kBAC1E,EAAE;IAAAA,eAAA,gBACJ,KAAK;IAAAA,eAAA,mBACS,EAAE;IAAAA,eAAA,kBACd,IAAI;EAGqB;EAEnC,MAAMwB,MAAMA,CAAC,CAACC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,CAAW,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACL,GAAG,CAACM,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,CAAAZ,eAAA,GAAAA,eAAA","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAG1B,MAAMW,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAvB,eAAA,eARzBoB,YAAY;IAAApB,eAAA,gBACX,KAAK;IAAAA,eAAA,sBACE,+CAA8C;IAAAA,eAAA,kBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAAA,eAAA,gBACxD,KAAK;IAAAA,eAAA,mBACS,EAAE;EAGW;EAEnC,MAAMwB,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACJ,GAAG,CAACK,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,CAAAX,oBAAA,GAAAA,oBAAA"}
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","COMMAND_NAME","SetGitMergeDriverCmd","constructor","git","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;AAA0B,SAAAC,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAG,gBAAAH,GAAA,EAAAI,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAJ,GAAA,IAAAO,MAAA,CAAAC,cAAA,CAAAR,GAAA,EAAAI,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAX,GAAA,CAAAI,GAAA,IAAAC,KAAA,WAAAL,GAAA;AAAA,SAAAM,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAG1B,MAAMW,YAAY,GAAG,kBAAkB;AAMhC,MAAMC,oBAAoB,CAAoB;EAOnD;;EAEAC,WAAWA,CAASC,GAAY,EAAE;IAAA,KAAdA,GAAY,GAAZA,GAAY;IAAAvB,eAAA,eARzBoB,YAAY;IAAApB,eAAA,gBACX,KAAK;IAAAA,eAAA,sBACE,+CAA8C;IAAAA,eAAA,kBACnD,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,mCAAmC,CAAC,CAAC;IAAAA,eAAA,gBACxD,KAAK;IAAAA,eAAA,mBACS,EAAE;EAGW;EAEnC,MAAMwB,MAAMA,CAACC,KAAK,EAAEC,KAA6B,EAAE;IACjD,MAAMC,GAAG,GAAG,MAAM,IAAI,CAACJ,GAAG,CAACK,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,CAAAX,oBAAA,GAAAA,oBAAA","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/git",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.190",
|
|
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.190"
|
|
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.857",
|
|
18
|
+
"@teambit/workspace": "1.0.190"
|
|
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.27"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"@teambit/legacy": "1.0.624"
|
|
File without changes
|