@teambit/merge-lanes 1.0.258 → 1.0.260

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 (6) hide show
  1. package/artifacts/__bit_junit.xml +2 -2
  2. package/artifacts/schema.json +378 -85
  3. package/dist/merge-lane-from-scope.cmd.js +1 -1
  4. package/dist/merge-lane-from-scope.cmd.js.map +1 -1
  5. package/package.json +17 -17
  6. /package/dist/{preview-1714472366682.js → preview-1714620113654.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.258" tests="1" failures="0" errors="0" skipped="0">
4
- <testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only"/>
3
+ <testsuite name="teambit.lanes/merge-lanes@1.0.260" tests="1" failures="0" errors="0" skipped="0">
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
@@ -64,7 +64,11 @@
64
64
  "line": 76,
65
65
  "character": 24
66
66
  },
67
- "name": "Workspace"
67
+ "name": "Workspace",
68
+ "componentId": {
69
+ "scope": "teambit.workspace",
70
+ "name": "workspace"
71
+ }
68
72
  },
69
73
  {
70
74
  "__schema": "KeywordTypeSchema",
@@ -95,7 +99,11 @@
95
99
  "line": 77,
96
100
  "character": 22
97
101
  },
98
- "name": "MergingMain"
102
+ "name": "MergingMain",
103
+ "componentId": {
104
+ "scope": "teambit.component",
105
+ "name": "merging"
106
+ }
99
107
  },
100
108
  "isOptional": false,
101
109
  "isSpread": false
@@ -115,7 +123,11 @@
115
123
  "line": 78,
116
124
  "character": 21
117
125
  },
118
- "name": "LanesMain"
126
+ "name": "LanesMain",
127
+ "componentId": {
128
+ "scope": "teambit.lanes",
129
+ "name": "lanes"
130
+ }
119
131
  },
120
132
  "isOptional": false,
121
133
  "isSpread": false
@@ -135,7 +147,11 @@
135
147
  "line": 79,
136
148
  "character": 22
137
149
  },
138
- "name": "Logger"
150
+ "name": "Logger",
151
+ "componentId": {
152
+ "scope": "teambit.harmony",
153
+ "name": "logger"
154
+ }
139
155
  },
140
156
  "isOptional": false,
141
157
  "isSpread": false
@@ -155,7 +171,11 @@
155
171
  "line": 80,
156
172
  "character": 21
157
173
  },
158
- "name": "RemoveMain"
174
+ "name": "RemoveMain",
175
+ "componentId": {
176
+ "scope": "teambit.component",
177
+ "name": "remove"
178
+ }
159
179
  },
160
180
  "isOptional": false,
161
181
  "isSpread": false
@@ -175,7 +195,11 @@
175
195
  "line": 81,
176
196
  "character": 20
177
197
  },
178
- "name": "ScopeMain"
198
+ "name": "ScopeMain",
199
+ "componentId": {
200
+ "scope": "teambit.scope",
201
+ "name": "scope"
202
+ }
179
203
  },
180
204
  "isOptional": false,
181
205
  "isSpread": false
@@ -195,7 +219,11 @@
195
219
  "line": 82,
196
220
  "character": 23
197
221
  },
198
- "name": "ExportMain"
222
+ "name": "ExportMain",
223
+ "componentId": {
224
+ "scope": "teambit.scope",
225
+ "name": "export"
226
+ }
199
227
  },
200
228
  "isOptional": false,
201
229
  "isSpread": false
@@ -215,7 +243,11 @@
215
243
  "line": 83,
216
244
  "character": 23
217
245
  },
218
- "name": "ImporterMain"
246
+ "name": "ImporterMain",
247
+ "componentId": {
248
+ "scope": "teambit.scope",
249
+ "name": "importer"
250
+ }
219
251
  },
220
252
  "isOptional": false,
221
253
  "isSpread": false
@@ -235,7 +267,11 @@
235
267
  "line": 84,
236
268
  "character": 23
237
269
  },
238
- "name": "CheckoutMain"
270
+ "name": "CheckoutMain",
271
+ "componentId": {
272
+ "scope": "teambit.component",
273
+ "name": "checkout"
274
+ }
239
275
  },
240
276
  "isOptional": false,
241
277
  "isSpread": false
@@ -297,7 +333,8 @@
297
333
  "line": 87,
298
334
  "character": 51
299
335
  },
300
- "name": "MergeLaneOptions"
336
+ "name": "MergeLaneOptions",
337
+ "internalFilePath": "merge-lanes.main.runtime.ts"
301
338
  },
302
339
  "isOptional": false,
303
340
  "isSpread": false
@@ -341,7 +378,12 @@
341
378
  "line": 98,
342
379
  "character": 18
343
380
  },
344
- "name": "LaneId"
381
+ "name": "LaneId",
382
+ "componentId": {
383
+ "scope": "teambit.lanes",
384
+ "name": "lane-id",
385
+ "version": "0.0.311"
386
+ }
345
387
  },
346
388
  "isOptional": false,
347
389
  "isSpread": false
@@ -361,7 +403,12 @@
361
403
  "line": 99,
362
404
  "character": 20
363
405
  },
364
- "name": "LaneId"
406
+ "name": "LaneId",
407
+ "componentId": {
408
+ "scope": "teambit.lanes",
409
+ "name": "lane-id",
410
+ "version": "0.0.311"
411
+ }
365
412
  },
366
413
  "isOptional": false,
367
414
  "isSpread": false
@@ -381,7 +428,8 @@
381
428
  "line": 100,
382
429
  "character": 14
383
430
  },
384
- "name": "MergeLaneOptions"
431
+ "name": "MergeLaneOptions",
432
+ "internalFilePath": "merge-lanes.main.runtime.ts"
385
433
  },
386
434
  "isOptional": false,
387
435
  "isSpread": false
