@teambit/merge-lanes 1.0.503 → 1.0.504

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.
Files changed (4) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +85 -404
  3. package/package.json +17 -17
  4. /package/dist/{preview-1735217145314.js → preview-1736179639539.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -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.503" tests="1" failures="0" errors="0" skipped="0">
3
+ <testsuite name="teambit.lanes/merge-lanes@1.0.504" 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>
package/artifacts/schema.json CHANGED
@@ -65,11 +65,7 @@
65
65
  "line": 78,
66
66
  "character": 24
67
67
  },
68
- "name": "Workspace",
69
- "componentId": {
70
- "scope": "teambit.workspace",
71
- "name": "workspace"
72
- }
68
+ "name": "Workspace"
73
69
  },
74
70
  {
75
71
  "__schema": "KeywordTypeSchema",
@@ -100,11 +96,7 @@
100
96
  "line": 79,
101
97
  "character": 22
102
98
  },
103
- "name": "MergingMain",
104
- "componentId": {
105
- "scope": "teambit.component",
106
- "name": "merging"
107
- }
99
+ "name": "MergingMain"
108
100
  },
109
101
  "isOptional": false,
110
102
  "isSpread": false
@@ -124,11 +116,7 @@
124
116
  "line": 80,
125
117
  "character": 21
126
118
  },
127
- "name": "LanesMain",
128
- "componentId": {
129
- "scope": "teambit.lanes",
130
- "name": "lanes"
131
- }
119
+ "name": "LanesMain"
132
120
  },
133
121
  "isOptional": false,
134
122
  "isSpread": false
@@ -148,11 +136,7 @@
148
136
  "line": 81,
149
137
  "character": 22
150
138
  },
151
- "name": "Logger",
152
- "componentId": {
153
- "scope": "teambit.harmony",
154
- "name": "logger"
155
- }
139
+ "name": "Logger"
156
140
  },
157
141
  "isOptional": false,
158
142
  "isSpread": false
@@ -172,11 +156,7 @@
172
156
  "line": 82,
173
157
  "character": 21
174
158
  },
175
- "name": "RemoveMain",
176
- "componentId": {
177
- "scope": "teambit.component",
178
- "name": "remove"
179
- }
159
+ "name": "RemoveMain"
180
160
  },
181
161
  "isOptional": false,
182
162
  "isSpread": false
@@ -196,11 +176,7 @@
196
176
  "line": 83,
197
177
  "character": 20
198
178
  },
199
- "name": "ScopeMain",
200
- "componentId": {
201
- "scope": "teambit.scope",
202
- "name": "scope"
203
- }
179
+ "name": "ScopeMain"
204
180
  },
205
181
  "isOptional": false,
206
182
  "isSpread": false
@@ -220,11 +196,7 @@
220
196
  "line": 84,
221
197
  "character": 23
222
198
  },
223
- "name": "ExportMain",
224
- "componentId": {
225
- "scope": "teambit.scope",
226
- "name": "export"
227
- }
199
+ "name": "ExportMain"
228
200
  },
229
201
  "isOptional": false,
230
202
  "isSpread": false
@@ -244,11 +216,7 @@
244
216
  "line": 85,
245
217
  "character": 23
246
218
  },
247
- "name": "ImporterMain",
248
- "componentId": {
249
- "scope": "teambit.scope",
250
- "name": "importer"
251
- }
219
+ "name": "ImporterMain"
252
220
  },
253
221
  "isOptional": false,
254
222
  "isSpread": false
@@ -268,11 +236,7 @@
268
236
  "line": 86,
269
237
  "character": 23
270
238
  },
271
- "name": "CheckoutMain",
272
- "componentId": {
273
- "scope": "teambit.component",
274
- "name": "checkout"
275
- }
239
+ "name": "CheckoutMain"
276
240
  },
277
241
  "isOptional": false,
278
242
  "isSpread": false
@@ -334,8 +298,7 @@
334
298
  "line": 89,
335
299
  "character": 51
336
300
  },
337
- "name": "MergeLaneOptions",
338
- "internalFilePath": "merge-lanes.main.runtime.ts"
301
+ "name": "MergeLaneOptions"
339
302
  },
340
303
  "isOptional": false,
341
304
  "isSpread": false
@@ -379,12 +342,7 @@
379
342
  "line": 100,
380
343
  "character": 18
381
344
  },
382
- "name": "LaneId",
383
- "componentId": {
384
- "scope": "teambit.lanes",
385
- "name": "lane-id",
386
- "version": "0.0.311"
387
- }
345
+ "name": "LaneId"
388
346
  },
389
347
  "isOptional": false,
390
348
  "isSpread": false
@@ -404,12 +362,7 @@
404
362
  "line": 101,
405
363
  "character": 20
406
364
  },
407
- "name": "LaneId",
408
- "componentId": {
409
- "scope": "teambit.lanes",
410
- "name": "lane-id",
411
- "version": "0.0.311"
412
- }
365
+ "name": "LaneId"
413
366
  },
