@teambit/merge-lanes 1.0.468 → 1.0.470

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 +1 -1
  2. package/artifacts/schema.json +85 -384
  3. package/dist/merge-lane.cmd.js +1 -1
  4. package/dist/merge-lane.cmd.js.map +1 -1
  5. package/package.json +18 -18
  6. /package/dist/{preview-1732072955804.js → preview-1732245631025.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.468" tests="1" failures="0" errors="0" skipped="0">
3
+ <testsuite name="teambit.lanes/merge-lanes@1.0.470" 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": 332,
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": 332,
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": 391,
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": 392,
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": 514,
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": 515,
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": 516,
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": 517,
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": 518,
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": 519,
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": 520,
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": 521,
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": 522,
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": 523,
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": 524,
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": 42,
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": 57,
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
  },
@@ -1837,12 +1720,7 @@
1837
1720
  "line": 67,
1838
1721
  "character": 14
1839
1722
  },
1840
- "name": "ComponentID",
1841
- "componentId": {
1842
- "scope": "teambit.component",
1843
- "name": "component-id",
1844
- "version": "1.2.2"
1845
- }
1723
+ "name": "ComponentID"
1846
1724
  }
1847
1725
  },
1848
1726
  "isOptional": false
@@ -1870,12 +1748,7 @@
1870
1748
  "line": 68,
1871
1749
  "character": 16
1872
1750
  },
1873
- "name": "ComponentID",
1874
- "componentId": {
1875
- "scope": "teambit.component",
1876
- "name": "component-id",
1877
- "version": "1.2.2"
1878
- }
1751
+ "name": "ComponentID"
1879
1752
  }
1880
1753
  },
1881
1754
  "isOptional": false
@@ -1977,8 +1850,7 @@
1977
1850
  "line": 70,
1978
1851
  "character": 15
1979
1852
  },
1980
- "name": "ConflictPerId",
1981
- "internalFilePath": "merge-lanes.main.runtime.ts"
1853
+ "name": "ConflictPerId"
1982
1854
  }
1983
1855
  },
1984
1856
  "isOptional": true
@@ -2006,12 +1878,7 @@
2006
1878
  "line": 71,
2007
1879
  "character": 16
2008
1880
  },
2009
- "name": "ComponentID",
2010
- "componentId": {
2011
- "scope": "teambit.component",
2012
- "name": "component-id",
2013
- "version": "1.2.2"
2014
- }
1881
+ "name": "ComponentID"
2015
1882
  }
2016
1883
  },
2017
1884
  "isOptional": true
@@ -2039,12 +1906,7 @@
2039
1906
  "line": 72,
2040
1907
  "character": 21
2041
1908
  },
2042
- "name": "ComponentID",
2043
- "componentId": {
2044
- "scope": "teambit.component",
2045
- "name": "component-id",
2046
- "version": "1.2.2"
2047
- }
1909
+ "name": "ComponentID"
2048
1910
  }
2049
1911
  },
2050
1912
  "isOptional": false
@@ -2115,11 +1977,7 @@
2115
1977
  "line": 78,
2116
1978
  "character": 24
2117
1979
  },
2118
- "name": "Workspace",
2119
- "componentId": {
2120
- "scope": "teambit.workspace",
2121
- "name": "workspace"
2122
- }
1980
+ "name": "Workspace"
2123
1981
  },
2124
1982
  {
2125
1983
  "__schema": "KeywordTypeSchema",
@@ -2150,11 +2008,7 @@
2150
2008
  "line": 79,
2151
2009
  "character": 22
2152
2010
  },
2153
- "name": "MergingMain",
2154
- "componentId": {
2155
- "scope": "teambit.component",
2156
- "name": "merging"
2157
- }
2011
+ "name": "MergingMain"
2158
2012
  },
2159
2013
  "isOptional": false,
2160
2014
  "isSpread": false
@@ -2174,11 +2028,7 @@
2174
2028
  "line": 80,
2175
2029
  "character": 21
2176
2030
  },
2177
- "name": "LanesMain",
2178
- "componentId": {
2179
- "scope": "teambit.lanes",
2180
- "name": "lanes"
2181
- }
2031
+ "name": "LanesMain"
2182
2032
  },
2183
2033
  "isOptional": false,
2184
2034
  "isSpread": false
@@ -2198,11 +2048,7 @@
2198
2048
  "line": 81,
2199
2049
  "character": 22
2200
2050
  },
2201
- "name": "Logger",
2202
- "componentId": {
2203
- "scope": "teambit.harmony",
2204
- "name": "logger"
2205
- }
2051
+ "name": "Logger"
2206
2052
  },
2207
2053
  "isOptional": false,