@@ -471,7 +519,11 @@
471
519
  "line": 104,
472
520
  "character": 25
473
521
  },
474
- "name": "ConfigMergeResult"
522
+ "name": "ConfigMergeResult",
523
+ "componentId": {
524
+ "scope": "teambit.workspace",
525
+ "name": "config-merger"
526
+ }
475
527
  }
476
528
  },
477
529
  "isOptional": false
@@ -499,7 +551,12 @@
499
551
  "line": 105,
500
552
  "character": 28
501
553
  },
502
- "name": "ComponentID"
554
+ "name": "ComponentID",
555
+ "componentId": {
556
+ "scope": "teambit.component",
557
+ "name": "component-id",
558
+ "version": "1.2.0"
559
+ }
503
560
  }
504
561
  },
505
562
  "isOptional": false
@@ -527,7 +584,8 @@
527
584
  "line": 106,
528
585
  "character": 16
529
586
  },
530
- "name": "ConflictPerId"
587
+ "name": "ConflictPerId",
588
+ "internalFilePath": "merge-lanes.main.runtime.ts"
531
589
  }
532
590
  },
533
591
  "isOptional": false
@@ -650,7 +708,11 @@
650
708
  "line": 327,
651
709
  "character": 39
652
710
  },
653
- "name": "CheckoutProps"
711
+ "name": "CheckoutProps",
712
+ "componentId": {
713
+ "scope": "teambit.component",
714
+ "name": "checkout"
715
+ }
654
716
  },
655
717
  "isOptional": false,
656
718
  "isSpread": false
@@ -670,7 +732,8 @@
670
732
  "line": 327,
671
733
  "character": 70
672
734
  },
673
- "name": "MergeAbortOpts"
735
+ "name": "MergeAbortOpts",
736
+ "internalFilePath": "merge-abort.cmd.ts"
674
737
  },
675
738
  "isOptional": false,
676
739
  "isSpread": false
@@ -771,7 +834,8 @@
771
834
  "line": 386,
772
835
  "character": 22
773
836
  },
774
- "name": "MergeLaneOptions"
837
+ "name": "MergeLaneOptions",
838
+ "internalFilePath": "merge-lanes.main.runtime.ts"
775
839
  }
776
840
  ]
777
841
  },
@@ -847,7 +911,8 @@
847
911
  "line": 387,
848
912
  "character": 14
849
913
  },
850
- "name": "MergeFromScopeResult"
914
+ "name": "MergeFromScopeResult",
915
+ "internalFilePath": "merge-lanes.main.runtime.ts"
851
916
  }
852
917
  ]
853
918
  },
@@ -951,7 +1016,11 @@
951
1016
  "line": 510,
952
1017
  "character": 5
953
1018
  },
954
- "name": "LanesMain"
1019
+ "name": "LanesMain",
1020
+ "componentId": {
1021
+ "scope": "teambit.lanes",
1022
+ "name": "lanes"
1023
+ }
955
1024
  },
956
1025
  {
957
1026
  "__schema": "TypeRefSchema",
@@ -960,7 +1029,11 @@
960
1029
  "line": 511,
961
1030
  "character": 5
962
1031
  },
963
- "name": "CLIMain"
1032
+ "name": "CLIMain",
1033
+ "componentId": {
1034
+ "scope": "teambit.harmony",
1035
+ "name": "cli"
1036
+ }
964
1037
  },
965
1038
  {
966
1039
  "__schema": "TypeRefSchema",
@@ -969,7 +1042,11 @@
969
1042
  "line": 512,
970
1043
  "character": 5
971
1044
  },
972
- "name": "Workspace"
1045
+ "name": "Workspace",
1046
+ "componentId": {
1047
+ "scope": "teambit.workspace",
1048
+ "name": "workspace"
1049
+ }
973
1050
  },
974
1051
  {
975
1052
  "__schema": "TypeRefSchema",
@@ -978,7 +1055,11 @@
978
1055
  "line": 513,
979
1056
  "character": 5
980
1057
  },
981
- "name": "MergingMain"
1058
+ "name": "MergingMain",
1059
+ "componentId": {
1060
+ "scope": "teambit.component",
1061
+ "name": "merging"
1062
+ }
982
1063
  },
983
1064
  {
984
1065
  "__schema": "TypeRefSchema",
@@ -987,7 +1068,11 @@
987
1068
  "line": 514,
988
1069
  "character": 5
989
1070
  },
990
- "name": "LoggerMain"
1071
+ "name": "LoggerMain",
1072
+ "componentId": {
1073
+ "scope": "teambit.harmony",
1074
+ "name": "logger"
1075
+ }
991
1076
  },
992
1077
  {
993
1078
  "__schema": "TypeRefSchema",
@@ -996,7 +1081,11 @@
996
1081
  "line": 515,
997
1082
  "character": 5
998
1083
  },
999
- "name": "RemoveMain"
1084
+ "name": "RemoveMain",
1085
+ "componentId": {
1086
+ "scope": "teambit.component",
1087
+ "name": "remove"
1088
+ }
1000
1089
  },
1001
1090
  {
1002
1091
  "__schema": "TypeRefSchema",
@@ -1005,7 +1094,11 @@
1005
1094
  "line": 516,
1006
1095
  "character": 5
1007
1096
  },
1008
- "name": "ScopeMain"
1097
+ "name": "ScopeMain",
1098
+ "componentId": {
1099
+ "scope": "teambit.scope",
1100
+ "name": "scope"
1101
+ }
1009
1102
  },
1010
1103
  {
1011
1104
  "__schema": "TypeRefSchema",
@@ -1014,7 +1107,11 @@
1014
1107
  "line": 517,
1015
1108
  "character": 5
1016
1109
  },