414
367
  "isOptional": false,
415
368
  "isSpread": false
@@ -429,8 +382,7 @@
429
382
  "line": 102,
430
383
  "character": 14
431
384
  },
432
- "name": "MergeLaneOptions",
433
- "internalFilePath": "merge-lanes.main.runtime.ts"
385
+ "name": "MergeLaneOptions"
434
386
  },
435
387
  "isOptional": false,
436
388
  "isSpread": false
@@ -520,11 +472,7 @@
520
472
  "line": 106,
521
473
  "character": 25
522
474
  },
523
- "name": "ConfigMergeResult",
524
- "componentId": {
525
- "scope": "teambit.workspace",
526
- "name": "config-merger"
527
- }
475
+ "name": "ConfigMergeResult"
528
476
  }
529
477
  },
530
478
  "isOptional": false
@@ -552,12 +500,7 @@
552
500
  "line": 107,
553
501
  "character": 28
554
502
  },
555
- "name": "ComponentID",
556
- "componentId": {
557
- "scope": "teambit.component",
558
- "name": "component-id",
559
- "version": "1.2.2"
560
- }
503
+ "name": "ComponentID"
561
504
  }
562
505
  },
563
506
  "isOptional": false
@@ -585,8 +528,7 @@
585
528
  "line": 108,
586
529
  "character": 16
587
530
  },
588
- "name": "ConflictPerId",
589
- "internalFilePath": "merge-lanes.main.runtime.ts"
531
+ "name": "ConflictPerId"
590
532
  }
591
533
  },
592
534
  "isOptional": false
@@ -709,11 +651,7 @@
709
651
  "line": 344,
710
652
  "character": 39
711
653
  },
712
- "name": "CheckoutProps",
713
- "componentId": {
714
- "scope": "teambit.component",
715
- "name": "checkout"
716
- }
654
+ "name": "CheckoutProps"
717
655
  },
718
656
  "isOptional": false,
719
657
  "isSpread": false
@@ -733,8 +671,7 @@
733
671
  "line": 344,
734
672
  "character": 70
735
673
  },
736
- "name": "MergeAbortOpts",
737
- "internalFilePath": "merge-abort.cmd.ts"
674
+ "name": "MergeAbortOpts"
738
675
  },
739
676
  "isOptional": false,
740
677
  "isSpread": false
@@ -835,8 +772,7 @@
835
772
  "line": 403,
836
773
  "character": 22
837
774
  },
838
- "name": "MergeLaneOptions",
839
- "internalFilePath": "merge-lanes.main.runtime.ts"
775
+ "name": "MergeLaneOptions"
840
776
  }
841
777
  ]
842
778
  },
@@ -912,8 +848,7 @@
912
848
  "line": 404,
913
849
  "character": 14
914
850
  },
915
- "name": "MergeFromScopeResult",
916
- "internalFilePath": "merge-lanes.main.runtime.ts"
851
+ "name": "MergeFromScopeResult"
917
852
  }
918
853
  ]
919
854
  },
@@ -1017,11 +952,7 @@
1017
952
  "line": 526,
1018
953
  "character": 5
1019
954
  },
1020
- "name": "LanesMain",
1021
- "componentId": {
1022
- "scope": "teambit.lanes",
1023
- "name": "lanes"
1024
- }
955
+ "name": "LanesMain"
1025
956
  },
1026
957
  {
1027
958
  "__schema": "TypeRefSchema",
@@ -1030,11 +961,7 @@
1030
961
  "line": 527,
1031
962
  "character": 5
1032
963
  },
1033
- "name": "CLIMain",
1034
- "componentId": {
1035
- "scope": "teambit.harmony",
1036
- "name": "cli"
1037
- }
964
+ "name": "CLIMain"
1038
965
  },
1039
966
  {
1040
967
  "__schema": "TypeRefSchema",
@@ -1043,11 +970,7 @@
1043
970
  "line": 528,
1044
971
  "character": 5
1045
972
  },
1046
- "name": "Workspace",
1047
- "componentId": {
1048
- "scope": "teambit.workspace",
1049
- "name": "workspace"
1050
- }
973
+ "name": "Workspace"
1051
974
  },
1052
975
  {
1053
976
  "__schema": "TypeRefSchema",
@@ -1056,11 +979,7 @@
1056
979
  "line": 529,
1057
980
  "character": 5
1058
981
  },
1059
- "name": "MergingMain",
1060
- "componentId": {
1061
- "scope": "teambit.component",
1062
- "name": "merging"
1063
- }
982
+ "name": "MergingMain"
1064
983
  },
1065
984
  {
1066
985
  "__schema": "TypeRefSchema",
@@ -1069,11 +988,7 @@
1069
988
  "line": 530,
1070
989
  "character": 5
1071
990
  },
