@teambit/merging 1.0.271 → 1.0.273

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 (8) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +179 -179
  3. package/dist/merge-cmd.js +11 -2
  4. package/dist/merge-cmd.js.map +1 -1
  5. package/dist/merging.main.runtime.js +5 -2
  6. package/dist/merging.main.runtime.js.map +1 -1
  7. package/package.json +13 -13
  8. /package/dist/{preview-1715656872728.js → preview-1715829635662.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -263,14 +263,14 @@
263
263
  "__schema": "FunctionLikeSchema",
264
264
  "location": {
265
265
  "filePath": "merge-cmd.ts",
266
- "line": 298,
266
+ "line": 314,
267
267
  "character": 1
268
268
  },
269
269
  "doc": {
270
270
  "__schema": "DocSchema",
271
271
  "location": {
272
272
  "filePath": "merge-cmd.ts",
273
- "line": 294,
273
+ "line": 310,
274
274
  "character": 1
275
275
  },
276
276
  "raw": "/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */",
@@ -283,7 +283,7 @@
283
283
  "__schema": "ParameterSchema",
284
284
  "location": {
285
285
  "filePath": "merge-cmd.ts",
286
- "line": 298,
286
+ "line": 314,
287
287
  "character": 36
288
288
  },
289
289
  "name": "components",
@@ -291,14 +291,14 @@
291
291
  "__schema": "TypeArraySchema",
292
292
  "location": {
293
293
  "filePath": "merge-cmd.ts",
294
- "line": 298,
294
+ "line": 314,
295
295
  "character": 48
296
296
  },
297
297
  "type": {
298
298
  "__schema": "TypeRefSchema",
299
299
  "location": {
300
300
  "filePath": "merge-cmd.ts",
301
- "line": 298,
301
+ "line": 314,
302
302
  "character": 48
303
303
  },
304
304
  "name": "ApplyVersionResult"
@@ -311,7 +311,7 @@
311
311
  "__schema": "ParameterSchema",
312
312
  "location": {
313
313
  "filePath": "merge-cmd.ts",
314
- "line": 298,
314
+ "line": 314,
315
315
  "character": 70
316
316
  },
317
317
  "name": "addName",
@@ -319,7 +319,7 @@
319
319
  "__schema": "InferenceTypeSchema",
320
320
  "location": {
321
321
  "filePath": "merge-cmd.ts",
322
- "line": 298,
322
+ "line": 314,
323
323
  "character": 70
324
324
  },
325
325
  "type": "boolean"
@@ -332,7 +332,7 @@
332
332
  "__schema": "ParameterSchema",
333
333
  "location": {
334
334
  "filePath": "merge-cmd.ts",
335
- "line": 298,
335
+ "line": 314,
336
336
  "character": 86
337
337
  },
338
338
  "name": "showVersion",
@@ -340,7 +340,7 @@
340
340
  "__schema": "InferenceTypeSchema",
341
341
  "location": {
342
342
  "filePath": "merge-cmd.ts",
343
- "line": 298,
343
+ "line": 314,
344
344
  "character": 86
345
345
  },
346
346
  "type": "boolean"
@@ -354,7 +354,7 @@
354
354
  "__schema": "KeywordTypeSchema",
355
355
  "location": {
356
356
  "filePath": "merge-cmd.ts",
357
- "line": 298,
357
+ "line": 314,
358
358
  "character": 108
359
359
  },
360
360
  "name": "string"
@@ -376,7 +376,7 @@
376
376
  "__schema": "FunctionLikeSchema",
377
377
  "location": {
378
378
  "filePath": "merge-cmd.ts",
379
- "line": 324,
379
+ "line": 340,
380
380
  "character": 1
381
381
  },
382
382
  "signature": "function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n}",
@@ -386,7 +386,7 @@
386
386
  "__schema": "ParameterSchema",
387
387
  "location": {
388
388
  "filePath": "merge-cmd.ts",
389
- "line": 324,
389
+ "line": 340,
390
390
  "character": 39
391
391
  },
392
392
  "name": "components",
@@ -394,14 +394,14 @@
394
394
  "__schema": "TypeArraySchema",
395
395
  "location": {
396
396
  "filePath": "merge-cmd.ts",
397
- "line": 324,
397
+ "line": 340,
398
398
  "character": 51
399
399
  },
400
400
  "type": {
401
401
  "__schema": "TypeRefSchema",
402
402
  "location": {
403
403
  "filePath": "merge-cmd.ts",
404
- "line": 324,
404
+ "line": 340,
405
405
  "character": 51
406
406
  },
407
407
  "name": "ApplyVersionResult"
@@ -415,7 +415,7 @@
415
415
  "__schema": "TypeLiteralSchema",
416
416
  "location": {
417
417
  "filePath": "merge-cmd.ts",
418
- "line": 324,
418
+ "line": 340,
419
419
  "character": 74
420
420
  },
421
421
  "members": [
@@ -423,7 +423,7 @@
423
423
  "__schema": "VariableLikeSchema",
424
424
  "location": {
425
425
  "filePath": "merge-cmd.ts",
426
- "line": 325,
426
+ "line": 341,
427
427
  "character": 3
428
428
  },
429
429
  "signature": "(property) conflictedComponents: number",
@@ -432,7 +432,7 @@
432
432
  "__schema": "KeywordTypeSchema",
433
433
  "location": {
434
434
  "filePath": "merge-cmd.ts",
435
- "line": 325,
435
+ "line": 341,
436
436
  "character": 25
437
437
  },
438
438
  "name": "number"
@@ -443,7 +443,7 @@
443
443
  "__schema": "VariableLikeSchema",
444
444
  "location": {
445
445
  "filePath": "merge-cmd.ts",
446
- "line": 326,
446
+ "line": 342,
447
447
  "character": 3
448
448
  },
449
449
  "signature": "(property) conflictedFiles: number",
@@ -452,7 +452,7 @@
452
452
  "__schema": "KeywordTypeSchema",
453
453
  "location": {
454
454
  "filePath": "merge-cmd.ts",
455
- "line": 326,
455
+ "line": 342,
456
456
  "character": 20
457
457
  },
458
458
  "name": "number"
@@ -463,7 +463,7 @@
463
463
  "__schema": "VariableLikeSchema",
464
464
  "location": {
465
465
  "filePath": "merge-cmd.ts",
466
- "line": 327,
466
+ "line": 343,
467
467
  "character": 3
468
468
  },
469
469
  "signature": "(property) conflictStr: string",
@@ -472,7 +472,7 @@
472
472
  "__schema": "KeywordTypeSchema",
473
473
  "location": {
474
474
  "filePath": "merge-cmd.ts",
475
- "line": 327,
475
+ "line": 343,
476
476
  "character": 16
477
477
  },
478
478
  "name": "string"
@@ -498,7 +498,7 @@
498
498
  "__schema": "FunctionLikeSchema",
499
499
  "location": {
500
500
  "filePath": "merge-cmd.ts",
501
- "line": 353,
501
+ "line": 369,
502
502
  "character": 1
503
503
  },
504
504
  "signature": "function installationErrorOutput(installationError?: Error): string",
@@ -508,7 +508,7 @@
508
508
  "__schema": "ParameterSchema",
509
509
  "location": {
510
510
  "filePath": "merge-cmd.ts",
511
- "line": 353,
511
+ "line": 369,
512
512
  "character": 41
513
513
  },
514
514
  "name": "installationError",
@@ -516,7 +516,7 @@
516
516
  "__schema": "TypeRefSchema",
517
517
  "location": {
518
518
  "filePath": "merge-cmd.ts",
519
- "line": 353,
519
+ "line": 369,
520
520
  "character": 61
521
521
  },
522
522
  "name": "Error"
@@ -529,7 +529,7 @@
529
529
  "__schema": "InferenceTypeSchema",
530
530
  "location": {
531
531
  "filePath": "merge-cmd.ts",
532
- "line": 353,
532
+ "line": 369,
533
533
  "character": 1
534
534
  },
535
535
  "type": "string"
@@ -551,7 +551,7 @@
551
551
  "__schema": "FunctionLikeSchema",
552
552
  "location": {
553
553
  "filePath": "merge-cmd.ts",
554
- "line": 363,
554
+ "line": 379,
555
555
  "character": 1
556
556
  },
557
557
  "signature": "function compilationErrorOutput(compilationError?: Error): string",
@@ -561,7 +561,7 @@
561
561
  "__schema": "ParameterSchema",
562
562
  "location": {
563
563
  "filePath": "merge-cmd.ts",
564
- "line": 363,
564
+ "line": 379,
565
565
  "character": 40
566
566
  },
567
567
  "name": "compilationError",
@@ -569,7 +569,7 @@
569
569
  "__schema": "TypeRefSchema",
570
570
  "location": {
571
571
  "filePath": "merge-cmd.ts",
572
- "line": 363,
572
+ "line": 379,
573
573
  "character": 59
574
574
  },
575
575
  "name": "Error"
@@ -582,7 +582,7 @@
582
582
  "__schema": "InferenceTypeSchema",
583
583
  "location": {
584
584
  "filePath": "merge-cmd.ts",
585
- "line": 363,
585
+ "line": 379,
586
586
  "character": 1
587
587
  },
588
588
  "type": "string"
@@ -604,7 +604,7 @@
604
604
  "__schema": "FunctionLikeSchema",
605
605
  "location": {
606
606
  "filePath": "merge-cmd.ts",
607
- "line": 372,
607
+ "line": 388,
608
608
  "character": 1
609
609
  },
610
610
  "signature": "function getRemovedOutput(removedComponents?: ComponentID[]): string",
@@ -614,7 +614,7 @@
614
614
  "__schema": "ParameterSchema",
615
615
  "location": {
616
616
  "filePath": "merge-cmd.ts",
617
- "line": 372,
617
+ "line": 388,
618
618
  "character": 34
619
619
  },
620
620
  "name": "removedComponents",
@@ -622,14 +622,14 @@
622
622
  "__schema": "TypeArraySchema",
623
623
  "location": {
624
624
  "filePath": "merge-cmd.ts",
625
- "line": 372,
625
+ "line": 388,
626
626
  "character": 54
627
627
  },
628
628
  "type": {
629
629
  "__schema": "TypeRefSchema",
630
630
  "location": {
631
631
  "filePath": "merge-cmd.ts",
632
- "line": 372,
632
+ "line": 388,
633
633
  "character": 54
634
634
  },
635
635
  "name": "ComponentID",
@@ -648,7 +648,7 @@
648
648
  "__schema": "InferenceTypeSchema",
649
649
  "location": {
650
650
  "filePath": "merge-cmd.ts",
651
- "line": 372,
651
+ "line": 388,
652
652
  "character": 1
653
653
  },
654
654
  "type": "string"
@@ -670,7 +670,7 @@
670
670
  "__schema": "FunctionLikeSchema",
671
671
  "location": {
672
672
  "filePath": "merge-cmd.ts",
673
- "line": 379,
673
+ "line": 395,
674
674
  "character": 1
675
675
  },
676
676
  "signature": "function getAddedOutput(addedComponents?: ComponentID[]): string",
@@ -680,7 +680,7 @@
680
680
  "__schema": "ParameterSchema",
681
681
  "location": {
682
682
  "filePath": "merge-cmd.ts",
683
- "line": 379,
683
+ "line": 395,
684
684
  "character": 32
685
685
  },
686
686
  "name": "addedComponents",
@@ -688,14 +688,14 @@
688
688
  "__schema": "TypeArraySchema",
689
689
  "location": {
690
690
  "filePath": "merge-cmd.ts",
691
- "line": 379,
691
+ "line": 395,
692
692
  "character": 50
693
693
  },
694
694
  "type": {
695
695
  "__schema": "TypeRefSchema",
696
696
  "location": {
697
697
  "filePath": "merge-cmd.ts",
698
- "line": 379,
698
+ "line": 395,
699
699
  "character": 50
700
700
  },
701
701
  "name": "ComponentID",
@@ -714,7 +714,7 @@
714
714
  "__schema": "InferenceTypeSchema",
715
715
  "location": {
716
716
  "filePath": "merge-cmd.ts",
717
- "line": 379,
717
+ "line": 395,
718
718
  "character": 1
719
719
  },
720
720
  "type": "string"
@@ -2005,7 +2005,7 @@
2005
2005
  "__schema": "FunctionLikeSchema",
2006
2006
  "location": {
2007
2007
  "filePath": "merging.main.runtime.ts",
2008
- "line": 352,
2008
+ "line": 353,
2009
2009
  "character": 3
2010
2010
  },
2011
2011
  "signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
@@ -2015,7 +2015,7 @@
2015
2015
  "__schema": "ParameterSchema",
2016
2016
  "location": {
2017
2017
  "filePath": "merging.main.runtime.ts",
2018
- "line": 353,
2018
+ "line": 354,
2019
2019
  "character": 5
2020
2020
  },
2021
2021
  "name": "componentsResults",
@@ -2023,14 +2023,14 @@
2023
2023
  "__schema": "TypeArraySchema",
2024
2024
  "location": {
2025
2025
  "filePath": "merging.main.runtime.ts",
2026
- "line": 353,
2026
+ "line": 354,
2027
2027
  "character": 24
2028
2028
  },
2029
2029
  "type": {
2030
2030
  "__schema": "TypeRefSchema",
2031
2031
  "location": {
2032
2032
  "filePath": "merging.main.runtime.ts",
2033
- "line": 353,
2033
+ "line": 354,
2034
2034
  "character": 24
2035
2035
  },
2036
2036
  "name": "ApplyVersionWithComps",
@@ -2047,7 +2047,7 @@
2047
2047
  "__schema": "ParameterSchema",
2048
2048
  "location": {
2049
2049
  "filePath": "merging.main.runtime.ts",
2050
- "line": 354,
2050
+ "line": 355,
2051
2051
  "character": 5
2052
2052
  },
2053
2053
  "name": "currentLane",
@@ -2055,7 +2055,7 @@
2055
2055
  "__schema": "TypeRefSchema",
2056
2056
  "location": {
2057
2057
  "filePath": "merging.main.runtime.ts",
2058
- "line": 354,
2058
+ "line": 355,
2059
2059
  "character": 19
2060
2060
  },
2061
2061
  "name": "Lane",
@@ -2068,7 +2068,7 @@
2068
2068
  "__schema": "ParameterSchema",
2069
2069
  "location": {
2070
2070
  "filePath": "merging.main.runtime.ts",
2071
- "line": 355,
2071
+ "line": 356,
2072
2072
  "character": 5
2073
2073
  },
2074
2074
  "name": "currentLaneIdsBeforeMerge",
@@ -2076,7 +2076,7 @@
2076
2076
  "__schema": "TypeRefSchema",
2077
2077
  "location": {
2078
2078
  "filePath": "merging.main.runtime.ts",
2079
- "line": 355,
2079
+ "line": 356,
2080
2080
  "character": 33
2081
2081
  },
2082
2082
  "name": "ComponentIdList",
@@ -2094,7 +2094,7 @@
2094
2094
  "__schema": "InferenceTypeSchema",
2095
2095
  "location": {
2096
2096
  "filePath": "merging.main.runtime.ts",
2097
- "line": 352,
2097
+ "line": 353,
2098
2098
  "character": 3
2099
2099
  },
2100
2100
  "type": "Promise<void>"
@@ -2107,14 +2107,14 @@
2107
2107
  "__schema": "FunctionLikeSchema",
2108
2108
  "location": {
2109
2109
  "filePath": "merging.main.runtime.ts",
2110
- "line": 377,
2110
+ "line": 378,
2111
2111
  "character": 3
2112
2112
  },
2113
2113
  "doc": {
2114
2114
  "__schema": "DocSchema",
2115
2115
  "location": {
2116
2116
  "filePath": "merging.main.runtime.ts",
2117
- "line": 371,
2117
+ "line": 372,
2118
2118
  "character": 3
2119
2119
  },
2120
2120
  "raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
@@ -2127,7 +2127,7 @@
2127
2127
  "__schema": "ParameterSchema",
2128
2128
  "location": {
2129
2129
  "filePath": "merging.main.runtime.ts",
2130
- "line": 378,
2130
+ "line": 379,
2131
2131
  "character": 5
2132
2132
  },
2133
2133
  "name": "bitIds",
@@ -2135,14 +2135,14 @@
2135
2135
  "__schema": "TypeArraySchema",
2136
2136
  "location": {
2137
2137
  "filePath": "merging.main.runtime.ts",
2138
- "line": 378,
2138
+ "line": 379,
2139
2139
  "character": 13
2140
2140
  },
2141
2141
  "type": {
2142
2142
  "__schema": "TypeRefSchema",
2143
2143
  "location": {
2144
2144
  "filePath": "merging.main.runtime.ts",
2145
- "line": 378,
2145
+ "line": 379,
2146
2146
  "character": 13
2147
2147
  },
2148
2148
  "name": "ComponentID",
@@ -2160,7 +2160,7 @@
2160
2160
  "__schema": "ParameterSchema",
2161
2161
  "location": {
2162
2162
  "filePath": "merging.main.runtime.ts",
2163
- "line": 379,
2163
+ "line": 380,
2164
2164
  "character": 5
2165
2165
  },
2166
2166
  "name": "options",
@@ -2168,7 +2168,7 @@
2168
2168
  "__schema": "TypeRefSchema",
2169
2169
  "location": {
2170
2170
  "filePath": "merging.main.runtime.ts",
2171
- "line": 379,
2171
+ "line": 380,
2172
2172
  "character": 14
2173
2173
  },
2174
2174
  "name": "MergeStatusProviderOptions",
@@ -2181,7 +2181,7 @@
2181
2181
  "__schema": "ParameterSchema",
2182
2182
  "location": {
2183
2183
  "filePath": "merging.main.runtime.ts",
2184
- "line": 380,
2184
+ "line": 381,
2185
2185
  "character": 5
2186
2186
  },
2187
2187
  "name": "currentLane",
@@ -2189,7 +2189,7 @@
2189
2189
  "__schema": "TypeRefSchema",
2190
2190
  "location": {
2191
2191
  "filePath": "merging.main.runtime.ts",
2192
- "line": 380,
2192
+ "line": 381,
2193
2193
  "character": 19
2194
2194
  },
2195
2195
  "name": "Lane",
@@ -2202,7 +2202,7 @@
2202
2202
  "__schema": "ParameterSchema",
2203
2203
  "location": {
2204
2204
  "filePath": "merging.main.runtime.ts",
2205
- "line": 381,
2205
+ "line": 382,
2206
2206
  "character": 5
2207
2207
  },
2208
2208
  "name": "otherLane",
@@ -2210,7 +2210,7 @@
2210
2210
  "__schema": "TypeRefSchema",
2211
2211
  "location": {
2212
2212
  "filePath": "merging.main.runtime.ts",
2213
- "line": 381,
2213
+ "line": 382,
2214
2214
  "character": 17
2215
2215
  },
2216
2216
  "name": "Lane",
@@ -2224,7 +2224,7 @@
2224
2224
  "__schema": "TypeRefSchema",
2225
2225
  "location": {
2226
2226
  "filePath": "merging.main.runtime.ts",
2227
- "line": 382,
2227
+ "line": 383,
2228
2228
  "character": 6
2229
2229
  },
2230
2230
  "name": "Promise",
@@ -2233,14 +2233,14 @@
2233
2233
  "__schema": "TypeArraySchema",
2234
2234
  "location": {
2235
2235
  "filePath": "merging.main.runtime.ts",
2236
- "line": 382,
2236
+ "line": 383,
2237
2237
  "character": 14
2238
2238
  },
2239
2239
  "type": {
2240
2240
  "__schema": "TypeRefSchema",
2241
2241
  "location": {
2242
2242
  "filePath": "merging.main.runtime.ts",
2243
- "line": 382,
2243
+ "line": 383,
2244
2244
  "character": 14
2245
2245
  },
2246
2246
  "name": "ComponentMergeStatus"
@@ -2256,7 +2256,7 @@
2256
2256
  "__schema": "VariableLikeSchema",
2257
2257
  "location": {
2258
2258
  "filePath": "merging.main.runtime.ts",
2259
- "line": 678,
2259
+ "line": 679,
2260
2260
  "character": 3
2261
2261
  },
2262
2262
  "signature": "(property) MergingMain.slots: never[]",
@@ -2265,7 +2265,7 @@
2265
2265
  "__schema": "InferenceTypeSchema",
2266
2266
  "location": {
2267
2267
  "filePath": "merging.main.runtime.ts",
2268
- "line": 678,
2268
+ "line": 679,
2269
2269
  "character": 3
2270
2270
  },
2271
2271
  "type": "never[]"
@@ -2277,7 +2277,7 @@
2277
2277
  "__schema": "VariableLikeSchema",
2278
2278
  "location": {
2279
2279
  "filePath": "merging.main.runtime.ts",
2280
- "line": 679,
2280
+ "line": 680,
2281
2281
  "character": 3
2282
2282
  },
2283
2283
  "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -2286,7 +2286,7 @@
2286
2286
  "__schema": "InferenceTypeSchema",
2287
2287
  "location": {
2288
2288
  "filePath": "merging.main.runtime.ts",
2289
- "line": 679,
2289
+ "line": 680,
2290
2290
  "character": 3
2291
2291
  },
2292
2292
  "type": "Aspect[]"
@@ -2298,7 +2298,7 @@
2298
2298
  "__schema": "VariableLikeSchema",
2299
2299
  "location": {
2300
2300
  "filePath": "merging.main.runtime.ts",
2301
- "line": 695,
2301
+ "line": 696,
2302
2302
  "character": 3
2303
2303
  },
2304
2304
  "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -2307,7 +2307,7 @@
2307
2307
  "__schema": "InferenceTypeSchema",
2308
2308
  "location": {
2309
2309
  "filePath": "merging.main.runtime.ts",
2310
- "line": 695,
2310
+ "line": 696,
2311
2311
  "character": 3
2312
2312
  },
2313
2313
  "type": "RuntimeDefinition"
@@ -2319,7 +2319,7 @@
2319
2319
  "__schema": "FunctionLikeSchema",
2320
2320
  "location": {
2321
2321
  "filePath": "merging.main.runtime.ts",
2322
- "line": 696,
2322
+ "line": 697,
2323
2323
  "character": 3
2324
2324
  },
2325
2325
  "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n]): Promise<MergingMain>",
@@ -2329,7 +2329,7 @@
2329
2329
  "__schema": "ParameterSchema",
2330
2330
  "location": {
2331
2331
  "filePath": "merging.main.runtime.ts",
2332
- "line": 696,
2332
+ "line": 697,
2333
2333
  "character": 25
2334
2334
  },
2335
2335
  "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
@@ -2337,7 +2337,7 @@
2337
2337
  "__schema": "TupleTypeSchema",
2338
2338
  "location": {
2339
2339
  "filePath": "merging.main.runtime.ts",
2340
- "line": 711,
2340
+ "line": 712,
2341
2341
  "character": 6
2342
2342
  },
2343
2343
  "elements": [
@@ -2345,7 +2345,7 @@
2345
2345
  "__schema": "TypeRefSchema",
2346
2346
  "location": {
2347
2347
  "filePath": "merging.main.runtime.ts",
2348
- "line": 712,
2348
+ "line": 713,
2349
2349
  "character": 5
2350
2350
  },
2351
2351
  "name": "CLIMain",
@@ -2358,7 +2358,7 @@
2358
2358
  "__schema": "TypeRefSchema",
2359
2359
  "location": {
2360
2360
  "filePath": "merging.main.runtime.ts",
2361
- "line": 713,
2361
+ "line": 714,
2362
2362
  "character": 5
2363
2363
  },
2364
2364
  "name": "Workspace",
@@ -2371,7 +2371,7 @@
2371
2371
  "__schema": "TypeRefSchema",
2372
2372
  "location": {
2373
2373
  "filePath": "merging.main.runtime.ts",
2374
- "line": 714,
2374
+ "line": 715,
2375
2375
  "character": 5
2376
2376
  },
2377
2377
  "name": "ScopeMain",
@@ -2384,7 +2384,7 @@
2384
2384
  "__schema": "TypeRefSchema",
2385
2385
  "location": {
2386
2386
  "filePath": "merging.main.runtime.ts",
2387
- "line": 715,
2387
+ "line": 716,
2388
2388
  "character": 5
2389
2389
  },
2390
2390
  "name": "SnappingMain",
@@ -2397,7 +2397,7 @@
2397
2397
  "__schema": "TypeRefSchema",
2398
2398
  "location": {
2399
2399
  "filePath": "merging.main.runtime.ts",
2400
- "line": 716,
2400
+ "line": 717,
2401
2401
  "character": 5
2402
2402
  },
2403
2403
  "name": "CheckoutMain",
@@ -2410,7 +2410,7 @@
2410
2410
  "__schema": "TypeRefSchema",
2411
2411
  "location": {
2412
2412
  "filePath": "merging.main.runtime.ts",
2413
- "line": 717,
2413
+ "line": 718,
2414
2414
  "character": 5
2415
2415
  },
2416
2416
  "name": "InstallMain",
@@ -2423,7 +2423,7 @@
2423
2423
  "__schema": "TypeRefSchema",
2424
2424
  "location": {
2425
2425
  "filePath": "merging.main.runtime.ts",
2426
- "line": 718,
2426
+ "line": 719,
2427
2427
  "character": 5
2428
2428
  },
2429
2429
  "name": "LoggerMain",
@@ -2436,7 +2436,7 @@
2436
2436
  "__schema": "TypeRefSchema",
2437
2437
  "location": {
2438
2438
  "filePath": "merging.main.runtime.ts",
2439
- "line": 719,
2439
+ "line": 720,
2440
2440
  "character": 5
2441
2441
  },
2442
2442
  "name": "ComponentWriterMain",
@@ -2449,7 +2449,7 @@
2449
2449
  "__schema": "TypeRefSchema",
2450
2450
  "location": {
2451
2451
  "filePath": "merging.main.runtime.ts",
2452
- "line": 720,
2452
+ "line": 721,
2453
2453
  "character": 5
2454
2454
  },
2455
2455
  "name": "ImporterMain",
@@ -2462,7 +2462,7 @@
2462
2462
  "__schema": "TypeRefSchema",
2463
2463
  "location": {
2464
2464
  "filePath": "merging.main.runtime.ts",
2465
- "line": 721,
2465
+ "line": 722,
2466
2466
  "character": 5
2467
2467
  },
2468
2468
  "name": "ConfigMain",
@@ -2475,7 +2475,7 @@
2475
2475
  "__schema": "TypeRefSchema",
2476
2476
  "location": {
2477
2477
  "filePath": "merging.main.runtime.ts",
2478
- "line": 722,
2478
+ "line": 723,
2479
2479
  "character": 5
2480
2480
  },
2481
2481
  "name": "RemoveMain",
@@ -2488,7 +2488,7 @@
2488
2488
  "__schema": "TypeRefSchema",
2489
2489
  "location": {
2490
2490
  "filePath": "merging.main.runtime.ts",
2491
- "line": 723,
2491
+ "line": 724,
2492
2492
  "character": 5
2493
2493
  },
2494
2494
  "name": "GlobalConfigMain",
@@ -2501,7 +2501,7 @@
2501
2501
  "__schema": "TypeRefSchema",
2502
2502
  "location": {
2503
2503
  "filePath": "merging.main.runtime.ts",
2504
- "line": 724,
2504
+ "line": 725,
2505
2505
  "character": 5
2506
2506
  },
2507
2507
  "name": "ConfigMergerMain",
@@ -2514,7 +2514,7 @@
2514
2514
  "__schema": "TypeRefSchema",
2515
2515
  "location": {
2516
2516
  "filePath": "merging.main.runtime.ts",
2517
- "line": 725,
2517
+ "line": 726,
2518
2518
  "character": 5
2519
2519
  },
2520
2520
  "name": "DependencyResolverMain",
@@ -2533,7 +2533,7 @@
2533
2533
  "__schema": "InferenceTypeSchema",
2534
2534
  "location": {
2535
2535
  "filePath": "merging.main.runtime.ts",
2536
- "line": 696,
2536
+ "line": 697,
2537
2537
  "character": 3
2538
2538
  },
2539
2539
  "type": "Promise<MergingMain>"
@@ -4236,7 +4236,7 @@
4236
4236
  "_legacy": {
4237
4237
  "scope": "teambit.component",
4238
4238
  "name": "merging",
4239
- "version": "1.0.271"
4239
+ "version": "1.0.273"
4240
4240
  },
4241
4241
  "_scope": "teambit.component"
4242
4242
  }
@@ -4525,14 +4525,14 @@
4525
4525
  "__schema": "FunctionLikeSchema",
4526
4526
  "location": {
4527
4527
  "filePath": "merge-cmd.ts",
4528
- "line": 298,
4528
+ "line": 314,
4529
4529
  "character": 1
4530
4530
  },
4531
4531
  "doc": {
4532
4532
  "__schema": "DocSchema",
4533
4533
  "location": {
4534
4534
  "filePath": "merge-cmd.ts",
4535
- "line": 294,
4535
+ "line": 310,
4536
4536
  "character": 1
4537
4537
  },
4538
4538
  "raw": "/**\n * shows only the file-changes section.\n * if all files are \"unchanged\", it returns an empty string\n */",
@@ -4545,7 +4545,7 @@
4545
4545
  "__schema": "ParameterSchema",
4546
4546
  "location": {
4547
4547
  "filePath": "merge-cmd.ts",
4548
- "line": 298,
4548
+ "line": 314,
4549
4549
  "character": 36
4550
4550
  },
4551
4551
  "name": "components",
@@ -4553,14 +4553,14 @@
4553
4553
  "__schema": "TypeArraySchema",
4554
4554
  "location": {
4555
4555
  "filePath": "merge-cmd.ts",
4556
- "line": 298,
4556
+ "line": 314,
4557
4557
  "character": 48
4558
4558
  },
4559
4559
  "type": {
4560
4560
  "__schema": "TypeRefSchema",
4561
4561
  "location": {
4562
4562
  "filePath": "merge-cmd.ts",
4563
- "line": 298,
4563
+ "line": 314,
4564
4564
  "character": 48
4565
4565
  },
4566
4566
  "name": "ApplyVersionResult"
@@ -4573,7 +4573,7 @@
4573
4573
  "__schema": "ParameterSchema",
4574
4574
  "location": {
4575
4575
  "filePath": "merge-cmd.ts",
4576
- "line": 298,
4576
+ "line": 314,
4577
4577
  "character": 70
4578
4578
  },
4579
4579
  "name": "addName",
@@ -4581,7 +4581,7 @@
4581
4581
  "__schema": "InferenceTypeSchema",
4582
4582
  "location": {
4583
4583
  "filePath": "merge-cmd.ts",
4584
- "line": 298,
4584
+ "line": 314,
4585
4585
  "character": 70
4586
4586
  },
4587
4587
  "type": "boolean"
@@ -4594,7 +4594,7 @@
4594
4594
  "__schema": "ParameterSchema",
4595
4595
  "location": {
4596
4596
  "filePath": "merge-cmd.ts",
4597
- "line": 298,
4597
+ "line": 314,
4598
4598
  "character": 86
4599
4599
  },
4600
4600
  "name": "showVersion",
@@ -4602,7 +4602,7 @@
4602
4602
  "__schema": "InferenceTypeSchema",
4603
4603
  "location": {
4604
4604
  "filePath": "merge-cmd.ts",
4605
- "line": 298,
4605
+ "line": 314,
4606
4606
  "character": 86
4607
4607
  },
4608
4608
  "type": "boolean"
@@ -4616,7 +4616,7 @@
4616
4616
  "__schema": "KeywordTypeSchema",
4617
4617
  "location": {
4618
4618
  "filePath": "merge-cmd.ts",
4619
- "line": 298,
4619
+ "line": 314,
4620
4620
  "character": 108
4621
4621
  },
4622
4622
  "name": "string"
@@ -4629,7 +4629,7 @@
4629
4629
  "__schema": "FunctionLikeSchema",
4630
4630
  "location": {
4631
4631
  "filePath": "merge-cmd.ts",
4632
- "line": 324,
4632
+ "line": 340,
4633
4633
  "character": 1
4634
4634
  },
4635
4635
  "signature": "function conflictSummaryReport(components: ApplyVersionResult[]): {\n conflictedComponents: number;\n conflictedFiles: number;\n conflictStr: string;\n}",
@@ -4639,7 +4639,7 @@
4639
4639
  "__schema": "ParameterSchema",
4640
4640
  "location": {
4641
4641
  "filePath": "merge-cmd.ts",
4642
- "line": 324,
4642
+ "line": 340,
4643
4643
  "character": 39
4644
4644
  },
4645
4645
  "name": "components",
@@ -4647,14 +4647,14 @@
4647
4647
  "__schema": "TypeArraySchema",
4648
4648
  "location": {
4649
4649
  "filePath": "merge-cmd.ts",
4650
- "line": 324,
4650
+ "line": 340,
4651
4651
  "character": 51
4652
4652
  },
4653
4653
  "type": {
4654
4654
  "__schema": "TypeRefSchema",
4655
4655
  "location": {
4656
4656
  "filePath": "merge-cmd.ts",
4657
- "line": 324,
4657
+ "line": 340,
4658
4658
  "character": 51
4659
4659
  },
4660
4660
  "name": "ApplyVersionResult"
@@ -4668,7 +4668,7 @@
4668
4668
  "__schema": "TypeLiteralSchema",
4669
4669
  "location": {
4670
4670
  "filePath": "merge-cmd.ts",
4671
- "line": 324,
4671
+ "line": 340,
4672
4672
  "character": 74
4673
4673
  },
4674
4674
  "members": [
@@ -4676,7 +4676,7 @@
4676
4676
  "__schema": "VariableLikeSchema",
4677
4677
  "location": {
4678
4678
  "filePath": "merge-cmd.ts",
4679
- "line": 325,
4679
+ "line": 341,
4680
4680
  "character": 3
4681
4681
  },
4682
4682
  "signature": "(property) conflictedComponents: number",
@@ -4685,7 +4685,7 @@
4685
4685
  "__schema": "KeywordTypeSchema",
4686
4686
  "location": {
4687
4687
  "filePath": "merge-cmd.ts",
4688
- "line": 325,
4688
+ "line": 341,
4689
4689
  "character": 25
4690
4690
  },
4691
4691
  "name": "number"
@@ -4696,7 +4696,7 @@
4696
4696
  "__schema": "VariableLikeSchema",
4697
4697
  "location": {
4698
4698
  "filePath": "merge-cmd.ts",
4699
- "line": 326,
4699
+ "line": 342,
4700
4700
  "character": 3
4701
4701
  },
4702
4702
  "signature": "(property) conflictedFiles: number",
@@ -4705,7 +4705,7 @@
4705
4705
  "__schema": "KeywordTypeSchema",
4706
4706
  "location": {
4707
4707
  "filePath": "merge-cmd.ts",
4708
- "line": 326,
4708
+ "line": 342,
4709
4709
  "character": 20
4710
4710
  },
4711
4711
  "name": "number"
@@ -4716,7 +4716,7 @@
4716
4716
  "__schema": "VariableLikeSchema",
4717
4717
  "location": {
4718
4718
  "filePath": "merge-cmd.ts",
4719
- "line": 327,
4719
+ "line": 343,
4720
4720
  "character": 3
4721
4721
  },
4722
4722
  "signature": "(property) conflictStr: string",
@@ -4725,7 +4725,7 @@
4725
4725
  "__schema": "KeywordTypeSchema",
4726
4726
  "location": {
4727
4727
  "filePath": "merge-cmd.ts",
4728
- "line": 327,
4728
+ "line": 343,
4729
4729
  "character": 16
4730
4730
  },
4731
4731
  "name": "string"
@@ -4742,7 +4742,7 @@
4742
4742
  "__schema": "FunctionLikeSchema",
4743
4743
  "location": {
4744
4744
  "filePath": "merge-cmd.ts",
4745
- "line": 353,
4745
+ "line": 369,
4746
4746
  "character": 1
4747
4747
  },
4748
4748
  "signature": "function installationErrorOutput(installationError?: Error): string",
@@ -4752,7 +4752,7 @@
4752
4752
  "__schema": "ParameterSchema",
4753
4753
  "location": {
4754
4754
  "filePath": "merge-cmd.ts",
4755
- "line": 353,
4755
+ "line": 369,
4756
4756
  "character": 41
4757
4757
  },
4758
4758
  "name": "installationError",
@@ -4760,7 +4760,7 @@
4760
4760
  "__schema": "TypeRefSchema",
4761
4761
  "location": {
4762
4762
  "filePath": "merge-cmd.ts",
4763
- "line": 353,
4763
+ "line": 369,
4764
4764
  "character": 61
4765
4765
  },
4766
4766
  "name": "Error"
@@ -4773,7 +4773,7 @@
4773
4773
  "__schema": "InferenceTypeSchema",
4774
4774
  "location": {
4775
4775
  "filePath": "merge-cmd.ts",
4776
- "line": 353,
4776
+ "line": 369,
4777
4777
  "character": 1
4778
4778
  },
4779
4779
  "type": "string"
@@ -4786,7 +4786,7 @@
4786
4786
  "__schema": "FunctionLikeSchema",
4787
4787
  "location": {
4788
4788
  "filePath": "merge-cmd.ts",
4789
- "line": 363,
4789
+ "line": 379,
4790
4790
  "character": 1
4791
4791
  },
4792
4792
  "signature": "function compilationErrorOutput(compilationError?: Error): string",
@@ -4796,7 +4796,7 @@
4796
4796
  "__schema": "ParameterSchema",
4797
4797
  "location": {
4798
4798
  "filePath": "merge-cmd.ts",
4799
- "line": 363,
4799
+ "line": 379,
4800
4800
  "character": 40
4801
4801
  },
4802
4802
  "name": "compilationError",
@@ -4804,7 +4804,7 @@
4804
4804
  "__schema": "TypeRefSchema",
4805
4805
  "location": {
4806
4806
  "filePath": "merge-cmd.ts",
4807
- "line": 363,
4807
+ "line": 379,
4808
4808
  "character": 59
4809
4809
  },
4810
4810
  "name": "Error"
@@ -4817,7 +4817,7 @@
4817
4817
  "__schema": "InferenceTypeSchema",
4818
4818
  "location": {
4819
4819
  "filePath": "merge-cmd.ts",
4820
- "line": 363,
4820
+ "line": 379,
4821
4821
  "character": 1
4822
4822
  },
4823
4823
  "type": "string"
@@ -4830,7 +4830,7 @@
4830
4830
  "__schema": "FunctionLikeSchema",
4831
4831
  "location": {
4832
4832
  "filePath": "merge-cmd.ts",
4833
- "line": 372,
4833
+ "line": 388,
4834
4834
  "character": 1
4835
4835
  },
4836
4836
  "signature": "function getRemovedOutput(removedComponents?: ComponentID[]): string",
@@ -4840,7 +4840,7 @@
4840
4840
  "__schema": "ParameterSchema",
4841
4841
  "location": {
4842
4842
  "filePath": "merge-cmd.ts",
4843
- "line": 372,
4843
+ "line": 388,
4844
4844
  "character": 34
4845
4845
  },
4846
4846
  "name": "removedComponents",
@@ -4848,14 +4848,14 @@
4848
4848
  "__schema": "TypeArraySchema",
4849
4849
  "location": {
4850
4850
  "filePath": "merge-cmd.ts",
4851
- "line": 372,
4851
+ "line": 388,
4852
4852
  "character": 54
4853
4853
  },
4854
4854
  "type": {
4855
4855
  "__schema": "TypeRefSchema",
4856
4856
  "location": {
4857
4857
  "filePath": "merge-cmd.ts",
4858
- "line": 372,
4858
+ "line": 388,
4859
4859
  "character": 54
4860
4860
  },
4861
4861
  "name": "ComponentID",
@@ -4874,7 +4874,7 @@
4874
4874
  "__schema": "InferenceTypeSchema",
4875
4875
  "location": {
4876
4876
  "filePath": "merge-cmd.ts",
4877
- "line": 372,
4877
+ "line": 388,
4878
4878
  "character": 1
4879
4879
  },
4880
4880
  "type": "string"
@@ -4887,7 +4887,7 @@
4887
4887
  "__schema": "FunctionLikeSchema",
4888
4888
  "location": {
4889
4889
  "filePath": "merge-cmd.ts",
4890
- "line": 379,
4890
+ "line": 395,
4891
4891
  "character": 1
4892
4892
  },
4893
4893
  "signature": "function getAddedOutput(addedComponents?: ComponentID[]): string",
@@ -4897,7 +4897,7 @@
4897
4897
  "__schema": "ParameterSchema",
4898
4898
  "location": {
4899
4899
  "filePath": "merge-cmd.ts",
4900
- "line": 379,
4900
+ "line": 395,
4901
4901
  "character": 32
4902
4902
  },
4903
4903
  "name": "addedComponents",
@@ -4905,14 +4905,14 @@
4905
4905
  "__schema": "TypeArraySchema",
4906
4906
  "location": {
4907
4907
  "filePath": "merge-cmd.ts",
4908
- "line": 379,
4908
+ "line": 395,
4909
4909
  "character": 50
4910
4910
  },
4911
4911
  "type": {
4912
4912
  "__schema": "TypeRefSchema",
4913
4913
  "location": {
4914
4914
  "filePath": "merge-cmd.ts",
4915
- "line": 379,
4915
+ "line": 395,
4916
4916
  "character": 50
4917
4917
  },
4918
4918
  "name": "ComponentID",
@@ -4931,7 +4931,7 @@
4931
4931
  "__schema": "InferenceTypeSchema",
4932
4932
  "location": {
4933
4933
  "filePath": "merge-cmd.ts",
4934
- "line": 379,
4934
+ "line": 395,
4935
4935
  "character": 1
4936
4936
  },
4937
4937
  "type": "string"
@@ -4946,7 +4946,7 @@
4946
4946
  "__schema": "FunctionLikeSchema",
4947
4947
  "location": {
4948
4948
  "filePath": "merge-cmd.ts",
4949
- "line": 280,
4949
+ "line": 296,
4950
4950
  "character": 1
4951
4951
  },
4952
4952
  "signature": "function getWorkspaceDepsOutput(workspaceDepsUpdates?: WorkspaceDepsUpdates): string",
@@ -4956,7 +4956,7 @@
4956
4956
  "__schema": "ParameterSchema",
4957
4957
  "location": {
4958
4958
  "filePath": "merge-cmd.ts",
4959
- "line": 280,
4959
+ "line": 296,
4960
4960
  "character": 33
4961
4961
  },
4962
4962
  "name": "workspaceDepsUpdates",
@@ -4964,7 +4964,7 @@
4964
4964
  "__schema": "TypeRefSchema",
4965
4965
  "location": {
4966
4966
  "filePath": "merge-cmd.ts",
4967
- "line": 280,
4967
+ "line": 296,
4968
4968
  "character": 56
4969
4969
  },
4970
4970
  "name": "WorkspaceDepsUpdates",
@@ -4981,7 +4981,7 @@
4981
4981
  "__schema": "KeywordTypeSchema",
4982
4982
  "location": {
4983
4983
  "filePath": "merge-cmd.ts",
4984
- "line": 280,
4984
+ "line": 296,
4985
4985
  "character": 79
4986
4986
  },
4987
4987
  "name": "string"
@@ -7299,7 +7299,7 @@
7299
7299
  "__schema": "FunctionLikeSchema",
7300
7300
  "location": {
7301
7301
  "filePath": "merging.main.runtime.ts",
7302
- "line": 352,
7302
+ "line": 353,
7303
7303
  "character": 3
7304
7304
  },
7305
7305
  "signature": "(method) MergingMain.removeFromWsJsonPolicyIfExists(componentsResults: ApplyVersionWithComps[], currentLane?: Lane, currentLaneIdsBeforeMerge?: ComponentIdList): Promise<void>",
@@ -7309,7 +7309,7 @@
7309
7309
  "__schema": "ParameterSchema",
7310
7310
  "location": {
7311
7311
  "filePath": "merging.main.runtime.ts",
7312
- "line": 353,
7312
+ "line": 354,
7313
7313
  "character": 5
7314
7314
  },
7315
7315
  "name": "componentsResults",
@@ -7317,14 +7317,14 @@
7317
7317
  "__schema": "TypeArraySchema",
7318
7318
  "location": {
7319
7319
  "filePath": "merging.main.runtime.ts",
7320
- "line": 353,
7320
+ "line": 354,
7321
7321
  "character": 24
7322
7322
  },
7323
7323
  "type": {
7324
7324
  "__schema": "TypeRefSchema",
7325
7325
  "location": {
7326
7326
  "filePath": "merging.main.runtime.ts",
7327
- "line": 353,
7327
+ "line": 354,
7328
7328
  "character": 24
7329
7329
  },
7330
7330
  "name": "ApplyVersionWithComps",
@@ -7341,7 +7341,7 @@
7341
7341
  "__schema": "ParameterSchema",
7342
7342
  "location": {
7343
7343
  "filePath": "merging.main.runtime.ts",
7344
- "line": 354,
7344
+ "line": 355,
7345
7345
  "character": 5
7346
7346
  },
7347
7347
  "name": "currentLane",
@@ -7349,7 +7349,7 @@
7349
7349
  "__schema": "TypeRefSchema",
7350
7350
  "location": {
7351
7351
  "filePath": "merging.main.runtime.ts",
7352
- "line": 354,
7352
+ "line": 355,
7353
7353
  "character": 19
7354
7354
  },
7355
7355
  "name": "Lane",
@@ -7362,7 +7362,7 @@
7362
7362
  "__schema": "ParameterSchema",
7363
7363
  "location": {
7364
7364
  "filePath": "merging.main.runtime.ts",
7365
- "line": 355,
7365
+ "line": 356,
7366
7366
  "character": 5
7367
7367
  },
7368
7368
  "name": "currentLaneIdsBeforeMerge",
@@ -7370,7 +7370,7 @@
7370
7370
  "__schema": "TypeRefSchema",
7371
7371
  "location": {
7372
7372
  "filePath": "merging.main.runtime.ts",
7373
- "line": 355,
7373
+ "line": 356,
7374
7374
  "character": 33
7375
7375
  },
7376
7376
  "name": "ComponentIdList",
@@ -7388,7 +7388,7 @@
7388
7388
  "__schema": "InferenceTypeSchema",
7389
7389
  "location": {
7390
7390
  "filePath": "merging.main.runtime.ts",
7391
- "line": 352,
7391
+ "line": 353,
7392
7392
  "character": 3
7393
7393
  },
7394
7394
  "type": "Promise<void>"
@@ -7401,14 +7401,14 @@
7401
7401
  "__schema": "FunctionLikeSchema",
7402
7402
  "location": {
7403
7403
  "filePath": "merging.main.runtime.ts",
7404
- "line": 377,
7404
+ "line": 378,
7405
7405
  "character": 3
7406
7406
  },
7407
7407
  "doc": {
7408
7408
  "__schema": "DocSchema",
7409
7409
  "location": {
7410
7410
  "filePath": "merging.main.runtime.ts",
7411
- "line": 371,
7411
+ "line": 372,
7412
7412
  "character": 3
7413
7413
  },
7414
7414
  "raw": "/**\n * this function gets called from two different commands:\n * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n * in this case, the remote and local are on the same lane or both on main.\n * 2. \"bit lane merge\", when merging from one lane to another.\n */",
@@ -7421,7 +7421,7 @@
7421
7421
  "__schema": "ParameterSchema",
7422
7422
  "location": {
7423
7423
  "filePath": "merging.main.runtime.ts",
7424
- "line": 378,
7424
+ "line": 379,
7425
7425
  "character": 5
7426
7426
  },
7427
7427
  "name": "bitIds",
@@ -7429,14 +7429,14 @@
7429
7429
  "__schema": "TypeArraySchema",
7430
7430
  "location": {
7431
7431
  "filePath": "merging.main.runtime.ts",
7432
- "line": 378,
7432
+ "line": 379,
7433
7433
  "character": 13
7434
7434
  },
7435
7435
  "type": {
7436
7436
  "__schema": "TypeRefSchema",
7437
7437
  "location": {
7438
7438
  "filePath": "merging.main.runtime.ts",
7439
- "line": 378,
7439
+ "line": 379,
7440
7440
  "character": 13
7441
7441
  },
7442
7442
  "name": "ComponentID",
@@ -7454,7 +7454,7 @@
7454
7454
  "__schema": "ParameterSchema",
7455
7455
  "location": {
7456
7456
  "filePath": "merging.main.runtime.ts",
7457
- "line": 379,
7457
+ "line": 380,
7458
7458
  "character": 5
7459
7459
  },
7460
7460
  "name": "options",
@@ -7462,7 +7462,7 @@
7462
7462
  "__schema": "TypeRefSchema",
7463
7463
  "location": {
7464
7464
  "filePath": "merging.main.runtime.ts",
7465
- "line": 379,
7465
+ "line": 380,
7466
7466
  "character": 14
7467
7467
  },
7468
7468
  "name": "MergeStatusProviderOptions",
@@ -7475,7 +7475,7 @@
7475
7475
  "__schema": "ParameterSchema",
7476
7476
  "location": {
7477
7477
  "filePath": "merging.main.runtime.ts",
7478
- "line": 380,
7478
+ "line": 381,
7479
7479
  "character": 5
7480
7480
  },
7481
7481
  "name": "currentLane",
@@ -7483,7 +7483,7 @@
7483
7483
  "__schema": "TypeRefSchema",
7484
7484
  "location": {
7485
7485
  "filePath": "merging.main.runtime.ts",
7486
- "line": 380,
7486
+ "line": 381,
7487
7487
  "character": 19
7488
7488
  },
7489
7489
  "name": "Lane",
@@ -7496,7 +7496,7 @@
7496
7496
  "__schema": "ParameterSchema",
7497
7497
  "location": {
7498
7498
  "filePath": "merging.main.runtime.ts",
7499
- "line": 381,
7499
+ "line": 382,
7500
7500
  "character": 5
7501
7501
  },
7502
7502
  "name": "otherLane",
@@ -7504,7 +7504,7 @@
7504
7504
  "__schema": "TypeRefSchema",
7505
7505
  "location": {
7506
7506
  "filePath": "merging.main.runtime.ts",
7507
- "line": 381,
7507
+ "line": 382,
7508
7508
  "character": 17
7509
7509
  },
7510
7510
  "name": "Lane",
@@ -7518,7 +7518,7 @@
7518
7518
  "__schema": "TypeRefSchema",
7519
7519
  "location": {
7520
7520
  "filePath": "merging.main.runtime.ts",
7521
- "line": 382,
7521
+ "line": 383,
7522
7522
  "character": 6
7523
7523
  },
7524
7524
  "name": "Promise",
@@ -7527,14 +7527,14 @@
7527
7527
  "__schema": "TypeArraySchema",
7528
7528
  "location": {
7529
7529
  "filePath": "merging.main.runtime.ts",
7530
- "line": 382,
7530
+ "line": 383,
7531
7531
  "character": 14
7532
7532
  },
7533
7533
  "type": {
7534
7534
  "__schema": "TypeRefSchema",
7535
7535
  "location": {
7536
7536
  "filePath": "merging.main.runtime.ts",
7537
- "line": 382,
7537
+ "line": 383,
7538
7538
  "character": 14
7539
7539
  },
7540
7540
  "name": "ComponentMergeStatus"
@@ -7550,7 +7550,7 @@
7550
7550
  "__schema": "VariableLikeSchema",
7551
7551
  "location": {
7552
7552
  "filePath": "merging.main.runtime.ts",
7553
- "line": 678,
7553
+ "line": 679,
7554
7554
  "character": 3
7555
7555
  },
7556
7556
  "signature": "(property) MergingMain.slots: never[]",
@@ -7559,7 +7559,7 @@
7559
7559
  "__schema": "InferenceTypeSchema",
7560
7560
  "location": {
7561
7561
  "filePath": "merging.main.runtime.ts",
7562
- "line": 678,
7562
+ "line": 679,
7563
7563
  "character": 3
7564
7564
  },
7565
7565
  "type": "never[]"
@@ -7571,7 +7571,7 @@
7571
7571
  "__schema": "VariableLikeSchema",
7572
7572
  "location": {
7573
7573
  "filePath": "merging.main.runtime.ts",
7574
- "line": 679,
7574
+ "line": 680,
7575
7575
  "character": 3
7576
7576
  },
7577
7577
  "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -7580,7 +7580,7 @@
7580
7580
  "__schema": "InferenceTypeSchema",
7581
7581
  "location": {
7582
7582
  "filePath": "merging.main.runtime.ts",
7583
- "line": 679,
7583
+ "line": 680,
7584
7584
  "character": 3
7585
7585
  },
7586
7586
  "type": "Aspect[]"
@@ -7592,7 +7592,7 @@
7592
7592
  "__schema": "VariableLikeSchema",
7593
7593
  "location": {
7594
7594
  "filePath": "merging.main.runtime.ts",
7595
- "line": 695,
7595
+ "line": 696,
7596
7596
  "character": 3
7597
7597
  },
7598
7598
  "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -7601,7 +7601,7 @@
7601
7601
  "__schema": "InferenceTypeSchema",
7602
7602
  "location": {
7603
7603
  "filePath": "merging.main.runtime.ts",
7604
- "line": 695,
7604
+ "line": 696,
7605
7605
  "character": 3
7606
7606
  },
7607
7607
  "type": "RuntimeDefinition"
@@ -7613,7 +7613,7 @@
7613
7613
  "__schema": "FunctionLikeSchema",
7614
7614
  "location": {
7615
7615
  "filePath": "merging.main.runtime.ts",
7616
- "line": 696,
7616
+ "line": 697,
7617
7617
  "character": 3
7618
7618
  },
7619
7619
  "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver,]: [\n CLIMain,\n Workspace,\n ScopeMain,\n SnappingMain,\n CheckoutMain,\n InstallMain,\n LoggerMain,\n ComponentWriterMain,\n ImporterMain,\n ConfigMain,\n RemoveMain,\n GlobalConfigMain,\n ConfigMergerMain,\n DependencyResolverMain\n]): Promise<MergingMain>",
@@ -7623,7 +7623,7 @@
7623
7623
  "__schema": "ParameterSchema",
7624
7624
  "location": {
7625
7625
  "filePath": "merging.main.runtime.ts",
7626
- "line": 696,
7626
+ "line": 697,
7627
7627
  "character": 25
7628
7628
  },
7629
7629
  "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger, depResolver ]",
@@ -7631,7 +7631,7 @@
7631
7631
  "__schema": "TupleTypeSchema",
7632
7632
  "location": {
7633
7633
  "filePath": "merging.main.runtime.ts",
7634
- "line": 711,
7634
+ "line": 712,
7635
7635
  "character": 6
7636
7636
  },
7637
7637
  "elements": [
@@ -7639,7 +7639,7 @@
7639
7639
  "__schema": "TypeRefSchema",
7640
7640
  "location": {
7641
7641
  "filePath": "merging.main.runtime.ts",
7642
- "line": 712,
7642
+ "line": 713,
7643
7643
  "character": 5
7644
7644
  },
7645
7645
  "name": "CLIMain",
@@ -7652,7 +7652,7 @@
7652
7652
  "__schema": "TypeRefSchema",
7653
7653
  "location": {
7654
7654
  "filePath": "merging.main.runtime.ts",
7655
- "line": 713,
7655
+ "line": 714,
7656
7656
  "character": 5
7657
7657
  },
7658
7658
  "name": "Workspace",
@@ -7665,7 +7665,7 @@
7665
7665
  "__schema": "TypeRefSchema",
7666
7666
  "location": {
7667
7667
  "filePath": "merging.main.runtime.ts",
7668
- "line": 714,
7668
+ "line": 715,
7669
7669
  "character": 5
7670
7670
  },
7671
7671
  "name": "ScopeMain",
@@ -7678,7 +7678,7 @@
7678
7678
  "__schema": "TypeRefSchema",
7679
7679
  "location": {
7680
7680
  "filePath": "merging.main.runtime.ts",
7681
- "line": 715,
7681
+ "line": 716,
7682
7682
  "character": 5
7683
7683
  },
7684
7684
  "name": "SnappingMain",
@@ -7691,7 +7691,7 @@
7691
7691
  "__schema": "TypeRefSchema",
7692
7692
  "location": {
7693
7693
  "filePath": "merging.main.runtime.ts",
7694
- "line": 716,
7694
+ "line": 717,
7695
7695
  "character": 5
7696
7696
  },
7697
7697
  "name": "CheckoutMain",
@@ -7704,7 +7704,7 @@
7704
7704
  "__schema": "TypeRefSchema",
7705
7705
  "location": {
7706
7706
  "filePath": "merging.main.runtime.ts",
7707
- "line": 717,
7707
+ "line": 718,
7708
7708
  "character": 5
7709
7709
  },
7710
7710
  "name": "InstallMain",
@@ -7717,7 +7717,7 @@
7717
7717
  "__schema": "TypeRefSchema",
7718
7718
  "location": {
7719
7719
  "filePath": "merging.main.runtime.ts",
7720
- "line": 718,
7720
+ "line": 719,
7721
7721
  "character": 5
7722
7722
  },
7723
7723
  "name": "LoggerMain",
@@ -7730,7 +7730,7 @@
7730
7730
  "__schema": "TypeRefSchema",
7731
7731
  "location": {
7732
7732
  "filePath": "merging.main.runtime.ts",
7733
- "line": 719,
7733
+ "line": 720,
7734
7734
  "character": 5
7735
7735
  },
7736
7736
  "name": "ComponentWriterMain",
@@ -7743,7 +7743,7 @@
7743
7743
  "__schema": "TypeRefSchema",
7744
7744
  "location": {
7745
7745
  "filePath": "merging.main.runtime.ts",
7746
- "line": 720,
7746
+ "line": 721,
7747
7747
  "character": 5
7748
7748
  },
7749
7749
  "name": "ImporterMain",
@@ -7756,7 +7756,7 @@
7756
7756
  "__schema": "TypeRefSchema",
7757
7757
  "location": {
7758
7758
  "filePath": "merging.main.runtime.ts",
7759
- "line": 721,
7759
+ "line": 722,
7760
7760
  "character": 5
7761
7761
  },
7762
7762
  "name": "ConfigMain",
@@ -7769,7 +7769,7 @@
7769
7769
  "__schema": "TypeRefSchema",
7770
7770
  "location": {
7771
7771
  "filePath": "merging.main.runtime.ts",
7772
- "line": 722,
7772
+ "line": 723,
7773
7773
  "character": 5
7774
7774
  },
7775
7775
  "name": "RemoveMain",
@@ -7782,7 +7782,7 @@
7782
7782
  "__schema": "TypeRefSchema",
7783
7783
  "location": {
7784
7784
  "filePath": "merging.main.runtime.ts",
7785
- "line": 723,
7785
+ "line": 724,
7786
7786
  "character": 5
7787
7787
  },
7788
7788
  "name": "GlobalConfigMain",
@@ -7795,7 +7795,7 @@
7795
7795
  "__schema": "TypeRefSchema",
7796
7796
  "location": {
7797
7797
  "filePath": "merging.main.runtime.ts",
7798
- "line": 724,
7798
+ "line": 725,
7799
7799
  "character": 5
7800
7800
  },
7801
7801
  "name": "ConfigMergerMain",
@@ -7808,7 +7808,7 @@
7808
7808
  "__schema": "TypeRefSchema",
7809
7809
  "location": {
7810
7810
  "filePath": "merging.main.runtime.ts",
7811
- "line": 725,
7811
+ "line": 726,
7812
7812
  "character": 5
7813
7813
  },
7814
7814
  "name": "DependencyResolverMain",
@@ -7827,7 +7827,7 @@
7827
7827
  "__schema": "InferenceTypeSchema",
7828
7828
  "location": {
7829
7829
  "filePath": "merging.main.runtime.ts",
7830
- "line": 696,
7830
+ "line": 697,
7831
7831
  "character": 3
7832
7832
  },
7833
7833
  "type": "Promise<MergingMain>"
@@ -7955,7 +7955,7 @@
7955
7955
  "__schema": "UnImplementedSchema",
7956
7956
  "location": {
7957
7957
  "filePath": "merging.main.runtime.ts",
7958
- "line": 747,
7958
+ "line": 748,
7959
7959
  "character": 1
7960
7960
  },
7961
7961
  "name": "MergingAspect.addRuntime(MergingMain);",
@@ -8004,7 +8004,7 @@
8004
8004
  "componentId": {
8005
8005
  "scope": "teambit.component",
8006
8006
  "name": "merging",
8007
- "version": "1.0.271"
8007
+ "version": "1.0.273"
8008
8008
  },
8009
8009
  "taggedModuleExports": []
8010
8010
  }