1017
- "name": "ExportMain"
1110
+ "name": "ExportMain",
1111
+ "componentId": {
1112
+ "scope": "teambit.scope",
1113
+ "name": "export"
1114
+ }
1018
1115
  },
1019
1116
  {
1020
1117
  "__schema": "TypeRefSchema",
@@ -1023,7 +1120,11 @@
1023
1120
  "line": 518,
1024
1121
  "character": 5
1025
1122
  },
1026
- "name": "ImporterMain"
1123
+ "name": "ImporterMain",
1124
+ "componentId": {
1125
+ "scope": "teambit.scope",
1126
+ "name": "importer"
1127
+ }
1027
1128
  },
1028
1129
  {
1029
1130
  "__schema": "TypeRefSchema",
@@ -1032,7 +1133,11 @@
1032
1133
  "line": 519,
1033
1134
  "character": 5
1034
1135
  },
1035
- "name": "CheckoutMain"
1136
+ "name": "CheckoutMain",
1137
+ "componentId": {
1138
+ "scope": "teambit.component",
1139
+ "name": "checkout"
1140
+ }
1036
1141
  },
1037
1142
  {
1038
1143
  "__schema": "TypeRefSchema",
@@ -1041,7 +1146,11 @@
1041
1146
  "line": 520,
1042
1147
  "character": 5
1043
1148
  },
1044
- "name": "GlobalConfigMain"
1149
+ "name": "GlobalConfigMain",
1150
+ "componentId": {
1151
+ "scope": "teambit.harmony",
1152
+ "name": "global-config"
1153
+ }
1045
1154
  }
1046
1155
  ]
1047
1156
  },
@@ -1158,7 +1267,8 @@
1158
1267
  "line": 41,
1159
1268
  "character": 18
1160
1269
  },
1161
- "name": "MergeStrategy"
1270
+ "name": "MergeStrategy",
1271
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1162
1272
  },
1163
1273
  "isOptional": false
1164
1274
  },
@@ -1438,7 +1548,8 @@
1438
1548
  "line": 55,
1439
1549
  "character": 22
1440
1550
  },
1441
- "name": "MergeStrategy"
1551
+ "name": "MergeStrategy",
1552
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1442
1553
  },
1443
1554
  "isOptional": true
1444
1555
  },
@@ -1698,7 +1809,12 @@
1698
1809
  "line": 65,
1699
1810
  "character": 14
1700
1811
  },
1701
- "name": "ComponentID"
1812
+ "name": "ComponentID",
1813
+ "componentId": {
1814
+ "scope": "teambit.component",
1815
+ "name": "component-id",
1816
+ "version": "1.2.0"
1817
+ }
1702
1818
  }
1703
1819
  },
1704
1820
  "isOptional": false
@@ -1726,7 +1842,12 @@
1726
1842
  "line": 66,
1727
1843
  "character": 16
1728
1844
  },
1729
- "name": "ComponentID"
1845
+ "name": "ComponentID",
1846
+ "componentId": {
1847
+ "scope": "teambit.component",
1848
+ "name": "component-id",
1849
+ "version": "1.2.0"
1850
+ }
1730
1851
  }
1731
1852
  },
1732
1853
  "isOptional": false
@@ -1828,7 +1949,8 @@
1828
1949
  "line": 68,
1829
1950
  "character": 15
1830
1951
  },
1831
- "name": "ConflictPerId"
1952
+ "name": "ConflictPerId",
1953
+ "internalFilePath": "merge-lanes.main.runtime.ts"
1832
1954
  }
1833
1955
  },
1834
1956
  "isOptional": true
@@ -1856,7 +1978,12 @@
1856
1978
  "line": 69,
1857
1979
  "character": 16
1858
1980
  },
1859
- "name": "ComponentID"
1981
+ "name": "ComponentID",
1982
+ "componentId": {
1983
+ "scope": "teambit.component",
1984
+ "name": "component-id",
1985
+ "version": "1.2.0"
1986
+ }
1860
1987
  }
1861
1988
  },
1862
1989
  "isOptional": true
@@ -1884,7 +2011,12 @@
1884
2011
  "line": 70,
1885
2012
  "character": 21
1886
2013
  },
1887
- "name": "ComponentID"
2014
+ "name": "ComponentID",
2015
+ "componentId": {
2016
+ "scope": "teambit.component",
2017
+ "name": "component-id",
2018
+ "version": "1.2.0"
2019
+ }
1888
2020
  }
1889
2021
  },
1890
2022
  "isOptional": false
@@ -1955,7 +2087,11 @@
1955
2087
  "line": 76,
1956
2088
  "character": 24
1957
2089
  },
1958
- "name": "Workspace"
2090
+ "name": "Workspace",
2091
+ "componentId": {
2092
+ "scope": "teambit.workspace",
2093
+ "name": "workspace"
2094
+ }
1959
2095
  },
1960
2096
  {
1961
2097
  "__schema": "KeywordTypeSchema",
@@ -1986,7 +2122,11 @@
1986
2122
  "line": 77,
1987
2123
  "character": 22
1988
2124
  },
1989
- "name": "MergingMain"
2125
+ "name": "MergingMain",
2126
+ "componentId": {
2127
+ "scope": "teambit.component",
2128
+ "name": "merging"
2129
+ }
1990
2130
  },
1991
2131
  "isOptional": false,
1992
2132
  "isSpread": false
@@ -2006,7 +2146,11 @@
2006
2146
  "line": 78,
2007
2147
  "character": 21
2008
2148
  },
2009
- "name": "LanesMain"
2149
+ "name": "LanesMain",
2150
+ "componentId": {
2151
+ "scope": "teambit.lanes",
2152
+ "name": "lanes"
2153
+ }
2010
2154
  },
2011
2155
  "isOptional": false,
2012
2156
  "isSpread": false
@@ -2026,7 +2170,11 @@
2026
2170
  "line": 79,