1072
- "name": "LoggerMain",
1073
- "componentId": {
1074
- "scope": "teambit.harmony",
1075
- "name": "logger"
1076
- }
991
+ "name": "LoggerMain"
1077
992
  },
1078
993
  {
1079
994
  "__schema": "TypeRefSchema",
@@ -1082,11 +997,7 @@
1082
997
  "line": 531,
1083
998
  "character": 5
1084
999
  },
1085
- "name": "RemoveMain",
1086
- "componentId": {
1087
- "scope": "teambit.component",
1088
- "name": "remove"
1089
- }
1000
+ "name": "RemoveMain"
1090
1001
  },
1091
1002
  {
1092
1003
  "__schema": "TypeRefSchema",
@@ -1095,11 +1006,7 @@
1095
1006
  "line": 532,
1096
1007
  "character": 5
1097
1008
  },
1098
- "name": "ScopeMain",
1099
- "componentId": {
1100
- "scope": "teambit.scope",
1101
- "name": "scope"
1102
- }
1009
+ "name": "ScopeMain"
1103
1010
  },
1104
1011
  {
1105
1012
  "__schema": "TypeRefSchema",
@@ -1108,11 +1015,7 @@
1108
1015
  "line": 533,
1109
1016
  "character": 5
1110
1017
  },
1111
- "name": "ExportMain",
1112
- "componentId": {
1113
- "scope": "teambit.scope",
1114
- "name": "export"
1115
- }
1018
+ "name": "ExportMain"
1116
1019
  },
1117
1020
  {
1118
1021
  "__schema": "TypeRefSchema",
@@ -1121,11 +1024,7 @@
1121
1024
  "line": 534,
1122
1025
  "character": 5
1123
1026
  },
1124
- "name": "ImporterMain",
1125
- "componentId": {
1126
- "scope": "teambit.scope",
1127
- "name": "importer"
1128
- }
1027
+ "name": "ImporterMain"
1129
1028
  },
1130
1029
  {
1131
1030
  "__schema": "TypeRefSchema",
@@ -1134,11 +1033,7 @@
1134
1033
  "line": 535,
1135
1034
  "character": 5
1136
1035
  },
1137
- "name": "CheckoutMain",
1138
- "componentId": {
1139
- "scope": "teambit.component",
1140
- "name": "checkout"
1141
- }
1036
+ "name": "CheckoutMain"
1142
1037
  },
1143
1038
  {
1144
1039
  "__schema": "TypeRefSchema",
@@ -1147,11 +1042,7 @@
1147
1042
  "line": 536,
1148
1043
  "character": 5
1149
1044
  },
1150
- "name": "GlobalConfigMain",
1151
- "componentId": {
1152
- "scope": "teambit.harmony",
1153
- "name": "global-config"
1154
- }
1045
+ "name": "GlobalConfigMain"
1155
1046
  }
1156
1047
  ]
1157
1048
  },
@@ -1269,11 +1160,7 @@
1269
1160
  "line": 41,
1270
1161
  "character": 18
1271
1162
  },
1272
- "name": "MergeStrategy",
1273
- "componentId": {
1274
- "scope": "teambit.component",
1275
- "name": "merging"
1276
- }
1163
+ "name": "MergeStrategy"
1277
1164
  },
1278
1165
  "isOptional": false
1279
1166
  },
@@ -1573,11 +1460,7 @@
1573
1460
  "line": 56,
1574
1461
  "character": 22
1575
1462
  },
1576
- "name": "MergeStrategy",
1577
- "componentId": {
1578
- "scope": "teambit.component",
1579
- "name": "merging"
1580
- }
1463
+ "name": "MergeStrategy"
1581
1464
  },
1582
1465
  "isOptional": true
1583
1466
  },
@@ -1857,12 +1740,7 @@
1857
1740
  "line": 67,
1858
1741
  "character": 14
1859
1742
  },
1860
- "name": "ComponentID",
1861
- "componentId": {
1862
- "scope": "teambit.component",
1863
- "name": "component-id",
1864
- "version": "1.2.2"
1865
- }
1743
+ "name": "ComponentID"
1866
1744
  }
1867
1745
  },
1868
1746
  "isOptional": false
@@ -1890,12 +1768,7 @@
1890
1768
  "line": 68,
1891
1769
  "character": 16
1892
1770
  },
1893
- "name": "ComponentID",
1894
- "componentId": {
1895
- "scope": "teambit.component",
1896
- "name": "component-id",
1897
- "version": "1.2.2"
1898
- }
1771
+ "name": "ComponentID"
1899
1772
  }
1900
1773
  },
1901
1774
  "isOptional": false
@@ -1997,8 +1870,7 @@
1997
1870
  "line": 70,
1998
1871
  "character": 15
1999
1872
  },
2000
- "name": "ConflictPerId",
2001
- "internalFilePath": "merge-lanes.main.runtime.ts"
1873
+ "name": "ConflictPerId"
2002
1874
  }
