@teambit/merge-lanes 1.0.488 → 1.0.489

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.
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="1" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.lanes/merge-lanes@1.0.488" tests="1" failures="0" errors="0" skipped="0">
3
+ <testsuite name="teambit.lanes/merge-lanes@1.0.489" tests="1" failures="0" errors="0" skipped="0">
4
4
  <testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
5
5
  </testsuite>
6
6
  </testsuites>
@@ -65,7 +65,11 @@
65
65
  "line": 76,
66
66
  "character": 24
67
67
  },
68
- "name": "Workspace"
68
+ "name": "Workspace",
69
+ "componentId": {
70
+ "scope": "teambit.workspace",
71
+ "name": "workspace"
72
+ }
69
73
  },
70
74
  {
71
75
  "__schema": "KeywordTypeSchema",
@@ -96,7 +100,11 @@
96
100
  "line": 77,
97
101
  "character": 22
98
102
  },
99
- "name": "MergingMain"
103
+ "name": "MergingMain",
104
+ "componentId": {
105
+ "scope": "teambit.component",
106
+ "name": "merging"
107
+ }
100
108
  },
101
109
  "isOptional": false,
102
110
  "isSpread": false
@@ -116,7 +124,11 @@
116
124
  "line": 78,
117
125
  "character": 21
118
126
  },
119
- "name": "LanesMain"
127
+ "name": "LanesMain",
128
+ "componentId": {
129
+ "scope": "teambit.lanes",
130
+ "name": "lanes"
131
+ }
120
132
  },
121
133
  "isOptional": false,
122
134
  "isSpread": false
@@ -136,7 +148,11 @@
136
148
  "line": 79,
137
149
  "character": 22
138
150
  },
139
- "name": "Logger"
151
+ "name": "Logger",
152
+ "componentId": {
153
+ "scope": "teambit.harmony",
154
+ "name": "logger"
155
+ }
140
156
  },
141
157
  "isOptional": false,
142
158
  "isSpread": false
@@ -156,7 +172,11 @@
156
172
  "line": 80,
157
173
  "character": 21
158
174
  },
159
- "name": "RemoveMain"
175
+ "name": "RemoveMain",
176
+ "componentId": {
177
+ "scope": "teambit.component",
178
+ "name": "remove"
179
+ }
160
180
  },
161
181
  "isOptional": false,
162
182
  "isSpread": false
@@ -176,7 +196,11 @@
176
196
  "line": 81,
177
197
  "character": 20
178
198
  },
179
- "name": "ScopeMain"
199
+ "name": "ScopeMain",
200
+ "componentId": {
201
+ "scope": "teambit.scope",
202
+ "name": "scope"
203
+ }
180
204
  },
181
205
  "isOptional": false,
182
206
  "isSpread": false
@@ -196,7 +220,11 @@
196
220
  "line": 82,
197
221
  "character": 23
198
222
  },
199
- "name": "ExportMain"
223
+ "name": "ExportMain",
224
+ "componentId": {
225
+ "scope": "teambit.scope",
226
+ "name": "export"
227
+ }
200
228
  },
201
229
  "isOptional": false,
202
230
  "isSpread": false
@@ -216,7 +244,11 @@
216
244
  "line": 83,
217
245
  "character": 23
218
246
  },
219
- "name": "ImporterMain"
247
+ "name": "ImporterMain",
248
+ "componentId": {
249
+ "scope": "teambit.scope",
250
+ "name": "importer"
251
+ }
220
252
  },
221
253
  "isOptional": false,
222
254
  "isSpread": false
@@ -236,7 +268,11 @@
236
268
  "line": 84,
237
269
  "character": 23
238
270
  },
239
- "name": "CheckoutMain"
271
+ "name": "CheckoutMain",
272
+ "componentId": {
273
+ "scope": "teambit.component",
274
+ "name": "checkout"
275
+ }
240
276
  },
241
277
  "isOptional": false,
242
278
  "isSpread": false
@@ -298,7 +334,8 @@
298
334
  "line": 87,
299
335
  "character": 51
300
336
  },
301
- "name": "MergeLaneOptions"
337
+ "name": "MergeLaneOptions",
338
+ "internalFilePath": "merge-lanes.main.runtime.ts"
302
339
  },
303
340
  "isOptional": false,
304
341
  "isSpread": false
@@ -342,7 +379,12 @@
342
379
  "line": 98,
343
380
  "character": 18
344
381
  },
345
- "name": "LaneId"
382
+ "name": "LaneId",
383
+ "componentId": {
384
+ "scope": "teambit.lanes",
385
+ "name": "lane-id",
386
+ "version": "0.0.311"
387
+ }
346
388
  },
347
389
  "isOptional": false,
348
390
  "isSpread": false
@@ -362,7 +404,12 @@
362
404
  "line": 99,
363
405
  "character": 20
364
406
  },
365
- "name": "LaneId"
407
+ "name": "LaneId",
408
+ "componentId": {
409
+ "scope": "teambit.lanes",
410
+ "name": "lane-id",
411
+ "version": "0.0.311"
412
+ }
366
413
  },
