@teambit/merging 1.0.500 → 1.0.502
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.
|
@@ -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.component/merging@1.0.
|
|
3
|
+
<testsuite name="teambit.component/merging@1.0.502" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -887,7 +887,7 @@
|
|
|
887
887
|
"componentId": {
|
|
888
888
|
"scope": "teambit.legacy",
|
|
889
889
|
"name": "scope",
|
|
890
|
-
"version": "0.0.
|
|
890
|
+
"version": "0.0.11"
|
|
891
891
|
}
|
|
892
892
|
},
|
|
893
893
|
"isOptional": false
|
|
@@ -912,7 +912,7 @@
|
|
|
912
912
|
"componentId": {
|
|
913
913
|
"scope": "teambit.scope",
|
|
914
914
|
"name": "objects",
|
|
915
|
-
"version": "0.0.
|
|
915
|
+
"version": "0.0.11"
|
|
916
916
|
}
|
|
917
917
|
},
|
|
918
918
|
"isOptional": false
|
|
@@ -997,7 +997,7 @@
|
|
|
997
997
|
"componentId": {
|
|
998
998
|
"scope": "teambit.scope",
|
|
999
999
|
"name": "objects",
|
|
1000
|
-
"version": "0.0.
|
|
1000
|
+
"version": "0.0.11"
|
|
1001
1001
|
}
|
|
1002
1002
|
},
|
|
1003
1003
|
"isOptional": false
|
|
@@ -1026,7 +1026,7 @@
|
|
|
1026
1026
|
"componentId": {
|
|
1027
1027
|
"scope": "teambit.legacy",
|
|
1028
1028
|
"name": "scope",
|
|
1029
|
-
"version": "0.0.
|
|
1029
|
+
"version": "0.0.11"
|
|
1030
1030
|
}
|
|
1031
1031
|
},
|
|
1032
1032
|
"isOptional": false
|
|
@@ -1051,7 +1051,7 @@
|
|
|
1051
1051
|
"componentId": {
|
|
1052
1052
|
"scope": "teambit.scope",
|
|
1053
1053
|
"name": "objects",
|
|
1054
|
-
"version": "0.0.
|
|
1054
|
+
"version": "0.0.11"
|
|
1055
1055
|
}
|
|
1056
1056
|
},
|
|
1057
1057
|
"isOptional": false
|
|
@@ -1136,7 +1136,7 @@
|
|
|
1136
1136
|
"componentId": {
|
|
1137
1137
|
"scope": "teambit.scope",
|
|
1138
1138
|
"name": "objects",
|
|
1139
|
-
"version": "0.0.
|
|
1139
|
+
"version": "0.0.11"
|
|
1140
1140
|
}
|
|
1141
1141
|
},
|
|
1142
1142
|
"isOptional": false
|
|
@@ -1422,7 +1422,7 @@
|
|
|
1422
1422
|
"componentId": {
|
|
1423
1423
|
"scope": "teambit.component",
|
|
1424
1424
|
"name": "sources",
|
|
1425
|
-
"version": "0.0.
|
|
1425
|
+
"version": "0.0.63"
|
|
1426
1426
|
}
|
|
1427
1427
|
},
|
|
1428
1428
|
"isOptional": false
|
|
@@ -1618,7 +1618,7 @@
|
|
|
1618
1618
|
"componentId": {
|
|
1619
1619
|
"scope": "teambit.component",
|
|
1620
1620
|
"name": "sources",
|
|
1621
|
-
"version": "0.0.
|
|
1621
|
+
"version": "0.0.63"
|
|
1622
1622
|
}
|
|
1623
1623
|
},
|
|
1624
1624
|
"isOptional": true
|
|
@@ -1700,7 +1700,7 @@
|
|
|
1700
1700
|
"componentId": {
|
|
1701
1701
|
"scope": "teambit.component",
|
|
1702
1702
|
"name": "sources",
|
|
1703
|
-
"version": "0.0.
|
|
1703
|
+
"version": "0.0.63"
|
|
1704
1704
|
}
|
|
1705
1705
|
},
|
|
1706
1706
|
"isOptional": false
|
|
@@ -1725,7 +1725,7 @@
|
|
|
1725
1725
|
"componentId": {
|
|
1726
1726
|
"scope": "teambit.scope",
|
|
1727
1727
|
"name": "objects",
|
|
1728
|
-
"version": "0.0.
|
|
1728
|
+
"version": "0.0.11"
|
|
1729
1729
|
}
|
|
1730
1730
|
},
|
|
1731
1731
|
"isOptional": true
|
|
@@ -1750,7 +1750,7 @@
|
|
|
1750
1750
|
"componentId": {
|
|
1751
1751
|
"scope": "teambit.scope",
|
|
1752
1752
|
"name": "objects",
|
|
1753
|
-
"version": "0.0.
|
|
1753
|
+
"version": "0.0.11"
|
|
1754
1754
|
}
|
|
1755
1755
|
},
|
|
1756
1756
|
"isOptional": false
|
|
@@ -1948,7 +1948,7 @@
|
|
|
1948
1948
|
"componentId": {
|
|
1949
1949
|
"scope": "teambit.component",
|
|
1950
1950
|
"name": "sources",
|
|
1951
|
-
"version": "0.0.
|
|
1951
|
+
"version": "0.0.63"
|
|
1952
1952
|
}
|
|
1953
1953
|
},
|
|
1954
1954
|
"isOptional": false
|
|
@@ -2030,7 +2030,7 @@
|
|
|
2030
2030
|
"componentId": {
|
|
2031
2031
|
"scope": "teambit.component",
|
|
2032
2032
|
"name": "sources",
|
|
2033
|
-
"version": "0.0.
|
|
2033
|
+
"version": "0.0.63"
|
|
2034
2034
|
}
|
|
2035
2035
|
},
|
|
2036
2036
|
"isOptional": false
|
|
@@ -2112,7 +2112,7 @@
|
|
|
2112
2112
|
"componentId": {
|
|
2113
2113
|
"scope": "teambit.scope",
|
|
2114
2114
|
"name": "objects",
|
|
2115
|
-
"version": "0.0.
|
|
2115
|
+
"version": "0.0.11"
|
|
2116
2116
|
}
|
|
2117
2117
|
},
|
|
2118
2118
|
"isOptional": false
|
|
@@ -3258,7 +3258,7 @@
|
|
|
3258
3258
|
"componentId": {
|
|
3259
3259
|
"scope": "teambit.legacy",
|
|
3260
3260
|
"name": "consumer",
|
|
3261
|
-
"version": "0.0.
|
|
3261
|
+
"version": "0.0.11"
|
|
3262
3262
|
}
|
|
3263
3263
|
},
|
|
3264
3264
|
"isOptional": false,
|
|
@@ -3552,7 +3552,7 @@
|
|
|
3552
3552
|
"componentId": {
|
|
3553
3553
|
"scope": "teambit.scope",
|
|
3554
3554
|
"name": "objects",
|
|
3555
|
-
"version": "0.0.
|
|
3555
|
+
"version": "0.0.11"
|
|
3556
3556
|
}
|
|
3557
3557
|
},
|
|
3558
3558
|
"isOptional": true
|
|
@@ -3794,7 +3794,7 @@
|
|
|
3794
3794
|
"componentId": {
|
|
3795
3795
|
"scope": "teambit.scope",
|
|
3796
3796
|
"name": "objects",
|
|
3797
|
-
"version": "0.0.
|
|
3797
|
+
"version": "0.0.11"
|
|
3798
3798
|
}
|
|
3799
3799
|
},
|
|
3800
3800
|
"isOptional": true
|
|
@@ -4028,7 +4028,7 @@
|
|
|
4028
4028
|
"componentId": {
|
|
4029
4029
|
"scope": "teambit.scope",
|
|
4030
4030
|
"name": "objects",
|
|
4031
|
-
"version": "0.0.
|
|
4031
|
+
"version": "0.0.11"
|
|
4032
4032
|
}
|
|
4033
4033
|
},
|
|
4034
4034
|
"isOptional": true,
|
|
@@ -4167,7 +4167,7 @@
|
|
|
4167
4167
|
"componentId": {
|
|
4168
4168
|
"scope": "teambit.scope",
|
|
4169
4169
|
"name": "objects",
|
|
4170
|
-
"version": "0.0.
|
|
4170
|
+
"version": "0.0.11"
|
|
4171
4171
|
}
|
|
4172
4172
|
},
|
|
4173
4173
|
"isOptional": true,
|
|
@@ -4192,7 +4192,7 @@
|
|
|
4192
4192
|
"componentId": {
|
|
4193
4193
|
"scope": "teambit.scope",
|
|
4194
4194
|
"name": "objects",
|
|
4195
|
-
"version": "0.0.
|
|
4195
|
+
"version": "0.0.11"
|
|
4196
4196
|
}
|
|
4197
4197
|
},
|
|
4198
4198
|
"isOptional": true,
|
|
@@ -4260,7 +4260,7 @@
|
|
|
4260
4260
|
"componentId": {
|
|
4261
4261
|
"scope": "teambit.legacy",
|
|
4262
4262
|
"name": "component-list",
|
|
4263
|
-
"version": "0.0.
|
|
4263
|
+
"version": "0.0.65"
|
|
4264
4264
|
}
|
|
4265
4265
|
},
|
|
4266
4266
|
"isOptional": true,
|
|
@@ -4702,7 +4702,7 @@
|
|
|
4702
4702
|
"componentId": {
|
|
4703
4703
|
"scope": "teambit.component",
|
|
4704
4704
|
"name": "snap-distance",
|
|
4705
|
-
"version": "0.0.
|
|
4705
|
+
"version": "0.0.12"
|
|
4706
4706
|
}
|
|
4707
4707
|
},
|
|
4708
4708
|
"isOptional": true
|
|
@@ -4986,7 +4986,7 @@
|
|
|
4986
4986
|
"componentId": {
|
|
4987
4987
|
"scope": "teambit.legacy",
|
|
4988
4988
|
"name": "consumer-component",
|
|
4989
|
-
"version": "0.0.
|
|
4989
|
+
"version": "0.0.12"
|
|
4990
4990
|
}
|
|
4991
4991
|
}
|
|
4992
4992
|
},
|
|
@@ -5299,7 +5299,7 @@
|
|
|
5299
5299
|
"line": 28,
|
|
5300
5300
|
"character": 3
|
|
5301
5301
|
},
|
|
5302
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"
|
|
5302
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"added\" | \"removed\" | \"unchanged\" | \"manual\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
5303
5303
|
"name": "FilesStatus",
|
|
5304
5304
|
"exportNode": {
|
|
5305
5305
|
"__schema": "TypeSchema",
|
|
@@ -5308,7 +5308,7 @@
|
|
|
5308
5308
|
"line": 82,
|
|
5309
5309
|
"character": 1
|
|
5310
5310
|
},
|
|
5311
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"
|
|
5311
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"added\" | \"removed\" | \"unchanged\" | \"manual\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
5312
5312
|
"name": "FilesStatus",
|
|
5313
5313
|
"type": {
|
|
5314
5314
|
"__schema": "TypeLiteralSchema",
|
|
@@ -6340,7 +6340,7 @@
|
|
|
6340
6340
|
"_legacy": {
|
|
6341
6341
|
"scope": "teambit.component",
|
|
6342
6342
|
"name": "merging",
|
|
6343
|
-
"version": "1.0.
|
|
6343
|
+
"version": "1.0.502"
|
|
6344
6344
|
},
|
|
6345
6345
|
"_scope": "teambit.component"
|
|
6346
6346
|
}
|
|
@@ -7191,7 +7191,7 @@
|
|
|
7191
7191
|
"componentId": {
|
|
7192
7192
|
"scope": "teambit.component",
|
|
7193
7193
|
"name": "sources",
|
|
7194
|
-
"version": "0.0.
|
|
7194
|
+
"version": "0.0.63"
|
|
7195
7195
|
}
|
|
7196
7196
|
},
|
|
7197
7197
|
"isOptional": false
|
|
@@ -7387,7 +7387,7 @@
|
|
|
7387
7387
|
"componentId": {
|
|
7388
7388
|
"scope": "teambit.component",
|
|
7389
7389
|
"name": "sources",
|
|
7390
|
-
"version": "0.0.
|
|
7390
|
+
"version": "0.0.63"
|
|
7391
7391
|
}
|
|
7392
7392
|
},
|
|
7393
7393
|
"isOptional": true
|
|
@@ -7469,7 +7469,7 @@
|
|
|
7469
7469
|
"componentId": {
|
|
7470
7470
|
"scope": "teambit.component",
|
|
7471
7471
|
"name": "sources",
|
|
7472
|
-
"version": "0.0.
|
|
7472
|
+
"version": "0.0.63"
|
|
7473
7473
|
}
|
|
7474
7474
|
},
|
|
7475
7475
|
"isOptional": false
|
|
@@ -7494,7 +7494,7 @@
|
|
|
7494
7494
|
"componentId": {
|
|
7495
7495
|
"scope": "teambit.scope",
|
|
7496
7496
|
"name": "objects",
|
|
7497
|
-
"version": "0.0.
|
|
7497
|
+
"version": "0.0.11"
|
|
7498
7498
|
}
|
|
7499
7499
|
},
|
|
7500
7500
|
"isOptional": true
|
|
@@ -7519,7 +7519,7 @@
|
|
|
7519
7519
|
"componentId": {
|
|
7520
7520
|
"scope": "teambit.scope",
|
|
7521
7521
|
"name": "objects",
|
|
7522
|
-
"version": "0.0.
|
|
7522
|
+
"version": "0.0.11"
|
|
7523
7523
|
}
|
|
7524
7524
|
},
|
|
7525
7525
|
"isOptional": false
|
|
@@ -7717,7 +7717,7 @@
|
|
|
7717
7717
|
"componentId": {
|
|
7718
7718
|
"scope": "teambit.component",
|
|
7719
7719
|
"name": "sources",
|
|
7720
|
-
"version": "0.0.
|
|
7720
|
+
"version": "0.0.63"
|
|
7721
7721
|
}
|
|
7722
7722
|
},
|
|
7723
7723
|
"isOptional": false
|
|
@@ -7799,7 +7799,7 @@
|
|
|
7799
7799
|
"componentId": {
|
|
7800
7800
|
"scope": "teambit.component",
|
|
7801
7801
|
"name": "sources",
|
|
7802
|
-
"version": "0.0.
|
|
7802
|
+
"version": "0.0.63"
|
|
7803
7803
|
}
|
|
7804
7804
|
},
|
|
7805
7805
|
"isOptional": false
|
|
@@ -7881,7 +7881,7 @@
|
|
|
7881
7881
|
"componentId": {
|
|
7882
7882
|
"scope": "teambit.scope",
|
|
7883
7883
|
"name": "objects",
|
|
7884
|
-
"version": "0.0.
|
|
7884
|
+
"version": "0.0.11"
|
|
7885
7885
|
}
|
|
7886
7886
|
},
|
|
7887
7887
|
"isOptional": false
|
|
@@ -7992,7 +7992,7 @@
|
|
|
7992
7992
|
"componentId": {
|
|
7993
7993
|
"scope": "teambit.legacy",
|
|
7994
7994
|
"name": "scope",
|
|
7995
|
-
"version": "0.0.
|
|
7995
|
+
"version": "0.0.11"
|
|
7996
7996
|
}
|
|
7997
7997
|
},
|
|
7998
7998
|
"isOptional": false
|
|
@@ -8017,7 +8017,7 @@
|
|
|
8017
8017
|
"componentId": {
|
|
8018
8018
|
"scope": "teambit.scope",
|
|
8019
8019
|
"name": "objects",
|
|
8020
|
-
"version": "0.0.
|
|
8020
|
+
"version": "0.0.11"
|
|
8021
8021
|
}
|
|
8022
8022
|
},
|
|
8023
8023
|
"isOptional": false
|
|
@@ -8102,7 +8102,7 @@
|
|
|
8102
8102
|
"componentId": {
|
|
8103
8103
|
"scope": "teambit.scope",
|
|
8104
8104
|
"name": "objects",
|
|
8105
|
-
"version": "0.0.
|
|
8105
|
+
"version": "0.0.11"
|
|
8106
8106
|
}
|
|
8107
8107
|
},
|
|
8108
8108
|
"isOptional": false
|
|
@@ -8131,7 +8131,7 @@
|
|
|
8131
8131
|
"componentId": {
|
|
8132
8132
|
"scope": "teambit.legacy",
|
|
8133
8133
|
"name": "scope",
|
|
8134
|
-
"version": "0.0.
|
|
8134
|
+
"version": "0.0.11"
|
|
8135
8135
|
}
|
|
8136
8136
|
},
|
|
8137
8137
|
"isOptional": false
|
|
@@ -8156,7 +8156,7 @@
|
|
|
8156
8156
|
"componentId": {
|
|
8157
8157
|
"scope": "teambit.scope",
|
|
8158
8158
|
"name": "objects",
|
|
8159
|
-
"version": "0.0.
|
|
8159
|
+
"version": "0.0.11"
|
|
8160
8160
|
}
|
|
8161
8161
|
},
|
|
8162
8162
|
"isOptional": false
|
|
@@ -8241,7 +8241,7 @@
|
|
|
8241
8241
|
"componentId": {
|
|
8242
8242
|
"scope": "teambit.scope",
|
|
8243
8243
|
"name": "objects",
|
|
8244
|
-
"version": "0.0.
|
|
8244
|
+
"version": "0.0.11"
|
|
8245
8245
|
}
|
|
8246
8246
|
},
|
|
8247
8247
|
"isOptional": false
|
|
@@ -8306,7 +8306,7 @@
|
|
|
8306
8306
|
"componentId": {
|
|
8307
8307
|
"scope": "teambit.legacy",
|
|
8308
8308
|
"name": "scope",
|
|
8309
|
-
"version": "0.0.
|
|
8309
|
+
"version": "0.0.11"
|
|
8310
8310
|
}
|
|
8311
8311
|
},
|
|
8312
8312
|
"isOptional": false,
|
|
@@ -8962,7 +8962,7 @@
|
|
|
8962
8962
|
"componentId": {
|
|
8963
8963
|
"scope": "teambit.component",
|
|
8964
8964
|
"name": "snap-distance",
|
|
8965
|
-
"version": "0.0.
|
|
8965
|
+
"version": "0.0.12"
|
|
8966
8966
|
}
|
|
8967
8967
|
},
|
|
8968
8968
|
"isOptional": false
|
|
@@ -9067,7 +9067,7 @@
|
|
|
9067
9067
|
"componentId": {
|
|
9068
9068
|
"scope": "teambit.component",
|
|
9069
9069
|
"name": "snap-distance",
|
|
9070
|
-
"version": "0.0.
|
|
9070
|
+
"version": "0.0.12"
|
|
9071
9071
|
}
|
|
9072
9072
|
},
|
|
9073
9073
|
"isOptional": true
|
|
@@ -9180,7 +9180,7 @@
|
|
|
9180
9180
|
"componentId": {
|
|
9181
9181
|
"scope": "teambit.component",
|
|
9182
9182
|
"name": "snap-distance",
|
|
9183
|
-
"version": "0.0.
|
|
9183
|
+
"version": "0.0.12"
|
|
9184
9184
|
}
|
|
9185
9185
|
},
|
|
9186
9186
|
"isOptional": true
|
|
@@ -9243,7 +9243,7 @@
|
|
|
9243
9243
|
"componentId": {
|
|
9244
9244
|
"scope": "teambit.scope",
|
|
9245
9245
|
"name": "objects",
|
|
9246
|
-
"version": "0.0.
|
|
9246
|
+
"version": "0.0.11"
|
|
9247
9247
|
}
|
|
9248
9248
|
},
|
|
9249
9249
|
"isOptional": false
|
|
@@ -9293,7 +9293,7 @@
|
|
|
9293
9293
|
"componentId": {
|
|
9294
9294
|
"scope": "teambit.scope",
|
|
9295
9295
|
"name": "objects",
|
|
9296
|
-
"version": "0.0.
|
|
9296
|
+
"version": "0.0.11"
|
|
9297
9297
|
}
|
|
9298
9298
|
},
|
|
9299
9299
|
"isOptional": false
|
|
@@ -9399,7 +9399,7 @@
|
|
|
9399
9399
|
"line": 82,
|
|
9400
9400
|
"character": 1
|
|
9401
9401
|
},
|
|
9402
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"
|
|
9402
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"added\" | \"removed\" | \"unchanged\" | \"manual\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
9403
9403
|
"name": "FilesStatus",
|
|
9404
9404
|
"type": {
|
|
9405
9405
|
"__schema": "TypeLiteralSchema",
|
|
@@ -9519,7 +9519,7 @@
|
|
|
9519
9519
|
"componentId": {
|
|
9520
9520
|
"scope": "teambit.legacy",
|
|
9521
9521
|
"name": "consumer-component",
|
|
9522
|
-
"version": "0.0.
|
|
9522
|
+
"version": "0.0.12"
|
|
9523
9523
|
}
|
|
9524
9524
|
}
|
|
9525
9525
|
},
|
|
@@ -9913,7 +9913,7 @@
|
|
|
9913
9913
|
"componentId": {
|
|
9914
9914
|
"scope": "teambit.legacy",
|
|
9915
9915
|
"name": "consumer-component",
|
|
9916
|
-
"version": "0.0.
|
|
9916
|
+
"version": "0.0.12"
|
|
9917
9917
|
}
|
|
9918
9918
|
}
|
|
9919
9919
|
},
|
|
@@ -10698,7 +10698,7 @@
|
|
|
10698
10698
|
"componentId": {
|
|
10699
10699
|
"scope": "teambit.legacy",
|
|
10700
10700
|
"name": "consumer",
|
|
10701
|
-
"version": "0.0.
|
|
10701
|
+
"version": "0.0.11"
|
|
10702
10702
|
}
|
|
10703
10703
|
},
|
|
10704
10704
|
"isOptional": false,
|
|
@@ -10992,7 +10992,7 @@
|
|
|
10992
10992
|
"componentId": {
|
|
10993
10993
|
"scope": "teambit.scope",
|
|
10994
10994
|
"name": "objects",
|
|
10995
|
-
"version": "0.0.
|
|
10995
|
+
"version": "0.0.11"
|
|
10996
10996
|
}
|
|
10997
10997
|
},
|
|
10998
10998
|
"isOptional": true
|
|
@@ -11234,7 +11234,7 @@
|
|
|
11234
11234
|
"componentId": {
|
|
11235
11235
|
"scope": "teambit.scope",
|
|
11236
11236
|
"name": "objects",
|
|
11237
|
-
"version": "0.0.
|
|
11237
|
+
"version": "0.0.11"
|
|
11238
11238
|
}
|
|
11239
11239
|
},
|
|
11240
11240
|
"isOptional": true
|
|
@@ -11468,7 +11468,7 @@
|
|
|
11468
11468
|
"componentId": {
|
|
11469
11469
|
"scope": "teambit.scope",
|
|
11470
11470
|
"name": "objects",
|
|
11471
|
-
"version": "0.0.
|
|
11471
|
+
"version": "0.0.11"
|
|
11472
11472
|
}
|
|
11473
11473
|
},
|
|
11474
11474
|
"isOptional": true,
|
|
@@ -11607,7 +11607,7 @@
|
|
|
11607
11607
|
"componentId": {
|
|
11608
11608
|
"scope": "teambit.scope",
|
|
11609
11609
|
"name": "objects",
|
|
11610
|
-
"version": "0.0.
|
|
11610
|
+
"version": "0.0.11"
|
|
11611
11611
|
}
|
|
11612
11612
|
},
|
|
11613
11613
|
"isOptional": true,
|
|
@@ -11632,7 +11632,7 @@
|
|
|
11632
11632
|
"componentId": {
|
|
11633
11633
|
"scope": "teambit.scope",
|
|
11634
11634
|
"name": "objects",
|
|
11635
|
-
"version": "0.0.
|
|
11635
|
+
"version": "0.0.11"
|
|
11636
11636
|
}
|
|
11637
11637
|
},
|
|
11638
11638
|
"isOptional": true,
|
|
@@ -11700,7 +11700,7 @@
|
|
|
11700
11700
|
"componentId": {
|
|
11701
11701
|
"scope": "teambit.legacy",
|
|
11702
11702
|
"name": "component-list",
|
|
11703
|
-
"version": "0.0.
|
|
11703
|
+
"version": "0.0.65"
|
|
11704
11704
|
}
|
|
11705
11705
|
},
|
|
11706
11706
|
"isOptional": true,
|
|
@@ -12094,7 +12094,7 @@
|
|
|
12094
12094
|
"componentId": {
|
|
12095
12095
|
"scope": "teambit.scope",
|
|
12096
12096
|
"name": "objects",
|
|
12097
|
-
"version": "0.0.
|
|
12097
|
+
"version": "0.0.11"
|
|
12098
12098
|
}
|
|
12099
12099
|
},
|
|
12100
12100
|
"isOptional": false
|
|
@@ -12119,7 +12119,7 @@
|
|
|
12119
12119
|
"componentId": {
|
|
12120
12120
|
"scope": "teambit.scope",
|
|
12121
12121
|
"name": "objects",
|
|
12122
|
-
"version": "0.0.
|
|
12122
|
+
"version": "0.0.11"
|
|
12123
12123
|
}
|
|
12124
12124
|
},
|
|
12125
12125
|
"isOptional": false
|
|
@@ -12205,7 +12205,7 @@
|
|
|
12205
12205
|
"componentId": {
|
|
12206
12206
|
"scope": "teambit.component",
|
|
12207
12207
|
"name": "merging",
|
|
12208
|
-
"version": "1.0.
|
|
12208
|
+
"version": "1.0.502"
|
|
12209
12209
|
},
|
|
12210
12210
|
"taggedModuleExports": []
|
|
12211
12211
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.502",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/merging",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "merging",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.502"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -17,34 +17,34 @@
|
|
|
17
17
|
"@teambit/component-id": "1.2.2",
|
|
18
18
|
"@teambit/lane-id": "0.0.311",
|
|
19
19
|
"@teambit/harmony": "0.4.6",
|
|
20
|
-
"@teambit/cli": "0.0.
|
|
21
|
-
"@teambit/config-merger": "0.0.
|
|
22
|
-
"@teambit/global-config": "0.0.
|
|
20
|
+
"@teambit/cli": "0.0.1079",
|
|
21
|
+
"@teambit/config-merger": "0.0.369",
|
|
22
|
+
"@teambit/global-config": "0.0.1082",
|
|
23
23
|
"@teambit/legacy.constants": "0.0.4",
|
|
24
24
|
"@teambit/git.modules.git-executable": "0.0.5",
|
|
25
25
|
"@teambit/legacy.logger": "0.0.6",
|
|
26
26
|
"@teambit/legacy.utils": "0.0.12",
|
|
27
|
-
"@teambit/component.snap-distance": "0.0.
|
|
28
|
-
"@teambit/importer": "1.0.
|
|
29
|
-
"@teambit/legacy.consumer-component": "0.0.
|
|
30
|
-
"@teambit/legacy.scope": "0.0.
|
|
31
|
-
"@teambit/logger": "0.0.
|
|
32
|
-
"@teambit/scope.objects": "0.0.
|
|
33
|
-
"@teambit/scope": "1.0.
|
|
34
|
-
"@teambit/workspace": "1.0.
|
|
35
|
-
"@teambit/checkout": "1.0.
|
|
36
|
-
"@teambit/component-writer": "1.0.
|
|
37
|
-
"@teambit/config": "0.0.
|
|
38
|
-
"@teambit/dependency-resolver": "1.0.
|
|
39
|
-
"@teambit/install": "1.0.
|
|
40
|
-
"@teambit/legacy.component-list": "0.0.
|
|
41
|
-
"@teambit/legacy.consumer": "0.0.
|
|
42
|
-
"@teambit/pkg.modules.component-package-name": "0.0.
|
|
43
|
-
"@teambit/remove": "1.0.
|
|
44
|
-
"@teambit/snapping": "1.0.
|
|
27
|
+
"@teambit/component.snap-distance": "0.0.12",
|
|
28
|
+
"@teambit/importer": "1.0.502",
|
|
29
|
+
"@teambit/legacy.consumer-component": "0.0.12",
|
|
30
|
+
"@teambit/legacy.scope": "0.0.11",
|
|
31
|
+
"@teambit/logger": "0.0.1172",
|
|
32
|
+
"@teambit/scope.objects": "0.0.11",
|
|
33
|
+
"@teambit/scope": "1.0.502",
|
|
34
|
+
"@teambit/workspace": "1.0.502",
|
|
35
|
+
"@teambit/checkout": "1.0.502",
|
|
36
|
+
"@teambit/component-writer": "1.0.502",
|
|
37
|
+
"@teambit/config": "0.0.1253",
|
|
38
|
+
"@teambit/dependency-resolver": "1.0.502",
|
|
39
|
+
"@teambit/install": "1.0.502",
|
|
40
|
+
"@teambit/legacy.component-list": "0.0.65",
|
|
41
|
+
"@teambit/legacy.consumer": "0.0.11",
|
|
42
|
+
"@teambit/pkg.modules.component-package-name": "0.0.18",
|
|
43
|
+
"@teambit/remove": "1.0.502",
|
|
44
|
+
"@teambit/snapping": "1.0.502",
|
|
45
45
|
"@teambit/toolbox.path.path": "0.0.5",
|
|
46
46
|
"@teambit/legacy.cli.prompts": "0.0.9",
|
|
47
|
-
"@teambit/component.sources": "0.0.
|
|
47
|
+
"@teambit/component.sources": "0.0.63",
|
|
48
48
|
"@teambit/toolbox.crypto.sha1": "0.0.4",
|
|
49
49
|
"@teambit/toolbox.string.eol": "0.0.2"
|
|
50
50
|
},
|
|
File without changes
|