2003
1875
  },
2004
1876
  "isOptional": true
@@ -2026,12 +1898,7 @@
2026
1898
  "line": 71,
2027
1899
  "character": 16
2028
1900
  },
2029
- "name": "ComponentID",
2030
- "componentId": {
2031
- "scope": "teambit.component",
2032
- "name": "component-id",
2033
- "version": "1.2.2"
2034
- }
1901
+ "name": "ComponentID"
2035
1902
  }
2036
1903
  },
2037
1904
  "isOptional": true
@@ -2059,12 +1926,7 @@
2059
1926
  "line": 72,
2060
1927
  "character": 21
2061
1928
  },
2062
- "name": "ComponentID",
2063
- "componentId": {
2064
- "scope": "teambit.component",
2065
- "name": "component-id",
2066
- "version": "1.2.2"
2067
- }
1929
+ "name": "ComponentID"
2068
1930
  }
2069
1931
  },
2070
1932
  "isOptional": false
@@ -2135,11 +1997,7 @@
2135
1997
  "line": 78,
2136
1998
  "character": 24
2137
1999
  },
2138
- "name": "Workspace",
2139
- "componentId": {
2140
- "scope": "teambit.workspace",
2141
- "name": "workspace"
2142
- }
2000
+ "name": "Workspace"
2143
2001
  },
2144
2002
  {
2145
2003
  "__schema": "KeywordTypeSchema",
@@ -2170,11 +2028,7 @@
2170
2028
  "line": 79,
2171
2029
  "character": 22
2172
2030
  },
2173
- "name": "MergingMain",
2174
- "componentId": {
2175
- "scope": "teambit.component",
2176
- "name": "merging"
2177
- }
2031
+ "name": "MergingMain"
2178
2032
  },
2179
2033
  "isOptional": false,
2180
2034
  "isSpread": false
@@ -2194,11 +2048,7 @@
2194
2048
  "line": 80,
2195
2049
  "character": 21
2196
2050
  },
2197
- "name": "LanesMain",
2198
- "componentId": {
2199
- "scope": "teambit.lanes",
2200
- "name": "lanes"
2201
- }
2051
+ "name": "LanesMain"
2202
2052
  },
2203
2053
  "isOptional": false,
2204
2054
  "isSpread": false
@@ -2218,11 +2068,7 @@
2218
2068
  "line": 81,
2219
2069
  "character": 22
2220
2070
  },
2221
- "name": "Logger",
2222
- "componentId": {
2223
- "scope": "teambit.harmony",
2224
- "name": "logger"
2225
- }
2071
+ "name": "Logger"
2226
2072
  },
2227
2073
  "isOptional": false,
2228
2074
  "isSpread": false
@@ -2242,11 +2088,7 @@
2242
2088
  "line": 82,
2243
2089
  "character": 21
2244
2090
  },
2245
- "name": "RemoveMain",
2246
- "componentId": {
2247
- "scope": "teambit.component",
2248
- "name": "remove"
2249
- }
2091
+ "name": "RemoveMain"
2250
2092
  },
2251
2093
  "isOptional": false,
2252
2094
  "isSpread": false
@@ -2266,11 +2108,7 @@
2266
2108
  "line": 83,
2267
2109
  "character": 20
2268
2110
  },
2269
- "name": "ScopeMain",
2270
- "componentId": {
2271
- "scope": "teambit.scope",
2272
- "name": "scope"
2273
- }
2111
+ "name": "ScopeMain"
2274
2112
  },
2275
2113
  "isOptional": false,
2276
2114
  "isSpread": false
@@ -2290,11 +2128,7 @@
2290
2128
  "line": 84,
2291
2129
  "character": 23
2292
2130
  },
2293
- "name": "ExportMain",
2294
- "componentId": {
2295
- "scope": "teambit.scope",
2296
- "name": "export"
2297
- }
2131
+ "name": "ExportMain"
2298
2132
  },
2299
2133
  "isOptional": false,
2300
2134
  "isSpread": false
@@ -2314,11 +2148,7 @@
2314
2148
  "line": 85,
2315
2149
  "character": 23
2316
2150
  },
2317
- "name": "ImporterMain",
2318
- "componentId": {
2319
- "scope": "teambit.scope",
2320
- "name": "importer"
2321
- }
2151
+ "name": "ImporterMain"
2322
2152
  },
2323
2153
  "isOptional": false,
2324
2154
  "isSpread": false
@@ -2338,11 +2168,7 @@
2338
2168
  "line": 86,
2339
2169
  "character": 23
2340
2170
  },
2341
- "name": "CheckoutMain",
2342
- "componentId": {
2343
- "scope": "teambit.component",
2344
- "name": "checkout"
2345
- }
2171
+ "name": "CheckoutMain"
2346
2172
  },
2347
2173
  "isOptional": false,
2348
2174
  "isSpread": false