367
414
  "isOptional": false,
368
415
  "isSpread": false
@@ -382,7 +429,8 @@
382
429
  "line": 100,
383
430
  "character": 14
384
431
  },
385
- "name": "MergeLaneOptions"
432
+ "name": "MergeLaneOptions",
433
+ "internalFilePath": "merge-lanes.main.runtime.ts"
386
434
  },
387
435
  "isOptional": false,
388
436
  "isSpread": false
@@ -472,7 +520,11 @@
472
520
  "line": 104,
473
521
  "character": 25
474
522
  },
475
- "name": "ConfigMergeResult"
523
+ "name": "ConfigMergeResult",
524
+ "componentId": {
525
+ "scope": "teambit.workspace",
526
+ "name": "config-merger"
527
+ }
476
528
  }
477
529
  },
478
530
  "isOptional": false
@@ -500,7 +552,12 @@
500
552
  "line": 105,
501
553
  "character": 28
502
554
  },
503
- "name": "ComponentID"
555
+ "name": "ComponentID",
556
+ "componentId": {
557
+ "scope": "teambit.component",
558
+ "name": "component-id",
559
+ "version": "1.2.2"
560
+ }
504
561
  }
505
562
  },
506
563
  "isOptional": false
@@ -528,7 +585,8 @@
528
585
  "line": 106,
529
586
  "character": 16
530
587
  },
531
- "name": "ConflictPerId"
588
+ "name": "ConflictPerId",
589
+ "internalFilePath": "merge-lanes.main.runtime.ts"
532
590
  }
533
591
  },
534
592
  "isOptional": false
@@ -651,7 +709,11 @@
651
709
  "line": 330,
652
710
  "character": 39
653
711
  },
654
- "name": "CheckoutProps"
712
+ "name": "CheckoutProps",
713
+ "componentId": {
714
+ "scope": "teambit.component",
715
+ "name": "checkout"
716
+ }
655
717
  },
656
718
  "isOptional": false,
657
719
  "isSpread": false
@@ -671,7 +733,8 @@
671
733
  "line": 330,
672
734
  "character": 70
673
735
  },
674
- "name": "MergeAbortOpts"
736
+ "name": "MergeAbortOpts",
737
+ "internalFilePath": "merge-abort.cmd.ts"
675
738
  },
676
739
  "isOptional": false,
677
740
  "isSpread": false
@@ -772,7 +835,8 @@
772
835
  "line": 389,
773
836
  "character": 22
774
837
  },
775
- "name": "MergeLaneOptions"
838
+ "name": "MergeLaneOptions",
839
+ "internalFilePath": "merge-lanes.main.runtime.ts"
776
840
  }
777
841
  ]
778
842
  },
@@ -848,7 +912,8 @@
848
912
  "line": 390,
849
913
  "character": 14
850
914
  },
851
- "name": "MergeFromScopeResult"
915
+ "name": "MergeFromScopeResult",
916
+ "internalFilePath": "merge-lanes.main.runtime.ts"
852
917
  }
853
918
  ]
854
919
  },
@@ -952,7 +1017,11 @@
952
1017
  "line": 512,
953
1018
  "character": 5
954
1019
  },
955
- "name": "LanesMain"
1020
+ "name": "LanesMain",
1021
+ "componentId": {
1022
+ "scope": "teambit.lanes",
1023
+ "name": "lanes"
1024
+ }
956
1025
  },
957
1026
  {
958
1027
  "__schema": "TypeRefSchema",
@@ -961,7 +1030,11 @@
961
1030
  "line": 513,
962
1031
  "character": 5
963
1032
  },
964
- "name": "CLIMain"
1033
+ "name": "CLIMain",
1034
+ "componentId": {
1035
+ "scope": "teambit.harmony",
1036
+ "name": "cli"
1037
+ }
965
1038
  },
966
1039
  {
967
1040
  "__schema": "TypeRefSchema",
@@ -970,7 +1043,11 @@
970
1043
  "line": 514,
971
1044
  "character": 5
972
1045
  },
973
- "name": "Workspace"
1046
+ "name": "Workspace",
1047
+ "componentId": {
1048
+ "scope": "teambit.workspace",
1049
+ "name": "workspace"
1050
+ }
974
1051
  },
975
1052
  {
976
1053
  "__schema": "TypeRefSchema",
@@ -979,7 +1056,11 @@
979
1056
  "line": 515,
980
1057
  "character": 5
981
1058
  },
982
- "name": "MergingMain"
1059
+ "name": "MergingMain",
1060
+ "componentId": {
1061
+ "scope": "teambit.component",
1062
+ "name": "merging"
1063
+ }
983
1064
  },
984
1065
  {
985
1066
  "__schema": "TypeRefSchema",
@@ -988,7 +1069,11 @@
988
1069
  "line": 516,
989
1070
  "character": 5
990
1071
  },
991
- "name": "LoggerMain"
1072
+ "name": "LoggerMain",
1073
+ "componentId": {
1074
+ "scope": "teambit.harmony",
1075
+ "name": "logger"
1076
+ }
992
1077
  },