2208
2054
  "isSpread": false
@@ -2222,11 +2068,7 @@
2222
2068
  "line": 82,
2223
2069
  "character": 21
2224
2070
  },
2225
- "name": "RemoveMain",
2226
- "componentId": {
2227
- "scope": "teambit.component",
2228
- "name": "remove"
2229
- }
2071
+ "name": "RemoveMain"
2230
2072
  },
2231
2073
  "isOptional": false,
2232
2074
  "isSpread": false
@@ -2246,11 +2088,7 @@
2246
2088
  "line": 83,
2247
2089
  "character": 20
2248
2090
  },
2249
- "name": "ScopeMain",
2250
- "componentId": {
2251
- "scope": "teambit.scope",
2252
- "name": "scope"
2253
- }
2091
+ "name": "ScopeMain"
2254
2092
  },
2255
2093
  "isOptional": false,
2256
2094
  "isSpread": false
@@ -2270,11 +2108,7 @@
2270
2108
  "line": 84,
2271
2109
  "character": 23
2272
2110
  },
2273
- "name": "ExportMain",
2274
- "componentId": {
2275
- "scope": "teambit.scope",
2276
- "name": "export"
2277
- }
2111
+ "name": "ExportMain"
2278
2112
  },
2279
2113
  "isOptional": false,
2280
2114
  "isSpread": false
@@ -2294,11 +2128,7 @@
2294
2128
  "line": 85,
2295
2129
  "character": 23
2296
2130
  },
2297
- "name": "ImporterMain",
2298
- "componentId": {
2299
- "scope": "teambit.scope",
2300
- "name": "importer"
2301
- }
2131
+ "name": "ImporterMain"
2302
2132
  },
2303
2133
  "isOptional": false,
2304
2134
  "isSpread": false
@@ -2318,11 +2148,7 @@
2318
2148
  "line": 86,
2319
2149
  "character": 23
2320
2150
  },
2321
- "name": "CheckoutMain",
2322
- "componentId": {
2323
- "scope": "teambit.component",
2324
- "name": "checkout"
2325
- }
2151
+ "name": "CheckoutMain"
2326
2152
  },
2327
2153
  "isOptional": false,
2328
2154
  "isSpread": false
@@ -2384,8 +2210,7 @@
2384
2210
  "line": 89,
2385
2211
  "character": 51
2386
2212
  },
2387
- "name": "MergeLaneOptions",
2388
- "internalFilePath": "merge-lanes.main.runtime.ts"
2213
+ "name": "MergeLaneOptions"
2389
2214
  },
2390
2215
  "isOptional": false,
2391
2216
  "isSpread": false
@@ -2429,12 +2254,7 @@
2429
2254
  "line": 100,
2430
2255
  "character": 18
2431
2256
  },
2432
- "name": "LaneId",
2433
- "componentId": {
2434
- "scope": "teambit.lanes",
2435
- "name": "lane-id",
2436
- "version": "0.0.311"
2437
- }
2257
+ "name": "LaneId"
2438
2258
  },
2439
2259
  "isOptional": false,
2440
2260
  "isSpread": false
@@ -2454,12 +2274,7 @@
2454
2274
  "line": 101,
2455
2275
  "character": 20
2456
2276
  },
2457
- "name": "LaneId",
2458
- "componentId": {
2459
- "scope": "teambit.lanes",
2460
- "name": "lane-id",
2461
- "version": "0.0.311"
2462
- }
2277
+ "name": "LaneId"
2463
2278
  },
2464
2279
  "isOptional": false,
2465
2280
  "isSpread": false
@@ -2479,8 +2294,7 @@
2479
2294
  "line": 102,
2480
2295
  "character": 14
2481
2296
  },
2482
- "name": "MergeLaneOptions",
2483
- "internalFilePath": "merge-lanes.main.runtime.ts"
2297
+ "name": "MergeLaneOptions"
2484
2298
  },
2485
2299
  "isOptional": false,
2486
2300
  "isSpread": false
@@ -2570,11 +2384,7 @@
2570
2384
  "line": 106,
2571
2385
  "character": 25
2572
2386
  },
2573
- "name": "ConfigMergeResult",
2574
- "componentId": {
2575
- "scope": "teambit.workspace",
2576
- "name": "config-merger"
2577
- }
2387
+ "name": "ConfigMergeResult"
2578
2388
  }
2579
2389
  },
2580
2390
  "isOptional": false
@@ -2602,12 +2412,7 @@
2602
2412
  "line": 107,
2603
2413
  "character": 28
2604
2414
  },
2605
- "name": "ComponentID",
2606
- "componentId": {
2607
- "scope": "teambit.component",
2608
- "name": "component-id",
2609
- "version": "1.2.2"
2610
- }
2415
+ "name": "ComponentID"
2611
2416
  }