@@ -2404,8 +2230,7 @@
2404
2230
  "line": 89,
2405
2231
  "character": 51
2406
2232
  },
2407
- "name": "MergeLaneOptions",
2408
- "internalFilePath": "merge-lanes.main.runtime.ts"
2233
+ "name": "MergeLaneOptions"
2409
2234
  },
2410
2235
  "isOptional": false,
2411
2236
  "isSpread": false
@@ -2449,12 +2274,7 @@
2449
2274
  "line": 100,
2450
2275
  "character": 18
2451
2276
  },
2452
- "name": "LaneId",
2453
- "componentId": {
2454
- "scope": "teambit.lanes",
2455
- "name": "lane-id",
2456
- "version": "0.0.311"
2457
- }
2277
+ "name": "LaneId"
2458
2278
  },
2459
2279
  "isOptional": false,
2460
2280
  "isSpread": false
@@ -2474,12 +2294,7 @@
2474
2294
  "line": 101,
2475
2295
  "character": 20
2476
2296
  },
2477
- "name": "LaneId",
2478
- "componentId": {
2479
- "scope": "teambit.lanes",
2480
- "name": "lane-id",
2481
- "version": "0.0.311"
2482
- }
2297
+ "name": "LaneId"
2483
2298
  },
2484
2299
  "isOptional": false,
2485
2300
  "isSpread": false
@@ -2499,8 +2314,7 @@
2499
2314
  "line": 102,
2500
2315
  "character": 14
2501
2316
  },
2502
- "name": "MergeLaneOptions",
2503
- "internalFilePath": "merge-lanes.main.runtime.ts"
2317
+ "name": "MergeLaneOptions"
2504
2318
  },
2505
2319
  "isOptional": false,
2506
2320
  "isSpread": false
@@ -2590,11 +2404,7 @@
2590
2404
  "line": 106,
2591
2405
  "character": 25
2592
2406
  },
2593
- "name": "ConfigMergeResult",
2594
- "componentId": {
2595
- "scope": "teambit.workspace",
2596
- "name": "config-merger"
2597
- }
2407
+ "name": "ConfigMergeResult"
2598
2408
  }
2599
2409
  },
2600
2410
  "isOptional": false
@@ -2622,12 +2432,7 @@
2622
2432
  "line": 107,
2623
2433
  "character": 28
2624
2434
  },
2625
- "name": "ComponentID",
2626
- "componentId": {
2627
- "scope": "teambit.component",
2628
- "name": "component-id",
2629
- "version": "1.2.2"
2630
- }
2435
+ "name": "ComponentID"
2631
2436
  }
2632
2437
  },
2633
2438
  "isOptional": false
@@ -2655,8 +2460,7 @@
2655
2460
  "line": 108,
2656
2461
  "character": 16
2657
2462
  },
2658
- "name": "ConflictPerId",
2659
- "internalFilePath": "merge-lanes.main.runtime.ts"
2463
+ "name": "ConflictPerId"
2660
2464
  }
2661
2465
  },
2662
2466
  "isOptional": false
@@ -2779,11 +2583,7 @@
2779
2583
  "line": 344,
2780
2584
  "character": 39
2781
2585
  },
2782
- "name": "CheckoutProps",
2783
- "componentId": {
2784
- "scope": "teambit.component",
2785
- "name": "checkout"
2786
- }
2586
+ "name": "CheckoutProps"
2787
2587
  },
2788
2588
  "isOptional": false,
2789
2589
  "isSpread": false
@@ -2803,8 +2603,7 @@
2803
2603
  "line": 344,
2804
2604
  "character": 70
2805
2605
  },
2806
- "name": "MergeAbortOpts",
2807
- "internalFilePath": "merge-abort.cmd.ts"
2606
+ "name": "MergeAbortOpts"
2808
2607
  },
2809
2608
  "isOptional": false,
2810
2609
  "isSpread": false
@@ -2905,8 +2704,7 @@
2905
2704
  "line": 403,
2906
2705
  "character": 22
2907
2706
  },
2908
- "name": "MergeLaneOptions",
2909
- "internalFilePath": "merge-lanes.main.runtime.ts"
2707
+ "name": "MergeLaneOptions"
2910
2708
  }
2911
2709
  ]
2912
2710
  },
@@ -2982,8 +2780,7 @@
2982
2780
  "line": 404,
2983
2781
  "character": 14
2984
2782
  },
2985
- "name": "MergeFromScopeResult",
2986
- "internalFilePath": "merge-lanes.main.runtime.ts"
2783
+ "name": "MergeFromScopeResult"
2987
2784
  }
2988
2785
  ]
2989
2786
  },
@@ -3087,11 +2884,7 @@
3087
2884
  "line": 526,
3088
2885
  "character": 5
3089
2886
  },