993
1078
  {
994
1079
  "__schema": "TypeRefSchema",
@@ -997,7 +1082,11 @@
997
1082
  "line": 517,
998
1083
  "character": 5
999
1084
  },
1000
- "name": "RemoveMain"
1085
+ "name": "RemoveMain",
1086
+ "componentId": {
1087
+ "scope": "teambit.component",
1088
+ "name": "remove"
1089
+ }
1001
1090
  },
1002
1091
  {
1003
1092
  "__schema": "TypeRefSchema",
@@ -1006,7 +1095,11 @@
1006
1095
  "line": 518,
1007
1096
  "character": 5
1008
1097
  },
1009
- "name": "ScopeMain"
1098
+ "name": "ScopeMain",
1099
+ "componentId": {
1100
+ "scope": "teambit.scope",
1101
+ "name": "scope"
1102
+ }
1010
1103
  },
1011
1104
  {
1012
1105
  "__schema": "TypeRefSchema",
@@ -1015,7 +1108,11 @@
1015
1108
  "line": 519,
1016
1109
  "character": 5
1017
1110
  },
1018
- "name": "ExportMain"
1111
+ "name": "ExportMain",
1112
+ "componentId": {
1113
+ "scope": "teambit.scope",
1114
+ "name": "export"
1115
+ }
1019
1116
  },
1020
1117
  {
1021
1118
  "__schema": "TypeRefSchema",
@@ -1024,7 +1121,11 @@
1024
1121
  "line": 520,
1025
1122
  "character": 5
1026
1123
  },
1027
- "name": "ImporterMain"
1124
+ "name": "ImporterMain",
1125
+ "componentId": {
1126
+ "scope": "teambit.scope",
1127
+ "name": "importer"
1128
+ }
1028
1129
  },
1029
1130
  {
1030
1131
  "__schema": "TypeRefSchema",
@@ -1033,7 +1134,11 @@
1033
1134
  "line": 521,
1034
1135
  "character": 5
1035
1136
  },
1036
- "name": "CheckoutMain"
1137
+ "name": "CheckoutMain",
1138
+ "componentId": {
1139
+ "scope": "teambit.component",
1140
+ "name": "checkout"
1141
+ }
1037
1142
  },
1038
1143
  {
1039
1144
  "__schema": "TypeRefSchema",
@@ -1042,7 +1147,11 @@
1042
1147
  "line": 522,
1043
1148
  "character": 5
1044
1149
  },
1045
- "name": "GlobalConfigMain"
1150
+ "name": "GlobalConfigMain",
1151
+ "componentId": {
1152
+ "scope": "teambit.harmony",
1153
+ "name": "global-config"
1154
+ }
1046
1155
  }
1047
1156
  ]
1048
1157
  },
@@ -1160,7 +1269,11 @@
1160
1269
  "line": 40,
1161
1270
  "character": 18
1162
1271
  },
1163
- "name": "MergeStrategy"
1272
+ "name": "MergeStrategy",
1273
+ "componentId": {
1274
+ "scope": "teambit.component",
1275
+ "name": "merging"
1276
+ }
1164
1277
  },
1165
1278
  "isOptional": false
1166
1279
  },
@@ -1460,7 +1573,11 @@
1460
1573
  "line": 55,
1461
1574
  "character": 22
1462
1575
  },
1463
- "name": "MergeStrategy"
1576
+ "name": "MergeStrategy",
1577
+ "componentId": {
1578
+ "scope": "teambit.component",
1579
+ "name": "merging"
1580
+ }
1464
1581
  },
1465
1582
  "isOptional": true
1466
1583
  },
@@ -1720,7 +1837,12 @@
1720
1837
  "line": 65,
1721
1838
  "character": 14
1722
1839
  },
1723
- "name": "ComponentID"
1840
+ "name": "ComponentID",
1841
+ "componentId": {
1842
+ "scope": "teambit.component",
1843
+ "name": "component-id",
1844
+ "version": "1.2.2"
1845
+ }
1724
1846
  }
1725
1847
  },
1726
1848
  "isOptional": false
@@ -1748,7 +1870,12 @@
1748
1870
  "line": 66,
1749
1871
  "character": 16
1750
1872
  },
1751
- "name": "ComponentID"
1873
+ "name": "ComponentID",
1874
+ "componentId": {
1875
+ "scope": "teambit.component",
1876
+ "name": "component-id",
1877
+ "version": "1.2.2"
1878
+ }
1752
1879
  }
1753
1880
  },
1754
1881
  "isOptional": false
@@ -1850,7 +1977,8 @@
1850
1977
  "line": 68,
1851
1978
  "character": 15
1852
1979
  },
1853
- "name": "ConflictPerId"
1980
+ "name": "ConflictPerId",
1981
+ "internalFilePath": "merge-lanes.main.runtime.ts"
1854
1982
  }
1855
1983
  },
1856
1984
  "isOptional": true
@@ -1878,7 +2006,12 @@
1878
2006
  "line": 69,