2027
2171
  "character": 22
2028
2172
  },
2029
- "name": "Logger"
2173
+ "name": "Logger",
2174
+ "componentId": {
2175
+ "scope": "teambit.harmony",
2176
+ "name": "logger"
2177
+ }
2030
2178
  },
2031
2179
  "isOptional": false,
2032
2180
  "isSpread": false
@@ -2046,7 +2194,11 @@
2046
2194
  "line": 80,
2047
2195
  "character": 21
2048
2196
  },
2049
- "name": "RemoveMain"
2197
+ "name": "RemoveMain",
2198
+ "componentId": {
2199
+ "scope": "teambit.component",
2200
+ "name": "remove"
2201
+ }
2050
2202
  },
2051
2203
  "isOptional": false,
2052
2204
  "isSpread": false
@@ -2066,7 +2218,11 @@
2066
2218
  "line": 81,
2067
2219
  "character": 20
2068
2220
  },
2069
- "name": "ScopeMain"
2221
+ "name": "ScopeMain",
2222
+ "componentId": {
2223
+ "scope": "teambit.scope",
2224
+ "name": "scope"
2225
+ }
2070
2226
  },
2071
2227
  "isOptional": false,
2072
2228
  "isSpread": false
@@ -2086,7 +2242,11 @@
2086
2242
  "line": 82,
2087
2243
  "character": 23
2088
2244
  },
2089
- "name": "ExportMain"
2245
+ "name": "ExportMain",
2246
+ "componentId": {
2247
+ "scope": "teambit.scope",
2248
+ "name": "export"
2249
+ }
2090
2250
  },
2091
2251
  "isOptional": false,
2092
2252
  "isSpread": false
@@ -2106,7 +2266,11 @@
2106
2266
  "line": 83,
2107
2267
  "character": 23
2108
2268
  },
2109
- "name": "ImporterMain"
2269
+ "name": "ImporterMain",
2270
+ "componentId": {
2271
+ "scope": "teambit.scope",
2272
+ "name": "importer"
2273
+ }
2110
2274
  },
2111
2275
  "isOptional": false,
2112
2276
  "isSpread": false
@@ -2126,7 +2290,11 @@
2126
2290
  "line": 84,
2127
2291
  "character": 23
2128
2292
  },
2129
- "name": "CheckoutMain"
2293
+ "name": "CheckoutMain",
2294
+ "componentId": {
2295
+ "scope": "teambit.component",
2296
+ "name": "checkout"
2297
+ }
2130
2298
  },
2131
2299
  "isOptional": false,
2132
2300
  "isSpread": false
@@ -2188,7 +2356,8 @@
2188
2356
  "line": 87,
2189
2357
  "character": 51
2190
2358
  },
2191
- "name": "MergeLaneOptions"
2359
+ "name": "MergeLaneOptions",
2360
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2192
2361
  },
2193
2362
  "isOptional": false,
2194
2363
  "isSpread": false
@@ -2232,7 +2401,12 @@
2232
2401
  "line": 98,
2233
2402
  "character": 18
2234
2403
  },
2235
- "name": "LaneId"
2404
+ "name": "LaneId",
2405
+ "componentId": {
2406
+ "scope": "teambit.lanes",
2407
+ "name": "lane-id",
2408
+ "version": "0.0.311"
2409
+ }
2236
2410
  },
2237
2411
  "isOptional": false,
2238
2412
  "isSpread": false
@@ -2252,7 +2426,12 @@
2252
2426
  "line": 99,
2253
2427
  "character": 20
2254
2428
  },
2255
- "name": "LaneId"
2429
+ "name": "LaneId",
2430
+ "componentId": {
2431
+ "scope": "teambit.lanes",
2432
+ "name": "lane-id",
2433
+ "version": "0.0.311"
2434
+ }
2256
2435
  },
2257
2436
  "isOptional": false,
2258
2437
  "isSpread": false
@@ -2272,7 +2451,8 @@
2272
2451
  "line": 100,
2273
2452
  "character": 14
2274
2453
  },
2275
- "name": "MergeLaneOptions"
2454
+ "name": "MergeLaneOptions",
2455
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2276
2456
  },
2277
2457
  "isOptional": false,
2278
2458
  "isSpread": false
@@ -2362,7 +2542,11 @@
2362
2542
  "line": 104,
2363
2543
  "character": 25
2364
2544
  },
2365
- "name": "ConfigMergeResult"
2545
+ "name": "ConfigMergeResult",
2546
+ "componentId": {
2547
+ "scope": "teambit.workspace",
2548
+ "name": "config-merger"
2549
+ }
2366
2550
  }
2367
2551
  },
2368
2552
  "isOptional": false
@@ -2390,7 +2574,12 @@
2390
2574
  "line": 105,
2391
2575
  "character": 28
2392
2576
  },
2393
- "name": "ComponentID"
2577
+ "name": "ComponentID",
2578
+ "componentId": {
2579
+ "scope": "teambit.component",
2580
+ "name": "component-id",
2581
+ "version": "1.2.0"
2582
+ }
2394
2583
  }
2395
2584
  },
2396
2585
  "isOptional": false
@@ -2418,7 +2607,8 @@
2418
2607
  "line": 106,
2419
2608
  "character": 16
2420
2609
  },
2421
- "name": "ConflictPerId"
2610
+ "name": "ConflictPerId",
2611
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2422
2612
  }
2423
2613
  },
2424
2614
  "isOptional": false
@@ -2541,7 +2731,11 @@
2541
2731
  "line": 327,
2542
2732
  "character": 39
2543
2733
  },
2544
- "name": "CheckoutProps"
2734
+ "name": "CheckoutProps",
2735
+ "componentId": {
2736
+ "scope": "teambit.component",
2737
+ "name": "checkout"
2738
+ }
2545
2739
  },