2612
2417
  },
2613
2418
  "isOptional": false
@@ -2635,8 +2440,7 @@
2635
2440
  "line": 108,
2636
2441
  "character": 16
2637
2442
  },
2638
- "name": "ConflictPerId",
2639
- "internalFilePath": "merge-lanes.main.runtime.ts"
2443
+ "name": "ConflictPerId"
2640
2444
  }
2641
2445
  },
2642
2446
  "isOptional": false
@@ -2759,11 +2563,7 @@
2759
2563
  "line": 332,
2760
2564
  "character": 39
2761
2565
  },
2762
- "name": "CheckoutProps",
2763
- "componentId": {
2764
- "scope": "teambit.component",
2765
- "name": "checkout"
2766
- }
2566
+ "name": "CheckoutProps"
2767
2567
  },
2768
2568
  "isOptional": false,
2769
2569
  "isSpread": false
@@ -2783,8 +2583,7 @@
2783
2583
  "line": 332,
2784
2584
  "character": 70
2785
2585
  },
2786
- "name": "MergeAbortOpts",
2787
- "internalFilePath": "merge-abort.cmd.ts"
2586
+ "name": "MergeAbortOpts"
2788
2587
  },
2789
2588
  "isOptional": false,
2790
2589
  "isSpread": false
@@ -2885,8 +2684,7 @@
2885
2684
  "line": 391,
2886
2685
  "character": 22
2887
2686
  },
2888
- "name": "MergeLaneOptions",
2889
- "internalFilePath": "merge-lanes.main.runtime.ts"
2687
+ "name": "MergeLaneOptions"
2890
2688
  }
2891
2689
  ]
2892
2690
  },
@@ -2962,8 +2760,7 @@
2962
2760
  "line": 392,
2963
2761
  "character": 14
2964
2762
  },
2965
- "name": "MergeFromScopeResult",
2966
- "internalFilePath": "merge-lanes.main.runtime.ts"
2763
+ "name": "MergeFromScopeResult"
2967
2764
  }
2968
2765
  ]
2969
2766
  },
@@ -3067,11 +2864,7 @@
3067
2864
  "line": 514,
3068
2865
  "character": 5
3069
2866
  },
3070
- "name": "LanesMain",
3071
- "componentId": {
3072
- "scope": "teambit.lanes",
3073
- "name": "lanes"
3074
- }
2867
+ "name": "LanesMain"
3075
2868
  },
3076
2869
  {
3077
2870
  "__schema": "TypeRefSchema",
@@ -3080,11 +2873,7 @@
3080
2873
  "line": 515,
3081
2874
  "character": 5
3082
2875
  },
3083
- "name": "CLIMain",
3084
- "componentId": {
3085
- "scope": "teambit.harmony",
3086
- "name": "cli"
3087
- }
2876
+ "name": "CLIMain"
3088
2877
  },
3089
2878
  {
3090
2879
  "__schema": "TypeRefSchema",
@@ -3093,11 +2882,7 @@
3093
2882
  "line": 516,
3094
2883
  "character": 5
3095
2884
  },
3096
- "name": "Workspace",
3097
- "componentId": {
3098
- "scope": "teambit.workspace",
3099
- "name": "workspace"
3100
- }
2885
+ "name": "Workspace"
3101
2886
  },
3102
2887
  {
3103
2888
  "__schema": "TypeRefSchema",
@@ -3106,11 +2891,7 @@
3106
2891
  "line": 517,
3107
2892
  "character": 5
3108
2893
  },
3109
- "name": "MergingMain",
3110
- "componentId": {
3111
- "scope": "teambit.component",
3112
- "name": "merging"
3113
- }
2894
+ "name": "MergingMain"
3114
2895
  },
3115
2896
  {
3116
2897
  "__schema": "TypeRefSchema",
@@ -3119,11 +2900,7 @@
3119
2900
  "line": 518,
3120
2901
  "character": 5
3121
2902
  },
3122
- "name": "LoggerMain",
3123
- "componentId": {
3124
- "scope": "teambit.harmony",
3125
- "name": "logger"
3126
- }
2903
+ "name": "LoggerMain"
3127
2904
  },
3128
2905
  {
3129
2906
  "__schema": "TypeRefSchema",
@@ -3132,11 +2909,7 @@
3132
2909
  "line": 519,
3133
2910
  "character": 5
3134
2911
  },
3135
- "name": "RemoveMain",
3136
- "componentId": {
3137
- "scope": "teambit.component",
3138
- "name": "remove"
3139
- }
2912
+ "name": "RemoveMain"
3140
2913
  },