1879
2007
  "character": 16
1880
2008
  },
1881
- "name": "ComponentID"
2009
+ "name": "ComponentID",
2010
+ "componentId": {
2011
+ "scope": "teambit.component",
2012
+ "name": "component-id",
2013
+ "version": "1.2.2"
2014
+ }
1882
2015
  }
1883
2016
  },
1884
2017
  "isOptional": true
@@ -1906,7 +2039,12 @@
1906
2039
  "line": 70,
1907
2040
  "character": 21
1908
2041
  },
1909
- "name": "ComponentID"
2042
+ "name": "ComponentID",
2043
+ "componentId": {
2044
+ "scope": "teambit.component",
2045
+ "name": "component-id",
2046
+ "version": "1.2.2"
2047
+ }
1910
2048
  }
1911
2049
  },
1912
2050
  "isOptional": false
@@ -1977,7 +2115,11 @@
1977
2115
  "line": 76,
1978
2116
  "character": 24
1979
2117
  },
1980
- "name": "Workspace"
2118
+ "name": "Workspace",
2119
+ "componentId": {
2120
+ "scope": "teambit.workspace",
2121
+ "name": "workspace"
2122
+ }
1981
2123
  },
1982
2124
  {
1983
2125
  "__schema": "KeywordTypeSchema",
@@ -2008,7 +2150,11 @@
2008
2150
  "line": 77,
2009
2151
  "character": 22
2010
2152
  },
2011
- "name": "MergingMain"
2153
+ "name": "MergingMain",
2154
+ "componentId": {
2155
+ "scope": "teambit.component",
2156
+ "name": "merging"
2157
+ }
2012
2158
  },
2013
2159
  "isOptional": false,
2014
2160
  "isSpread": false
@@ -2028,7 +2174,11 @@
2028
2174
  "line": 78,
2029
2175
  "character": 21
2030
2176
  },
2031
- "name": "LanesMain"
2177
+ "name": "LanesMain",
2178
+ "componentId": {
2179
+ "scope": "teambit.lanes",
2180
+ "name": "lanes"
2181
+ }
2032
2182
  },
2033
2183
  "isOptional": false,
2034
2184
  "isSpread": false
@@ -2048,7 +2198,11 @@
2048
2198
  "line": 79,
2049
2199
  "character": 22
2050
2200
  },
2051
- "name": "Logger"
2201
+ "name": "Logger",
2202
+ "componentId": {
2203
+ "scope": "teambit.harmony",
2204
+ "name": "logger"
2205
+ }
2052
2206
  },
2053
2207
  "isOptional": false,
2054
2208
  "isSpread": false
@@ -2068,7 +2222,11 @@
2068
2222
  "line": 80,
2069
2223
  "character": 21
2070
2224
  },
2071
- "name": "RemoveMain"
2225
+ "name": "RemoveMain",
2226
+ "componentId": {
2227
+ "scope": "teambit.component",
2228
+ "name": "remove"
2229
+ }
2072
2230
  },
2073
2231
  "isOptional": false,
2074
2232
  "isSpread": false
@@ -2088,7 +2246,11 @@
2088
2246
  "line": 81,
2089
2247
  "character": 20
2090
2248
  },
2091
- "name": "ScopeMain"
2249
+ "name": "ScopeMain",
2250
+ "componentId": {
2251
+ "scope": "teambit.scope",
2252
+ "name": "scope"
2253
+ }
2092
2254
  },
2093
2255
  "isOptional": false,
2094
2256
  "isSpread": false
@@ -2108,7 +2270,11 @@
2108
2270
  "line": 82,
2109
2271
  "character": 23
2110
2272
  },
2111
- "name": "ExportMain"
2273
+ "name": "ExportMain",
2274
+ "componentId": {
2275
+ "scope": "teambit.scope",
2276
+ "name": "export"
2277
+ }
2112
2278
  },
2113
2279
  "isOptional": false,
2114
2280
  "isSpread": false
@@ -2128,7 +2294,11 @@
2128
2294
  "line": 83,
2129
2295
  "character": 23
2130
2296
  },
2131
- "name": "ImporterMain"
2297
+ "name": "ImporterMain",
2298
+ "componentId": {
2299
+ "scope": "teambit.scope",
2300
+ "name": "importer"
2301
+ }
2132
2302
  },
2133
2303
  "isOptional": false,
2134
2304
  "isSpread": false
@@ -2148,7 +2318,11 @@
2148
2318
  "line": 84,
2149
2319
  "character": 23
2150
2320
  },
2151
- "name": "CheckoutMain"
2321
+ "name": "CheckoutMain",
2322
+ "componentId": {
2323
+ "scope": "teambit.component",
2324
+ "name": "checkout"
2325
+ }
2152
2326
  },
2153
2327
  "isOptional": false,
2154
2328
  "isSpread": false
@@ -2210,7 +2384,8 @@
2210
2384
  "line": 87,
2211
2385
  "character": 51
2212
2386
  },