2546
2740
  "isOptional": false,
2547
2741
  "isSpread": false
@@ -2561,7 +2755,8 @@
2561
2755
  "line": 327,
2562
2756
  "character": 70
2563
2757
  },
2564
- "name": "MergeAbortOpts"
2758
+ "name": "MergeAbortOpts",
2759
+ "internalFilePath": "merge-abort.cmd.ts"
2565
2760
  },
2566
2761
  "isOptional": false,
2567
2762
  "isSpread": false
@@ -2662,7 +2857,8 @@
2662
2857
  "line": 386,
2663
2858
  "character": 22
2664
2859
  },
2665
- "name": "MergeLaneOptions"
2860
+ "name": "MergeLaneOptions",
2861
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2666
2862
  }
2667
2863
  ]
2668
2864
  },
@@ -2738,7 +2934,8 @@
2738
2934
  "line": 387,
2739
2935
  "character": 14
2740
2936
  },
2741
- "name": "MergeFromScopeResult"
2937
+ "name": "MergeFromScopeResult",
2938
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2742
2939
  }
2743
2940
  ]
2744
2941
  },
@@ -2842,7 +3039,11 @@
2842
3039
  "line": 510,
2843
3040
  "character": 5
2844
3041
  },
2845
- "name": "LanesMain"
3042
+ "name": "LanesMain",
3043
+ "componentId": {
3044
+ "scope": "teambit.lanes",
3045
+ "name": "lanes"
3046
+ }
2846
3047
  },
2847
3048
  {
2848
3049
  "__schema": "TypeRefSchema",
@@ -2851,7 +3052,11 @@
2851
3052
  "line": 511,
2852
3053
  "character": 5
2853
3054
  },
2854
- "name": "CLIMain"
3055
+ "name": "CLIMain",
3056
+ "componentId": {
3057
+ "scope": "teambit.harmony",
3058
+ "name": "cli"
3059
+ }
2855
3060
  },
2856
3061
  {
2857
3062
  "__schema": "TypeRefSchema",
@@ -2860,7 +3065,11 @@
2860
3065
  "line": 512,
2861
3066
  "character": 5
2862
3067
  },
2863
- "name": "Workspace"
3068
+ "name": "Workspace",
3069
+ "componentId": {
3070
+ "scope": "teambit.workspace",
3071
+ "name": "workspace"
3072
+ }
2864
3073
  },
2865
3074
  {
2866
3075
  "__schema": "TypeRefSchema",
@@ -2869,7 +3078,11 @@
2869
3078
  "line": 513,
2870
3079
  "character": 5
2871
3080
  },
2872
- "name": "MergingMain"
3081
+ "name": "MergingMain",
3082
+ "componentId": {
3083
+ "scope": "teambit.component",
3084
+ "name": "merging"
3085
+ }
2873
3086
  },
2874
3087
  {
2875
3088
  "__schema": "TypeRefSchema",
@@ -2878,7 +3091,11 @@
2878
3091
  "line": 514,
2879
3092
  "character": 5
2880
3093
  },
2881
- "name": "LoggerMain"
3094
+ "name": "LoggerMain",
3095
+ "componentId": {
3096
+ "scope": "teambit.harmony",
3097
+ "name": "logger"
3098
+ }
2882
3099
  },
2883
3100
  {
2884
3101
  "__schema": "TypeRefSchema",
@@ -2887,7 +3104,11 @@
2887
3104
  "line": 515,
2888
3105
  "character": 5
2889
3106
  },
2890
- "name": "RemoveMain"
3107
+ "name": "RemoveMain",
3108
+ "componentId": {
3109
+ "scope": "teambit.component",
3110
+ "name": "remove"
3111
+ }
2891
3112
  },
2892
3113
  {
2893
3114
  "__schema": "TypeRefSchema",
@@ -2896,7 +3117,11 @@
2896
3117
  "line": 516,
2897
3118
  "character": 5
2898
3119
  },
2899
- "name": "ScopeMain"
3120
+ "name": "ScopeMain",
3121
+ "componentId": {
3122
+ "scope": "teambit.scope",
3123
+ "name": "scope"
3124
+ }
2900
3125
  },
2901
3126
  {
2902
3127
  "__schema": "TypeRefSchema",
@@ -2905,7 +3130,11 @@
2905
3130
  "line": 517,
2906
3131
  "character": 5
2907
3132
  },
2908
- "name": "ExportMain"
3133
+ "name": "ExportMain",
3134
+ "componentId": {
3135
+ "scope": "teambit.scope",
3136
+ "name": "export"
3137
+ }
2909
3138
  },
2910
3139
  {
2911
3140
  "__schema": "TypeRefSchema",
@@ -2914,7 +3143,11 @@
2914
3143
  "line": 518,
2915
3144
  "character": 5
2916
3145
  },
2917
- "name": "ImporterMain"
3146
+ "name": "ImporterMain",
3147
+ "componentId": {
3148
+ "scope": "teambit.scope",
3149
+ "name": "importer"
3150
+ }
2918
3151
  },
2919
3152
  {
2920
3153
  "__schema": "TypeRefSchema",
@@ -2923,7 +3156,11 @@
2923
3156
  "line": 519,
2924
3157
  "character": 5
2925
3158
  },
2926
- "name": "CheckoutMain"
3159
+ "name": "CheckoutMain",
3160
+ "componentId": {
3161
+ "scope": "teambit.component",
3162
+ "name": "checkout"
3163
+ }
2927
3164
  },
2928
3165
  {
2929
3166
  "__schema": "TypeRefSchema",
@@ -2932,7 +3169,11 @@
2932
3169
  "line": 520,
2933
3170
  "character": 5
2934
3171
  },