3141
2914
  {
3142
2915
  "__schema": "TypeRefSchema",
@@ -3145,11 +2918,7 @@
3145
2918
  "line": 520,
3146
2919
  "character": 5
3147
2920
  },
3148
- "name": "ScopeMain",
3149
- "componentId": {
3150
- "scope": "teambit.scope",
3151
- "name": "scope"
3152
- }
2921
+ "name": "ScopeMain"
3153
2922
  },
3154
2923
  {
3155
2924
  "__schema": "TypeRefSchema",
@@ -3158,11 +2927,7 @@
3158
2927
  "line": 521,
3159
2928
  "character": 5
3160
2929
  },
3161
- "name": "ExportMain",
3162
- "componentId": {
3163
- "scope": "teambit.scope",
3164
- "name": "export"
3165
- }
2930
+ "name": "ExportMain"
3166
2931
  },
3167
2932
  {
3168
2933
  "__schema": "TypeRefSchema",
@@ -3171,11 +2936,7 @@
3171
2936
  "line": 522,
3172
2937
  "character": 5
3173
2938
  },
3174
- "name": "ImporterMain",
3175
- "componentId": {
3176
- "scope": "teambit.scope",
3177
- "name": "importer"
3178
- }
2939
+ "name": "ImporterMain"
3179
2940
  },
3180
2941
  {
3181
2942
  "__schema": "TypeRefSchema",
@@ -3184,11 +2945,7 @@
3184
2945
  "line": 523,
3185
2946
  "character": 5
3186
2947
  },
3187
- "name": "CheckoutMain",
3188
- "componentId": {
3189
- "scope": "teambit.component",
3190
- "name": "checkout"
3191
- }
2948
+ "name": "CheckoutMain"
3192
2949
  },
3193
2950
  {
3194
2951
  "__schema": "TypeRefSchema",
@@ -3197,11 +2954,7 @@
3197
2954
  "line": 524,
3198
2955
  "character": 5
3199
2956
  },
3200
- "name": "GlobalConfigMain",
3201
- "componentId": {
3202
- "scope": "teambit.harmony",
3203
- "name": "global-config"
3204
- }
2957
+ "name": "GlobalConfigMain"
3205
2958
  }
3206
2959
  ]
3207
2960
  },
@@ -3271,11 +3024,7 @@
3271
3024
  "line": 548,
3272
3025
  "character": 24
3273
3026
  },
3274
- "name": "ComponentMergeStatus",
3275
- "componentId": {
3276
- "scope": "teambit.component",
3277
- "name": "merging"
3278
- }
3027
+ "name": "ComponentMergeStatus"
3279
3028
  }
3280
3029
  },
3281
3030
  "isOptional": false,
@@ -3303,12 +3052,7 @@
3303
3052
  "line": 549,
3304
3053
  "character": 18
3305
3054
  },
3306
- "name": "ComponentID",
3307
- "componentId": {
3308
- "scope": "teambit.component",
3309
- "name": "component-id",
3310
- "version": "1.2.2"
3311
- }
3055
+ "name": "ComponentID"
3312
3056
  }
3313
3057
  },
3314
3058
  "isOptional": false,
@@ -3336,12 +3080,7 @@
3336
3080
  "line": 550,
3337
3081
  "character": 14
3338
3082
  },
3339
- "name": "ComponentID",
3340
- "componentId": {
3341
- "scope": "teambit.component",
3342
- "name": "component-id",
3343
- "version": "1.2.2"
3344
- }
3083
+ "name": "ComponentID"
3345
3084
  }
3346
3085
  },
3347
3086
  "isOptional": false,
@@ -3403,8 +3142,7 @@
3403
3142
  "line": 553,
3404
3143
  "character": 15
3405
3144
  },
3406
- "name": "Lane",
3407
- "packageName": "@teambit/legacy/dist/scope/models"
3145
+ "name": "Lane"
3408
3146
  },
3409
3147
  "isOptional": true,
3410
3148
  "isSpread": false
@@ -3453,11 +3191,7 @@
3453
3191
  "line": 555,
3454
3192
  "character": 12
3455
3193
  },
3456
- "name": "ComponentMergeStatus",
3457
- "componentId": {
3458
- "scope": "teambit.component",
3459
- "name": "merging"
3460
- }
3194
+ "name": "ComponentMergeStatus"
3461
3195
  }
3462
3196
  }
3463
3197
  ]
@@ -3491,12 +3225,7 @@
3491
3225
  "line": 664,
3492
3226
  "character": 45
3493
3227
  },