2213
- "name": "MergeLaneOptions"
2387
+ "name": "MergeLaneOptions",
2388
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2214
2389
  },
2215
2390
  "isOptional": false,
2216
2391
  "isSpread": false
@@ -2254,7 +2429,12 @@
2254
2429
  "line": 98,
2255
2430
  "character": 18
2256
2431
  },
2257
- "name": "LaneId"
2432
+ "name": "LaneId",
2433
+ "componentId": {
2434
+ "scope": "teambit.lanes",
2435
+ "name": "lane-id",
2436
+ "version": "0.0.311"
2437
+ }
2258
2438
  },
2259
2439
  "isOptional": false,
2260
2440
  "isSpread": false
@@ -2274,7 +2454,12 @@
2274
2454
  "line": 99,
2275
2455
  "character": 20
2276
2456
  },
2277
- "name": "LaneId"
2457
+ "name": "LaneId",
2458
+ "componentId": {
2459
+ "scope": "teambit.lanes",
2460
+ "name": "lane-id",
2461
+ "version": "0.0.311"
2462
+ }
2278
2463
  },
2279
2464
  "isOptional": false,
2280
2465
  "isSpread": false
@@ -2294,7 +2479,8 @@
2294
2479
  "line": 100,
2295
2480
  "character": 14
2296
2481
  },
2297
- "name": "MergeLaneOptions"
2482
+ "name": "MergeLaneOptions",
2483
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2298
2484
  },
2299
2485
  "isOptional": false,
2300
2486
  "isSpread": false
@@ -2384,7 +2570,11 @@
2384
2570
  "line": 104,
2385
2571
  "character": 25
2386
2572
  },
2387
- "name": "ConfigMergeResult"
2573
+ "name": "ConfigMergeResult",
2574
+ "componentId": {
2575
+ "scope": "teambit.workspace",
2576
+ "name": "config-merger"
2577
+ }
2388
2578
  }
2389
2579
  },
2390
2580
  "isOptional": false
@@ -2412,7 +2602,12 @@
2412
2602
  "line": 105,
2413
2603
  "character": 28
2414
2604
  },
2415
- "name": "ComponentID"
2605
+ "name": "ComponentID",
2606
+ "componentId": {
2607
+ "scope": "teambit.component",
2608
+ "name": "component-id",
2609
+ "version": "1.2.2"
2610
+ }
2416
2611
  }
2417
2612
  },
2418
2613
  "isOptional": false
@@ -2440,7 +2635,8 @@
2440
2635
  "line": 106,
2441
2636
  "character": 16
2442
2637
  },
2443
- "name": "ConflictPerId"
2638
+ "name": "ConflictPerId",
2639
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2444
2640
  }
2445
2641
  },
2446
2642
  "isOptional": false
@@ -2563,7 +2759,11 @@
2563
2759
  "line": 330,
2564
2760
  "character": 39
2565
2761
  },
2566
- "name": "CheckoutProps"
2762
+ "name": "CheckoutProps",
2763
+ "componentId": {
2764
+ "scope": "teambit.component",
2765
+ "name": "checkout"
2766
+ }
2567
2767
  },
2568
2768
  "isOptional": false,
2569
2769
  "isSpread": false
@@ -2583,7 +2783,8 @@
2583
2783
  "line": 330,
2584
2784
  "character": 70
2585
2785
  },
2586
- "name": "MergeAbortOpts"
2786
+ "name": "MergeAbortOpts",
2787
+ "internalFilePath": "merge-abort.cmd.ts"
2587
2788
  },
2588
2789
  "isOptional": false,
2589
2790
  "isSpread": false
@@ -2684,7 +2885,8 @@
2684
2885
  "line": 389,
2685
2886
  "character": 22
2686
2887
  },
2687
- "name": "MergeLaneOptions"
2888
+ "name": "MergeLaneOptions",
2889
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2688
2890
  }
2689
2891
  ]
2690
2892
  },
@@ -2760,7 +2962,8 @@
2760
2962
  "line": 390,
2761
2963
  "character": 14
2762
2964
  },
2763
- "name": "MergeFromScopeResult"
2965
+ "name": "MergeFromScopeResult",
2966
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2764
2967
  }
2765
2968
  ]
2766
2969
  },
@@ -2864,7 +3067,11 @@
2864
3067
  "line": 512,
2865
3068
  "character": 5
2866
3069
  },
2867
- "name": "LanesMain"
3070
+ "name": "LanesMain",
3071
+ "componentId": {
3072
+ "scope": "teambit.lanes",
3073
+ "name": "lanes"
3074
+ }
2868
3075
  },
2869
3076
  {
2870
3077
  "__schema": "TypeRefSchema",
@@ -2873,7 +3080,11 @@
2873
3080
  "line": 513,
2874
3081
  "character": 5
2875
3082
  },
2876
- "name": "CLIMain"
3083
+ "name": "CLIMain",
3084
+ "componentId": {
3085
+ "scope": "teambit.harmony",
3086
+ "name": "cli"
3087
+ }
2877
3088
  },
