@teambit/merge-lanes 1.0.330 → 1.0.332
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 +2 -2
- package/artifacts/schema.json +85 -384
- package/dist/last-merged.js +8 -8
- package/dist/last-merged.js.map +1 -1
- package/dist/merge-lane-from-scope.cmd.js +4 -4
- package/dist/merge-lane-from-scope.cmd.js.map +1 -1
- package/dist/merge-lanes.main.runtime.js +4 -4
- package/dist/merge-lanes.main.runtime.js.map +1 -1
- package/package.json +22 -18
- /package/dist/{preview-1720513025675.js → preview-1720690103747.js} +0 -0
package/artifacts/schema.json
CHANGED
@@ -64,11 +64,7 @@
|
|
64
64
|
"line": 77,
|
65
65
|
"character": 24
|
66
66
|
},
|
67
|
-
"name": "Workspace"
|
68
|
-
"componentId": {
|
69
|
-
"scope": "teambit.workspace",
|
70
|
-
"name": "workspace"
|
71
|
-
}
|
67
|
+
"name": "Workspace"
|
72
68
|
},
|
73
69
|
{
|
74
70
|
"__schema": "KeywordTypeSchema",
|
@@ -99,11 +95,7 @@
|
|
99
95
|
"line": 78,
|
100
96
|
"character": 22
|
101
97
|
},
|
102
|
-
"name": "MergingMain"
|
103
|
-
"componentId": {
|
104
|
-
"scope": "teambit.component",
|
105
|
-
"name": "merging"
|
106
|
-
}
|
98
|
+
"name": "MergingMain"
|
107
99
|
},
|
108
100
|
"isOptional": false,
|
109
101
|
"isSpread": false
|
@@ -123,11 +115,7 @@
|
|
123
115
|
"line": 79,
|
124
116
|
"character": 21
|
125
117
|
},
|
126
|
-
"name": "LanesMain"
|
127
|
-
"componentId": {
|
128
|
-
"scope": "teambit.lanes",
|
129
|
-
"name": "lanes"
|
130
|
-
}
|
118
|
+
"name": "LanesMain"
|
131
119
|
},
|
132
120
|
"isOptional": false,
|
133
121
|
"isSpread": false
|
@@ -147,11 +135,7 @@
|
|
147
135
|
"line": 80,
|
148
136
|
"character": 22
|
149
137
|
},
|
150
|
-
"name": "Logger"
|
151
|
-
"componentId": {
|
152
|
-
"scope": "teambit.harmony",
|
153
|
-
"name": "logger"
|
154
|
-
}
|
138
|
+
"name": "Logger"
|
155
139
|
},
|
156
140
|
"isOptional": false,
|
157
141
|
"isSpread": false
|
@@ -171,11 +155,7 @@
|
|
171
155
|
"line": 81,
|
172
156
|
"character": 21
|
173
157
|
},
|
174
|
-
"name": "RemoveMain"
|
175
|
-
"componentId": {
|
176
|
-
"scope": "teambit.component",
|
177
|
-
"name": "remove"
|
178
|
-
}
|
158
|
+
"name": "RemoveMain"
|
179
159
|
},
|
180
160
|
"isOptional": false,
|
181
161
|
"isSpread": false
|
@@ -195,11 +175,7 @@
|
|
195
175
|
"line": 82,
|
196
176
|
"character": 20
|
197
177
|
},
|
198
|
-
"name": "ScopeMain"
|
199
|
-
"componentId": {
|
200
|
-
"scope": "teambit.scope",
|
201
|
-
"name": "scope"
|
202
|
-
}
|
178
|
+
"name": "ScopeMain"
|
203
179
|
},
|
204
180
|
"isOptional": false,
|
205
181
|
"isSpread": false
|
@@ -219,11 +195,7 @@
|
|
219
195
|
"line": 83,
|
220
196
|
"character": 23
|
221
197
|
},
|
222
|
-
"name": "ExportMain"
|
223
|
-
"componentId": {
|
224
|
-
"scope": "teambit.scope",
|
225
|
-
"name": "export"
|
226
|
-
}
|
198
|
+
"name": "ExportMain"
|
227
199
|
},
|
228
200
|
"isOptional": false,
|
229
201
|
"isSpread": false
|
@@ -243,11 +215,7 @@
|
|
243
215
|
"line": 84,
|
244
216
|
"character": 23
|
245
217
|
},
|
246
|
-
"name": "ImporterMain"
|
247
|
-
"componentId": {
|
248
|
-
"scope": "teambit.scope",
|
249
|
-
"name": "importer"
|
250
|
-
}
|
218
|
+
"name": "ImporterMain"
|
251
219
|
},
|
252
220
|
"isOptional": false,
|
253
221
|
"isSpread": false
|
@@ -267,11 +235,7 @@
|
|
267
235
|
"line": 85,
|
268
236
|
"character": 23
|
269
237
|
},
|
270
|
-
"name": "CheckoutMain"
|
271
|
-
"componentId": {
|
272
|
-
"scope": "teambit.component",
|
273
|
-
"name": "checkout"
|
274
|
-
}
|
238
|
+
"name": "CheckoutMain"
|
275
239
|
},
|
276
240
|
"isOptional": false,
|
277
241
|
"isSpread": false
|
@@ -333,8 +297,7 @@
|
|
333
297
|
"line": 88,
|
334
298
|
"character": 51
|
335
299
|
},
|
336
|
-
"name": "MergeLaneOptions"
|
337
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
300
|
+
"name": "MergeLaneOptions"
|
338
301
|
},
|
339
302
|
"isOptional": false,
|
340
303
|
"isSpread": false
|
@@ -378,12 +341,7 @@
|
|
378
341
|
"line": 99,
|
379
342
|
"character": 18
|
380
343
|
},
|
381
|
-
"name": "LaneId"
|
382
|
-
"componentId": {
|
383
|
-
"scope": "teambit.lanes",
|
384
|
-
"name": "lane-id",
|
385
|
-
"version": "0.0.311"
|
386
|
-
}
|
344
|
+
"name": "LaneId"
|
387
345
|
},
|
388
346
|
"isOptional": false,
|
389
347
|
"isSpread": false
|
@@ -403,12 +361,7 @@
|
|
403
361
|
"line": 100,
|
404
362
|
"character": 20
|
405
363
|
},
|
406
|
-
"name": "LaneId"
|
407
|
-
"componentId": {
|
408
|
-
"scope": "teambit.lanes",
|
409
|
-
"name": "lane-id",
|
410
|
-
"version": "0.0.311"
|
411
|
-
}
|
364
|
+
"name": "LaneId"
|
412
365
|
},
|
413
366
|
"isOptional": false,
|
414
367
|
"isSpread": false
|
@@ -428,8 +381,7 @@
|
|
428
381
|
"line": 101,
|
429
382
|
"character": 14
|
430
383
|
},
|
431
|
-
"name": "MergeLaneOptions"
|
432
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
384
|
+
"name": "MergeLaneOptions"
|
433
385
|
},
|
434
386
|
"isOptional": false,
|
435
387
|
"isSpread": false
|
@@ -519,11 +471,7 @@
|
|
519
471
|
"line": 105,
|
520
472
|
"character": 25
|
521
473
|
},
|
522
|
-
"name": "ConfigMergeResult"
|
523
|
-
"componentId": {
|
524
|
-
"scope": "teambit.workspace",
|
525
|
-
"name": "config-merger"
|
526
|
-
}
|
474
|
+
"name": "ConfigMergeResult"
|
527
475
|
}
|
528
476
|
},
|
529
477
|
"isOptional": false
|
@@ -551,12 +499,7 @@
|
|
551
499
|
"line": 106,
|
552
500
|
"character": 28
|
553
501
|
},
|
554
|
-
"name": "ComponentID"
|
555
|
-
"componentId": {
|
556
|
-
"scope": "teambit.component",
|
557
|
-
"name": "component-id",
|
558
|
-
"version": "1.2.0"
|
559
|
-
}
|
502
|
+
"name": "ComponentID"
|
560
503
|
}
|
561
504
|
},
|
562
505
|
"isOptional": false
|
@@ -584,8 +527,7 @@
|
|
584
527
|
"line": 107,
|
585
528
|
"character": 16
|
586
529
|
},
|
587
|
-
"name": "ConflictPerId"
|
588
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
530
|
+
"name": "ConflictPerId"
|
589
531
|
}
|
590
532
|
},
|
591
533
|
"isOptional": false
|
@@ -708,11 +650,7 @@
|
|
708
650
|
"line": 328,
|
709
651
|
"character": 39
|
710
652
|
},
|
711
|
-
"name": "CheckoutProps"
|
712
|
-
"componentId": {
|
713
|
-
"scope": "teambit.component",
|
714
|
-
"name": "checkout"
|
715
|
-
}
|
653
|
+
"name": "CheckoutProps"
|
716
654
|
},
|
717
655
|
"isOptional": false,
|
718
656
|
"isSpread": false
|
@@ -732,8 +670,7 @@
|
|
732
670
|
"line": 328,
|
733
671
|
"character": 70
|
734
672
|
},
|
735
|
-
"name": "MergeAbortOpts"
|
736
|
-
"internalFilePath": "merge-abort.cmd.ts"
|
673
|
+
"name": "MergeAbortOpts"
|
737
674
|
},
|
738
675
|
"isOptional": false,
|
739
676
|
"isSpread": false
|
@@ -834,8 +771,7 @@
|
|
834
771
|
"line": 387,
|
835
772
|
"character": 22
|
836
773
|
},
|
837
|
-
"name": "MergeLaneOptions"
|
838
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
774
|
+
"name": "MergeLaneOptions"
|
839
775
|
}
|
840
776
|
]
|
841
777
|
},
|
@@ -911,8 +847,7 @@
|
|
911
847
|
"line": 388,
|
912
848
|
"character": 14
|
913
849
|
},
|
914
|
-
"name": "MergeFromScopeResult"
|
915
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
850
|
+
"name": "MergeFromScopeResult"
|
916
851
|
}
|
917
852
|
]
|
918
853
|
},
|
@@ -1016,11 +951,7 @@
|
|
1016
951
|
"line": 511,
|
1017
952
|
"character": 5
|
1018
953
|
},
|
1019
|
-
"name": "LanesMain"
|
1020
|
-
"componentId": {
|
1021
|
-
"scope": "teambit.lanes",
|
1022
|
-
"name": "lanes"
|
1023
|
-
}
|
954
|
+
"name": "LanesMain"
|
1024
955
|
},
|
1025
956
|
{
|
1026
957
|
"__schema": "TypeRefSchema",
|
@@ -1029,11 +960,7 @@
|
|
1029
960
|
"line": 512,
|
1030
961
|
"character": 5
|
1031
962
|
},
|
1032
|
-
"name": "CLIMain"
|
1033
|
-
"componentId": {
|
1034
|
-
"scope": "teambit.harmony",
|
1035
|
-
"name": "cli"
|
1036
|
-
}
|
963
|
+
"name": "CLIMain"
|
1037
964
|
},
|
1038
965
|
{
|
1039
966
|
"__schema": "TypeRefSchema",
|
@@ -1042,11 +969,7 @@
|
|
1042
969
|
"line": 513,
|
1043
970
|
"character": 5
|
1044
971
|
},
|
1045
|
-
"name": "Workspace"
|
1046
|
-
"componentId": {
|
1047
|
-
"scope": "teambit.workspace",
|
1048
|
-
"name": "workspace"
|
1049
|
-
}
|
972
|
+
"name": "Workspace"
|
1050
973
|
},
|
1051
974
|
{
|
1052
975
|
"__schema": "TypeRefSchema",
|
@@ -1055,11 +978,7 @@
|
|
1055
978
|
"line": 514,
|
1056
979
|
"character": 5
|
1057
980
|
},
|
1058
|
-
"name": "MergingMain"
|
1059
|
-
"componentId": {
|
1060
|
-
"scope": "teambit.component",
|
1061
|
-
"name": "merging"
|
1062
|
-
}
|
981
|
+
"name": "MergingMain"
|
1063
982
|
},
|
1064
983
|
{
|
1065
984
|
"__schema": "TypeRefSchema",
|
@@ -1068,11 +987,7 @@
|
|
1068
987
|
"line": 515,
|
1069
988
|
"character": 5
|
1070
989
|
},
|
1071
|
-
"name": "LoggerMain"
|
1072
|
-
"componentId": {
|
1073
|
-
"scope": "teambit.harmony",
|
1074
|
-
"name": "logger"
|
1075
|
-
}
|
990
|
+
"name": "LoggerMain"
|
1076
991
|
},
|
1077
992
|
{
|
1078
993
|
"__schema": "TypeRefSchema",
|
@@ -1081,11 +996,7 @@
|
|
1081
996
|
"line": 516,
|
1082
997
|
"character": 5
|
1083
998
|
},
|
1084
|
-
"name": "RemoveMain"
|
1085
|
-
"componentId": {
|
1086
|
-
"scope": "teambit.component",
|
1087
|
-
"name": "remove"
|
1088
|
-
}
|
999
|
+
"name": "RemoveMain"
|
1089
1000
|
},
|
1090
1001
|
{
|
1091
1002
|
"__schema": "TypeRefSchema",
|
@@ -1094,11 +1005,7 @@
|
|
1094
1005
|
"line": 517,
|
1095
1006
|
"character": 5
|
1096
1007
|
},
|
1097
|
-
"name": "ScopeMain"
|
1098
|
-
"componentId": {
|
1099
|
-
"scope": "teambit.scope",
|
1100
|
-
"name": "scope"
|
1101
|
-
}
|
1008
|
+
"name": "ScopeMain"
|
1102
1009
|
},
|
1103
1010
|
{
|
1104
1011
|
"__schema": "TypeRefSchema",
|
@@ -1107,11 +1014,7 @@
|
|
1107
1014
|
"line": 518,
|
1108
1015
|
"character": 5
|
1109
1016
|
},
|
1110
|
-
"name": "ExportMain"
|
1111
|
-
"componentId": {
|
1112
|
-
"scope": "teambit.scope",
|
1113
|
-
"name": "export"
|
1114
|
-
}
|
1017
|
+
"name": "ExportMain"
|
1115
1018
|
},
|
1116
1019
|
{
|
1117
1020
|
"__schema": "TypeRefSchema",
|
@@ -1120,11 +1023,7 @@
|
|
1120
1023
|
"line": 519,
|
1121
1024
|
"character": 5
|
1122
1025
|
},
|
1123
|
-
"name": "ImporterMain"
|
1124
|
-
"componentId": {
|
1125
|
-
"scope": "teambit.scope",
|
1126
|
-
"name": "importer"
|
1127
|
-
}
|
1026
|
+
"name": "ImporterMain"
|
1128
1027
|
},
|
1129
1028
|
{
|
1130
1029
|
"__schema": "TypeRefSchema",
|
@@ -1133,11 +1032,7 @@
|
|
1133
1032
|
"line": 520,
|
1134
1033
|
"character": 5
|
1135
1034
|
},
|
1136
|
-
"name": "CheckoutMain"
|
1137
|
-
"componentId": {
|
1138
|
-
"scope": "teambit.component",
|
1139
|
-
"name": "checkout"
|
1140
|
-
}
|
1035
|
+
"name": "CheckoutMain"
|
1141
1036
|
},
|
1142
1037
|
{
|
1143
1038
|
"__schema": "TypeRefSchema",
|
@@ -1146,11 +1041,7 @@
|
|
1146
1041
|
"line": 521,
|
1147
1042
|
"character": 5
|
1148
1043
|
},
|
1149
|
-
"name": "GlobalConfigMain"
|
1150
|
-
"componentId": {
|
1151
|
-
"scope": "teambit.harmony",
|
1152
|
-
"name": "global-config"
|
1153
|
-
}
|
1044
|
+
"name": "GlobalConfigMain"
|
1154
1045
|
}
|
1155
1046
|
]
|
1156
1047
|
},
|
@@ -1267,11 +1158,7 @@
|
|
1267
1158
|
"line": 42,
|
1268
1159
|
"character": 18
|
1269
1160
|
},
|
1270
|
-
"name": "MergeStrategy"
|
1271
|
-
"componentId": {
|
1272
|
-
"scope": "teambit.component",
|
1273
|
-
"name": "merging"
|
1274
|
-
}
|
1161
|
+
"name": "MergeStrategy"
|
1275
1162
|
},
|
1276
1163
|
"isOptional": false
|
1277
1164
|
},
|
@@ -1551,11 +1438,7 @@
|
|
1551
1438
|
"line": 56,
|
1552
1439
|
"character": 22
|
1553
1440
|
},
|
1554
|
-
"name": "MergeStrategy"
|
1555
|
-
"componentId": {
|
1556
|
-
"scope": "teambit.component",
|
1557
|
-
"name": "merging"
|
1558
|
-
}
|
1441
|
+
"name": "MergeStrategy"
|
1559
1442
|
},
|
1560
1443
|
"isOptional": true
|
1561
1444
|
},
|
@@ -1815,12 +1698,7 @@
|
|
1815
1698
|
"line": 66,
|
1816
1699
|
"character": 14
|
1817
1700
|
},
|
1818
|
-
"name": "ComponentID"
|
1819
|
-
"componentId": {
|
1820
|
-
"scope": "teambit.component",
|
1821
|
-
"name": "component-id",
|
1822
|
-
"version": "1.2.0"
|
1823
|
-
}
|
1701
|
+
"name": "ComponentID"
|
1824
1702
|
}
|
1825
1703
|
},
|
1826
1704
|
"isOptional": false
|
@@ -1848,12 +1726,7 @@
|
|
1848
1726
|
"line": 67,
|
1849
1727
|
"character": 16
|
1850
1728
|
},
|
1851
|
-
"name": "ComponentID"
|
1852
|
-
"componentId": {
|
1853
|
-
"scope": "teambit.component",
|
1854
|
-
"name": "component-id",
|
1855
|
-
"version": "1.2.0"
|
1856
|
-
}
|
1729
|
+
"name": "ComponentID"
|
1857
1730
|
}
|
1858
1731
|
},
|
1859
1732
|
"isOptional": false
|
@@ -1955,8 +1828,7 @@
|
|
1955
1828
|
"line": 69,
|
1956
1829
|
"character": 15
|
1957
1830
|
},
|
1958
|
-
"name": "ConflictPerId"
|
1959
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
1831
|
+
"name": "ConflictPerId"
|
1960
1832
|
}
|
1961
1833
|
},
|
1962
1834
|
"isOptional": true
|
@@ -1984,12 +1856,7 @@
|
|
1984
1856
|
"line": 70,
|
1985
1857
|
"character": 16
|
1986
1858
|
},
|
1987
|
-
"name": "ComponentID"
|
1988
|
-
"componentId": {
|
1989
|
-
"scope": "teambit.component",
|
1990
|
-
"name": "component-id",
|
1991
|
-
"version": "1.2.0"
|
1992
|
-
}
|
1859
|
+
"name": "ComponentID"
|
1993
1860
|
}
|
1994
1861
|
},
|
1995
1862
|
"isOptional": true
|
@@ -2017,12 +1884,7 @@
|
|
2017
1884
|
"line": 71,
|
2018
1885
|
"character": 21
|
2019
1886
|
},
|
2020
|
-
"name": "ComponentID"
|
2021
|
-
"componentId": {
|
2022
|
-
"scope": "teambit.component",
|
2023
|
-
"name": "component-id",
|
2024
|
-
"version": "1.2.0"
|
2025
|
-
}
|
1887
|
+
"name": "ComponentID"
|
2026
1888
|
}
|
2027
1889
|
},
|
2028
1890
|
"isOptional": false
|
@@ -2093,11 +1955,7 @@
|
|
2093
1955
|
"line": 77,
|
2094
1956
|
"character": 24
|
2095
1957
|
},
|
2096
|
-
"name": "Workspace"
|
2097
|
-
"componentId": {
|
2098
|
-
"scope": "teambit.workspace",
|
2099
|
-
"name": "workspace"
|
2100
|
-
}
|
1958
|
+
"name": "Workspace"
|
2101
1959
|
},
|
2102
1960
|
{
|
2103
1961
|
"__schema": "KeywordTypeSchema",
|
@@ -2128,11 +1986,7 @@
|
|
2128
1986
|
"line": 78,
|
2129
1987
|
"character": 22
|
2130
1988
|
},
|
2131
|
-
"name": "MergingMain"
|
2132
|
-
"componentId": {
|
2133
|
-
"scope": "teambit.component",
|
2134
|
-
"name": "merging"
|
2135
|
-
}
|
1989
|
+
"name": "MergingMain"
|
2136
1990
|
},
|
2137
1991
|
"isOptional": false,
|
2138
1992
|
"isSpread": false
|
@@ -2152,11 +2006,7 @@
|
|
2152
2006
|
"line": 79,
|
2153
2007
|
"character": 21
|
2154
2008
|
},
|
2155
|
-
"name": "LanesMain"
|
2156
|
-
"componentId": {
|
2157
|
-
"scope": "teambit.lanes",
|
2158
|
-
"name": "lanes"
|
2159
|
-
}
|
2009
|
+
"name": "LanesMain"
|
2160
2010
|
},
|
2161
2011
|
"isOptional": false,
|
2162
2012
|
"isSpread": false
|
@@ -2176,11 +2026,7 @@
|
|
2176
2026
|
"line": 80,
|
2177
2027
|
"character": 22
|
2178
2028
|
},
|
2179
|
-
"name": "Logger"
|
2180
|
-
"componentId": {
|
2181
|
-
"scope": "teambit.harmony",
|
2182
|
-
"name": "logger"
|
2183
|
-
}
|
2029
|
+
"name": "Logger"
|
2184
2030
|
},
|
2185
2031
|
"isOptional": false,
|
2186
2032
|
"isSpread": false
|
@@ -2200,11 +2046,7 @@
|
|
2200
2046
|
"line": 81,
|
2201
2047
|
"character": 21
|
2202
2048
|
},
|
2203
|
-
"name": "RemoveMain"
|
2204
|
-
"componentId": {
|
2205
|
-
"scope": "teambit.component",
|
2206
|
-
"name": "remove"
|
2207
|
-
}
|
2049
|
+
"name": "RemoveMain"
|
2208
2050
|
},
|
2209
2051
|
"isOptional": false,
|
2210
2052
|
"isSpread": false
|
@@ -2224,11 +2066,7 @@
|
|
2224
2066
|
"line": 82,
|
2225
2067
|
"character": 20
|
2226
2068
|
},
|
2227
|
-
"name": "ScopeMain"
|
2228
|
-
"componentId": {
|
2229
|
-
"scope": "teambit.scope",
|
2230
|
-
"name": "scope"
|
2231
|
-
}
|
2069
|
+
"name": "ScopeMain"
|
2232
2070
|
},
|
2233
2071
|
"isOptional": false,
|
2234
2072
|
"isSpread": false
|
@@ -2248,11 +2086,7 @@
|
|
2248
2086
|
"line": 83,
|
2249
2087
|
"character": 23
|
2250
2088
|
},
|
2251
|
-
"name": "ExportMain"
|
2252
|
-
"componentId": {
|
2253
|
-
"scope": "teambit.scope",
|
2254
|
-
"name": "export"
|
2255
|
-
}
|
2089
|
+
"name": "ExportMain"
|
2256
2090
|
},
|
2257
2091
|
"isOptional": false,
|
2258
2092
|
"isSpread": false
|
@@ -2272,11 +2106,7 @@
|
|
2272
2106
|
"line": 84,
|
2273
2107
|
"character": 23
|
2274
2108
|
},
|
2275
|
-
"name": "ImporterMain"
|
2276
|
-
"componentId": {
|
2277
|
-
"scope": "teambit.scope",
|
2278
|
-
"name": "importer"
|
2279
|
-
}
|
2109
|
+
"name": "ImporterMain"
|
2280
2110
|
},
|
2281
2111
|
"isOptional": false,
|
2282
2112
|
"isSpread": false
|
@@ -2296,11 +2126,7 @@
|
|
2296
2126
|
"line": 85,
|
2297
2127
|
"character": 23
|
2298
2128
|
},
|
2299
|
-
"name": "CheckoutMain"
|
2300
|
-
"componentId": {
|
2301
|
-
"scope": "teambit.component",
|
2302
|
-
"name": "checkout"
|
2303
|
-
}
|
2129
|
+
"name": "CheckoutMain"
|
2304
2130
|
},
|
2305
2131
|
"isOptional": false,
|
2306
2132
|
"isSpread": false
|
@@ -2362,8 +2188,7 @@
|
|
2362
2188
|
"line": 88,
|
2363
2189
|
"character": 51
|
2364
2190
|
},
|
2365
|
-
"name": "MergeLaneOptions"
|
2366
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
2191
|
+
"name": "MergeLaneOptions"
|
2367
2192
|
},
|
2368
2193
|
"isOptional": false,
|
2369
2194
|
"isSpread": false
|
@@ -2407,12 +2232,7 @@
|
|
2407
2232
|
"line": 99,
|
2408
2233
|
"character": 18
|
2409
2234
|
},
|
2410
|
-
"name": "LaneId"
|
2411
|
-
"componentId": {
|
2412
|
-
"scope": "teambit.lanes",
|
2413
|
-
"name": "lane-id",
|
2414
|
-
"version": "0.0.311"
|
2415
|
-
}
|
2235
|
+
"name": "LaneId"
|
2416
2236
|
},
|
2417
2237
|
"isOptional": false,
|
2418
2238
|
"isSpread": false
|
@@ -2432,12 +2252,7 @@
|
|
2432
2252
|
"line": 100,
|
2433
2253
|
"character": 20
|
2434
2254
|
},
|
2435
|
-
"name": "LaneId"
|
2436
|
-
"componentId": {
|
2437
|
-
"scope": "teambit.lanes",
|
2438
|
-
"name": "lane-id",
|
2439
|
-
"version": "0.0.311"
|
2440
|
-
}
|
2255
|
+
"name": "LaneId"
|
2441
2256
|
},
|
2442
2257
|
"isOptional": false,
|
2443
2258
|
"isSpread": false
|
@@ -2457,8 +2272,7 @@
|
|
2457
2272
|
"line": 101,
|
2458
2273
|
"character": 14
|
2459
2274
|
},
|
2460
|
-
"name": "MergeLaneOptions"
|
2461
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
2275
|
+
"name": "MergeLaneOptions"
|
2462
2276
|
},
|
2463
2277
|
"isOptional": false,
|
2464
2278
|
"isSpread": false
|
@@ -2548,11 +2362,7 @@
|
|
2548
2362
|
"line": 105,
|
2549
2363
|
"character": 25
|
2550
2364
|
},
|
2551
|
-
"name": "ConfigMergeResult"
|
2552
|
-
"componentId": {
|
2553
|
-
"scope": "teambit.workspace",
|
2554
|
-
"name": "config-merger"
|
2555
|
-
}
|
2365
|
+
"name": "ConfigMergeResult"
|
2556
2366
|
}
|
2557
2367
|
},
|
2558
2368
|
"isOptional": false
|
@@ -2580,12 +2390,7 @@
|
|
2580
2390
|
"line": 106,
|
2581
2391
|
"character": 28
|
2582
2392
|
},
|
2583
|
-
"name": "ComponentID"
|
2584
|
-
"componentId": {
|
2585
|
-
"scope": "teambit.component",
|
2586
|
-
"name": "component-id",
|
2587
|
-
"version": "1.2.0"
|
2588
|
-
}
|
2393
|
+
"name": "ComponentID"
|
2589
2394
|
}
|
2590
2395
|
},
|
2591
2396
|
"isOptional": false
|
@@ -2613,8 +2418,7 @@
|
|
2613
2418
|
"line": 107,
|
2614
2419
|
"character": 16
|
2615
2420
|
},
|
2616
|
-
"name": "ConflictPerId"
|
2617
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
2421
|
+
"name": "ConflictPerId"
|
2618
2422
|
}
|
2619
2423
|
},
|
2620
2424
|
"isOptional": false
|
@@ -2737,11 +2541,7 @@
|
|
2737
2541
|
"line": 328,
|
2738
2542
|
"character": 39
|
2739
2543
|
},
|
2740
|
-
"name": "CheckoutProps"
|
2741
|
-
"componentId": {
|
2742
|
-
"scope": "teambit.component",
|
2743
|
-
"name": "checkout"
|
2744
|
-
}
|
2544
|
+
"name": "CheckoutProps"
|
2745
2545
|
},
|
2746
2546
|
"isOptional": false,
|
2747
2547
|
"isSpread": false
|
@@ -2761,8 +2561,7 @@
|
|
2761
2561
|
"line": 328,
|
2762
2562
|
"character": 70
|
2763
2563
|
},
|
2764
|
-
"name": "MergeAbortOpts"
|
2765
|
-
"internalFilePath": "merge-abort.cmd.ts"
|
2564
|
+
"name": "MergeAbortOpts"
|
2766
2565
|
},
|
2767
2566
|
"isOptional": false,
|
2768
2567
|
"isSpread": false
|
@@ -2863,8 +2662,7 @@
|
|
2863
2662
|
"line": 387,
|
2864
2663
|
"character": 22
|
2865
2664
|
},
|
2866
|
-
"name": "MergeLaneOptions"
|
2867
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
2665
|
+
"name": "MergeLaneOptions"
|
2868
2666
|
}
|
2869
2667
|
]
|
2870
2668
|
},
|
@@ -2940,8 +2738,7 @@
|
|
2940
2738
|
"line": 388,
|
2941
2739
|
"character": 14
|
2942
2740
|
},
|
2943
|
-
"name": "MergeFromScopeResult"
|
2944
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
2741
|
+
"name": "MergeFromScopeResult"
|
2945
2742
|
}
|
2946
2743
|
]
|
2947
2744
|
},
|
@@ -3045,11 +2842,7 @@
|
|
3045
2842
|
"line": 511,
|
3046
2843
|
"character": 5
|
3047
2844
|
},
|
3048
|
-
"name": "LanesMain"
|
3049
|
-
"componentId": {
|
3050
|
-
"scope": "teambit.lanes",
|
3051
|
-
"name": "lanes"
|
3052
|
-
}
|
2845
|
+
"name": "LanesMain"
|
3053
2846
|
},
|
3054
2847
|
{
|
3055
2848
|
"__schema": "TypeRefSchema",
|
@@ -3058,11 +2851,7 @@
|
|
3058
2851
|
"line": 512,
|
3059
2852
|
"character": 5
|
3060
2853
|
},
|
3061
|
-
"name": "CLIMain"
|
3062
|
-
"componentId": {
|
3063
|
-
"scope": "teambit.harmony",
|
3064
|
-
"name": "cli"
|
3065
|
-
}
|
2854
|
+
"name": "CLIMain"
|
3066
2855
|
},
|
3067
2856
|
{
|
3068
2857
|
"__schema": "TypeRefSchema",
|
@@ -3071,11 +2860,7 @@
|
|
3071
2860
|
"line": 513,
|
3072
2861
|
"character": 5
|
3073
2862
|
},
|
3074
|
-
"name": "Workspace"
|
3075
|
-
"componentId": {
|
3076
|
-
"scope": "teambit.workspace",
|
3077
|
-
"name": "workspace"
|
3078
|
-
}
|
2863
|
+
"name": "Workspace"
|
3079
2864
|
},
|
3080
2865
|
{
|
3081
2866
|
"__schema": "TypeRefSchema",
|
@@ -3084,11 +2869,7 @@
|
|
3084
2869
|
"line": 514,
|
3085
2870
|
"character": 5
|
3086
2871
|
},
|
3087
|
-
"name": "MergingMain"
|
3088
|
-
"componentId": {
|
3089
|
-
"scope": "teambit.component",
|
3090
|
-
"name": "merging"
|
3091
|
-
}
|
2872
|
+
"name": "MergingMain"
|
3092
2873
|
},
|
3093
2874
|
{
|
3094
2875
|
"__schema": "TypeRefSchema",
|
@@ -3097,11 +2878,7 @@
|
|
3097
2878
|
"line": 515,
|
3098
2879
|
"character": 5
|
3099
2880
|
},
|
3100
|
-
"name": "LoggerMain"
|
3101
|
-
"componentId": {
|
3102
|
-
"scope": "teambit.harmony",
|
3103
|
-
"name": "logger"
|
3104
|
-
}
|
2881
|
+
"name": "LoggerMain"
|
3105
2882
|
},
|
3106
2883
|
{
|
3107
2884
|
"__schema": "TypeRefSchema",
|
@@ -3110,11 +2887,7 @@
|
|
3110
2887
|
"line": 516,
|
3111
2888
|
"character": 5
|
3112
2889
|
},
|
3113
|
-
"name": "RemoveMain"
|
3114
|
-
"componentId": {
|
3115
|
-
"scope": "teambit.component",
|
3116
|
-
"name": "remove"
|
3117
|
-
}
|
2890
|
+
"name": "RemoveMain"
|
3118
2891
|
},
|
3119
2892
|
{
|
3120
2893
|
"__schema": "TypeRefSchema",
|
@@ -3123,11 +2896,7 @@
|
|
3123
2896
|
"line": 517,
|
3124
2897
|
"character": 5
|
3125
2898
|
},
|
3126
|
-
"name": "ScopeMain"
|
3127
|
-
"componentId": {
|
3128
|
-
"scope": "teambit.scope",
|
3129
|
-
"name": "scope"
|
3130
|
-
}
|
2899
|
+
"name": "ScopeMain"
|
3131
2900
|
},
|
3132
2901
|
{
|
3133
2902
|
"__schema": "TypeRefSchema",
|
@@ -3136,11 +2905,7 @@
|
|
3136
2905
|
"line": 518,
|
3137
2906
|
"character": 5
|
3138
2907
|
},
|
3139
|
-
"name": "ExportMain"
|
3140
|
-
"componentId": {
|
3141
|
-
"scope": "teambit.scope",
|
3142
|
-
"name": "export"
|
3143
|
-
}
|
2908
|
+
"name": "ExportMain"
|
3144
2909
|
},
|
3145
2910
|
{
|
3146
2911
|
"__schema": "TypeRefSchema",
|
@@ -3149,11 +2914,7 @@
|
|
3149
2914
|
"line": 519,
|
3150
2915
|
"character": 5
|
3151
2916
|
},
|
3152
|
-
"name": "ImporterMain"
|
3153
|
-
"componentId": {
|
3154
|
-
"scope": "teambit.scope",
|
3155
|
-
"name": "importer"
|
3156
|
-
}
|
2917
|
+
"name": "ImporterMain"
|
3157
2918
|
},
|
3158
2919
|
{
|
3159
2920
|
"__schema": "TypeRefSchema",
|
@@ -3162,11 +2923,7 @@
|
|
3162
2923
|
"line": 520,
|
3163
2924
|
"character": 5
|
3164
2925
|
},
|
3165
|
-
"name": "CheckoutMain"
|
3166
|
-
"componentId": {
|
3167
|
-
"scope": "teambit.component",
|
3168
|
-
"name": "checkout"
|
3169
|
-
}
|
2926
|
+
"name": "CheckoutMain"
|
3170
2927
|
},
|
3171
2928
|
{
|
3172
2929
|
"__schema": "TypeRefSchema",
|
@@ -3175,11 +2932,7 @@
|
|
3175
2932
|
"line": 521,
|
3176
2933
|
"character": 5
|
3177
2934
|
},
|
3178
|
-
"name": "GlobalConfigMain"
|
3179
|
-
"componentId": {
|
3180
|
-
"scope": "teambit.harmony",
|
3181
|
-
"name": "global-config"
|
3182
|
-
}
|
2935
|
+
"name": "GlobalConfigMain"
|
3183
2936
|
}
|
3184
2937
|
]
|
3185
2938
|
},
|
@@ -3249,11 +3002,7 @@
|
|
3249
3002
|
"line": 545,
|
3250
3003
|
"character": 24
|
3251
3004
|
},
|
3252
|
-
"name": "ComponentMergeStatus"
|
3253
|
-
"componentId": {
|
3254
|
-
"scope": "teambit.component",
|
3255
|
-
"name": "merging"
|
3256
|
-
}
|
3005
|
+
"name": "ComponentMergeStatus"
|
3257
3006
|
}
|
3258
3007
|
},
|
3259
3008
|
"isOptional": false,
|
@@ -3281,12 +3030,7 @@
|
|
3281
3030
|
"line": 546,
|
3282
3031
|
"character": 18
|
3283
3032
|
},
|
3284
|
-
"name": "ComponentID"
|
3285
|
-
"componentId": {
|
3286
|
-
"scope": "teambit.component",
|
3287
|
-
"name": "component-id",
|
3288
|
-
"version": "1.2.0"
|
3289
|
-
}
|
3033
|
+
"name": "ComponentID"
|
3290
3034
|
}
|
3291
3035
|
},
|
3292
3036
|
"isOptional": false,
|
@@ -3314,12 +3058,7 @@
|
|
3314
3058
|
"line": 547,
|
3315
3059
|
"character": 14
|
3316
3060
|
},
|
3317
|
-
"name": "ComponentID"
|
3318
|
-
"componentId": {
|
3319
|
-
"scope": "teambit.component",
|
3320
|
-
"name": "component-id",
|
3321
|
-
"version": "1.2.0"
|
3322
|
-
}
|
3061
|
+
"name": "ComponentID"
|
3323
3062
|
}
|
3324
3063
|
},
|
3325
3064
|
"isOptional": false,
|
@@ -3381,8 +3120,7 @@
|
|
3381
3120
|
"line": 550,
|
3382
3121
|
"character": 15
|
3383
3122
|
},
|
3384
|
-
"name": "Lane"
|
3385
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
3123
|
+
"name": "Lane"
|
3386
3124
|
},
|
3387
3125
|
"isOptional": true,
|
3388
3126
|
"isSpread": false
|
@@ -3431,11 +3169,7 @@
|
|
3431
3169
|
"line": 552,
|
3432
3170
|
"character": 12
|
3433
3171
|
},
|
3434
|
-
"name": "ComponentMergeStatus"
|
3435
|
-
"componentId": {
|
3436
|
-
"scope": "teambit.component",
|
3437
|
-
"name": "merging"
|
3438
|
-
}
|
3172
|
+
"name": "ComponentMergeStatus"
|
3439
3173
|
}
|
3440
3174
|
}
|
3441
3175
|
]
|
@@ -3469,12 +3203,7 @@
|
|
3469
3203
|
"line": 661,
|
3470
3204
|
"character": 45
|
3471
3205
|
},
|
3472
|
-
"name": "LaneId"
|
3473
|
-
"componentId": {
|
3474
|
-
"scope": "teambit.lanes",
|
3475
|
-
"name": "lane-id",
|
3476
|
-
"version": "0.0.311"
|
3477
|
-
}
|
3206
|
+
"name": "LaneId"
|
3478
3207
|
},
|
3479
3208
|
"isOptional": false,
|
3480
3209
|
"isSpread": false
|
@@ -3525,11 +3254,7 @@
|
|
3525
3254
|
"line": 671,
|
3526
3255
|
"character": 24
|
3527
3256
|
},
|
3528
|
-
"name": "ComponentMergeStatus"
|
3529
|
-
"componentId": {
|
3530
|
-
"scope": "teambit.component",
|
3531
|
-
"name": "merging"
|
3532
|
-
}
|
3257
|
+
"name": "ComponentMergeStatus"
|
3533
3258
|
}
|
3534
3259
|
},
|
3535
3260
|
"isOptional": false,
|
@@ -3550,12 +3275,7 @@
|
|
3550
3275
|
"line": 672,
|
3551
3276
|
"character": 18
|
3552
3277
|
},
|
3553
|
-
"name": "LaneId"
|
3554
|
-
"componentId": {
|
3555
|
-
"scope": "teambit.lanes",
|
3556
|
-
"name": "lane-id",
|
3557
|
-
"version": "0.0.311"
|
3558
|
-
}
|
3278
|
+
"name": "LaneId"
|
3559
3279
|
},
|
3560
3280
|
"isOptional": false,
|
3561
3281
|
"isSpread": false
|
@@ -3575,12 +3295,7 @@
|
|
3575
3295
|
"line": 673,
|
3576
3296
|
"character": 16
|
3577
3297
|
},
|
3578
|
-
"name": "LaneId"
|
3579
|
-
"componentId": {
|
3580
|
-
"scope": "teambit.lanes",
|
3581
|
-
"name": "lane-id",
|
3582
|
-
"version": "0.0.311"
|
3583
|
-
}
|
3298
|
+
"name": "LaneId"
|
3584
3299
|
},
|
3585
3300
|
"isOptional": false,
|
3586
3301
|
"isSpread": false
|
@@ -3695,12 +3410,7 @@
|
|
3695
3410
|
"line": 711,
|
3696
3411
|
"character": 16
|
3697
3412
|
},
|
3698
|
-
"name": "LaneId"
|
3699
|
-
"componentId": {
|
3700
|
-
"scope": "teambit.lanes",
|
3701
|
-
"name": "lane-id",
|
3702
|
-
"version": "0.0.311"
|
3703
|
-
}
|
3413
|
+
"name": "LaneId"
|
3704
3414
|
},
|
3705
3415
|
"isOptional": false,
|
3706
3416
|
"isSpread": false
|
@@ -3720,12 +3430,7 @@
|
|
3720
3430
|
"line": 712,
|
3721
3431
|
"character": 7
|
3722
3432
|
},
|
3723
|
-
"name": "ComponentID"
|
3724
|
-
"componentId": {
|
3725
|
-
"scope": "teambit.component",
|
3726
|
-
"name": "component-id",
|
3727
|
-
"version": "1.2.0"
|
3728
|
-
}
|
3433
|
+
"name": "ComponentID"
|
3729
3434
|
},
|
3730
3435
|
"isOptional": false,
|
3731
3436
|
"isSpread": false
|
@@ -3745,8 +3450,7 @@
|
|
3745
3450
|
"line": 713,
|
3746
3451
|
"character": 16
|
3747
3452
|
},
|
3748
|
-
"name": "SnapsDistance"
|
3749
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
|
3453
|
+
"name": "SnapsDistance"
|
3750
3454
|
},
|
3751
3455
|
"isOptional": false,
|
3752
3456
|
"isSpread": false
|
@@ -3766,8 +3470,7 @@
|
|
3766
3470
|
"line": 714,
|
3767
3471
|
"character": 8
|
3768
3472
|
},
|
3769
|
-
"name": "Log"
|
3770
|
-
"packageName": "@teambit/legacy/dist/scope/models/version"
|
3473
|
+
"name": "Log"
|
3771
3474
|
},
|
3772
3475
|
"isOptional": false,
|
3773
3476
|
"isSpread": false
|
@@ -3807,8 +3510,7 @@
|
|
3807
3510
|
"line": 716,
|
3808
3511
|
"character": 24
|
3809
3512
|
},
|
3810
|
-
"name": "Version"
|
3811
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
3513
|
+
"name": "Version"
|
3812
3514
|
},
|
3813
3515
|
"isOptional": true,
|
3814
3516
|
"isSpread": false
|
@@ -3858,8 +3560,7 @@
|
|
3858
3560
|
"line": 718,
|
3859
3561
|
"character": 12
|
3860
3562
|
},
|
3861
|
-
"name": "Version"
|
3862
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
3563
|
+
"name": "Version"
|
3863
3564
|
},
|
3864
3565
|
{
|
3865
3566
|
"__schema": "KeywordTypeSchema",
|
@@ -3931,7 +3632,7 @@
|
|
3931
3632
|
"componentId": {
|
3932
3633
|
"scope": "teambit.lanes",
|
3933
3634
|
"name": "merge-lanes",
|
3934
|
-
"version": "1.0.
|
3635
|
+
"version": "1.0.332"
|
3935
3636
|
},
|
3936
3637
|
"taggedModuleExports": []
|
3937
3638
|
}
|