3090
- "name": "LanesMain",
3091
- "componentId": {
3092
- "scope": "teambit.lanes",
3093
- "name": "lanes"
3094
- }
2887
+ "name": "LanesMain"
3095
2888
  },
3096
2889
  {
3097
2890
  "__schema": "TypeRefSchema",
@@ -3100,11 +2893,7 @@
3100
2893
  "line": 527,
3101
2894
  "character": 5
3102
2895
  },
3103
- "name": "CLIMain",
3104
- "componentId": {
3105
- "scope": "teambit.harmony",
3106
- "name": "cli"
3107
- }
2896
+ "name": "CLIMain"
3108
2897
  },
3109
2898
  {
3110
2899
  "__schema": "TypeRefSchema",
@@ -3113,11 +2902,7 @@
3113
2902
  "line": 528,
3114
2903
  "character": 5
3115
2904
  },
3116
- "name": "Workspace",
3117
- "componentId": {
3118
- "scope": "teambit.workspace",
3119
- "name": "workspace"
3120
- }
2905
+ "name": "Workspace"
3121
2906
  },
3122
2907
  {
3123
2908
  "__schema": "TypeRefSchema",
@@ -3126,11 +2911,7 @@
3126
2911
  "line": 529,
3127
2912
  "character": 5
3128
2913
  },
3129
- "name": "MergingMain",
3130
- "componentId": {
3131
- "scope": "teambit.component",
3132
- "name": "merging"
3133
- }
2914
+ "name": "MergingMain"
3134
2915
  },
3135
2916
  {
3136
2917
  "__schema": "TypeRefSchema",
@@ -3139,11 +2920,7 @@
3139
2920
  "line": 530,
3140
2921
  "character": 5
3141
2922
  },
3142
- "name": "LoggerMain",
3143
- "componentId": {
3144
- "scope": "teambit.harmony",
3145
- "name": "logger"
3146
- }
2923
+ "name": "LoggerMain"
3147
2924
  },
3148
2925
  {
3149
2926
  "__schema": "TypeRefSchema",
@@ -3152,11 +2929,7 @@
3152
2929
  "line": 531,
3153
2930
  "character": 5
3154
2931
  },
3155
- "name": "RemoveMain",
3156
- "componentId": {
3157
- "scope": "teambit.component",
3158
- "name": "remove"
3159
- }
2932
+ "name": "RemoveMain"
3160
2933
  },
3161
2934
  {
3162
2935
  "__schema": "TypeRefSchema",
@@ -3165,11 +2938,7 @@
3165
2938
  "line": 532,
3166
2939
  "character": 5
3167
2940
  },
3168
- "name": "ScopeMain",
3169
- "componentId": {
3170
- "scope": "teambit.scope",
3171
- "name": "scope"
3172
- }
2941
+ "name": "ScopeMain"
3173
2942
  },
3174
2943
  {
3175
2944
  "__schema": "TypeRefSchema",
@@ -3178,11 +2947,7 @@
3178
2947
  "line": 533,
3179
2948
  "character": 5
3180
2949
  },
3181
- "name": "ExportMain",
3182
- "componentId": {
3183
- "scope": "teambit.scope",
3184
- "name": "export"
3185
- }
2950
+ "name": "ExportMain"
3186
2951
  },
3187
2952
  {
3188
2953
  "__schema": "TypeRefSchema",
@@ -3191,11 +2956,7 @@
3191
2956
  "line": 534,
3192
2957
  "character": 5
3193
2958
  },
3194
- "name": "ImporterMain",
3195
- "componentId": {
3196
- "scope": "teambit.scope",
3197
- "name": "importer"
3198
- }
2959
+ "name": "ImporterMain"
3199
2960
  },
3200
2961
  {
3201
2962
  "__schema": "TypeRefSchema",
@@ -3204,11 +2965,7 @@
3204
2965
  "line": 535,
3205
2966
  "character": 5
3206
2967
  },
3207
- "name": "CheckoutMain",
3208
- "componentId": {
3209
- "scope": "teambit.component",
3210
- "name": "checkout"
3211
- }
2968
+ "name": "CheckoutMain"
3212
2969
  },
3213
2970
  {
3214
2971
  "__schema": "TypeRefSchema",
@@ -3217,11 +2974,7 @@
3217
2974
  "line": 536,
3218
2975
  "character": 5
3219
2976
  },
3220
- "name": "GlobalConfigMain",
3221
- "componentId": {
3222
- "scope": "teambit.harmony",
3223
- "name": "global-config"
3224
- }
2977
+ "name": "GlobalConfigMain"
3225
2978
  }
3226
2979
  ]
3227
2980
  },
@@ -3291,11 +3044,7 @@
3291
3044
  "line": 560,
3292
3045
  "character": 24
3293
3046
  },
3294
- "name": "ComponentMergeStatus",
3295
- "componentId": {
3296
- "scope": "teambit.component",
3297
- "name": "merging"
3298
- }
3047
+ "name": "ComponentMergeStatus"
3299
3048
  }