2878
3089
  {
2879
3090
  "__schema": "TypeRefSchema",
@@ -2882,7 +3093,11 @@
2882
3093
  "line": 514,
2883
3094
  "character": 5
2884
3095
  },
2885
- "name": "Workspace"
3096
+ "name": "Workspace",
3097
+ "componentId": {
3098
+ "scope": "teambit.workspace",
3099
+ "name": "workspace"
3100
+ }
2886
3101
  },
2887
3102
  {
2888
3103
  "__schema": "TypeRefSchema",
@@ -2891,7 +3106,11 @@
2891
3106
  "line": 515,
2892
3107
  "character": 5
2893
3108
  },
2894
- "name": "MergingMain"
3109
+ "name": "MergingMain",
3110
+ "componentId": {
3111
+ "scope": "teambit.component",
3112
+ "name": "merging"
3113
+ }
2895
3114
  },
2896
3115
  {
2897
3116
  "__schema": "TypeRefSchema",
@@ -2900,7 +3119,11 @@
2900
3119
  "line": 516,
2901
3120
  "character": 5
2902
3121
  },
2903
- "name": "LoggerMain"
3122
+ "name": "LoggerMain",
3123
+ "componentId": {
3124
+ "scope": "teambit.harmony",
3125
+ "name": "logger"
3126
+ }
2904
3127
  },
2905
3128
  {
2906
3129
  "__schema": "TypeRefSchema",
@@ -2909,7 +3132,11 @@
2909
3132
  "line": 517,
2910
3133
  "character": 5
2911
3134
  },
2912
- "name": "RemoveMain"
3135
+ "name": "RemoveMain",
3136
+ "componentId": {
3137
+ "scope": "teambit.component",
3138
+ "name": "remove"
3139
+ }
2913
3140
  },
2914
3141
  {
2915
3142
  "__schema": "TypeRefSchema",
@@ -2918,7 +3145,11 @@
2918
3145
  "line": 518,
2919
3146
  "character": 5
2920
3147
  },
2921
- "name": "ScopeMain"
3148
+ "name": "ScopeMain",
3149
+ "componentId": {
3150
+ "scope": "teambit.scope",
3151
+ "name": "scope"
3152
+ }
2922
3153
  },
2923
3154
  {
2924
3155
  "__schema": "TypeRefSchema",
@@ -2927,7 +3158,11 @@
2927
3158
  "line": 519,
2928
3159
  "character": 5
2929
3160
  },
2930
- "name": "ExportMain"
3161
+ "name": "ExportMain",
3162
+ "componentId": {
3163
+ "scope": "teambit.scope",
3164
+ "name": "export"
3165
+ }
2931
3166
  },
2932
3167
  {
2933
3168
  "__schema": "TypeRefSchema",
@@ -2936,7 +3171,11 @@
2936
3171
  "line": 520,
2937
3172
  "character": 5
2938
3173
  },
2939
- "name": "ImporterMain"
3174
+ "name": "ImporterMain",
3175
+ "componentId": {
3176
+ "scope": "teambit.scope",
3177
+ "name": "importer"
3178
+ }
2940
3179
  },
2941
3180
  {
2942
3181
  "__schema": "TypeRefSchema",
@@ -2945,7 +3184,11 @@
2945
3184
  "line": 521,
2946
3185
  "character": 5
2947
3186
  },
2948
- "name": "CheckoutMain"
3187
+ "name": "CheckoutMain",
3188
+ "componentId": {
3189
+ "scope": "teambit.component",
3190
+ "name": "checkout"
3191
+ }
2949
3192
  },
2950
3193
  {
2951
3194
  "__schema": "TypeRefSchema",
@@ -2954,7 +3197,11 @@
2954
3197
  "line": 522,
2955
3198
  "character": 5
2956
3199
  },
2957
- "name": "GlobalConfigMain"
3200
+ "name": "GlobalConfigMain",
3201
+ "componentId": {
3202
+ "scope": "teambit.harmony",
3203
+ "name": "global-config"
3204
+ }
2958
3205
  }
2959
3206
  ]
2960
3207
  },
@@ -3024,7 +3271,11 @@
3024
3271
  "line": 546,
3025
3272
  "character": 24
3026
3273
  },
3027
- "name": "ComponentMergeStatus"
3274
+ "name": "ComponentMergeStatus",
3275
+ "componentId": {
3276
+ "scope": "teambit.component",
3277
+ "name": "merging"
3278
+ }
3028
3279
  }
3029
3280
  },
3030
3281
  "isOptional": false,
@@ -3052,7 +3303,12 @@
3052
3303
  "line": 547,
3053
3304
  "character": 18
3054
3305
  },
3055
- "name": "ComponentID"
3306
+ "name": "ComponentID",
3307
+ "componentId": {
3308
+ "scope": "teambit.component",
3309
+ "name": "component-id",
3310
+ "version": "1.2.2"
3311
+ }
3056
3312
  }
3057
3313
  },
3058
3314
  "isOptional": false,
@@ -3080,7 +3336,12 @@
3080
3336
  "line": 548,