3494
- "name": "LaneId",
3495
- "componentId": {
3496
- "scope": "teambit.lanes",
3497
- "name": "lane-id",
3498
- "version": "0.0.311"
3499
- }
3228
+ "name": "LaneId"
3500
3229
  },
3501
3230
  "isOptional": false,
3502
3231
  "isSpread": false
@@ -3547,11 +3276,7 @@
3547
3276
  "line": 674,
3548
3277
  "character": 24
3549
3278
  },
3550
- "name": "ComponentMergeStatus",
3551
- "componentId": {
3552
- "scope": "teambit.component",
3553
- "name": "merging"
3554
- }
3279
+ "name": "ComponentMergeStatus"
3555
3280
  }
3556
3281
  },
3557
3282
  "isOptional": false,
@@ -3572,12 +3297,7 @@
3572
3297
  "line": 675,
3573
3298
  "character": 18
3574
3299
  },
3575
- "name": "LaneId",
3576
- "componentId": {
3577
- "scope": "teambit.lanes",
3578
- "name": "lane-id",
3579
- "version": "0.0.311"
3580
- }
3300
+ "name": "LaneId"
3581
3301
  },
3582
3302
  "isOptional": false,
3583
3303
  "isSpread": false
@@ -3597,12 +3317,7 @@
3597
3317
  "line": 676,
3598
3318
  "character": 16
3599
3319
  },
3600
- "name": "LaneId",
3601
- "componentId": {
3602
- "scope": "teambit.lanes",
3603
- "name": "lane-id",
3604
- "version": "0.0.311"
3605
- }
3320
+ "name": "LaneId"
3606
3321
  },
3607
3322
  "isOptional": false,
3608
3323
  "isSpread": false
@@ -3717,12 +3432,7 @@
3717
3432
  "line": 714,
3718
3433
  "character": 16
3719
3434
  },
3720
- "name": "LaneId",
3721
- "componentId": {
3722
- "scope": "teambit.lanes",
3723
- "name": "lane-id",
3724
- "version": "0.0.311"
3725
- }
3435
+ "name": "LaneId"
3726
3436
  },
3727
3437
  "isOptional": false,
3728
3438
  "isSpread": false
@@ -3742,12 +3452,7 @@
3742
3452
  "line": 715,
3743
3453
  "character": 7
3744
3454
  },
3745
- "name": "ComponentID",
3746
- "componentId": {
3747
- "scope": "teambit.component",
3748
- "name": "component-id",
3749
- "version": "1.2.2"
3750
- }
3455
+ "name": "ComponentID"
3751
3456
  },
3752
3457
  "isOptional": false,
3753
3458
  "isSpread": false
@@ -3767,8 +3472,7 @@
3767
3472
  "line": 716,
3768
3473
  "character": 16
3769
3474
  },
3770
- "name": "SnapsDistance",
3771
- "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
3475
+ "name": "SnapsDistance"
3772
3476
  },
3773
3477
  "isOptional": false,
3774
3478
  "isSpread": false
@@ -3788,8 +3492,7 @@
3788
3492
  "line": 717,
3789
3493
  "character": 8
3790
3494
  },
3791
- "name": "Log",
3792
- "packageName": "@teambit/legacy/dist/scope/models/version"
3495
+ "name": "Log"
3793
3496
  },
3794
3497
  "isOptional": false,
3795
3498
  "isSpread": false
@@ -3829,8 +3532,7 @@
3829
3532
  "line": 719,
3830
3533
  "character": 24
3831
3534
  },
3832
- "name": "Version",
3833
- "packageName": "@teambit/legacy/dist/scope/models"
3535
+ "name": "Version"
3834
3536
  },
3835
3537
  "isOptional": true,
3836
3538
  "isSpread": false
@@ -3880,8 +3582,7 @@
3880
3582
  "line": 721,
3881
3583
  "character": 12
3882
3584
  },
3883
- "name": "Version",
3884
- "packageName": "@teambit/legacy/dist/scope/models"
3585
+ "name": "Version"
3885
3586
  },
3886
3587
  {
3887
3588
  "__schema": "KeywordTypeSchema",
@@ -3953,7 +3654,7 @@
3953
3654
  "componentId": {
3954
3655
  "scope": "teambit.lanes",
3955
3656
  "name": "merge-lanes",
3956
- "version": "1.0.468"
3657
+ "version": "1.0.470"
3957
3658
  },
3958
3659
  "taggedModuleExports": []
3959
3660
  }