3300
3049
  },
3301
3050
  "isOptional": false,
@@ -3323,12 +3072,7 @@
3323
3072
  "line": 561,
3324
3073
  "character": 18
3325
3074
  },
3326
- "name": "ComponentID",
3327
- "componentId": {
3328
- "scope": "teambit.component",
3329
- "name": "component-id",
3330
- "version": "1.2.2"
3331
- }
3075
+ "name": "ComponentID"
3332
3076
  }
3333
3077
  },
3334
3078
  "isOptional": false,
@@ -3356,12 +3100,7 @@
3356
3100
  "line": 562,
3357
3101
  "character": 14
3358
3102
  },
3359
- "name": "ComponentID",
3360
- "componentId": {
3361
- "scope": "teambit.component",
3362
- "name": "component-id",
3363
- "version": "1.2.2"
3364
- }
3103
+ "name": "ComponentID"
3365
3104
  }
3366
3105
  },
3367
3106
  "isOptional": false,
@@ -3423,12 +3162,7 @@
3423
3162
  "line": 565,
3424
3163
  "character": 15
3425
3164
  },
3426
- "name": "Lane",
3427
- "componentId": {
3428
- "scope": "teambit.scope",
3429
- "name": "objects",
3430
- "version": "0.0.11"
3431
- }
3165
+ "name": "Lane"
3432
3166
  },
3433
3167
  "isOptional": true,
3434
3168
  "isSpread": false
@@ -3477,11 +3211,7 @@
3477
3211
  "line": 567,
3478
3212
  "character": 12
3479
3213
  },
3480
- "name": "ComponentMergeStatus",
3481
- "componentId": {
3482
- "scope": "teambit.component",
3483
- "name": "merging"
3484
- }
3214
+ "name": "ComponentMergeStatus"
3485
3215
  }
3486
3216
  }
3487
3217
  ]
@@ -3515,12 +3245,7 @@
3515
3245
  "line": 676,
3516
3246
  "character": 45
3517
3247
  },
3518
- "name": "LaneId",
3519
- "componentId": {
3520
- "scope": "teambit.lanes",
3521
- "name": "lane-id",
3522
- "version": "0.0.311"
3523
- }
3248
+ "name": "LaneId"
3524
3249
  },
3525
3250
  "isOptional": false,
3526
3251
  "isSpread": false
@@ -3571,11 +3296,7 @@
3571
3296
  "line": 686,
3572
3297
  "character": 24
3573
3298
  },
3574
- "name": "ComponentMergeStatus",
3575
- "componentId": {
3576
- "scope": "teambit.component",
3577
- "name": "merging"
3578
- }
3299
+ "name": "ComponentMergeStatus"
3579
3300
  }
3580
3301
  },
3581
3302
  "isOptional": false,
@@ -3596,12 +3317,7 @@
3596
3317
  "line": 687,
3597
3318
  "character": 18
3598
3319
  },
3599
- "name": "LaneId",
3600
- "componentId": {
3601
- "scope": "teambit.lanes",
3602
- "name": "lane-id",
3603
- "version": "0.0.311"
3604
- }
3320
+ "name": "LaneId"
3605
3321
  },
3606
3322
  "isOptional": false,
3607
3323
  "isSpread": false
@@ -3621,12 +3337,7 @@
3621
3337
  "line": 688,
3622
3338
  "character": 16
3623
3339
  },
3624
- "name": "LaneId",
3625
- "componentId": {
3626
- "scope": "teambit.lanes",
3627
- "name": "lane-id",
3628
- "version": "0.0.311"
3629
- }
3340
+ "name": "LaneId"
3630
3341
  },
3631
3342
  "isOptional": false,
3632
3343
  "isSpread": false
@@ -3783,12 +3494,7 @@
3783
3494
  "line": 726,
3784
3495
  "character": 16
3785
3496
  },
3786
- "name": "LaneId",
3787
- "componentId": {
3788
- "scope": "teambit.lanes",
3789
- "name": "lane-id",
3790
- "version": "0.0.311"
3791
- }
3497
+ "name": "LaneId"
3792
3498
  },
3793
3499
  "isOptional": false,
3794
3500
  "isSpread": false
@@ -3808,12 +3514,7 @@
3808
3514
  "line": 727,
3809
3515
  "character": 7
3810
3516
  },
3811
- "name": "ComponentID",
3812
- "componentId": {
3813
- "scope": "teambit.component",
3814
- "name": "component-id",
3815
- "version": "1.2.2"
3816
- }
3517
+ "name": "ComponentID"
3817
3518
  },
3818
3519
  "isOptional": false,
3819
3520
  "isSpread": false
@@ -3833,12 +3534,7 @@
3833
3534
  "line": 728,
3834
3535
  "character": 16
3835
3536
  },
