@teambit/config-merger 0.0.184 → 0.0.186

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 (9) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +214 -202
  3. package/dist/component-config-merger.d.ts +1 -1
  4. package/dist/component-config-merger.js.map +1 -1
  5. package/dist/config-merger.main.runtime.d.ts +1 -1
  6. package/dist/config-merger.main.runtime.js +7 -7
  7. package/dist/config-merger.main.runtime.js.map +1 -1
  8. package/package.json +11 -10
  9. /package/dist/{preview-1719458409904.js → preview-1719631375170.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -25,7 +25,7 @@
25
25
  "__schema": "ClassSchema",
26
26
  "location": {
27
27
  "filePath": "config-merger.main.runtime.ts",
28
- "line": 41,
28
+ "line": 40,
29
29
  "character": 1
30
30
  },
31
31
  "signature": "class ConfigMergerMain",
@@ -35,7 +35,7 @@
35
35
  "__schema": "ConstructorSchema",
36
36
  "location": {
37
37
  "filePath": "config-merger.main.runtime.ts",
38
- "line": 42,
38
+ "line": 41,
39
39
  "character": 3
40
40
  },
41
41
  "signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
@@ -45,7 +45,7 @@
45
45
  "__schema": "ParameterSchema",
46
46
  "location": {
47
47
  "filePath": "config-merger.main.runtime.ts",
48
- "line": 43,
48
+ "line": 42,
49
49
  "character": 5
50
50
  },
51
51
  "name": "workspace",
@@ -53,7 +53,7 @@
53
53
  "__schema": "TypeRefSchema",
54
54
  "location": {
55
55
  "filePath": "config-merger.main.runtime.ts",
56
- "line": 43,
56
+ "line": 42,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace",
@@ -69,7 +69,7 @@
69
69
  "__schema": "ParameterSchema",
70
70
  "location": {
71
71
  "filePath": "config-merger.main.runtime.ts",
72
- "line": 44,
72
+ "line": 43,
73
73
  "character": 5
74
74
  },
75
75
  "name": "logger",
@@ -77,7 +77,7 @@
77
77
  "__schema": "TypeRefSchema",
78
78
  "location": {
79
79
  "filePath": "config-merger.main.runtime.ts",
80
- "line": 44,
80
+ "line": 43,
81
81
  "character": 21
82
82
  },
83
83
  "name": "Logger",
@@ -93,7 +93,7 @@
93
93
  "__schema": "ParameterSchema",
94
94
  "location": {
95
95
  "filePath": "config-merger.main.runtime.ts",
96
- "line": 45,
96
+ "line": 44,
97
97
  "character": 5
98
98
  },
99
99
  "name": "config",
@@ -101,7 +101,7 @@
101
101
  "__schema": "TypeRefSchema",
102
102
  "location": {
103
103
  "filePath": "config-merger.main.runtime.ts",
104
- "line": 45,
104
+ "line": 44,
105
105
  "character": 21
106
106
  },
107
107
  "name": "ConfigMain",
@@ -117,7 +117,7 @@
117
117
  "__schema": "ParameterSchema",
118
118
  "location": {
119
119
  "filePath": "config-merger.main.runtime.ts",
120
- "line": 46,
120
+ "line": 45,
121
121
  "character": 5
122
122
  },
123
123
  "name": "depsResolver",
@@ -125,7 +125,7 @@
125
125
  "__schema": "TypeRefSchema",
126
126
  "location": {
127
127
  "filePath": "config-merger.main.runtime.ts",
128
- "line": 46,
128
+ "line": 45,
129
129
  "character": 27
130
130
  },
131
131
  "name": "DependencyResolverMain",
@@ -142,7 +142,7 @@
142
142
  "__schema": "ThisTypeSchema",
143
143
  "location": {
144
144
  "filePath": "config-merger.main.runtime.ts",
145
- "line": 41,
145
+ "line": 40,
146
146
  "character": 1
147
147
  },
148
148
  "name": "ConfigMergerMain"
@@ -153,7 +153,7 @@
153
153
  "__schema": "FunctionLikeSchema",
154
154
  "location": {
155
155
  "filePath": "config-merger.main.runtime.ts",
156
- "line": 49,
156
+ "line": 48,
157
157
  "character": 3
158
158
  },
159
159
  "signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
@@ -163,7 +163,7 @@
163
163
  "__schema": "ParameterSchema",
164
164
  "location": {
165
165
  "filePath": "config-merger.main.runtime.ts",
166
- "line": 49,
166
+ "line": 48,
167
167
  "character": 47
168
168
  },
169
169
  "name": "allConfigMerge",
@@ -171,14 +171,14 @@
171
171
  "__schema": "TypeArraySchema",
172
172
  "location": {
173
173
  "filePath": "config-merger.main.runtime.ts",
174
- "line": 49,
174
+ "line": 48,
175
175
  "character": 63
176
176
  },
177
177
  "type": {
178
178
  "__schema": "TypeRefSchema",
179
179
  "location": {
180
180
  "filePath": "config-merger.main.runtime.ts",
181
- "line": 49,
181
+ "line": 48,
182
182
  "character": 63
183
183
  },
184
184
  "name": "ConfigMergeResult"
@@ -192,7 +192,7 @@
192
192
  "__schema": "InferenceTypeSchema",
193
193
  "location": {
194
194
  "filePath": "config-merger.main.runtime.ts",
195
- "line": 49,
195
+ "line": 48,
196
196
  "character": 3
197
197
  },
198
198
  "type": "Promise<void>"
@@ -205,7 +205,7 @@
205
205
  "__schema": "FunctionLikeSchema",
206
206
  "location": {
207
207
  "filePath": "config-merger.main.runtime.ts",
208
- "line": 61,
208
+ "line": 60,
209
209
  "character": 3
210
210
  },
211
211
  "signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
@@ -215,7 +215,7 @@
215
215
  "__schema": "ParameterSchema",
216
216
  "location": {
217
217
  "filePath": "config-merger.main.runtime.ts",
218
- "line": 62,
218
+ "line": 61,
219
219
  "character": 5
220
220
  },
221
221
  "name": "workspaceDepsConflicts",
@@ -223,7 +223,7 @@
223
223
  "__schema": "TypeRefSchema",
224
224
  "location": {
225
225
  "filePath": "config-merger.main.runtime.ts",
226
- "line": 62,
226
+ "line": 61,
227
227
  "character": 29
228
228
  },
229
229
  "name": "WorkspaceDepsConflicts"
@@ -236,7 +236,7 @@
236
236
  "__schema": "TypeRefSchema",
237
237
  "location": {
238
238
  "filePath": "config-merger.main.runtime.ts",
239
- "line": 63,
239
+ "line": 62,
240
240
  "character": 6
241
241
  },
242
242
  "name": "Promise",
@@ -245,7 +245,7 @@
245
245
  "__schema": "TypeUnionSchema",
246
246
  "location": {
247
247
  "filePath": "config-merger.main.runtime.ts",
248
- "line": 63,
248
+ "line": 62,
249
249
  "character": 14
250
250
  },
251
251
  "types": [
@@ -253,7 +253,7 @@
253
253
  "__schema": "TypeRefSchema",
254
254
  "location": {
255
255
  "filePath": "config-merger.main.runtime.ts",
256
- "line": 63,
256
+ "line": 62,
257
257
  "character": 14
258
258
  },
259
259
  "name": "Error"
@@ -262,7 +262,7 @@
262
262
  "__schema": "KeywordTypeSchema",
263
263
  "location": {
264
264
  "filePath": "config-merger.main.runtime.ts",
265
- "line": 63,
265
+ "line": 62,
266
266
  "character": 22
267
267
  },
268
268
  "name": "undefined"
@@ -279,7 +279,7 @@
279
279
  "__schema": "FunctionLikeSchema",
280
280
  "location": {
281
281
  "filePath": "config-merger.main.runtime.ts",
282
- "line": 131,
282
+ "line": 130,
283
283
  "character": 3
284
284
  },
285
285
  "signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n}>",
@@ -289,7 +289,7 @@
289
289
  "__schema": "ParameterSchema",
290
290
  "location": {
291
291
  "filePath": "config-merger.main.runtime.ts",
292
- "line": 131,
292
+ "line": 130,
293
293
  "character": 46
294
294
  },
295
295
  "name": "allConfigMerge",
@@ -297,14 +297,14 @@
297
297
  "__schema": "TypeArraySchema",
298
298
  "location": {
299
299
  "filePath": "config-merger.main.runtime.ts",
300
- "line": 131,
300
+ "line": 130,
301
301
  "character": 62
302
302
  },
303
303
  "type": {
304
304
  "__schema": "TypeRefSchema",
305
305
  "location": {
306
306
  "filePath": "config-merger.main.runtime.ts",
307
- "line": 131,
307
+ "line": 130,
308
308
  "character": 62
309
309
  },
310
310
  "name": "ConfigMergeResult"
@@ -318,7 +318,7 @@
318
318
  "__schema": "TypeRefSchema",
319
319
  "location": {
320
320
  "filePath": "config-merger.main.runtime.ts",
321
- "line": 131,
321
+ "line": 130,
322
322
  "character": 84
323
323
  },
324
324
  "name": "Promise",
@@ -327,7 +327,7 @@
327
327
  "__schema": "TypeLiteralSchema",
328
328
  "location": {
329
329
  "filePath": "config-merger.main.runtime.ts",
330
- "line": 131,
330
+ "line": 130,
331
331
  "character": 92
332
332
  },
333
333
  "members": [
@@ -335,7 +335,7 @@
335
335
  "__schema": "VariableLikeSchema",
336
336
  "location": {
337
337
  "filePath": "config-merger.main.runtime.ts",
338
- "line": 132,
338
+ "line": 131,
339
339
  "character": 5
340
340
  },
341
341
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -344,7 +344,7 @@
344
344
  "__schema": "TypeRefSchema",
345
345
  "location": {
346
346
  "filePath": "config-merger.main.runtime.ts",
347
- "line": 132,
347
+ "line": 131,
348
348
  "character": 28
349
349
  },
350
350
  "name": "WorkspaceDepsUpdates"
@@ -355,7 +355,7 @@
355
355
  "__schema": "VariableLikeSchema",
356
356
  "location": {
357
357
  "filePath": "config-merger.main.runtime.ts",
358
- "line": 133,
358
+ "line": 132,
359
359
  "character": 5
360
360
  },
361
361
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -364,7 +364,7 @@
364
364
  "__schema": "TypeRefSchema",
365
365
  "location": {
366
366
  "filePath": "config-merger.main.runtime.ts",
367
- "line": 133,
367
+ "line": 132,
368
368
  "character": 30
369
369
  },
370
370
  "name": "WorkspaceDepsConflicts"
@@ -375,7 +375,7 @@
375
375
  "__schema": "VariableLikeSchema",
376
376
  "location": {
377
377
  "filePath": "config-merger.main.runtime.ts",
378
- "line": 134,
378
+ "line": 133,
379
379
  "character": 5
380
380
  },
381
381
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -384,7 +384,7 @@
384
384
  "__schema": "TypeRefSchema",
385
385
  "location": {
386
386
  "filePath": "config-merger.main.runtime.ts",
387
- "line": 134,
387
+ "line": 133,
388
388
  "character": 30
389
389
  },
390
390
  "name": "WorkspaceDepsUnchanged",
@@ -404,7 +404,7 @@
404
404
  "__schema": "FunctionLikeSchema",
405
405
  "location": {
406
406
  "filePath": "config-merger.main.runtime.ts",
407
- "line": 266,
407
+ "line": 265,
408
408
  "character": 3
409
409
  },
410
410
  "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[], mergeStrategy?: MergeStrategy): Promise<WorkspaceConfigUpdateResult | undefined>",
@@ -414,7 +414,7 @@
414
414
  "__schema": "ParameterSchema",
415
415
  "location": {
416
416
  "filePath": "config-merger.main.runtime.ts",
417
- "line": 267,
417
+ "line": 266,
418
418
  "character": 5
419
419
  },
420
420
  "name": "components",
@@ -422,14 +422,14 @@
422
422
  "__schema": "TypeArraySchema",
423
423
  "location": {
424
424
  "filePath": "config-merger.main.runtime.ts",
425
- "line": 267,
425
+ "line": 266,
426
426
  "character": 17
427
427
  },
428
428
  "type": {
429
429
  "__schema": "TypeRefSchema",
430
430
  "location": {
431
431
  "filePath": "config-merger.main.runtime.ts",
432
- "line": 267,
432
+ "line": 266,
433
433
  "character": 17
434
434
  },
435
435
  "name": "ConsumerComponent",
@@ -443,7 +443,7 @@
443
443
  "__schema": "ParameterSchema",
444
444
  "location": {
445
445
  "filePath": "config-merger.main.runtime.ts",
446
- "line": 268,
446
+ "line": 267,
447
447
  "character": 5
448
448
  },
449
449
  "name": "mergeStrategy",
@@ -451,11 +451,14 @@
451
451
  "__schema": "TypeRefSchema",
452
452
  "location": {
453
453
  "filePath": "config-merger.main.runtime.ts",
454
- "line": 268,
454
+ "line": 267,
455
455
  "character": 21
456
456
  },
457
457
  "name": "MergeStrategy",
458
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
458
+ "componentId": {
459
+ "scope": "teambit.component",
460
+ "name": "merging"
461
+ }
459
462
  },
460
463
  "isOptional": true,
461
464
  "isSpread": false
@@ -465,7 +468,7 @@
465
468
  "__schema": "TypeRefSchema",
466
469
  "location": {
467
470
  "filePath": "config-merger.main.runtime.ts",
468
- "line": 269,
471
+ "line": 268,
469
472
  "character": 6
470
473
  },
471
474
  "name": "Promise",
@@ -474,7 +477,7 @@
474
477
  "__schema": "TypeUnionSchema",
475
478
  "location": {
476
479
  "filePath": "config-merger.main.runtime.ts",
477
- "line": 269,
480
+ "line": 268,
478
481
  "character": 14
479
482
  },
480
483
  "types": [
@@ -482,7 +485,7 @@
482
485
  "__schema": "TypeRefSchema",
483
486
  "location": {
484
487
  "filePath": "config-merger.main.runtime.ts",
485
- "line": 269,
488
+ "line": 268,
486
489
  "character": 14
487
490
  },
488
491
  "name": "WorkspaceConfigUpdateResult"
@@ -491,7 +494,7 @@
491
494
  "__schema": "KeywordTypeSchema",
492
495
  "location": {
493
496
  "filePath": "config-merger.main.runtime.ts",
494
- "line": 269,
497
+ "line": 268,
495
498
  "character": 44
496
499
  },
497
500
  "name": "undefined"
@@ -508,7 +511,7 @@
508
511
  "__schema": "VariableLikeSchema",
509
512
  "location": {
510
513
  "filePath": "config-merger.main.runtime.ts",
511
- "line": 495,
514
+ "line": 494,
512
515
  "character": 3
513
516
  },
514
517
  "signature": "(property) ConfigMergerMain.slots: never[]",
@@ -517,7 +520,7 @@
517
520
  "__schema": "InferenceTypeSchema",
518
521
  "location": {
519
522
  "filePath": "config-merger.main.runtime.ts",
520
- "line": 495,
523
+ "line": 494,
521
524
  "character": 3
522
525
  },
523
526
  "type": "never[]"
@@ -529,7 +532,7 @@
529
532
  "__schema": "VariableLikeSchema",
530
533
  "location": {
531
534
  "filePath": "config-merger.main.runtime.ts",
532
- "line": 496,
535
+ "line": 495,
533
536
  "character": 3
534
537
  },
535
538
  "signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
@@ -538,7 +541,7 @@
538
541
  "__schema": "InferenceTypeSchema",
539
542
  "location": {
540
543
  "filePath": "config-merger.main.runtime.ts",
541
- "line": 496,
544
+ "line": 495,
542
545
  "character": 3
543
546
  },
544
547
  "type": "Aspect[]"
@@ -550,7 +553,7 @@
550
553
  "__schema": "VariableLikeSchema",
551
554
  "location": {
552
555
  "filePath": "config-merger.main.runtime.ts",
553
- "line": 497,
556
+ "line": 496,
554
557
  "character": 3
555
558
  },
556
559
  "signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
@@ -559,7 +562,7 @@
559
562
  "__schema": "InferenceTypeSchema",
560
563
  "location": {
561
564
  "filePath": "config-merger.main.runtime.ts",
562
- "line": 497,
565
+ "line": 496,
563
566
  "character": 3
564
567
  },
565
568
  "type": "RuntimeDefinition"
@@ -571,7 +574,7 @@
571
574
  "__schema": "FunctionLikeSchema",
572
575
  "location": {
573
576
  "filePath": "config-merger.main.runtime.ts",
574
- "line": 498,
577
+ "line": 497,
575
578
  "character": 3
576
579
  },
577
580
  "signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
@@ -581,7 +584,7 @@
581
584
  "__schema": "ParameterSchema",
582
585
  "location": {
583
586
  "filePath": "config-merger.main.runtime.ts",
584
- "line": 498,
587
+ "line": 497,
585
588
  "character": 25
586
589
  },
587
590
  "name": "[ workspace, config, loggerMain, depsResolver ]",
@@ -589,7 +592,7 @@
589
592
  "__schema": "TupleTypeSchema",
590
593
  "location": {
591
594
  "filePath": "config-merger.main.runtime.ts",
592
- "line": 498,
595
+ "line": 497,
593
596
  "character": 72
594
597
  },
595
598
  "elements": [
@@ -597,7 +600,7 @@
597
600
  "__schema": "TypeRefSchema",
598
601
  "location": {
599
602
  "filePath": "config-merger.main.runtime.ts",
600
- "line": 499,
603
+ "line": 498,
601
604
  "character": 5
602
605
  },
603
606
  "name": "Workspace",
@@ -610,7 +613,7 @@
610
613
  "__schema": "TypeRefSchema",
611
614
  "location": {
612
615
  "filePath": "config-merger.main.runtime.ts",
613
- "line": 500,
616
+ "line": 499,
614
617
  "character": 5
615
618
  },
616
619
  "name": "ConfigMain",
@@ -623,7 +626,7 @@
623
626
  "__schema": "TypeRefSchema",
624
627
  "location": {
625
628
  "filePath": "config-merger.main.runtime.ts",
626
- "line": 501,
629
+ "line": 500,
627
630
  "character": 5
628
631
  },
629
632
  "name": "LoggerMain",
@@ -636,7 +639,7 @@
636
639
  "__schema": "TypeRefSchema",
637
640
  "location": {
638
641
  "filePath": "config-merger.main.runtime.ts",
639
- "line": 502,
642
+ "line": 501,
640
643
  "character": 5
641
644
  },
642
645
  "name": "DependencyResolverMain",
@@ -655,7 +658,7 @@
655
658
  "__schema": "InferenceTypeSchema",
656
659
  "location": {
657
660
  "filePath": "config-merger.main.runtime.ts",
658
- "line": 498,
661
+ "line": 497,
659
662
  "character": 3
660
663
  },
661
664
  "type": "Promise<ConfigMergerMain>"
@@ -682,7 +685,7 @@
682
685
  "__schema": "TypeSchema",
683
686
  "location": {
684
687
  "filePath": "config-merger.main.runtime.ts",
685
- "line": 30,
688
+ "line": 29,
686
689
  "character": 1
687
690
  },
688
691
  "signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
@@ -691,7 +694,7 @@
691
694
  "__schema": "TypeLiteralSchema",
692
695
  "location": {
693
696
  "filePath": "config-merger.main.runtime.ts",
694
- "line": 30,
697
+ "line": 29,
695
698
  "character": 36
696
699
  },
697
700
  "members": [
@@ -699,14 +702,14 @@
699
702
  "__schema": "IndexSignatureSchema",
700
703
  "location": {
701
704
  "filePath": "config-merger.main.runtime.ts",
702
- "line": 30,
705
+ "line": 29,
703
706
  "character": 38
704
707
  },
705
708
  "keyType": {
706
709
  "__schema": "ParameterSchema",
707
710
  "location": {
708
711
  "filePath": "config-merger.main.runtime.ts",
709
- "line": 30,
712
+ "line": 29,
710
713
  "character": 39
711
714
  },
712
715
  "name": "pkgName",
@@ -714,7 +717,7 @@
714
717
  "__schema": "KeywordTypeSchema",
715
718
  "location": {
716
719
  "filePath": "config-merger.main.runtime.ts",
717
- "line": 30,
720
+ "line": 29,
718
721
  "character": 48
719
722
  },
720
723
  "name": "string"
@@ -726,7 +729,7 @@
726
729
  "__schema": "TupleTypeSchema",
727
730
  "location": {
728
731
  "filePath": "config-merger.main.runtime.ts",
729
- "line": 30,
732
+ "line": 29,
730
733
  "character": 57
731
734
  },
732
735
  "elements": [
@@ -734,7 +737,7 @@
734
737
  "__schema": "KeywordTypeSchema",
735
738
  "location": {
736
739
  "filePath": "config-merger.main.runtime.ts",
737
- "line": 30,
740
+ "line": 29,
738
741
  "character": 58
739
742
  },
740
743
  "name": "string"
@@ -743,7 +746,7 @@
743
746
  "__schema": "KeywordTypeSchema",
744
747
  "location": {
745
748
  "filePath": "config-merger.main.runtime.ts",
746
- "line": 30,
749
+ "line": 29,
747
750
  "character": 66
748
751
  },
749
752
  "name": "string"
@@ -767,7 +770,7 @@
767
770
  "__schema": "TypeSchema",
768
771
  "location": {
769
772
  "filePath": "config-merger.main.runtime.ts",
770
- "line": 31,
773
+ "line": 30,
771
774
  "character": 1
772
775
  },
773
776
  "signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
@@ -776,7 +779,7 @@
776
779
  "__schema": "TypeRefSchema",
777
780
  "location": {
778
781
  "filePath": "config-merger.main.runtime.ts",
779
- "line": 31,
782
+ "line": 30,
780
783
  "character": 38
781
784
  },
782
785
  "name": "Record",
@@ -785,7 +788,7 @@
785
788
  "__schema": "TypeRefSchema",
786
789
  "location": {
787
790
  "filePath": "config-merger.main.runtime.ts",
788
- "line": 31,
791
+ "line": 30,
789
792
  "character": 45
790
793
  },
791
794
  "name": "WorkspacePolicyConfigKeysNames",
@@ -798,7 +801,7 @@
798
801
  "__schema": "TypeRefSchema",
799
802
  "location": {
800
803
  "filePath": "config-merger.main.runtime.ts",
801
- "line": 31,
804
+ "line": 30,
802
805
  "character": 77
803
806
  },
804
807
  "name": "Array",
@@ -807,7 +810,7 @@
807
810
  "__schema": "TypeLiteralSchema",
808
811
  "location": {
809
812
  "filePath": "config-merger.main.runtime.ts",
810
- "line": 31,
813
+ "line": 30,
811
814
  "character": 83
812
815
  },
813
816
  "members": [
@@ -815,7 +818,7 @@
815
818
  "__schema": "VariableLikeSchema",
816
819
  "location": {
817
820
  "filePath": "config-merger.main.runtime.ts",
818
- "line": 31,
821
+ "line": 30,
819
822
  "character": 85
820
823
  },
821
824
  "signature": "(property) name: string",
@@ -824,7 +827,7 @@
824
827
  "__schema": "KeywordTypeSchema",
825
828
  "location": {
826
829
  "filePath": "config-merger.main.runtime.ts",
827
- "line": 31,
830
+ "line": 30,
828
831
  "character": 91
829
832
  },
830
833
  "name": "string"
@@ -835,7 +838,7 @@
835
838
  "__schema": "VariableLikeSchema",
836
839
  "location": {
837
840
  "filePath": "config-merger.main.runtime.ts",
838
- "line": 31,
841
+ "line": 30,
839
842
  "character": 99
840
843
  },
841
844
  "signature": "(property) version: string",
@@ -844,7 +847,7 @@
844
847
  "__schema": "KeywordTypeSchema",
845
848
  "location": {
846
849
  "filePath": "config-merger.main.runtime.ts",
847
- "line": 31,
850
+ "line": 30,
848
851
  "character": 108
849
852
  },
850
853
  "name": "string"
@@ -871,7 +874,7 @@
871
874
  "__schema": "TypeSchema",
872
875
  "location": {
873
876
  "filePath": "config-merger.main.runtime.ts",
874
- "line": 34,
877
+ "line": 33,
875
878
  "character": 1
876
879
  },
877
880
  "signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
@@ -880,7 +883,7 @@
880
883
  "__schema": "TypeLiteralSchema",
881
884
  "location": {
882
885
  "filePath": "config-merger.main.runtime.ts",
883
- "line": 34,
886
+ "line": 33,
884
887
  "character": 43
885
888
  },
886
889
  "members": [
@@ -888,7 +891,7 @@
888
891
  "__schema": "VariableLikeSchema",
889
892
  "location": {
890
893
  "filePath": "config-merger.main.runtime.ts",
891
- "line": 35,
894
+ "line": 34,
892
895
  "character": 3
893
896
  },
894
897
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -897,7 +900,7 @@
897
900
  "__schema": "TypeRefSchema",
898
901
  "location": {
899
902
  "filePath": "config-merger.main.runtime.ts",
900
- "line": 35,
903
+ "line": 34,
901
904
  "character": 26
902
905
  },
903
906
  "name": "WorkspaceDepsUpdates"
@@ -908,7 +911,7 @@
908
911
  "__schema": "VariableLikeSchema",
909
912
  "location": {
910
913
  "filePath": "config-merger.main.runtime.ts",
911
- "line": 36,
914
+ "line": 35,
912
915
  "character": 3
913
916
  },
914
917
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -917,7 +920,7 @@
917
920
  "__schema": "TypeRefSchema",
918
921
  "location": {
919
922
  "filePath": "config-merger.main.runtime.ts",
920
- "line": 36,
923
+ "line": 35,
921
924
  "character": 28
922
925
  },
923
926
  "name": "WorkspaceDepsConflicts"
@@ -928,7 +931,7 @@
928
931
  "__schema": "VariableLikeSchema",
929
932
  "location": {
930
933
  "filePath": "config-merger.main.runtime.ts",
931
- "line": 37,
934
+ "line": 36,
932
935
  "character": 3
933
936
  },
934
937
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -937,7 +940,7 @@
937
940
  "__schema": "TypeRefSchema",
938
941
  "location": {
939
942
  "filePath": "config-merger.main.runtime.ts",
940
- "line": 37,
943
+ "line": 36,
941
944
  "character": 28
942
945
  },
943
946
  "name": "WorkspaceDepsUnchanged",
@@ -949,7 +952,7 @@
949
952
  "__schema": "VariableLikeSchema",
950
953
  "location": {
951
954
  "filePath": "config-merger.main.runtime.ts",
952
- "line": 38,
955
+ "line": 37,
953
956
  "character": 3
954
957
  },
955
958
  "signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
@@ -958,7 +961,7 @@
958
961
  "__schema": "TypeRefSchema",
959
962
  "location": {
960
963
  "filePath": "config-merger.main.runtime.ts",
961
- "line": 38,
964
+ "line": 37,
962
965
  "character": 39
963
966
  },
964
967
  "name": "Error"
@@ -969,7 +972,7 @@
969
972
  "__schema": "VariableLikeSchema",
970
973
  "location": {
971
974
  "filePath": "config-merger.main.runtime.ts",
972
- "line": 39,
975
+ "line": 38,
973
976
  "character": 3
974
977
  },
975
978
  "signature": "(property) logs?: string[] | undefined",
@@ -978,14 +981,14 @@
978
981
  "__schema": "TypeArraySchema",
979
982
  "location": {
980
983
  "filePath": "config-merger.main.runtime.ts",
981
- "line": 39,
984
+ "line": 38,
982
985
  "character": 10
983
986
  },
984
987
  "type": {
985
988
  "__schema": "KeywordTypeSchema",
986
989
  "location": {
987
990
  "filePath": "config-merger.main.runtime.ts",
988
- "line": 39,
991
+ "line": 38,
989
992
  "character": 10
990
993
  },
991
994
  "name": "string"
@@ -1549,7 +1552,10 @@
1549
1552
  "character": 28
1550
1553
  },
1551
1554
  "name": "MergeStrategy",
1552
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1555
+ "componentId": {
1556
+ "scope": "teambit.component",
1557
+ "name": "merging"
1558
+ }
1553
1559
  },
1554
1560
  "isOptional": false,
1555
1561
  "isSpread": false
@@ -1653,7 +1659,7 @@
1653
1659
  "__schema": "TypeSchema",
1654
1660
  "location": {
1655
1661
  "filePath": "config-merger.main.runtime.ts",
1656
- "line": 26,
1662
+ "line": 25,
1657
1663
  "character": 1
1658
1664
  },
1659
1665
  "signature": "type PkgEntry = {\n name: string;\n version: string;\n force: boolean;\n}",
@@ -1662,7 +1668,7 @@
1662
1668
  "__schema": "TypeLiteralSchema",
1663
1669
  "location": {
1664
1670
  "filePath": "config-merger.main.runtime.ts",
1665
- "line": 26,
1671
+ "line": 25,
1666
1672
  "character": 24
1667
1673
  },
1668
1674
  "members": [
@@ -1670,7 +1676,7 @@
1670
1676
  "__schema": "VariableLikeSchema",
1671
1677
  "location": {
1672
1678
  "filePath": "config-merger.main.runtime.ts",
1673
- "line": 26,
1679
+ "line": 25,
1674
1680
  "character": 26
1675
1681
  },
1676
1682
  "signature": "(property) name: string",
@@ -1679,7 +1685,7 @@
1679
1685
  "__schema": "KeywordTypeSchema",
1680
1686
  "location": {
1681
1687
  "filePath": "config-merger.main.runtime.ts",
1682
- "line": 26,
1688
+ "line": 25,
1683
1689
  "character": 32
1684
1690
  },
1685
1691
  "name": "string"
@@ -1690,7 +1696,7 @@
1690
1696
  "__schema": "VariableLikeSchema",
1691
1697
  "location": {
1692
1698
  "filePath": "config-merger.main.runtime.ts",
1693
- "line": 26,
1699
+ "line": 25,
1694
1700
  "character": 40
1695
1701
  },
1696
1702
  "signature": "(property) version: string",
@@ -1699,7 +1705,7 @@
1699
1705
  "__schema": "KeywordTypeSchema",
1700
1706
  "location": {
1701
1707
  "filePath": "config-merger.main.runtime.ts",
1702
- "line": 26,
1708
+ "line": 25,
1703
1709
  "character": 49
1704
1710
  },
1705
1711
  "name": "string"
@@ -1710,7 +1716,7 @@
1710
1716
  "__schema": "VariableLikeSchema",
1711
1717
  "location": {
1712
1718
  "filePath": "config-merger.main.runtime.ts",
1713
- "line": 26,
1719
+ "line": 25,
1714
1720
  "character": 57
1715
1721
  },
1716
1722
  "signature": "(property) force: boolean",
@@ -1719,7 +1725,7 @@
1719
1725
  "__schema": "KeywordTypeSchema",
1720
1726
  "location": {
1721
1727
  "filePath": "config-merger.main.runtime.ts",
1722
- "line": 26,
1728
+ "line": 25,
1723
1729
  "character": 64
1724
1730
  },
1725
1731
  "name": "boolean"
@@ -1733,7 +1739,7 @@
1733
1739
  "__schema": "TypeSchema",
1734
1740
  "location": {
1735
1741
  "filePath": "config-merger.main.runtime.ts",
1736
- "line": 30,
1742
+ "line": 29,
1737
1743
  "character": 1
1738
1744
  },
1739
1745
  "signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
@@ -1742,7 +1748,7 @@
1742
1748
  "__schema": "TypeLiteralSchema",
1743
1749
  "location": {
1744
1750
  "filePath": "config-merger.main.runtime.ts",
1745
- "line": 30,
1751
+ "line": 29,
1746
1752
  "character": 36
1747
1753
  },
1748
1754
  "members": [
@@ -1750,14 +1756,14 @@
1750
1756
  "__schema": "IndexSignatureSchema",
1751
1757
  "location": {
1752
1758
  "filePath": "config-merger.main.runtime.ts",
1753
- "line": 30,
1759
+ "line": 29,
1754
1760
  "character": 38
1755
1761
  },
1756
1762
  "keyType": {
1757
1763
  "__schema": "ParameterSchema",
1758
1764
  "location": {
1759
1765
  "filePath": "config-merger.main.runtime.ts",
1760
- "line": 30,
1766
+ "line": 29,
1761
1767
  "character": 39
1762
1768
  },
1763
1769
  "name": "pkgName",
@@ -1765,7 +1771,7 @@
1765
1771
  "__schema": "KeywordTypeSchema",
1766
1772
  "location": {
1767
1773
  "filePath": "config-merger.main.runtime.ts",
1768
- "line": 30,
1774
+ "line": 29,
1769
1775
  "character": 48
1770
1776
  },
1771
1777
  "name": "string"
@@ -1777,7 +1783,7 @@
1777
1783
  "__schema": "TupleTypeSchema",
1778
1784
  "location": {
1779
1785
  "filePath": "config-merger.main.runtime.ts",
1780
- "line": 30,
1786
+ "line": 29,
1781
1787
  "character": 57
1782
1788
  },
1783
1789
  "elements": [
@@ -1785,7 +1791,7 @@
1785
1791
  "__schema": "KeywordTypeSchema",
1786
1792
  "location": {
1787
1793
  "filePath": "config-merger.main.runtime.ts",
1788
- "line": 30,
1794
+ "line": 29,
1789
1795
  "character": 58
1790
1796
  },
1791
1797
  "name": "string"
@@ -1794,7 +1800,7 @@
1794
1800
  "__schema": "KeywordTypeSchema",
1795
1801
  "location": {
1796
1802
  "filePath": "config-merger.main.runtime.ts",
1797
- "line": 30,
1803
+ "line": 29,
1798
1804
  "character": 66
1799
1805
  },
1800
1806
  "name": "string"
@@ -1809,7 +1815,7 @@
1809
1815
  "__schema": "TypeSchema",
1810
1816
  "location": {
1811
1817
  "filePath": "config-merger.main.runtime.ts",
1812
- "line": 31,
1818
+ "line": 30,
1813
1819
  "character": 1
1814
1820
  },
1815
1821
  "signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
@@ -1818,7 +1824,7 @@
1818
1824
  "__schema": "TypeRefSchema",
1819
1825
  "location": {
1820
1826
  "filePath": "config-merger.main.runtime.ts",
1821
- "line": 31,
1827
+ "line": 30,
1822
1828
  "character": 38
1823
1829
  },
1824
1830
  "name": "Record",
@@ -1827,7 +1833,7 @@
1827
1833
  "__schema": "TypeRefSchema",
1828
1834
  "location": {
1829
1835
  "filePath": "config-merger.main.runtime.ts",
1830
- "line": 31,
1836
+ "line": 30,
1831
1837
  "character": 45
1832
1838
  },
1833
1839
  "name": "WorkspacePolicyConfigKeysNames",
@@ -1840,7 +1846,7 @@
1840
1846
  "__schema": "TypeRefSchema",
1841
1847
  "location": {
1842
1848
  "filePath": "config-merger.main.runtime.ts",
1843
- "line": 31,
1849
+ "line": 30,
1844
1850
  "character": 77
1845
1851
  },
1846
1852
  "name": "Array",
@@ -1849,7 +1855,7 @@
1849
1855
  "__schema": "TypeLiteralSchema",
1850
1856
  "location": {
1851
1857
  "filePath": "config-merger.main.runtime.ts",
1852
- "line": 31,
1858
+ "line": 30,
1853
1859
  "character": 83
1854
1860
  },
1855
1861
  "members": [
@@ -1857,7 +1863,7 @@
1857
1863
  "__schema": "VariableLikeSchema",
1858
1864
  "location": {
1859
1865
  "filePath": "config-merger.main.runtime.ts",
1860
- "line": 31,
1866
+ "line": 30,
1861
1867
  "character": 85
1862
1868
  },
1863
1869
  "signature": "(property) name: string",
@@ -1866,7 +1872,7 @@
1866
1872
  "__schema": "KeywordTypeSchema",
1867
1873
  "location": {
1868
1874
  "filePath": "config-merger.main.runtime.ts",
1869
- "line": 31,
1875
+ "line": 30,
1870
1876
  "character": 91
1871
1877
  },
1872
1878
  "name": "string"
@@ -1877,7 +1883,7 @@
1877
1883
  "__schema": "VariableLikeSchema",
1878
1884
  "location": {
1879
1885
  "filePath": "config-merger.main.runtime.ts",
1880
- "line": 31,
1886
+ "line": 30,
1881
1887
  "character": 99
1882
1888
  },
1883
1889
  "signature": "(property) version: string",
@@ -1886,7 +1892,7 @@
1886
1892
  "__schema": "KeywordTypeSchema",
1887
1893
  "location": {
1888
1894
  "filePath": "config-merger.main.runtime.ts",
1889
- "line": 31,
1895
+ "line": 30,
1890
1896
  "character": 108
1891
1897
  },
1892
1898
  "name": "string"
@@ -1904,7 +1910,7 @@
1904
1910
  "__schema": "TypeSchema",
1905
1911
  "location": {
1906
1912
  "filePath": "config-merger.main.runtime.ts",
1907
- "line": 32,
1913
+ "line": 31,
1908
1914
  "character": 1
1909
1915
  },
1910
1916
  "signature": "type WorkspaceDepsUnchanged = {\n [pkgName: string]: string;\n}",
@@ -1913,7 +1919,7 @@
1913
1919
  "__schema": "TypeLiteralSchema",
1914
1920
  "location": {
1915
1921
  "filePath": "config-merger.main.runtime.ts",
1916
- "line": 32,
1922
+ "line": 31,
1917
1923
  "character": 38
1918
1924
  },
1919
1925
  "members": [
@@ -1921,14 +1927,14 @@
1921
1927
  "__schema": "IndexSignatureSchema",
1922
1928
  "location": {
1923
1929
  "filePath": "config-merger.main.runtime.ts",
1924
- "line": 32,
1930
+ "line": 31,
1925
1931
  "character": 40
1926
1932
  },
1927
1933
  "keyType": {
1928
1934
  "__schema": "ParameterSchema",
1929
1935
  "location": {
1930
1936
  "filePath": "config-merger.main.runtime.ts",
1931
- "line": 32,
1937
+ "line": 31,
1932
1938
  "character": 41
1933
1939
  },
1934
1940
  "name": "pkgName",
@@ -1936,7 +1942,7 @@
1936
1942
  "__schema": "KeywordTypeSchema",
1937
1943
  "location": {
1938
1944
  "filePath": "config-merger.main.runtime.ts",
1939
- "line": 32,
1945
+ "line": 31,
1940
1946
  "character": 50
1941
1947
  },
1942
1948
  "name": "string"
@@ -1948,7 +1954,7 @@
1948
1954
  "__schema": "KeywordTypeSchema",
1949
1955
  "location": {
1950
1956
  "filePath": "config-merger.main.runtime.ts",
1951
- "line": 32,
1957
+ "line": 31,
1952
1958
  "character": 59
1953
1959
  },
1954
1960
  "name": "string"
@@ -1961,7 +1967,7 @@
1961
1967
  "__schema": "TypeSchema",
1962
1968
  "location": {
1963
1969
  "filePath": "config-merger.main.runtime.ts",
1964
- "line": 34,
1970
+ "line": 33,
1965
1971
  "character": 1
1966
1972
  },
1967
1973
  "signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
@@ -1970,7 +1976,7 @@
1970
1976
  "__schema": "TypeLiteralSchema",
1971
1977
  "location": {
1972
1978
  "filePath": "config-merger.main.runtime.ts",
1973
- "line": 34,
1979
+ "line": 33,
1974
1980
  "character": 43
1975
1981
  },
1976
1982
  "members": [
@@ -1978,7 +1984,7 @@
1978
1984
  "__schema": "VariableLikeSchema",
1979
1985
  "location": {
1980
1986
  "filePath": "config-merger.main.runtime.ts",
1981
- "line": 35,
1987
+ "line": 34,
1982
1988
  "character": 3
1983
1989
  },
1984
1990
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -1987,7 +1993,7 @@
1987
1993
  "__schema": "TypeRefSchema",
1988
1994
  "location": {
1989
1995
  "filePath": "config-merger.main.runtime.ts",
1990
- "line": 35,
1996
+ "line": 34,
1991
1997
  "character": 26
1992
1998
  },
1993
1999
  "name": "WorkspaceDepsUpdates"
@@ -1998,7 +2004,7 @@
1998
2004
  "__schema": "VariableLikeSchema",
1999
2005
  "location": {
2000
2006
  "filePath": "config-merger.main.runtime.ts",
2001
- "line": 36,
2007
+ "line": 35,
2002
2008
  "character": 3
2003
2009
  },
2004
2010
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -2007,7 +2013,7 @@
2007
2013
  "__schema": "TypeRefSchema",
2008
2014
  "location": {
2009
2015
  "filePath": "config-merger.main.runtime.ts",
2010
- "line": 36,
2016
+ "line": 35,
2011
2017
  "character": 28
2012
2018
  },
2013
2019
  "name": "WorkspaceDepsConflicts"
@@ -2018,7 +2024,7 @@
2018
2024
  "__schema": "VariableLikeSchema",
2019
2025
  "location": {
2020
2026
  "filePath": "config-merger.main.runtime.ts",
2021
- "line": 37,
2027
+ "line": 36,
2022
2028
  "character": 3
2023
2029
  },
2024
2030
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -2027,7 +2033,7 @@
2027
2033
  "__schema": "TypeRefSchema",
2028
2034
  "location": {
2029
2035
  "filePath": "config-merger.main.runtime.ts",
2030
- "line": 37,
2036
+ "line": 36,
2031
2037
  "character": 28
2032
2038
  },
2033
2039
  "name": "WorkspaceDepsUnchanged",
@@ -2039,7 +2045,7 @@
2039
2045
  "__schema": "VariableLikeSchema",
2040
2046
  "location": {
2041
2047
  "filePath": "config-merger.main.runtime.ts",
2042
- "line": 38,
2048
+ "line": 37,
2043
2049
  "character": 3
2044
2050
  },
2045
2051
  "signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
@@ -2048,7 +2054,7 @@
2048
2054
  "__schema": "TypeRefSchema",
2049
2055
  "location": {
2050
2056
  "filePath": "config-merger.main.runtime.ts",
2051
- "line": 38,
2057
+ "line": 37,
2052
2058
  "character": 39
2053
2059
  },
2054
2060
  "name": "Error"
@@ -2059,7 +2065,7 @@
2059
2065
  "__schema": "VariableLikeSchema",
2060
2066
  "location": {
2061
2067
  "filePath": "config-merger.main.runtime.ts",
2062
- "line": 39,
2068
+ "line": 38,
2063
2069
  "character": 3
2064
2070
  },
2065
2071
  "signature": "(property) logs?: string[] | undefined",
@@ -2068,14 +2074,14 @@
2068
2074
  "__schema": "TypeArraySchema",
2069
2075
  "location": {
2070
2076
  "filePath": "config-merger.main.runtime.ts",
2071
- "line": 39,
2077
+ "line": 38,
2072
2078
  "character": 10
2073
2079
  },
2074
2080
  "type": {
2075
2081
  "__schema": "KeywordTypeSchema",
2076
2082
  "location": {
2077
2083
  "filePath": "config-merger.main.runtime.ts",
2078
- "line": 39,
2084
+ "line": 38,
2079
2085
  "character": 10
2080
2086
  },
2081
2087
  "name": "string"
@@ -2090,7 +2096,7 @@
2090
2096
  "__schema": "ClassSchema",
2091
2097
  "location": {
2092
2098
  "filePath": "config-merger.main.runtime.ts",
2093
- "line": 41,
2099
+ "line": 40,
2094
2100
  "character": 1
2095
2101
  },
2096
2102
  "signature": "class ConfigMergerMain",
@@ -2100,7 +2106,7 @@
2100
2106
  "__schema": "ConstructorSchema",
2101
2107
  "location": {
2102
2108
  "filePath": "config-merger.main.runtime.ts",
2103
- "line": 42,
2109
+ "line": 41,
2104
2110
  "character": 3
2105
2111
  },
2106
2112
  "signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
@@ -2110,7 +2116,7 @@
2110
2116
  "__schema": "ParameterSchema",
2111
2117
  "location": {
2112
2118
  "filePath": "config-merger.main.runtime.ts",
2113
- "line": 43,
2119
+ "line": 42,
2114
2120
  "character": 5
2115
2121
  },
2116
2122
  "name": "workspace",
@@ -2118,7 +2124,7 @@
2118
2124
  "__schema": "TypeRefSchema",
2119
2125
  "location": {
2120
2126
  "filePath": "config-merger.main.runtime.ts",
2121
- "line": 43,
2127
+ "line": 42,
2122
2128
  "character": 24
2123
2129
  },
2124
2130
  "name": "Workspace",
@@ -2134,7 +2140,7 @@
2134
2140
  "__schema": "ParameterSchema",
2135
2141
  "location": {
2136
2142
  "filePath": "config-merger.main.runtime.ts",
2137
- "line": 44,
2143
+ "line": 43,
2138
2144
  "character": 5
2139
2145
  },
2140
2146
  "name": "logger",
@@ -2142,7 +2148,7 @@
2142
2148
  "__schema": "TypeRefSchema",
2143
2149
  "location": {
2144
2150
  "filePath": "config-merger.main.runtime.ts",
2145
- "line": 44,
2151
+ "line": 43,
2146
2152
  "character": 21
2147
2153
  },
2148
2154
  "name": "Logger",
@@ -2158,7 +2164,7 @@
2158
2164
  "__schema": "ParameterSchema",
2159
2165
  "location": {
2160
2166
  "filePath": "config-merger.main.runtime.ts",
2161
- "line": 45,
2167
+ "line": 44,
2162
2168
  "character": 5
2163
2169
  },
2164
2170
  "name": "config",
@@ -2166,7 +2172,7 @@
2166
2172
  "__schema": "TypeRefSchema",
2167
2173
  "location": {
2168
2174
  "filePath": "config-merger.main.runtime.ts",
2169
- "line": 45,
2175
+ "line": 44,
2170
2176
  "character": 21
2171
2177
  },
2172
2178
  "name": "ConfigMain",
@@ -2182,7 +2188,7 @@
2182
2188
  "__schema": "ParameterSchema",
2183
2189
  "location": {
2184
2190
  "filePath": "config-merger.main.runtime.ts",
2185
- "line": 46,
2191
+ "line": 45,
2186
2192
  "character": 5
2187
2193
  },
2188
2194
  "name": "depsResolver",
@@ -2190,7 +2196,7 @@
2190
2196
  "__schema": "TypeRefSchema",
2191
2197
  "location": {
2192
2198
  "filePath": "config-merger.main.runtime.ts",
2193
- "line": 46,
2199
+ "line": 45,
2194
2200
  "character": 27
2195
2201
  },
2196
2202
  "name": "DependencyResolverMain",
@@ -2207,7 +2213,7 @@
2207
2213
  "__schema": "ThisTypeSchema",
2208
2214
  "location": {
2209
2215
  "filePath": "config-merger.main.runtime.ts",
2210
- "line": 41,
2216
+ "line": 40,
2211
2217
  "character": 1
2212
2218
  },
2213
2219
  "name": "ConfigMergerMain"
@@ -2218,7 +2224,7 @@
2218
2224
  "__schema": "FunctionLikeSchema",
2219
2225
  "location": {
2220
2226
  "filePath": "config-merger.main.runtime.ts",
2221
- "line": 49,
2227
+ "line": 48,
2222
2228
  "character": 3
2223
2229
  },
2224
2230
  "signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
@@ -2228,7 +2234,7 @@
2228
2234
  "__schema": "ParameterSchema",
2229
2235
  "location": {
2230
2236
  "filePath": "config-merger.main.runtime.ts",
2231
- "line": 49,
2237
+ "line": 48,
2232
2238
  "character": 47
2233
2239
  },
2234
2240
  "name": "allConfigMerge",
@@ -2236,14 +2242,14 @@
2236
2242
  "__schema": "TypeArraySchema",
2237
2243
  "location": {
2238
2244
  "filePath": "config-merger.main.runtime.ts",
2239
- "line": 49,
2245
+ "line": 48,
2240
2246
  "character": 63
2241
2247
  },
2242
2248
  "type": {
2243
2249
  "__schema": "TypeRefSchema",
2244
2250
  "location": {
2245
2251
  "filePath": "config-merger.main.runtime.ts",
2246
- "line": 49,
2252
+ "line": 48,
2247
2253
  "character": 63
2248
2254
  },
2249
2255
  "name": "ConfigMergeResult"
@@ -2257,7 +2263,7 @@
2257
2263
  "__schema": "InferenceTypeSchema",
2258
2264
  "location": {
2259
2265
  "filePath": "config-merger.main.runtime.ts",
2260
- "line": 49,
2266
+ "line": 48,
2261
2267
  "character": 3
2262
2268
  },
2263
2269
  "type": "Promise<void>"
@@ -2270,7 +2276,7 @@
2270
2276
  "__schema": "FunctionLikeSchema",
2271
2277
  "location": {
2272
2278
  "filePath": "config-merger.main.runtime.ts",
2273
- "line": 61,
2279
+ "line": 60,
2274
2280
  "character": 3
2275
2281
  },
2276
2282
  "signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
@@ -2280,7 +2286,7 @@
2280
2286
  "__schema": "ParameterSchema",
2281
2287
  "location": {
2282
2288
  "filePath": "config-merger.main.runtime.ts",
2283
- "line": 62,
2289
+ "line": 61,
2284
2290
  "character": 5
2285
2291
  },
2286
2292
  "name": "workspaceDepsConflicts",
@@ -2288,7 +2294,7 @@
2288
2294
  "__schema": "TypeRefSchema",
2289
2295
  "location": {
2290
2296
  "filePath": "config-merger.main.runtime.ts",
2291
- "line": 62,
2297
+ "line": 61,
2292
2298
  "character": 29
2293
2299
  },
2294
2300
  "name": "WorkspaceDepsConflicts"
@@ -2301,7 +2307,7 @@
2301
2307
  "__schema": "TypeRefSchema",
2302
2308
  "location": {
2303
2309
  "filePath": "config-merger.main.runtime.ts",
2304
- "line": 63,
2310
+ "line": 62,
2305
2311
  "character": 6
2306
2312
  },
2307
2313
  "name": "Promise",
@@ -2310,7 +2316,7 @@
2310
2316
  "__schema": "TypeUnionSchema",
2311
2317
  "location": {
2312
2318
  "filePath": "config-merger.main.runtime.ts",
2313
- "line": 63,
2319
+ "line": 62,
2314
2320
  "character": 14
2315
2321
  },
2316
2322
  "types": [
@@ -2318,7 +2324,7 @@
2318
2324
  "__schema": "TypeRefSchema",
2319
2325
  "location": {
2320
2326
  "filePath": "config-merger.main.runtime.ts",
2321
- "line": 63,
2327
+ "line": 62,
2322
2328
  "character": 14
2323
2329
  },
2324
2330
  "name": "Error"
@@ -2327,7 +2333,7 @@
2327
2333
  "__schema": "KeywordTypeSchema",
2328
2334
  "location": {
2329
2335
  "filePath": "config-merger.main.runtime.ts",
2330
- "line": 63,
2336
+ "line": 62,
2331
2337
  "character": 22
2332
2338
  },
2333
2339
  "name": "undefined"
@@ -2344,7 +2350,7 @@
2344
2350
  "__schema": "FunctionLikeSchema",
2345
2351
  "location": {
2346
2352
  "filePath": "config-merger.main.runtime.ts",
2347
- "line": 131,
2353
+ "line": 130,
2348
2354
  "character": 3
2349
2355
  },
2350
2356
  "signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n}>",
@@ -2354,7 +2360,7 @@
2354
2360
  "__schema": "ParameterSchema",
2355
2361
  "location": {
2356
2362
  "filePath": "config-merger.main.runtime.ts",
2357
- "line": 131,
2363
+ "line": 130,
2358
2364
  "character": 46
2359
2365
  },
2360
2366
  "name": "allConfigMerge",
@@ -2362,14 +2368,14 @@
2362
2368
  "__schema": "TypeArraySchema",
2363
2369
  "location": {
2364
2370
  "filePath": "config-merger.main.runtime.ts",
2365
- "line": 131,
2371
+ "line": 130,
2366
2372
  "character": 62
2367
2373
  },
2368
2374
  "type": {
2369
2375
  "__schema": "TypeRefSchema",
2370
2376
  "location": {
2371
2377
  "filePath": "config-merger.main.runtime.ts",
2372
- "line": 131,
2378
+ "line": 130,
2373
2379
  "character": 62
2374
2380
  },
2375
2381
  "name": "ConfigMergeResult"
@@ -2383,7 +2389,7 @@
2383
2389
  "__schema": "TypeRefSchema",
2384
2390
  "location": {
2385
2391
  "filePath": "config-merger.main.runtime.ts",
2386
- "line": 131,
2392
+ "line": 130,
2387
2393
  "character": 84
2388
2394
  },
2389
2395
  "name": "Promise",
@@ -2392,7 +2398,7 @@
2392
2398
  "__schema": "TypeLiteralSchema",
2393
2399
  "location": {
2394
2400
  "filePath": "config-merger.main.runtime.ts",
2395
- "line": 131,
2401
+ "line": 130,
2396
2402
  "character": 92
2397
2403
  },
2398
2404
  "members": [
@@ -2400,7 +2406,7 @@
2400
2406
  "__schema": "VariableLikeSchema",
2401
2407
  "location": {
2402
2408
  "filePath": "config-merger.main.runtime.ts",
2403
- "line": 132,
2409
+ "line": 131,
2404
2410
  "character": 5
2405
2411
  },
2406
2412
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -2409,7 +2415,7 @@
2409
2415
  "__schema": "TypeRefSchema",
2410
2416
  "location": {
2411
2417
  "filePath": "config-merger.main.runtime.ts",
2412
- "line": 132,
2418
+ "line": 131,
2413
2419
  "character": 28
2414
2420
  },
2415
2421
  "name": "WorkspaceDepsUpdates"
@@ -2420,7 +2426,7 @@
2420
2426
  "__schema": "VariableLikeSchema",
2421
2427
  "location": {
2422
2428
  "filePath": "config-merger.main.runtime.ts",
2423
- "line": 133,
2429
+ "line": 132,
2424
2430
  "character": 5
2425
2431
  },
2426
2432
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -2429,7 +2435,7 @@
2429
2435
  "__schema": "TypeRefSchema",
2430
2436
  "location": {
2431
2437
  "filePath": "config-merger.main.runtime.ts",
2432
- "line": 133,
2438
+ "line": 132,
2433
2439
  "character": 30
2434
2440
  },
2435
2441
  "name": "WorkspaceDepsConflicts"
@@ -2440,7 +2446,7 @@
2440
2446
  "__schema": "VariableLikeSchema",
2441
2447
  "location": {
2442
2448
  "filePath": "config-merger.main.runtime.ts",
2443
- "line": 134,
2449
+ "line": 133,
2444
2450
  "character": 5
2445
2451
  },
2446
2452
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -2449,7 +2455,7 @@
2449
2455
  "__schema": "TypeRefSchema",
2450
2456
  "location": {
2451
2457
  "filePath": "config-merger.main.runtime.ts",
2452
- "line": 134,
2458
+ "line": 133,
2453
2459
  "character": 30
2454
2460
  },
2455
2461
  "name": "WorkspaceDepsUnchanged",
@@ -2469,7 +2475,7 @@
2469
2475
  "__schema": "FunctionLikeSchema",
2470
2476
  "location": {
2471
2477
  "filePath": "config-merger.main.runtime.ts",
2472
- "line": 266,
2478
+ "line": 265,
2473
2479
  "character": 3
2474
2480
  },
2475
2481
  "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[], mergeStrategy?: MergeStrategy): Promise<WorkspaceConfigUpdateResult | undefined>",
@@ -2479,7 +2485,7 @@
2479
2485
  "__schema": "ParameterSchema",
2480
2486
  "location": {
2481
2487
  "filePath": "config-merger.main.runtime.ts",
2482
- "line": 267,
2488
+ "line": 266,
2483
2489
  "character": 5
2484
2490
  },
2485
2491
  "name": "components",
@@ -2487,14 +2493,14 @@
2487
2493
  "__schema": "TypeArraySchema",
2488
2494
  "location": {
2489
2495
  "filePath": "config-merger.main.runtime.ts",
2490
- "line": 267,
2496
+ "line": 266,
2491
2497
  "character": 17
2492
2498
  },
2493
2499
  "type": {
2494
2500
  "__schema": "TypeRefSchema",
2495
2501
  "location": {
2496
2502
  "filePath": "config-merger.main.runtime.ts",
2497
- "line": 267,
2503
+ "line": 266,
2498
2504
  "character": 17
2499
2505
  },
2500
2506
  "name": "ConsumerComponent",
@@ -2508,7 +2514,7 @@
2508
2514
  "__schema": "ParameterSchema",
2509
2515
  "location": {
2510
2516
  "filePath": "config-merger.main.runtime.ts",
2511
- "line": 268,
2517
+ "line": 267,
2512
2518
  "character": 5
2513
2519
  },
2514
2520
  "name": "mergeStrategy",
@@ -2516,11 +2522,14 @@
2516
2522
  "__schema": "TypeRefSchema",
2517
2523
  "location": {
2518
2524
  "filePath": "config-merger.main.runtime.ts",
2519
- "line": 268,
2525
+ "line": 267,
2520
2526
  "character": 21
2521
2527
  },
2522
2528
  "name": "MergeStrategy",
2523
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
2529
+ "componentId": {
2530
+ "scope": "teambit.component",
2531
+ "name": "merging"
2532
+ }
2524
2533
  },
2525
2534
  "isOptional": true,
2526
2535
  "isSpread": false
@@ -2530,7 +2539,7 @@
2530
2539
  "__schema": "TypeRefSchema",
2531
2540
  "location": {
2532
2541
  "filePath": "config-merger.main.runtime.ts",
2533
- "line": 269,
2542
+ "line": 268,
2534
2543
  "character": 6
2535
2544
  },
2536
2545
  "name": "Promise",
@@ -2539,7 +2548,7 @@
2539
2548
  "__schema": "TypeUnionSchema",
2540
2549
  "location": {
2541
2550
  "filePath": "config-merger.main.runtime.ts",
2542
- "line": 269,
2551
+ "line": 268,
2543
2552
  "character": 14
2544
2553
  },
2545
2554
  "types": [
@@ -2547,7 +2556,7 @@
2547
2556
  "__schema": "TypeRefSchema",
2548
2557
  "location": {
2549
2558
  "filePath": "config-merger.main.runtime.ts",
2550
- "line": 269,
2559
+ "line": 268,
2551
2560
  "character": 14
2552
2561
  },
2553
2562
  "name": "WorkspaceConfigUpdateResult"
@@ -2556,7 +2565,7 @@
2556
2565
  "__schema": "KeywordTypeSchema",
2557
2566
  "location": {
2558
2567
  "filePath": "config-merger.main.runtime.ts",
2559
- "line": 269,
2568
+ "line": 268,
2560
2569
  "character": 44
2561
2570
  },
2562
2571
  "name": "undefined"
@@ -2573,7 +2582,7 @@
2573
2582
  "__schema": "VariableLikeSchema",
2574
2583
  "location": {
2575
2584
  "filePath": "config-merger.main.runtime.ts",
2576
- "line": 495,
2585
+ "line": 494,
2577
2586
  "character": 3
2578
2587
  },
2579
2588
  "signature": "(property) ConfigMergerMain.slots: never[]",
@@ -2582,7 +2591,7 @@
2582
2591
  "__schema": "InferenceTypeSchema",
2583
2592
  "location": {
2584
2593
  "filePath": "config-merger.main.runtime.ts",
2585
- "line": 495,
2594
+ "line": 494,
2586
2595
  "character": 3
2587
2596
  },
2588
2597
  "type": "never[]"
@@ -2594,7 +2603,7 @@
2594
2603
  "__schema": "VariableLikeSchema",
2595
2604
  "location": {
2596
2605
  "filePath": "config-merger.main.runtime.ts",
2597
- "line": 496,
2606
+ "line": 495,
2598
2607
  "character": 3
2599
2608
  },
2600
2609
  "signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
@@ -2603,7 +2612,7 @@
2603
2612
  "__schema": "InferenceTypeSchema",
2604
2613
  "location": {
2605
2614
  "filePath": "config-merger.main.runtime.ts",
2606
- "line": 496,
2615
+ "line": 495,
2607
2616
  "character": 3
2608
2617
  },
2609
2618
  "type": "Aspect[]"
@@ -2615,7 +2624,7 @@
2615
2624
  "__schema": "VariableLikeSchema",
2616
2625
  "location": {
2617
2626
  "filePath": "config-merger.main.runtime.ts",
2618
- "line": 497,
2627
+ "line": 496,
2619
2628
  "character": 3
2620
2629
  },
2621
2630
  "signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
@@ -2624,7 +2633,7 @@
2624
2633
  "__schema": "InferenceTypeSchema",
2625
2634
  "location": {
2626
2635
  "filePath": "config-merger.main.runtime.ts",
2627
- "line": 497,
2636
+ "line": 496,
2628
2637
  "character": 3
2629
2638
  },
2630
2639
  "type": "RuntimeDefinition"
@@ -2636,7 +2645,7 @@
2636
2645
  "__schema": "FunctionLikeSchema",
2637
2646
  "location": {
2638
2647
  "filePath": "config-merger.main.runtime.ts",
2639
- "line": 498,
2648
+ "line": 497,
2640
2649
  "character": 3
2641
2650
  },
2642
2651
  "signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
@@ -2646,7 +2655,7 @@
2646
2655
  "__schema": "ParameterSchema",
2647
2656
  "location": {
2648
2657
  "filePath": "config-merger.main.runtime.ts",
2649
- "line": 498,
2658
+ "line": 497,
2650
2659
  "character": 25
2651
2660
  },
2652
2661
  "name": "[ workspace, config, loggerMain, depsResolver ]",
@@ -2654,7 +2663,7 @@
2654
2663
  "__schema": "TupleTypeSchema",
2655
2664
  "location": {
2656
2665
  "filePath": "config-merger.main.runtime.ts",
2657
- "line": 498,
2666
+ "line": 497,
2658
2667
  "character": 72
2659
2668
  },
2660
2669
  "elements": [
@@ -2662,7 +2671,7 @@
2662
2671
  "__schema": "TypeRefSchema",
2663
2672
  "location": {
2664
2673
  "filePath": "config-merger.main.runtime.ts",
2665
- "line": 499,
2674
+ "line": 498,
2666
2675
  "character": 5
2667
2676
  },
2668
2677
  "name": "Workspace",
@@ -2675,7 +2684,7 @@
2675
2684
  "__schema": "TypeRefSchema",
2676
2685
  "location": {
2677
2686
  "filePath": "config-merger.main.runtime.ts",
2678
- "line": 500,
2687
+ "line": 499,
2679
2688
  "character": 5
2680
2689
  },
2681
2690
  "name": "ConfigMain",
@@ -2688,7 +2697,7 @@
2688
2697
  "__schema": "TypeRefSchema",
2689
2698
  "location": {
2690
2699
  "filePath": "config-merger.main.runtime.ts",
2691
- "line": 501,
2700
+ "line": 500,
2692
2701
  "character": 5
2693
2702
  },
2694
2703
  "name": "LoggerMain",
@@ -2701,7 +2710,7 @@
2701
2710
  "__schema": "TypeRefSchema",
2702
2711
  "location": {
2703
2712
  "filePath": "config-merger.main.runtime.ts",
2704
- "line": 502,
2713
+ "line": 501,
2705
2714
  "character": 5
2706
2715
  },
2707
2716
  "name": "DependencyResolverMain",
@@ -2720,7 +2729,7 @@
2720
2729
  "__schema": "InferenceTypeSchema",
2721
2730
  "location": {
2722
2731
  "filePath": "config-merger.main.runtime.ts",
2723
- "line": 498,
2732
+ "line": 497,
2724
2733
  "character": 3
2725
2734
  },
2726
2735
  "type": "Promise<ConfigMergerMain>"
@@ -2738,7 +2747,7 @@
2738
2747
  "__schema": "UnImplementedSchema",
2739
2748
  "location": {
2740
2749
  "filePath": "config-merger.main.runtime.ts",
2741
- "line": 511,
2750
+ "line": 510,
2742
2751
  "character": 16
2743
2752
  },
2744
2753
  "name": "ConfigMergerMain",
@@ -2750,7 +2759,7 @@
2750
2759
  "__schema": "ModuleSchema",
2751
2760
  "location": {
2752
2761
  "filePath": "config-merger.main.runtime.ts",
2753
- "line": 28,
2762
+ "line": 27,
2754
2763
  "character": 1
2755
2764
  },
2756
2765
  "exports": [
@@ -2758,7 +2767,7 @@
2758
2767
  "__schema": "VariableLikeSchema",
2759
2768
  "location": {
2760
2769
  "filePath": "config-merger.main.runtime.ts",
2761
- "line": 28,
2770
+ "line": 27,
2762
2771
  "character": 7
2763
2772
  },
2764
2773
  "signature": "const WS_DEPS_FIELDS: string[]",
@@ -2767,7 +2776,7 @@
2767
2776
  "__schema": "InferenceTypeSchema",
2768
2777
  "location": {
2769
2778
  "filePath": "config-merger.main.runtime.ts",
2770
- "line": 28,
2779
+ "line": 27,
2771
2780
  "character": 7
2772
2781
  },
2773
2782
  "type": "string[]"
@@ -2782,7 +2791,7 @@
2782
2791
  "__schema": "UnImplementedSchema",
2783
2792
  "location": {
2784
2793
  "filePath": "config-merger.main.runtime.ts",
2785
- "line": 509,
2794
+ "line": 508,
2786
2795
  "character": 1
2787
2796
  },
2788
2797
  "name": "ConfigMergerAspect.addRuntime(ConfigMergerMain);",
@@ -3633,7 +3642,10 @@
3633
3642
  "character": 28
3634
3643
  },
3635
3644
  "name": "MergeStrategy",
3636
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
3645
+ "componentId": {
3646
+ "scope": "teambit.component",
3647
+ "name": "merging"
3648
+ }
3637
3649
  },
3638
3650
  "isOptional": false,
3639
3651
  "isSpread": false
@@ -4090,7 +4102,7 @@
4090
4102
  "componentId": {
4091
4103
  "scope": "teambit.workspace",
4092
4104
  "name": "config-merger",
4093
- "version": "0.0.184"
4105
+ "version": "0.0.186"
4094
4106
  },
4095
4107
  "taggedModuleExports": []
4096
4108
  }