3081
3337
  "character": 14
3082
3338
  },
3083
- "name": "ComponentID"
3339
+ "name": "ComponentID",
3340
+ "componentId": {
3341
+ "scope": "teambit.component",
3342
+ "name": "component-id",
3343
+ "version": "1.2.2"
3344
+ }
3084
3345
  }
3085
3346
  },
3086
3347
  "isOptional": false,
@@ -3142,7 +3403,12 @@
3142
3403
  "line": 551,
3143
3404
  "character": 15
3144
3405
  },
3145
- "name": "Lane"
3406
+ "name": "Lane",
3407
+ "componentId": {
3408
+ "scope": "teambit.scope",
3409
+ "name": "objects",
3410
+ "version": "0.0.2"
3411
+ }
3146
3412
  },
3147
3413
  "isOptional": true,
3148
3414
  "isSpread": false
@@ -3191,7 +3457,11 @@
3191
3457
  "line": 553,
3192
3458
  "character": 12
3193
3459
  },
3194
- "name": "ComponentMergeStatus"
3460
+ "name": "ComponentMergeStatus",
3461
+ "componentId": {
3462
+ "scope": "teambit.component",
3463
+ "name": "merging"
3464
+ }
3195
3465
  }
3196
3466
  }
3197
3467
  ]
@@ -3225,7 +3495,12 @@
3225
3495
  "line": 662,
3226
3496
  "character": 45
3227
3497
  },
3228
- "name": "LaneId"
3498
+ "name": "LaneId",
3499
+ "componentId": {
3500
+ "scope": "teambit.lanes",
3501
+ "name": "lane-id",
3502
+ "version": "0.0.311"
3503
+ }
3229
3504
  },
3230
3505
  "isOptional": false,
3231
3506
  "isSpread": false
@@ -3276,7 +3551,11 @@
3276
3551
  "line": 672,
3277
3552
  "character": 24
3278
3553
  },
3279
- "name": "ComponentMergeStatus"
3554
+ "name": "ComponentMergeStatus",
3555
+ "componentId": {
3556
+ "scope": "teambit.component",
3557
+ "name": "merging"
3558
+ }
3280
3559
  }
3281
3560
  },
3282
3561
  "isOptional": false,
@@ -3297,7 +3576,12 @@
3297
3576
  "line": 673,
3298
3577
  "character": 18
3299
3578
  },
3300
- "name": "LaneId"
3579
+ "name": "LaneId",
3580
+ "componentId": {
3581
+ "scope": "teambit.lanes",
3582
+ "name": "lane-id",
3583
+ "version": "0.0.311"
3584
+ }
3301
3585
  },
3302
3586
  "isOptional": false,
3303
3587
  "isSpread": false
@@ -3317,7 +3601,12 @@
3317
3601
  "line": 674,
3318
3602
  "character": 16
3319
3603
  },
3320
- "name": "LaneId"
3604
+ "name": "LaneId",
3605
+ "componentId": {
3606
+ "scope": "teambit.lanes",
3607
+ "name": "lane-id",
3608
+ "version": "0.0.311"
3609
+ }
3321
3610
  },
3322
3611
  "isOptional": false,
3323
3612
  "isSpread": false
@@ -3432,7 +3721,12 @@
3432
3721
  "line": 712,
3433
3722
  "character": 16
3434
3723
  },
3435
- "name": "LaneId"
3724
+ "name": "LaneId",
3725
+ "componentId": {
3726
+ "scope": "teambit.lanes",
3727
+ "name": "lane-id",
3728
+ "version": "0.0.311"
3729
+ }
3436
3730
  },
3437
3731
  "isOptional": false,
3438
3732
  "isSpread": false
@@ -3452,7 +3746,12 @@
3452
3746
  "line": 713,
3453
3747
  "character": 7
3454
3748
  },
3455
- "name": "ComponentID"
3749
+ "name": "ComponentID",
3750
+ "componentId": {
3751
+ "scope": "teambit.component",
3752
+ "name": "component-id",
3753
+ "version": "1.2.2"
3754
+ }
3456
3755
  },
3457
3756
  "isOptional": false,
3458
3757
  "isSpread": false
@@ -3472,7 +3771,12 @@
3472
3771
  "line": 714,
3473
3772
  "character": 16
3474
3773
  },
3475
- "name": "SnapsDistance"
3774
+ "name": "SnapsDistance",
3775
+ "componentId": {
3776
+ "scope": "teambit.component",
3777
+ "name": "snap-distance",
3778
+ "version": "0.0.2"
3779
+ }
3476
3780
  },
3477
3781
  "isOptional": false,
3478
3782
  "isSpread": false
@@ -3492,7 +3796,12 @@
3492
3796
  "line": 715,
3493
3797
  "character": 8
3494
3798
  },
3495
- "name": "Log"
3799
+ "name": "Log",
3800
+ "componentId": {
3801
+ "scope": "teambit.scope",
3802
+ "name": "objects",
3803
+ "version": "0.0.2"
3804
+ }
3496
3805
  },