3836
- "name": "SnapsDistance",
3837
- "componentId": {
3838
- "scope": "teambit.component",
3839
- "name": "snap-distance",
3840
- "version": "0.0.12"
3841
- }
3537
+ "name": "SnapsDistance"
3842
3538
  },
3843
3539
  "isOptional": false,
3844
3540
  "isSpread": false
@@ -3858,12 +3554,7 @@
3858
3554
  "line": 729,
3859
3555
  "character": 8
3860
3556
  },
3861
- "name": "Log",
3862
- "componentId": {
3863
- "scope": "teambit.scope",
3864
- "name": "objects",
3865
- "version": "0.0.11"
3866
- }
3557
+ "name": "Log"
3867
3558
  },
3868
3559
  "isOptional": false,
3869
3560
  "isSpread": false
@@ -3903,12 +3594,7 @@
3903
3594
  "line": 731,
3904
3595
  "character": 24
3905
3596
  },
3906
- "name": "Version",
3907
- "componentId": {
3908
- "scope": "teambit.scope",
3909
- "name": "objects",
3910
- "version": "0.0.11"
3911
- }
3597
+ "name": "Version"
3912
3598
  },
3913
3599
  "isOptional": true,
3914
3600
  "isSpread": false
@@ -4000,12 +3686,7 @@
4000
3686
  "line": 733,
4001
3687
  "character": 12
4002
3688
  },
4003
- "name": "Version",
4004
- "componentId": {
4005
- "scope": "teambit.scope",
4006
- "name": "objects",
4007
- "version": "0.0.11"
4008
- }
3689
+ "name": "Version"
4009
3690
  },
4010
3691
  {
4011
3692
  "__schema": "KeywordTypeSchema",
@@ -4077,7 +3758,7 @@
4077
3758
  "componentId": {
4078
3759
  "scope": "teambit.lanes",
4079
3760
  "name": "merge-lanes",
4080
- "version": "1.0.503"
3761
+ "version": "1.0.504"
4081
3762
  },
4082
3763
  "taggedModuleExports": []
4083
3764
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.503",
3
+ "version": "1.0.504",
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.503"
9
+ "version": "1.0.504"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -23,24 +23,24 @@
23
23
  "@teambit/legacy.cli.prompts": "0.0.9",
24
24
  "@teambit/legacy.consumer": "0.0.11",
25
25
  "@teambit/legacy.scope": "0.0.11",
26
- "@teambit/logger": "0.0.1173",
26
+ "@teambit/logger": "0.0.1174",
27
27
  "@teambit/scope.objects": "0.0.11",
28
- "@teambit/scope": "1.0.503",
29
- "@teambit/checkout": "1.0.503",
30
- "@teambit/cli": "0.0.1080",
28
+ "@teambit/scope": "1.0.504",
29
+ "@teambit/checkout": "1.0.504",
30
+ "@teambit/cli": "0.0.1081",
31
31
  "@teambit/legacy.utils": "0.0.12",
32
- "@teambit/global-config": "0.0.1083",
32
+ "@teambit/global-config": "0.0.1084",
33
33
  "@teambit/legacy.constants": "0.0.4",
34
- "@teambit/merging": "1.0.503",
35
- "@teambit/remove": "1.0.503",
34
+ "@teambit/merging": "1.0.504",
35
+ "@teambit/remove": "1.0.504",
36
36
  "@teambit/component.snap-distance": "0.0.12",
37
- "@teambit/config-merger": "0.0.370",
38
- "@teambit/export": "1.0.503",
37
+ "@teambit/config-merger": "0.0.371",
38
+ "@teambit/export": "1.0.504",
39
39
  "@teambit/harmony.modules.feature-toggle": "0.0.12",
40
40
  "@teambit/harmony.modules.get-basic-log": "0.0.12",
41
- "@teambit/importer": "1.0.503",
42
- "@teambit/lanes": "1.0.503",
43
- "@teambit/workspace": "1.0.503"
41
+ "@teambit/importer": "1.0.504",
42
+ "@teambit/lanes": "1.0.504",
43
+ "@teambit/workspace": "1.0.504"
44
44
  },
45
45
  "devDependencies": {
46
46
  "@types/fs-extra": "9.0.7",
@@ -48,9 +48,9 @@
48
48
  "chai": "4.3.0",
49
49
  "@types/mocha": "9.1.0",
50
50
  "@teambit/harmony.envs.core-aspect-env": "0.0.63",
51
- "@teambit/component.testing.mock-components": "0.0.270",
52
- "@teambit/harmony.testing.load-aspect": "0.0.265",
53
- "@teambit/snapping": "1.0.503",
51
+ "@teambit/component.testing.mock-components": "0.0.271",
52
+ "@teambit/harmony.testing.load-aspect": "0.0.266",
53
+ "@teambit/snapping": "1.0.504",
54
54
  "@teambit/workspace.testing.mock-workspace": "0.0.38"
55
55
  },
56
56
  "peerDependencies": {