package/dist/merge-lane.cmd.js CHANGED
@@ -79,7 +79,7 @@ so then the history (and the source-code) of the other lane will be kept.
79
79
  Component pattern format: ${_constants().COMPONENT_PATTERN_HELP}`
80
80
  }]);
81
81
  _defineProperty(this, "alias", '');
82
- _defineProperty(this, "options", [['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['r', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-auto-snap', 'do not auto snap after merge completed without conflicts of diverged components (see command description)'], ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'], ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'], ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'show details of components that were not merged successfully'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)'], ['', 'exclude-non-lane-comps', 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)']]);
82
+ _defineProperty(this, "options", [['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['r', 'auto-merge-resolve <merge-strategy>', 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'], ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'], ['', 'workspace', 'merge only lane components that are in the current workspace'], ['', 'no-auto-snap', 'do not auto snap after merge completed without conflicts of diverged components (see command description)'], ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'], ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'], ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'], ['m', 'message <message>', 'override the default message for the auto snap'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'], ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'], ['', 'ignore-config-changes', 'allow merging when components are modified due to config changes (such as dependencies) only and not files'], ['', 'verbose', 'display detailed information about components that were legitimately unmerged'], ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'], ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'], ['', 'include-deps', 'relevant for "pattern" and "--workspace". merge also dependencies of the specified components'], ['', 'resolve-unrelated [merge-strategy]', 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be "ours" (default) or "theirs"'], ['', 'include-non-lane-comps', 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)'], ['', 'exclude-non-lane-comps', 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)']]);
83
83
  _defineProperty(this, "loader", true);
84
84
  _defineProperty(this, "private", true);
85
85
  _defineProperty(this, "remoteOp", true);
package/dist/merge-lane.cmd.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noAutoSnap","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { mergeReport, MergeStrategy } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n name = 'merge <lane> [pattern]';\n description = `merge a local or a remote lane to the current lane`;\n extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n },\n {\n name: 'pattern',\n description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n },\n ];\n alias = '';\n options = [\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n ['', 'workspace', 'merge only lane components that are in the current workspace'],\n [\n '',\n 'no-auto-snap',\n 'do not auto snap after merge completed without conflicts of diverged components (see command description)',\n ],\n ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'],\n ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'],\n [\n '',\n 'ignore-config-changes',\n 'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n ],\n ['', 'verbose', 'show details of components that were not merged successfully'],\n ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n [\n '',\n 'include-deps',\n 'relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components',\n ],\n [\n '',\n 'resolve-unrelated [merge-strategy]',\n 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n ],\n [\n '',\n 'include-non-lane-comps',\n 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n ],\n [\n '',\n 'exclude-non-lane-comps',\n 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n ],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(\n private mergeLanes: MergeLanesMain,\n private globalConfig: GlobalConfigMain\n ) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n ours,\n theirs,\n manual,\n autoMergeResolve,\n build,\n workspace: existingOnWorkspaceOnly = false,\n squash = false,\n noAutoSnap = false,\n noSnap = false,\n tag = false,\n message: snapMessage = '',\n keepReadme = false,\n noSquash = false,\n skipDependencyInstallation = false,\n skipFetch = false,\n includeDeps = false,\n resolveUnrelated,\n ignoreConfigChanges,\n verbose = false,\n excludeNonLaneComps = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: string;\n workspace?: boolean;\n build?: boolean;\n noAutoSnap: boolean;\n noSnap: boolean;\n tag: boolean;\n message: string;\n keepReadme?: boolean;\n squash?: boolean;\n noSquash: boolean;\n skipDependencyInstallation?: boolean;\n skipFetch: boolean;\n includeDeps?: boolean;\n resolveUnrelated?: string | boolean;\n ignoreConfigChanges?: boolean;\n verbose?: boolean;\n excludeNonLaneComps?: boolean;\n }\n ): Promise<string> {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs) {\n throw new BitError(\n 'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n );\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n const mergeStrategy = autoMergeResolve;\n if (noAutoSnap && snapMessage) throw new BitError('unable to use \"no-snap\" and \"message\" flags together');\n if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n }\n const getResolveUnrelated = (): MergeStrategy | undefined => {\n if (!resolveUnrelated) return undefined;\n if (typeof resolveUnrelated === 'boolean') return 'ours';\n if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n }\n return resolveUnrelated;\n };\n if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n resolveUnrelated = 'ours';\n }\n const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n build,\n // @ts-ignore\n mergeStrategy,\n ours,\n theirs,\n existingOnWorkspaceOnly,\n noAutoSnap,\n noSnap,\n snapMessage,\n keepReadme,\n squash,\n noSquash,\n tag,\n pattern,\n skipDependencyInstallation,\n skipFetch,\n resolveUnrelated: getResolveUnrelated(),\n ignoreConfigChanges,\n includeDeps,\n excludeNonLaneComps,\n });\n\n const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n deleteResults.remoteResult || []\n ).map((item) => removeTemplate(item, true))}${\n (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n }\\n`;\n return mergeResult + deleteOutput;\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_merging","_constants","_bitError","_remove","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergeLaneCmd","constructor","mergeLanes","globalConfig","name","description","COMPONENT_PATTERN_HELP","report","pattern","ours","theirs","manual","autoMergeResolve","build","workspace","existingOnWorkspaceOnly","squash","noAutoSnap","noSnap","tag","message","snapMessage","keepReadme","noSquash","skipDependencyInstallation","skipFetch","includeDeps","resolveUnrelated","ignoreConfigChanges","verbose","excludeNonLaneComps","getBool","CFG_FORCE_LOCAL_BUILD","Boolean","BitError","mergeStrategy","getResolveUnrelated","undefined","Error","mergeResults","deleteResults","configMergeResults","mergeLaneByCLI","mergeResult","mergeReport","deleteOutput","localResult","removeTemplate","remoteResult","map","item","readmeResult","chalk","yellow","exports"],"sources":["merge-lane.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { mergeReport, MergeStrategy } from '@teambit/merging';\nimport { GlobalConfigMain } from '@teambit/global-config';\nimport { COMPONENT_PATTERN_HELP, CFG_FORCE_LOCAL_BUILD } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport { removeTemplate } from '@teambit/remove';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class MergeLaneCmd implements Command {\n name = 'merge <lane> [pattern]';\n description = `merge a local or a remote lane to the current lane`;\n extendedDescription = `by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-name or full lane-id (if remote) to merge to the current lane',\n },\n {\n name: 'pattern',\n description: `partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: ${COMPONENT_PATTERN_HELP}`,\n },\n ];\n alias = '';\n options = [\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n ['', 'ours', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications'],\n ['', 'theirs', 'DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes'],\n ['', 'workspace', 'merge only lane components that are in the current workspace'],\n [\n '',\n 'no-auto-snap',\n 'do not auto snap after merge completed without conflicts of diverged components (see command description)',\n ],\n ['', 'no-snap', 'do not pass snaps from the other lane even for non-diverged components (see command description)'],\n ['', 'tag', 'auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)'],\n ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n ['m', 'message <message>', 'override the default message for the auto snap'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'relevant for merging lanes into main, which by default squashes all lane snaps'],\n ['', 'squash', 'relevant for merging a lane into another non-main lane, which by default does not squash'],\n [\n '',\n 'ignore-config-changes',\n 'allow merging when components are modified due to config changes (such as dependencies) only and not files',\n ],\n ['', 'verbose', 'display detailed information about components that were legitimately unmerged'],\n ['x', 'skip-dependency-installation', 'do not install dependencies of the imported components'],\n ['', 'skip-fetch', 'use the local state of target-lane if exits locally, without updating it from the remote'],\n [\n '',\n 'include-deps',\n 'relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components',\n ],\n [\n '',\n 'resolve-unrelated [merge-strategy]',\n 'relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"',\n ],\n [\n '',\n 'include-non-lane-comps',\n 'DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)',\n ],\n [\n '',\n 'exclude-non-lane-comps',\n 'when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)',\n ],\n ] as CommandOptions;\n loader = true;\n private = true;\n remoteOp = true;\n\n constructor(\n private mergeLanes: MergeLanesMain,\n private globalConfig: GlobalConfigMain\n ) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n ours,\n theirs,\n manual,\n autoMergeResolve,\n build,\n workspace: existingOnWorkspaceOnly = false,\n squash = false,\n noAutoSnap = false,\n noSnap = false,\n tag = false,\n message: snapMessage = '',\n keepReadme = false,\n noSquash = false,\n skipDependencyInstallation = false,\n skipFetch = false,\n includeDeps = false,\n resolveUnrelated,\n ignoreConfigChanges,\n verbose = false,\n excludeNonLaneComps = false,\n }: {\n ours?: boolean;\n theirs?: boolean;\n manual?: boolean;\n autoMergeResolve?: string;\n workspace?: boolean;\n build?: boolean;\n noAutoSnap: boolean;\n noSnap: boolean;\n tag: boolean;\n message: string;\n keepReadme?: boolean;\n squash?: boolean;\n noSquash: boolean;\n skipDependencyInstallation?: boolean;\n skipFetch: boolean;\n includeDeps?: boolean;\n resolveUnrelated?: string | boolean;\n ignoreConfigChanges?: boolean;\n verbose?: boolean;\n excludeNonLaneComps?: boolean;\n }\n ): Promise<string> {\n build = (await this.globalConfig.getBool(CFG_FORCE_LOCAL_BUILD)) || Boolean(build);\n if (ours || theirs) {\n throw new BitError(\n 'the \"--ours\" and \"--theirs\" flags are deprecated. use \"--auto-merge-resolve\" instead. see \"bit lane merge --help\" for more information'\n );\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n const mergeStrategy = autoMergeResolve;\n if (noAutoSnap && snapMessage) throw new BitError('unable to use \"no-snap\" and \"message\" flags together');\n if (includeDeps && !pattern && !existingOnWorkspaceOnly) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --workspace and --pattern flags`);\n }\n const getResolveUnrelated = (): MergeStrategy | undefined => {\n if (!resolveUnrelated) return undefined;\n if (typeof resolveUnrelated === 'boolean') return 'ours';\n if (resolveUnrelated !== 'ours' && resolveUnrelated !== 'theirs' && resolveUnrelated !== 'manual') {\n throw new Error('--resolve-unrelated must be one of the following: [ours, theirs, manual]');\n }\n return resolveUnrelated;\n };\n if (resolveUnrelated && typeof resolveUnrelated === 'boolean') {\n resolveUnrelated = 'ours';\n }\n const { mergeResults, deleteResults, configMergeResults } = await this.mergeLanes.mergeLaneByCLI(name, {\n build,\n // @ts-ignore\n mergeStrategy,\n ours,\n theirs,\n existingOnWorkspaceOnly,\n noAutoSnap,\n noSnap,\n snapMessage,\n keepReadme,\n squash,\n noSquash,\n tag,\n pattern,\n skipDependencyInstallation,\n skipFetch,\n resolveUnrelated: getResolveUnrelated(),\n ignoreConfigChanges,\n includeDeps,\n excludeNonLaneComps,\n });\n\n const mergeResult = mergeReport({ ...mergeResults, configMergeResults, verbose });\n const deleteOutput = `\\n${deleteResults.localResult ? removeTemplate(deleteResults.localResult, false) : ''}${(\n deleteResults.remoteResult || []\n ).map((item) => removeTemplate(item, true))}${\n (deleteResults.readmeResult && chalk.yellow(deleteResults.readmeResult)) || ''\n }\\n`;\n return mergeResult + deleteOutput;\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.468",
3
+ "version": "1.0.470",
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.468"
9
+ "version": "1.0.470"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -19,22 +19,22 @@
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.50",
22
+ "@teambit/legacy.bit-map": "0.0.51",
23
23
  "@teambit/legacy.cli.prompts": "0.0.2",
24
- "@teambit/logger": "0.0.1138",
25
- "@teambit/scope": "1.0.468",
26
- "@teambit/checkout": "1.0.468",
27
- "@teambit/cli": "0.0.1045",
24
+ "@teambit/logger": "0.0.1140",
25
+ "@teambit/scope": "1.0.470",
26
+ "@teambit/checkout": "1.0.470",
27
+ "@teambit/cli": "0.0.1047",
28
28
  "@teambit/legacy.utils": "0.0.6",
29
- "@teambit/global-config": "0.0.1048",
30
- "@teambit/merging": "1.0.468",
31
- "@teambit/remove": "1.0.468",
32
- "@teambit/config-merger": "0.0.335",
33
- "@teambit/export": "1.0.468",
29
+ "@teambit/global-config": "0.0.1050",
30
+ "@teambit/merging": "1.0.470",
31
+ "@teambit/remove": "1.0.470",
32
+ "@teambit/config-merger": "0.0.337",
33
+ "@teambit/export": "1.0.470",
34
34
  "@teambit/harmony.modules.get-basic-log": "0.0.1",
35
- "@teambit/importer": "1.0.468",
36
- "@teambit/lanes": "1.0.468",
37
- "@teambit/workspace": "1.0.468"
35
+ "@teambit/importer": "1.0.470",
36
+ "@teambit/lanes": "1.0.470",
37
+ "@teambit/workspace": "1.0.470"
38
38
  },
39
39
  "devDependencies": {
40
40
  "@types/fs-extra": "9.0.7",
@@ -42,9 +42,9 @@
42
42
  "chai": "4.3.0",
43
43
  "@types/mocha": "9.1.0",
44
44
  "@teambit/harmony.envs.core-aspect-env": "0.0.60",
45
- "@teambit/component.testing.mock-components": "0.0.252",
46
- "@teambit/harmony.testing.load-aspect": "0.0.247",
47
- "@teambit/snapping": "1.0.468",
45
+ "@teambit/component.testing.mock-components": "0.0.253",
46
+ "@teambit/harmony.testing.load-aspect": "0.0.248",
47
+ "@teambit/snapping": "1.0.470",
48
48
  "@teambit/workspace.testing.mock-workspace": "0.0.27"
49
49
  },
50
50
  "peerDependencies": {