@teambit/config-merger 0.0.93 → 0.0.95
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.
- package/artifacts/__bit_junit.xml +1 -1
- package/artifacts/schema.json +44 -158
- package/package.json +11 -11
- package/tsconfig.json +22 -1
- package/dist/component-config-merger.d.ts +0 -65
- package/dist/config-merge-result.d.ts +0 -21
- package/dist/config-merger.aspect.d.ts +0 -2
- package/dist/config-merger.main.runtime.d.ts +0 -52
- package/dist/index.d.ts +0 -6
- /package/dist/{preview-1712632644937.js → preview-1712805335812.js} +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="0" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.workspace/config-merger@0.0.
|
|
3
|
+
<testsuite name="teambit.workspace/config-merger@0.0.95" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -48,11 +48,7 @@
|
|
|
48
48
|
"line": 39,
|
|
49
49
|
"character": 24
|
|
50
50
|
},
|
|
51
|
-
"name": "Workspace"
|
|
52
|
-
"componentId": {
|
|
53
|
-
"scope": "teambit.workspace",
|
|
54
|
-
"name": "workspace"
|
|
55
|
-
}
|
|
51
|
+
"name": "Workspace"
|
|
56
52
|
},
|
|
57
53
|
"isOptional": false,
|
|
58
54
|
"isSpread": false
|
|
@@ -72,11 +68,7 @@
|
|
|
72
68
|
"line": 40,
|
|
73
69
|
"character": 21
|
|
74
70
|
},
|
|
75
|
-
"name": "Logger"
|
|
76
|
-
"componentId": {
|
|
77
|
-
"scope": "teambit.harmony",
|
|
78
|
-
"name": "logger"
|
|
79
|
-
}
|
|
71
|
+
"name": "Logger"
|
|
80
72
|
},
|
|
81
73
|
"isOptional": false,
|
|
82
74
|
"isSpread": false
|
|
@@ -96,11 +88,7 @@
|
|
|
96
88
|
"line": 41,
|
|
97
89
|
"character": 21
|
|
98
90
|
},
|
|
99
|
-
"name": "ConfigMain"
|
|
100
|
-
"componentId": {
|
|
101
|
-
"scope": "teambit.harmony",
|
|
102
|
-
"name": "config"
|
|
103
|
-
}
|
|
91
|
+
"name": "ConfigMain"
|
|
104
92
|
},
|
|
105
93
|
"isOptional": false,
|
|
106
94
|
"isSpread": false
|
|
@@ -120,11 +108,7 @@
|
|
|
120
108
|
"line": 42,
|
|
121
109
|
"character": 27
|
|
122
110
|
},
|
|
123
|
-
"name": "DependencyResolverMain"
|
|
124
|
-
"componentId": {
|
|
125
|
-
"scope": "teambit.dependencies",
|
|
126
|
-
"name": "dependency-resolver"
|
|
127
|
-
}
|
|
111
|
+
"name": "DependencyResolverMain"
|
|
128
112
|
},
|
|
129
113
|
"isOptional": false,
|
|
130
114
|
"isSpread": false
|
|
@@ -403,8 +387,7 @@
|
|
|
403
387
|
"line": 276,
|
|
404
388
|
"character": 49
|
|
405
389
|
},
|
|
406
|
-
"name": "ConsumerComponent"
|
|
407
|
-
"packageName": "@teambit/legacy/dist/consumer/component"
|
|
390
|
+
"name": "ConsumerComponent"
|
|
408
391
|
}
|
|
409
392
|
},
|
|
410
393
|
"isOptional": false,
|
|
@@ -550,11 +533,7 @@
|
|
|
550
533
|
"line": 494,
|
|
551
534
|
"character": 5
|
|
552
535
|
},
|
|
553
|
-
"name": "Workspace"
|
|
554
|
-
"componentId": {
|
|
555
|
-
"scope": "teambit.workspace",
|
|
556
|
-
"name": "workspace"
|
|
557
|
-
}
|
|
536
|
+
"name": "Workspace"
|
|
558
537
|
},
|
|
559
538
|
{
|
|
560
539
|
"__schema": "TypeRefSchema",
|
|
@@ -563,11 +542,7 @@
|
|
|
563
542
|
"line": 495,
|
|
564
543
|
"character": 5
|
|
565
544
|
},
|
|
566
|
-
"name": "ConfigMain"
|
|
567
|
-
"componentId": {
|
|
568
|
-
"scope": "teambit.harmony",
|
|
569
|
-
"name": "config"
|
|
570
|
-
}
|
|
545
|
+
"name": "ConfigMain"
|
|
571
546
|
},
|
|
572
547
|
{
|
|
573
548
|
"__schema": "TypeRefSchema",
|
|
@@ -576,11 +551,7 @@
|
|
|
576
551
|
"line": 496,
|
|
577
552
|
"character": 5
|
|
578
553
|
},
|
|
579
|
-
"name": "LoggerMain"
|
|
580
|
-
"componentId": {
|
|
581
|
-
"scope": "teambit.harmony",
|
|
582
|
-
"name": "logger"
|
|
583
|
-
}
|
|
554
|
+
"name": "LoggerMain"
|
|
584
555
|
},
|
|
585
556
|
{
|
|
586
557
|
"__schema": "TypeRefSchema",
|
|
@@ -589,11 +560,7 @@
|
|
|
589
560
|
"line": 497,
|
|
590
561
|
"character": 5
|
|
591
562
|
},
|
|
592
|
-
"name": "DependencyResolverMain"
|
|
593
|
-
"componentId": {
|
|
594
|
-
"scope": "teambit.dependencies",
|
|
595
|
-
"name": "dependency-resolver"
|
|
596
|
-
}
|
|
563
|
+
"name": "DependencyResolverMain"
|
|
597
564
|
}
|
|
598
565
|
]
|
|
599
566
|
},
|
|
@@ -720,11 +687,7 @@
|
|
|
720
687
|
"line": 29,
|
|
721
688
|
"character": 45
|
|
722
689
|
},
|
|
723
|
-
"name": "WorkspacePolicyConfigKeysNames"
|
|
724
|
-
"componentId": {
|
|
725
|
-
"scope": "teambit.dependencies",
|
|
726
|
-
"name": "dependency-resolver"
|
|
727
|
-
}
|
|
690
|
+
"name": "WorkspacePolicyConfigKeysNames"
|
|
728
691
|
},
|
|
729
692
|
{
|
|
730
693
|
"__schema": "TypeRefSchema",
|
|
@@ -1000,8 +963,7 @@
|
|
|
1000
963
|
"line": 13,
|
|
1001
964
|
"character": 22
|
|
1002
965
|
},
|
|
1003
|
-
"name": "MergeStrategyResult"
|
|
1004
|
-
"internalFilePath": "component-config-merger.ts"
|
|
966
|
+
"name": "MergeStrategyResult"
|
|
1005
967
|
}
|
|
1006
968
|
},
|
|
1007
969
|
"isOptional": false,
|
|
@@ -1146,8 +1108,7 @@
|
|
|
1146
1108
|
"line": 36,
|
|
1147
1109
|
"character": 28
|
|
1148
1110
|
},
|
|
1149
|
-
"name": "MergeStrategyResult"
|
|
1150
|
-
"internalFilePath": "component-config-merger.ts"
|
|
1111
|
+
"name": "MergeStrategyResult"
|
|
1151
1112
|
},
|
|
1152
1113
|
{
|
|
1153
1114
|
"__schema": "KeywordTypeSchema",
|
|
@@ -1238,12 +1199,7 @@
|
|
|
1238
1199
|
"line": 76,
|
|
1239
1200
|
"character": 27
|
|
1240
1201
|
},
|
|
1241
|
-
"name": "ComponentID"
|
|
1242
|
-
"componentId": {
|
|
1243
|
-
"scope": "teambit.component",
|
|
1244
|
-
"name": "component-id",
|
|
1245
|
-
"version": "1.2.0"
|
|
1246
|
-
}
|
|
1202
|
+
"name": "ComponentID"
|
|
1247
1203
|
}
|
|
1248
1204
|
},
|
|
1249
1205
|
"isOptional": false,
|
|
@@ -1272,8 +1228,7 @@
|
|
|
1272
1228
|
"line": 77,
|
|
1273
1229
|
"character": 16
|
|
1274
1230
|
},
|
|
1275
|
-
"name": "Lane"
|
|
1276
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
1231
|
+
"name": "Lane"
|
|
1277
1232
|
},
|
|
1278
1233
|
{
|
|
1279
1234
|
"__schema": "KeywordTypeSchema",
|
|
@@ -1304,8 +1259,7 @@
|
|
|
1304
1259
|
"line": 78,
|
|
1305
1260
|
"character": 29
|
|
1306
1261
|
},
|
|
1307
|
-
"name": "ExtensionDataList"
|
|
1308
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1262
|
+
"name": "ExtensionDataList"
|
|
1309
1263
|
},
|
|
1310
1264
|
"isOptional": false,
|
|
1311
1265
|
"isSpread": false
|
|
@@ -1325,8 +1279,7 @@
|
|
|
1325
1279
|
"line": 79,
|
|
1326
1280
|
"character": 26
|
|
1327
1281
|
},
|
|
1328
|
-
"name": "ExtensionDataList"
|
|
1329
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1282
|
+
"name": "ExtensionDataList"
|
|
1330
1283
|
},
|
|
1331
1284
|
"isOptional": false,
|
|
1332
1285
|
"isSpread": false
|
|
@@ -1346,8 +1299,7 @@
|
|
|
1346
1299
|
"line": 80,
|
|
1347
1300
|
"character": 27
|
|
1348
1301
|
},
|
|
1349
|
-
"name": "ExtensionDataList"
|
|
1350
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1302
|
+
"name": "ExtensionDataList"
|
|
1351
1303
|
},
|
|
1352
1304
|
"isOptional": false,
|
|
1353
1305
|
"isSpread": false
|
|
@@ -1407,11 +1359,7 @@
|
|
|
1407
1359
|
"line": 83,
|
|
1408
1360
|
"character": 21
|
|
1409
1361
|
},
|
|
1410
|
-
"name": "Logger"
|
|
1411
|
-
"componentId": {
|
|
1412
|
-
"scope": "teambit.harmony",
|
|
1413
|
-
"name": "logger"
|
|
1414
|
-
}
|
|
1362
|
+
"name": "Logger"
|
|
1415
1363
|
},
|
|
1416
1364
|
"isOptional": false,
|
|
1417
1365
|
"isSpread": false
|
|
@@ -1431,8 +1379,7 @@
|
|
|
1431
1379
|
"line": 84,
|
|
1432
1380
|
"character": 28
|
|
1433
1381
|
},
|
|
1434
|
-
"name": "MergeStrategy"
|
|
1435
|
-
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
1382
|
+
"name": "MergeStrategy"
|
|
1436
1383
|
},
|
|
1437
1384
|
"isOptional": false,
|
|
1438
1385
|
"isSpread": false
|
|
@@ -1623,11 +1570,7 @@
|
|
|
1623
1570
|
"line": 29,
|
|
1624
1571
|
"character": 45
|
|
1625
1572
|
},
|
|
1626
|
-
"name": "WorkspacePolicyConfigKeysNames"
|
|
1627
|
-
"componentId": {
|
|
1628
|
-
"scope": "teambit.dependencies",
|
|
1629
|
-
"name": "dependency-resolver"
|
|
1630
|
-
}
|
|
1573
|
+
"name": "WorkspacePolicyConfigKeysNames"
|
|
1631
1574
|
},
|
|
1632
1575
|
{
|
|
1633
1576
|
"__schema": "TypeRefSchema",
|
|
@@ -1836,11 +1779,7 @@
|
|
|
1836
1779
|
"line": 39,
|
|
1837
1780
|
"character": 24
|
|
1838
1781
|
},
|
|
1839
|
-
"name": "Workspace"
|
|
1840
|
-
"componentId": {
|
|
1841
|
-
"scope": "teambit.workspace",
|
|
1842
|
-
"name": "workspace"
|
|
1843
|
-
}
|
|
1782
|
+
"name": "Workspace"
|
|
1844
1783
|
},
|
|
1845
1784
|
"isOptional": false,
|
|
1846
1785
|
"isSpread": false
|
|
@@ -1860,11 +1799,7 @@
|
|
|
1860
1799
|
"line": 40,
|
|
1861
1800
|
"character": 21
|
|
1862
1801
|
},
|
|
1863
|
-
"name": "Logger"
|
|
1864
|
-
"componentId": {
|
|
1865
|
-
"scope": "teambit.harmony",
|
|
1866
|
-
"name": "logger"
|
|
1867
|
-
}
|
|
1802
|
+
"name": "Logger"
|
|
1868
1803
|
},
|
|
1869
1804
|
"isOptional": false,
|
|
1870
1805
|
"isSpread": false
|
|
@@ -1884,11 +1819,7 @@
|
|
|
1884
1819
|
"line": 41,
|
|
1885
1820
|
"character": 21
|
|
1886
1821
|
},
|
|
1887
|
-
"name": "ConfigMain"
|
|
1888
|
-
"componentId": {
|
|
1889
|
-
"scope": "teambit.harmony",
|
|
1890
|
-
"name": "config"
|
|
1891
|
-
}
|
|
1822
|
+
"name": "ConfigMain"
|
|
1892
1823
|
},
|
|
1893
1824
|
"isOptional": false,
|
|
1894
1825
|
"isSpread": false
|
|
@@ -1908,11 +1839,7 @@
|
|
|
1908
1839
|
"line": 42,
|
|
1909
1840
|
"character": 27
|
|
1910
1841
|
},
|
|
1911
|
-
"name": "DependencyResolverMain"
|
|
1912
|
-
"componentId": {
|
|
1913
|
-
"scope": "teambit.dependencies",
|
|
1914
|
-
"name": "dependency-resolver"
|
|
1915
|
-
}
|
|
1842
|
+
"name": "DependencyResolverMain"
|
|
1916
1843
|
},
|
|
1917
1844
|
"isOptional": false,
|
|
1918
1845
|
"isSpread": false
|
|
@@ -2191,8 +2118,7 @@
|
|
|
2191
2118
|
"line": 276,
|
|
2192
2119
|
"character": 49
|
|
2193
2120
|
},
|
|
2194
|
-
"name": "ConsumerComponent"
|
|
2195
|
-
"packageName": "@teambit/legacy/dist/consumer/component"
|
|
2121
|
+
"name": "ConsumerComponent"
|
|
2196
2122
|
}
|
|
2197
2123
|
},
|
|
2198
2124
|
"isOptional": false,
|
|
@@ -2338,11 +2264,7 @@
|
|
|
2338
2264
|
"line": 494,
|
|
2339
2265
|
"character": 5
|
|
2340
2266
|
},
|
|
2341
|
-
"name": "Workspace"
|
|
2342
|
-
"componentId": {
|
|
2343
|
-
"scope": "teambit.workspace",
|
|
2344
|
-
"name": "workspace"
|
|
2345
|
-
}
|
|
2267
|
+
"name": "Workspace"
|
|
2346
2268
|
},
|
|
2347
2269
|
{
|
|
2348
2270
|
"__schema": "TypeRefSchema",
|
|
@@ -2351,11 +2273,7 @@
|
|
|
2351
2273
|
"line": 495,
|
|
2352
2274
|
"character": 5
|
|
2353
2275
|
},
|
|
2354
|
-
"name": "ConfigMain"
|
|
2355
|
-
"componentId": {
|
|
2356
|
-
"scope": "teambit.harmony",
|
|
2357
|
-
"name": "config"
|
|
2358
|
-
}
|
|
2276
|
+
"name": "ConfigMain"
|
|
2359
2277
|
},
|
|
2360
2278
|
{
|
|
2361
2279
|
"__schema": "TypeRefSchema",
|
|
@@ -2364,11 +2282,7 @@
|
|
|
2364
2282
|
"line": 496,
|
|
2365
2283
|
"character": 5
|
|
2366
2284
|
},
|
|
2367
|
-
"name": "LoggerMain"
|
|
2368
|
-
"componentId": {
|
|
2369
|
-
"scope": "teambit.harmony",
|
|
2370
|
-
"name": "logger"
|
|
2371
|
-
}
|
|
2285
|
+
"name": "LoggerMain"
|
|
2372
2286
|
},
|
|
2373
2287
|
{
|
|
2374
2288
|
"__schema": "TypeRefSchema",
|
|
@@ -2377,11 +2291,7 @@
|
|
|
2377
2291
|
"line": 497,
|
|
2378
2292
|
"character": 5
|
|
2379
2293
|
},
|
|
2380
|
-
"name": "DependencyResolverMain"
|
|
2381
|
-
"componentId": {
|
|
2382
|
-
"scope": "teambit.dependencies",
|
|
2383
|
-
"name": "dependency-resolver"
|
|
2384
|
-
}
|
|
2294
|
+
"name": "DependencyResolverMain"
|
|
2385
2295
|
}
|
|
2386
2296
|
]
|
|
2387
2297
|
},
|
|
@@ -2653,8 +2563,7 @@
|
|
|
2653
2563
|
"line": 13,
|
|
2654
2564
|
"character": 22
|
|
2655
2565
|
},
|
|
2656
|
-
"name": "MergeStrategyResult"
|
|
2657
|
-
"internalFilePath": "component-config-merger.ts"
|
|
2566
|
+
"name": "MergeStrategyResult"
|
|
2658
2567
|
}
|
|
2659
2568
|
},
|
|
2660
2569
|
"isOptional": false,
|
|
@@ -2799,8 +2708,7 @@
|
|
|
2799
2708
|
"line": 36,
|
|
2800
2709
|
"character": 28
|
|
2801
2710
|
},
|
|
2802
|
-
"name": "MergeStrategyResult"
|
|
2803
|
-
"internalFilePath": "component-config-merger.ts"
|
|
2711
|
+
"name": "MergeStrategyResult"
|
|
2804
2712
|
},
|
|
2805
2713
|
{
|
|
2806
2714
|
"__schema": "KeywordTypeSchema",
|
|
@@ -3071,8 +2979,7 @@
|
|
|
3071
2979
|
"line": 29,
|
|
3072
2980
|
"character": 18
|
|
3073
2981
|
},
|
|
3074
|
-
"name": "GenericConfigOrRemoved"
|
|
3075
|
-
"internalFilePath": "component-config-merger.ts"
|
|
2982
|
+
"name": "GenericConfigOrRemoved"
|
|
3076
2983
|
},
|
|
3077
2984
|
"isOptional": true
|
|
3078
2985
|
},
|
|
@@ -3191,12 +3098,7 @@
|
|
|
3191
3098
|
"line": 76,
|
|
3192
3099
|
"character": 27
|
|
3193
3100
|
},
|
|
3194
|
-
"name": "ComponentID"
|
|
3195
|
-
"componentId": {
|
|
3196
|
-
"scope": "teambit.component",
|
|
3197
|
-
"name": "component-id",
|
|
3198
|
-
"version": "1.2.0"
|
|
3199
|
-
}
|
|
3101
|
+
"name": "ComponentID"
|
|
3200
3102
|
}
|
|
3201
3103
|
},
|
|
3202
3104
|
"isOptional": false,
|
|
@@ -3225,8 +3127,7 @@
|
|
|
3225
3127
|
"line": 77,
|
|
3226
3128
|
"character": 16
|
|
3227
3129
|
},
|
|
3228
|
-
"name": "Lane"
|
|
3229
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3130
|
+
"name": "Lane"
|
|
3230
3131
|
},
|
|
3231
3132
|
{
|
|
3232
3133
|
"__schema": "KeywordTypeSchema",
|
|
@@ -3257,8 +3158,7 @@
|
|
|
3257
3158
|
"line": 78,
|
|
3258
3159
|
"character": 29
|
|
3259
3160
|
},
|
|
3260
|
-
"name": "ExtensionDataList"
|
|
3261
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3161
|
+
"name": "ExtensionDataList"
|
|
3262
3162
|
},
|
|
3263
3163
|
"isOptional": false,
|
|
3264
3164
|
"isSpread": false
|
|
@@ -3278,8 +3178,7 @@
|
|
|
3278
3178
|
"line": 79,
|
|
3279
3179
|
"character": 26
|
|
3280
3180
|
},
|
|
3281
|
-
"name": "ExtensionDataList"
|
|
3282
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3181
|
+
"name": "ExtensionDataList"
|
|
3283
3182
|
},
|
|
3284
3183
|
"isOptional": false,
|
|
3285
3184
|
"isSpread": false
|
|
@@ -3299,8 +3198,7 @@
|
|
|
3299
3198
|
"line": 80,
|
|
3300
3199
|
"character": 27
|
|
3301
3200
|
},
|
|
3302
|
-
"name": "ExtensionDataList"
|
|
3303
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3201
|
+
"name": "ExtensionDataList"
|
|
3304
3202
|
},
|
|
3305
3203
|
"isOptional": false,
|
|
3306
3204
|
"isSpread": false
|
|
@@ -3360,11 +3258,7 @@
|
|
|
3360
3258
|
"line": 83,
|
|
3361
3259
|
"character": 21
|
|
3362
3260
|
},
|
|
3363
|
-
"name": "Logger"
|
|
3364
|
-
"componentId": {
|
|
3365
|
-
"scope": "teambit.harmony",
|
|
3366
|
-
"name": "logger"
|
|
3367
|
-
}
|
|
3261
|
+
"name": "Logger"
|
|
3368
3262
|
},
|
|
3369
3263
|
"isOptional": false,
|
|
3370
3264
|
"isSpread": false
|
|
@@ -3384,8 +3278,7 @@
|
|
|
3384
3278
|
"line": 84,
|
|
3385
3279
|
"character": 28
|
|
3386
3280
|
},
|
|
3387
|
-
"name": "MergeStrategy"
|
|
3388
|
-
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
3281
|
+
"name": "MergeStrategy"
|
|
3389
3282
|
},
|
|
3390
3283
|
"isOptional": false,
|
|
3391
3284
|
"isSpread": false
|
|
@@ -3502,8 +3395,7 @@
|
|
|
3502
3395
|
"line": 21,
|
|
3503
3396
|
"character": 57
|
|
3504
3397
|
},
|
|
3505
|
-
"name": "GenericConfigOrRemoved"
|
|
3506
|
-
"internalFilePath": "component-config-merger.ts"
|
|
3398
|
+
"name": "GenericConfigOrRemoved"
|
|
3507
3399
|
},
|
|
3508
3400
|
"isOptional": true
|
|
3509
3401
|
}
|
|
@@ -3534,11 +3426,7 @@
|
|
|
3534
3426
|
"line": 23,
|
|
3535
3427
|
"character": 39
|
|
3536
3428
|
},
|
|
3537
|
-
"name": "SerializedDependency"
|
|
3538
|
-
"componentId": {
|
|
3539
|
-
"scope": "teambit.dependencies",
|
|
3540
|
-
"name": "dependency-resolver"
|
|
3541
|
-
}
|
|
3429
|
+
"name": "SerializedDependency"
|
|
3542
3430
|
},
|
|
3543
3431
|
{
|
|
3544
3432
|
"__schema": "TypeLiteralSchema",
|
|
@@ -3688,8 +3576,7 @@
|
|
|
3688
3576
|
"line": 36,
|
|
3689
3577
|
"character": 16
|
|
3690
3578
|
},
|
|
3691
|
-
"name": "GenericConfigOrRemoved"
|
|
3692
|
-
"internalFilePath": "component-config-merger.ts"
|
|
3579
|
+
"name": "GenericConfigOrRemoved"
|
|
3693
3580
|
},
|
|
3694
3581
|
"isOptional": true
|
|
3695
3582
|
}
|
|
@@ -3791,8 +3678,7 @@
|
|
|
3791
3678
|
"line": 42,
|
|
3792
3679
|
"character": 13
|
|
3793
3680
|
},
|
|
3794
|
-
"name": "ExtensionDataEntry"
|
|
3795
|
-
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3681
|
+
"name": "ExtensionDataEntry"
|
|
3796
3682
|
},
|
|
3797
3683
|
"isOptional": true
|
|
3798
3684
|
}
|
|
@@ -3842,7 +3728,7 @@
|
|
|
3842
3728
|
"componentId": {
|
|
3843
3729
|
"scope": "teambit.workspace",
|
|
3844
3730
|
"name": "config-merger",
|
|
3845
|
-
"version": "0.0.
|
|
3731
|
+
"version": "0.0.95"
|
|
3846
3732
|
},
|
|
3847
3733
|
"taggedModuleExports": []
|
|
3848
3734
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/config-merger",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.95",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/workspace/config-merger",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.workspace",
|
|
8
8
|
"name": "config-merger",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.95"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"lodash": "4.17.21",
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
"@teambit/component-version": "1.0.3",
|
|
18
18
|
"@teambit/harmony": "0.4.6",
|
|
19
19
|
"@teambit/bit-error": "0.0.404",
|
|
20
|
-
"@teambit/builder": "1.0.
|
|
21
|
-
"@teambit/dependency-resolver": "1.0.
|
|
22
|
-
"@teambit/envs": "1.0.
|
|
23
|
-
"@teambit/logger": "0.0.
|
|
24
|
-
"@teambit/cli": "0.0.
|
|
20
|
+
"@teambit/builder": "1.0.228",
|
|
21
|
+
"@teambit/dependency-resolver": "1.0.228",
|
|
22
|
+
"@teambit/envs": "1.0.228",
|
|
23
|
+
"@teambit/logger": "0.0.954",
|
|
24
|
+
"@teambit/cli": "0.0.861",
|
|
25
25
|
"@teambit/component-package-version": "0.0.433",
|
|
26
|
-
"@teambit/config": "0.0.
|
|
27
|
-
"@teambit/workspace": "1.0.
|
|
26
|
+
"@teambit/config": "0.0.979",
|
|
27
|
+
"@teambit/workspace": "1.0.228"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@types/lodash": "4.14.165",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"@types/fs-extra": "9.0.7",
|
|
33
33
|
"@types/mocha": "10.0.1",
|
|
34
34
|
"chai": "4.3.0",
|
|
35
|
-
"@teambit/harmony.envs.core-aspect-env": "0.0.
|
|
35
|
+
"@teambit/harmony.envs.core-aspect-env": "0.0.30"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@teambit/legacy": "1.0.
|
|
38
|
+
"@teambit/legacy": "1.0.682"
|
|
39
39
|
},
|
|
40
40
|
"license": "Apache-2.0",
|
|
41
41
|
"optionalDependencies": {},
|
package/tsconfig.json
CHANGED
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
"emitDeclarationOnly": true,
|
|
21
21
|
"strict": true,
|
|
22
22
|
"strictPropertyInitialization": false,
|
|
23
|
-
"noImplicitAny": false
|
|
23
|
+
"noImplicitAny": false,
|
|
24
|
+
"composite": true
|
|
24
25
|
},
|
|
25
26
|
"exclude": [
|
|
26
27
|
"artifacts",
|
|
@@ -35,5 +36,25 @@
|
|
|
35
36
|
"include": [
|
|
36
37
|
"**/*",
|
|
37
38
|
"**/*.json"
|
|
39
|
+
],
|
|
40
|
+
"references": [
|
|
41
|
+
{
|
|
42
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.pipelines_builder@1.0.228"
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.envs_envs@1.0.228"
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_logger@0.0.954"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.861"
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_config@0.0.979"
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.228"
|
|
58
|
+
}
|
|
38
59
|
]
|
|
39
60
|
}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { ComponentID } from '@teambit/component-id';
|
|
2
|
-
import { Logger } from '@teambit/logger';
|
|
3
|
-
import { Lane } from '@teambit/legacy/dist/scope/models';
|
|
4
|
-
import { ExtensionDataList } from '@teambit/legacy/dist/consumer/config/extension-data';
|
|
5
|
-
import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
|
|
6
|
-
import { ConfigMergeResult } from './config-merge-result';
|
|
7
|
-
export type GenericConfigOrRemoved = Record<string, any> | '-';
|
|
8
|
-
export declare const conflictIndicator = "CONFLICT::";
|
|
9
|
-
export type MergeStrategyResult = {
|
|
10
|
-
id: string;
|
|
11
|
-
mergedConfig?: GenericConfigOrRemoved;
|
|
12
|
-
conflict?: Record<string, any>;
|
|
13
|
-
};
|
|
14
|
-
/**
|
|
15
|
-
* perform 3-way merge of component configuration (aspects).
|
|
16
|
-
* normally this is needed when merging one lane into another. the component may have different aspects config in each lane.
|
|
17
|
-
* the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).
|
|
18
|
-
* the currentAspects are the aspects of the component in the current lane.
|
|
19
|
-
* the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.
|
|
20
|
-
*
|
|
21
|
-
* the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.
|
|
22
|
-
* we have two special cases:
|
|
23
|
-
*
|
|
24
|
-
* 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take
|
|
25
|
-
* into account not only the config, but also the data. this is needed because some dependencies are automatically
|
|
26
|
-
* added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps
|
|
27
|
-
* from both sources, the config and the data. The way we know to differentiate between them is by the "force" prop.
|
|
28
|
-
* the config has always force: true.
|
|
29
|
-
*
|
|
30
|
-
* 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also
|
|
31
|
-
* in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because
|
|
32
|
-
* teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver
|
|
33
|
-
* we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and
|
|
34
|
-
* version. later, when the component is loaded, we split the id and the version and put them in the correct places.
|
|
35
|
-
* see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.
|
|
36
|
-
*/
|
|
37
|
-
export declare class ComponentConfigMerger {
|
|
38
|
-
private compIdStr;
|
|
39
|
-
private workspaceIds;
|
|
40
|
-
private currentAspects;
|
|
41
|
-
private baseAspects;
|
|
42
|
-
private otherAspects;
|
|
43
|
-
private currentLabel;
|
|
44
|
-
private otherLabel;
|
|
45
|
-
private logger;
|
|
46
|
-
private mergeStrategy;
|
|
47
|
-
private currentEnv;
|
|
48
|
-
private otherEnv;
|
|
49
|
-
private baseEnv?;
|
|
50
|
-
private handledExtIds;
|
|
51
|
-
private otherLaneIdsStr;
|
|
52
|
-
constructor(compIdStr: string, workspaceIds: ComponentID[], otherLane: Lane | undefined, currentAspects: ExtensionDataList, baseAspects: ExtensionDataList, otherAspects: ExtensionDataList, currentLabel: string, otherLabel: string, logger: Logger, mergeStrategy: MergeStrategy);
|
|
53
|
-
merge(): ConfigMergeResult;
|
|
54
|
-
private populateEnvs;
|
|
55
|
-
private envStrategy;
|
|
56
|
-
private areConfigsEqual;
|
|
57
|
-
private mergePerStrategy;
|
|
58
|
-
private basicConfigMerge;
|
|
59
|
-
private depResolverStrategy;
|
|
60
|
-
private isIdInWorkspaceOrOtherLane;
|
|
61
|
-
private getIdFromWorkspace;
|
|
62
|
-
private isEnv;
|
|
63
|
-
private getConfig;
|
|
64
|
-
private getPolicy;
|
|
65
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { MergeStrategyResult } from './component-config-merger';
|
|
2
|
-
export declare class ConfigMergeResult {
|
|
3
|
-
readonly compIdStr: string;
|
|
4
|
-
private currentLabel;
|
|
5
|
-
private otherLabel;
|
|
6
|
-
private results;
|
|
7
|
-
constructor(compIdStr: string, currentLabel: string, otherLabel: string, results: MergeStrategyResult[]);
|
|
8
|
-
hasConflicts(): boolean;
|
|
9
|
-
generateMergeConflictFile(): string | null;
|
|
10
|
-
getSuccessfullyMergedConfig(): Record<string, any>;
|
|
11
|
-
getDepsResolverResult(): MergeStrategyResult | undefined;
|
|
12
|
-
private generateConflictStringPerAspect;
|
|
13
|
-
private depsResolverConfigGenerator;
|
|
14
|
-
private basicConflictGenerator;
|
|
15
|
-
private formatConflict;
|
|
16
|
-
private concatenateConflicts;
|
|
17
|
-
}
|
|
18
|
-
export declare function parseVersionLineWithConflict(line: string): {
|
|
19
|
-
currentVal: string;
|
|
20
|
-
otherVal: string;
|
|
21
|
-
};
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
import { DependencyResolverMain, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';
|
|
2
|
-
import { Workspace } from '@teambit/workspace';
|
|
3
|
-
import { Logger, LoggerMain } from '@teambit/logger';
|
|
4
|
-
import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
|
|
5
|
-
import { ConfigMain } from '@teambit/config';
|
|
6
|
-
import { ConfigMergeResult } from './config-merge-result';
|
|
7
|
-
export type WorkspaceDepsUpdates = {
|
|
8
|
-
[pkgName: string]: [string, string];
|
|
9
|
-
};
|
|
10
|
-
export type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{
|
|
11
|
-
name: string;
|
|
12
|
-
version: string;
|
|
13
|
-
}>>;
|
|
14
|
-
export type WorkspaceConfigUpdateResult = {
|
|
15
|
-
workspaceDepsUpdates?: WorkspaceDepsUpdates;
|
|
16
|
-
workspaceDepsConflicts?: WorkspaceDepsConflicts;
|
|
17
|
-
workspaceConfigConflictWriteError?: Error;
|
|
18
|
-
logs?: string[];
|
|
19
|
-
};
|
|
20
|
-
export declare class ConfigMergerMain {
|
|
21
|
-
private workspace;
|
|
22
|
-
private logger;
|
|
23
|
-
private config;
|
|
24
|
-
private depsResolver;
|
|
25
|
-
constructor(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain);
|
|
26
|
-
generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>;
|
|
27
|
-
writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>;
|
|
28
|
-
private writeWorkspaceJsoncWithConflicts;
|
|
29
|
-
updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{
|
|
30
|
-
workspaceDepsUpdates?: WorkspaceDepsUpdates;
|
|
31
|
-
workspaceDepsConflicts?: WorkspaceDepsConflicts;
|
|
32
|
-
}>;
|
|
33
|
-
updateDepsInWorkspaceConfig(components: ConsumerComponent[]): Promise<WorkspaceConfigUpdateResult | undefined>;
|
|
34
|
-
private updateWsConfigWithGivenChanges;
|
|
35
|
-
/**
|
|
36
|
-
* if both versions are ranges, it's hard to check which one is bigger. sometimes it's even impossible.
|
|
37
|
-
* remember that a range can be something like `1.2 <1.2.9 || >2.0.0`.
|
|
38
|
-
* this check is naive in a way that it assumes the range is simple, such as "^1.2.3" or "~1.2.3.
|
|
39
|
-
* in this case, it's possible to check for the minimum version and compare it.
|
|
40
|
-
*/
|
|
41
|
-
private isRange1GreaterThanRange2Naively;
|
|
42
|
-
static slots: never[];
|
|
43
|
-
static dependencies: import("@teambit/harmony").Aspect[];
|
|
44
|
-
static runtime: import("@teambit/harmony").RuntimeDefinition;
|
|
45
|
-
static provider([workspace, config, loggerMain, depsResolver]: [
|
|
46
|
-
Workspace,
|
|
47
|
-
ConfigMain,
|
|
48
|
-
LoggerMain,
|
|
49
|
-
DependencyResolverMain
|
|
50
|
-
]): Promise<ConfigMergerMain>;
|
|
51
|
-
}
|
|
52
|
-
export default ConfigMergerMain;
|
package/dist/index.d.ts
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { ConfigMergerAspect } from './config-merger.aspect';
|
|
2
|
-
export type { ConfigMergerMain, WorkspaceDepsUpdates, WorkspaceDepsConflicts, WorkspaceConfigUpdateResult, } from './config-merger.main.runtime';
|
|
3
|
-
export type { ConfigMergeResult } from './config-merge-result';
|
|
4
|
-
export { ComponentConfigMerger } from './component-config-merger';
|
|
5
|
-
export default ConfigMergerAspect;
|
|
6
|
-
export { ConfigMergerAspect };
|
|
File without changes
|