2935
- "name": "GlobalConfigMain"
3172
+ "name": "GlobalConfigMain",
3173
+ "componentId": {
3174
+ "scope": "teambit.harmony",
3175
+ "name": "global-config"
3176
+ }
2936
3177
  }
2937
3178
  ]
2938
3179
  },
@@ -3002,7 +3243,11 @@
3002
3243
  "line": 544,
3003
3244
  "character": 24
3004
3245
  },
3005
- "name": "ComponentMergeStatus"
3246
+ "name": "ComponentMergeStatus",
3247
+ "componentId": {
3248
+ "scope": "teambit.component",
3249
+ "name": "merging"
3250
+ }
3006
3251
  }
3007
3252
  },
3008
3253
  "isOptional": false,
@@ -3030,7 +3275,12 @@
3030
3275
  "line": 545,
3031
3276
  "character": 18
3032
3277
  },
3033
- "name": "ComponentID"
3278
+ "name": "ComponentID",
3279
+ "componentId": {
3280
+ "scope": "teambit.component",
3281
+ "name": "component-id",
3282
+ "version": "1.2.0"
3283
+ }
3034
3284
  }
3035
3285
  },
3036
3286
  "isOptional": false,
@@ -3058,7 +3308,12 @@
3058
3308
  "line": 546,
3059
3309
  "character": 14
3060
3310
  },
3061
- "name": "ComponentID"
3311
+ "name": "ComponentID",
3312
+ "componentId": {
3313
+ "scope": "teambit.component",
3314
+ "name": "component-id",
3315
+ "version": "1.2.0"
3316
+ }
3062
3317
  }
3063
3318
  },
3064
3319
  "isOptional": false,
@@ -3120,7 +3375,8 @@
3120
3375
  "line": 549,
3121
3376
  "character": 15
3122
3377
  },
3123
- "name": "Lane"
3378
+ "name": "Lane",
3379
+ "packageName": "@teambit/legacy/dist/scope/models"
3124
3380
  },
3125
3381
  "isOptional": true,
3126
3382
  "isSpread": false
@@ -3169,7 +3425,11 @@
3169
3425
  "line": 551,
3170
3426
  "character": 12
3171
3427
  },
3172
- "name": "ComponentMergeStatus"
3428
+ "name": "ComponentMergeStatus",
3429
+ "componentId": {
3430
+ "scope": "teambit.component",
3431
+ "name": "merging"
3432
+ }
3173
3433
  }
3174
3434
  }
3175
3435
  ]
@@ -3203,7 +3463,12 @@
3203
3463
  "line": 660,
3204
3464
  "character": 45
3205
3465
  },
3206
- "name": "LaneId"
3466
+ "name": "LaneId",
3467
+ "componentId": {
3468
+ "scope": "teambit.lanes",
3469
+ "name": "lane-id",
3470
+ "version": "0.0.311"
3471
+ }
3207
3472
  },
3208
3473
  "isOptional": false,
3209
3474
  "isSpread": false
@@ -3254,7 +3519,11 @@
3254
3519
  "line": 670,
3255
3520
  "character": 24
3256
3521
  },
3257
- "name": "ComponentMergeStatus"
3522
+ "name": "ComponentMergeStatus",
3523
+ "componentId": {
3524
+ "scope": "teambit.component",
3525
+ "name": "merging"
3526
+ }
3258
3527
  }
3259
3528
  },
3260
3529
  "isOptional": false,
@@ -3275,7 +3544,12 @@
3275
3544
  "line": 671,
3276
3545
  "character": 18
3277
3546
  },
3278
- "name": "LaneId"
3547
+ "name": "LaneId",
3548
+ "componentId": {
3549
+ "scope": "teambit.lanes",
3550
+ "name": "lane-id",
3551
+ "version": "0.0.311"
3552
+ }
3279
3553
  },
3280
3554
  "isOptional": false,
3281
3555
  "isSpread": false
@@ -3295,7 +3569,12 @@
3295
3569
  "line": 672,
3296
3570
  "character": 16
3297
3571
  },
3298
- "name": "LaneId"
3572
+ "name": "LaneId",
3573
+ "componentId": {
3574
+ "scope": "teambit.lanes",
3575
+ "name": "lane-id",
3576
+ "version": "0.0.311"
3577
+ }
3299
3578
  },
3300
3579
  "isOptional": false,
3301
3580
  "isSpread": false
@@ -3409,7 +3688,12 @@
3409
3688
  "line": 710,
3410
3689
  "character": 16
3411
3690
  },
3412
- "name": "LaneId"
3691
+ "name": "LaneId",
3692
+ "componentId": {
3693
+ "scope": "teambit.lanes",
3694
+ "name": "lane-id",
3695
+ "version": "0.0.311"
3696
+ }
3413
3697
  },
3414
3698
  "isOptional": false,
3415
3699
  "isSpread": false
@@ -3429,7 +3713,12 @@
3429
3713
  "line": 711,
3430
3714
  "character": 7
3431
3715
  },
3432
- "name": "ComponentID"
3716
+ "name": "ComponentID",
3717
+ "componentId": {
3718
+ "scope": "teambit.component",
3719
+ "name": "component-id",
3720
+ "version": "1.2.0"
3721
+ }
3433
3722
  },
3434
3723
  "isOptional": false,
3435
3724
  "isSpread": false
@@ -3449,7 +3738,8 @@
3449
3738
  "line": 712,
3450
3739
  "character": 16
3451
3740
  },
3452
- "name": "SnapsDistance"
3741
+ "name": "SnapsDistance",
3742
+ "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
3453
3743
  },
3454
3744
  "isOptional": false,
3455
3745
  "isSpread": false
@@ -3469,7 +3759,8 @@
3469
3759
  "line": 713,
3470
3760
  "character": 8
3471
3761
  },
3472
- "name": "Log"
3762
+ "name": "Log",
3763
+ "packageName": "@teambit/legacy/dist/scope/models/version"
3473
3764
  },