3497
3806
  "isOptional": false,
3498
3807
  "isSpread": false
@@ -3532,7 +3841,12 @@
3532
3841
  "line": 717,
3533
3842
  "character": 24
3534
3843
  },
3535
- "name": "Version"
3844
+ "name": "Version",
3845
+ "componentId": {
3846
+ "scope": "teambit.scope",
3847
+ "name": "objects",
3848
+ "version": "0.0.2"
3849
+ }
3536
3850
  },
3537
3851
  "isOptional": true,
3538
3852
  "isSpread": false
@@ -3582,7 +3896,12 @@
3582
3896
  "line": 719,
3583
3897
  "character": 12
3584
3898
  },
3585
- "name": "Version"
3899
+ "name": "Version",
3900
+ "componentId": {
3901
+ "scope": "teambit.scope",
3902
+ "name": "objects",
3903
+ "version": "0.0.2"
3904
+ }
3586
3905
  },
3587
3906
  {
3588
3907
  "__schema": "KeywordTypeSchema",
@@ -3654,7 +3973,7 @@
3654
3973
  "componentId": {
3655
3974
  "scope": "teambit.lanes",
3656
3975
  "name": "merge-lanes",
3657
- "version": "1.0.488"
3976
+ "version": "1.0.489"
3658
3977
  },
3659
3978
  "taggedModuleExports": []
3660
3979
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.488",
3
+ "version": "1.0.489",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "1.0.488"
9
+ "version": "1.0.489"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -19,27 +19,27 @@
19
19
  "@teambit/lane-id": "0.0.311",
20
20
  "@teambit/harmony": "0.4.6",
21
21
  "@teambit/component-id": "1.2.2",
22
- "@teambit/legacy.bit-map": "0.0.58",
23
- "@teambit/legacy.cli.prompts": "0.0.6",
24
- "@teambit/legacy.consumer": "0.0.1",
25
- "@teambit/legacy.scope": "0.0.1",
26
- "@teambit/logger": "0.0.1158",
27
- "@teambit/scope.objects": "0.0.1",
28
- "@teambit/scope": "1.0.488",
29
- "@teambit/checkout": "1.0.488",
30
- "@teambit/cli": "0.0.1065",
31
- "@teambit/legacy.utils": "0.0.8",
32
- "@teambit/global-config": "0.0.1068",
33
- "@teambit/legacy.constants": "0.0.1",
34
- "@teambit/merging": "1.0.488",
35
- "@teambit/remove": "1.0.488",
36
- "@teambit/component.snap-distance": "0.0.1",
37
- "@teambit/config-merger": "0.0.355",
38
- "@teambit/export": "1.0.488",
39
- "@teambit/harmony.modules.get-basic-log": "0.0.2",
40
- "@teambit/importer": "1.0.488",
41
- "@teambit/lanes": "1.0.488",
42
- "@teambit/workspace": "1.0.488"
22
+ "@teambit/legacy.bit-map": "0.0.59",
23
+ "@teambit/legacy.cli.prompts": "0.0.7",
24
+ "@teambit/legacy.consumer": "0.0.2",
25
+ "@teambit/legacy.scope": "0.0.2",
26
+ "@teambit/logger": "0.0.1159",
27
+ "@teambit/scope.objects": "0.0.2",
28
+ "@teambit/scope": "1.0.489",
29
+ "@teambit/checkout": "1.0.489",
30
+ "@teambit/cli": "0.0.1066",
31
+ "@teambit/legacy.utils": "0.0.9",
32
+ "@teambit/global-config": "0.0.1069",
33
+ "@teambit/legacy.constants": "0.0.2",
34
+ "@teambit/merging": "1.0.489",
35
+ "@teambit/remove": "1.0.489",
36
+ "@teambit/component.snap-distance": "0.0.2",
37
+ "@teambit/config-merger": "0.0.356",
38
+ "@teambit/export": "1.0.489",
39
+ "@teambit/harmony.modules.get-basic-log": "0.0.3",
40
+ "@teambit/importer": "1.0.489",
41
+ "@teambit/lanes": "1.0.489",
42
+ "@teambit/workspace": "1.0.489"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@types/fs-extra": "9.0.7",
@@ -47,10 +47,10 @@
47
47
  "chai": "4.3.0",
48
48
  "@types/mocha": "9.1.0",
49
49
  "@teambit/harmony.envs.core-aspect-env": "0.0.63",
50
- "@teambit/component.testing.mock-components": "0.0.260",
51
- "@teambit/harmony.testing.load-aspect": "0.0.255",
52
- "@teambit/snapping": "1.0.488",
53
- "@teambit/workspace.testing.mock-workspace": "0.0.28"
50
+ "@teambit/component.testing.mock-components": "0.0.261",
51
+ "@teambit/harmony.testing.load-aspect": "0.0.256",
52
+ "@teambit/snapping": "1.0.489",
53
+ "@teambit/workspace.testing.mock-workspace": "0.0.29"
54
54
  },
55
55
  "peerDependencies": {
56
56
  "@types/chai": "4.3.19",