3474
3765
  "isOptional": false,
3475
3766
  "isSpread": false
@@ -3509,7 +3800,8 @@
3509
3800
  "line": 715,
3510
3801
  "character": 24
3511
3802
  },
3512
- "name": "Version"
3803
+ "name": "Version",
3804
+ "packageName": "@teambit/legacy/dist/scope/models"
3513
3805
  },
3514
3806
  "isOptional": true,
3515
3807
  "isSpread": false
@@ -3559,7 +3851,8 @@
3559
3851
  "line": 717,
3560
3852
  "character": 12
3561
3853
  },
3562
- "name": "Version"
3854
+ "name": "Version",
3855
+ "packageName": "@teambit/legacy/dist/scope/models"
3563
3856
  },
3564
3857
  {
3565
3858
  "__schema": "KeywordTypeSchema",
@@ -3631,7 +3924,7 @@
3631
3924
  "componentId": {
3632
3925
  "scope": "teambit.lanes",
3633
3926
  "name": "merge-lanes",
3634
- "version": "1.0.258"
3927
+ "version": "1.0.260"
3635
3928
  },
3636
3929
  "taggedModuleExports": []
3637
3930
  }
package/dist/merge-lane-from-scope.cmd.js CHANGED
@@ -42,7 +42,7 @@ function _bitError() {
42
42
  const _excluded = ["id"];
43
43
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
44
44
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
45
- function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
45
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
46
46
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
47
47
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
48
48
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
package/dist/merge-lane-from-scope.cmd.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_utils","_bitError","_excluded","obj","__esModule","default","_objectWithoutProperties","source","excluded","target","_objectWithoutPropertiesLoose","key","i","Object","getOwnPropertySymbols","sourceSymbolKeys","length","indexOf","prototype","propertyIsEnumerable","call","sourceKeys","keys","ownKeys","e","r","t","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n pattern?: string;\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n title?: string;\n titleBase64?: string;\n reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <from-lane> [to-lane]';\n description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'from-lane',\n description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n },\n {\n name: 'to-lane',\n description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n },\n ];\n alias = '';\n options = [\n ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n [\n '',\n 'title <string>',\n 'if provided, it replaces the original message with this title and append squashed snaps messages',\n ],\n ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n ['j', 'json', 'output as json format'],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [fromLane, toLane]: [string, string],\n {\n pattern,\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n title,\n titleBase64,\n reMerge,\n }: Flags\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n if (fromLane === DEFAULT_LANE && !toLane) {\n throw new BitError('to merge from the main lane, specify the target lane');\n }\n\n const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n fromLane,\n toLane || DEFAULT_LANE,\n {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n snapMessage: titleBase64Decoded || title,\n reMerge,\n }\n );\n\n const mergedTitle = chalk.green(\n `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n );\n const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n const nonMergedOutput = unmerged.length\n ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n : '';\n\n const conflictsTitle = chalk.bold(\n `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n );\n const conflictsOutput = conflicts?.length\n ? `${conflictsTitle}\\n${conflicts\n .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n .join('\\n')}`\n : '';\n\n const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n }\n async json(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n ) {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n let results: MergeFromScopeResult;\n try {\n results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n reMerge,\n });\n return {\n code: 0,\n data: {\n ...results,\n mergedNow: results.mergedNow.map((id) => id.toString()),\n mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n exportedIds: results.exportedIds.map((id) => id.toString()),\n unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n snappedIds: results.snappedIds?.map((id) => id.toString()),\n mergeSnapError: results.mergeSnapError\n ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n : undefined,\n },\n };\n } catch (err: any) {\n this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n return {\n code: 1,\n error: err.message,\n };\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_laneId","_lodash","_utils","_bitError","_excluded","obj","__esModule","default","_objectWithoutProperties","source","excluded","target","_objectWithoutPropertiesLoose","key","i","Object","getOwnPropertySymbols","sourceSymbolKeys","length","indexOf","prototype","propertyIsEnumerable","call","hasOwnProperty","ownKeys","e","r","t","keys","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","value","_toPropertyKey","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","DEFAULT_LANE","report","fromLane","toLane","pattern","keepReadme","noSquash","includeDeps","title","titleBase64","reMerge","BitError","titleBase64Decoded","fromBase64","undefined","mergedNow","unmerged","exportedIds","conflicts","mergeSnapError","mergeFromScope","snapMessage","mergedTitle","chalk","green","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","map","u","id","reason","conflictsTitle","conflictsOutput","files","config","mergeSnapErrorTitle","mergeSnapErrorOutput","red","message","exportedTitle","exportedOutput","compact","json","results","code","toString","mergedPreviously","_ref","rest","snappedIds","stack","err","logger","error","exports"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { DEFAULT_LANE } from '@teambit/lane-id';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { fromBase64 } from '@teambit/legacy/dist/utils';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\n\ntype Flags = {\n pattern?: string;\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n title?: string;\n titleBase64?: string;\n reMerge?: boolean;\n};\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <from-lane> [to-lane]';\n description = `merge a remote lane into another lane or main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane.\nthe lane must be up-to-date with the other lane, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'from-lane',\n description: `lane-id to merge from or \"${DEFAULT_LANE}\"`,\n },\n {\n name: 'to-lane',\n description: `lane-id to merge to. default is \"${DEFAULT_LANE}\"`,\n },\n ];\n alias = '';\n options = [\n ['', 'pattern <string>', 'partially merge the lane with the specified component-pattern'],\n [\n '',\n 'title <string>',\n 'if provided, it replaces the original message with this title and append squashed snaps messages',\n ],\n ['', 'title-base64 <string>', 'same as --title flag but the title is base64 encoded'],\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'relevant for merging lanes into main, which by default squash.'],\n ['', 'include-deps', 'relevant for \"--pattern\". merge also dependencies of the given components'],\n ['', 're-merge', 'helpful when last merge failed during export. do not skip components that seemed to be merged'],\n ['j', 'json', 'output as json format'],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [fromLane, toLane]: [string, string],\n {\n pattern,\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n title,\n titleBase64,\n reMerge,\n }: Flags\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n if (fromLane === DEFAULT_LANE && !toLane) {\n throw new BitError('to merge from the main lane, specify the target lane');\n }\n\n const titleBase64Decoded = titleBase64 ? fromBase64(titleBase64) : undefined;\n\n const { mergedNow, unmerged, exportedIds, conflicts, mergeSnapError } = await this.mergeLanes.mergeFromScope(\n fromLane,\n toLane || DEFAULT_LANE,\n {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n snapMessage: titleBase64Decoded || title,\n reMerge,\n }\n );\n\n const mergedTitle = chalk.green(\n `successfully merged ${mergedNow.length} components from ${fromLane} to ${toLane || DEFAULT_LANE}`\n );\n const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n const nonMergedTitle = chalk.bold(`the following ${unmerged.length} components were not merged`);\n const nonMergedOutput = unmerged.length\n ? `${nonMergedTitle}\\n${unmerged.map((u) => `${u.id} (${u.reason})`).join('\\n')}`\n : '';\n\n const conflictsTitle = chalk.bold(\n `the following ${conflicts?.length} components have conflicts, the merge was not completed`\n );\n const conflictsOutput = conflicts?.length\n ? `${conflictsTitle}\\n${conflicts\n .map((u) => `${u.id} (files: ${u.files.join(', ') || 'N/A'}) (config: ${u.config})`)\n .join('\\n')}`\n : '';\n\n const mergeSnapErrorTitle = chalk.bold(`the following error was thrown while snapping the components:`);\n const mergeSnapErrorOutput = mergeSnapError ? `${mergeSnapErrorTitle}\\n${chalk.red(mergeSnapError.message)}` : '';\n\n const exportedTitle = chalk.bold(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return compact([mergedOutput, nonMergedOutput, conflictsOutput, mergeSnapErrorOutput, exportedOutput]).join('\\n\\n');\n }\n async json(\n [fromLane, toLane]: [string, string],\n { pattern, push = false, keepReadme = false, noSquash = false, includeDeps = false, reMerge }: Flags\n ) {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n let results: MergeFromScopeResult;\n try {\n results = await this.mergeLanes.mergeFromScope(fromLane, toLane || DEFAULT_LANE, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n reMerge,\n });\n return {\n code: 0,\n data: {\n ...results,\n mergedNow: results.mergedNow.map((id) => id.toString()),\n mergedPreviously: results.mergedPreviously.map((id) => id.toString()),\n exportedIds: results.exportedIds.map((id) => id.toString()),\n unmerged: results.unmerged.map(({ id, reason }) => ({ id: id.toString(), reason })),\n conflicts: results.conflicts?.map(({ id, ...rest }) => ({ id: id.toString(), ...rest })),\n snappedIds: results.snappedIds?.map((id) => id.toString()),\n mergeSnapError: results.mergeSnapError\n ? { message: results.mergeSnapError.message, stack: results.mergeSnapError.stack }\n : undefined,\n },\n };\n } catch (err: any) {\n this.mergeLanes.logger.error('merge-lane-from-scope.json, error: ', err);\n return {\n code: 1,\n error: err.message,\n };\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.258",
3
+ "version": "1.0.260",
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.258"
9
+ "version": "1.0.260"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -19,18 +19,18 @@
19
19
  "@teambit/lane-id": "0.0.311",
20
20
  "@teambit/harmony": "0.4.6",
21
21
  "@teambit/component-id": "1.2.0",
22
- "@teambit/logger": "0.0.955",
23
- "@teambit/scope": "1.0.258",
24
- "@teambit/checkout": "1.0.258",
25
- "@teambit/cli": "0.0.862",
26
- "@teambit/global-config": "0.0.865",
27
- "@teambit/merging": "1.0.258",
28
- "@teambit/remove": "1.0.258",
29
- "@teambit/config-merger": "0.0.125",
30
- "@teambit/export": "1.0.258",
31
- "@teambit/importer": "1.0.258",
32
- "@teambit/lanes": "1.0.258",
33
- "@teambit/workspace": "1.0.258"
22
+ "@teambit/logger": "0.0.956",
23
+ "@teambit/scope": "1.0.260",
24
+ "@teambit/checkout": "1.0.260",
25
+ "@teambit/cli": "0.0.863",
26
+ "@teambit/global-config": "0.0.866",
27
+ "@teambit/merging": "1.0.260",
28
+ "@teambit/remove": "1.0.260",
29
+ "@teambit/config-merger": "0.0.127",
30
+ "@teambit/export": "1.0.260",
31
+ "@teambit/importer": "1.0.260",
32
+ "@teambit/lanes": "1.0.260",
33
+ "@teambit/workspace": "1.0.260"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@types/fs-extra": "9.0.7",
@@ -39,9 +39,9 @@
39
39
  "chai": "4.3.0",
40
40
  "@types/mocha": "9.1.0",
41
41
  "@teambit/harmony.envs.core-aspect-env": "0.0.33",
42
- "@teambit/component.testing.mock-components": "0.0.200",
43
- "@teambit/harmony.testing.load-aspect": "0.0.195",
44
- "@teambit/snapping": "1.0.258",
42
+ "@teambit/component.testing.mock-components": "0.0.201",
43
+ "@teambit/harmony.testing.load-aspect": "0.0.196",
44
+ "@teambit/snapping": "1.0.260",
45
45
  "@teambit/workspace.testing.mock-workspace": "0.0.27"
46
46
  },
47
47
  "peerDependencies": {