@teambit/merging 1.0.509 → 1.0.510

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.509" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.510" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -865,7 +865,7 @@
865
865
  "componentId": {
866
866
  "scope": "teambit.legacy",
867
867
  "name": "scope",
868
- "version": "0.0.16"
868
+ "version": "0.0.17"
869
869
  }
870
870
  },
871
871
  "isOptional": false
@@ -890,7 +890,7 @@
890
890
  "componentId": {
891
891
  "scope": "teambit.scope",
892
892
  "name": "objects",
893
- "version": "0.0.16"
893
+ "version": "0.0.17"
894
894
  }
895
895
  },
896
896
  "isOptional": false
@@ -975,7 +975,7 @@
975
975
  "componentId": {
976
976
  "scope": "teambit.scope",
977
977
  "name": "objects",
978
- "version": "0.0.16"
978
+ "version": "0.0.17"
979
979
  }
980
980
  },
981
981
  "isOptional": false
@@ -1004,7 +1004,7 @@
1004
1004
  "componentId": {
1005
1005
  "scope": "teambit.legacy",
1006
1006
  "name": "scope",
1007
- "version": "0.0.16"
1007
+ "version": "0.0.17"
1008
1008
  }
1009
1009
  },
1010
1010
  "isOptional": false
@@ -1029,7 +1029,7 @@
1029
1029
  "componentId": {
1030
1030
  "scope": "teambit.scope",
1031
1031
  "name": "objects",
1032
- "version": "0.0.16"
1032
+ "version": "0.0.17"
1033
1033
  }
1034
1034
  },
1035
1035
  "isOptional": false
@@ -1114,7 +1114,7 @@
1114
1114
  "componentId": {
1115
1115
  "scope": "teambit.scope",
1116
1116
  "name": "objects",
1117
- "version": "0.0.16"
1117
+ "version": "0.0.17"
1118
1118
  }
1119
1119
  },
1120
1120
  "isOptional": false
@@ -1201,7 +1201,7 @@
1201
1201
  "line": 17,
1202
1202
  "character": 3
1203
1203
  },
1204
- "signature": "type MergeStrategy = \"ours\" | \"theirs\" | \"manual\"",
1204
+ "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
1205
1205
  "name": "MergeStrategy",
1206
1206
  "exportNode": {
1207
1207
  "__schema": "TypeSchema",
@@ -1210,7 +1210,7 @@
1210
1210
  "line": 8,
1211
1211
  "character": 1
1212
1212
  },
1213
- "signature": "type MergeStrategy = \"ours\" | \"theirs\" | \"manual\"",
1213
+ "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
1214
1214
  "name": "MergeStrategy",
1215
1215
  "type": {
1216
1216
  "__schema": "TypeOperatorSchema",
@@ -1395,7 +1395,7 @@
1395
1395
  "componentId": {
1396
1396
  "scope": "teambit.component",
1397
1397
  "name": "sources",
1398
- "version": "0.0.68"
1398
+ "version": "0.0.69"
1399
1399
  }
1400
1400
  },
1401
1401
  "isOptional": false
@@ -1648,7 +1648,7 @@
1648
1648
  "componentId": {
1649
1649
  "scope": "teambit.component",
1650
1650
  "name": "sources",
1651
- "version": "0.0.68"
1651
+ "version": "0.0.69"
1652
1652
  }
1653
1653
  },
1654
1654
  "isOptional": false
@@ -1693,7 +1693,7 @@
1693
1693
  "componentId": {
1694
1694
  "scope": "teambit.scope",
1695
1695
  "name": "objects",
1696
- "version": "0.0.16"
1696
+ "version": "0.0.17"
1697
1697
  }
1698
1698
  },
1699
1699
  "isOptional": false
@@ -1886,7 +1886,7 @@
1886
1886
  "componentId": {
1887
1887
  "scope": "teambit.component",
1888
1888
  "name": "sources",
1889
- "version": "0.0.68"
1889
+ "version": "0.0.69"
1890
1890
  }
1891
1891
  },
1892
1892
  "isOptional": false
@@ -1963,7 +1963,7 @@
1963
1963
  "componentId": {
1964
1964
  "scope": "teambit.component",
1965
1965
  "name": "sources",
1966
- "version": "0.0.68"
1966
+ "version": "0.0.69"
1967
1967
  }
1968
1968
  },
1969
1969
  "isOptional": false
@@ -2040,7 +2040,7 @@
2040
2040
  "componentId": {
2041
2041
  "scope": "teambit.scope",
2042
2042
  "name": "objects",
2043
- "version": "0.0.16"
2043
+ "version": "0.0.17"
2044
2044
  }
2045
2045
  },
2046
2046
  "isOptional": false
@@ -3311,7 +3311,7 @@
3311
3311
  "line": 222,
3312
3312
  "character": 5
3313
3313
  },
3314
- "signature": "(property) mergeStrategy: \"ours\" | \"theirs\" | \"manual\"",
3314
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
3315
3315
  "name": "mergeStrategy",
3316
3316
  "type": {
3317
3317
  "__schema": "TypeRefSchema",
@@ -3548,7 +3548,7 @@
3548
3548
  "line": 222,
3549
3549
  "character": 5
3550
3550
  },
3551
- "signature": "(property) mergeStrategy: \"ours\" | \"theirs\" | \"manual\"",
3551
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
3552
3552
  "name": "mergeStrategy",
3553
3553
  "type": {
3554
3554
  "__schema": "TypeRefSchema",
@@ -5003,7 +5003,7 @@
5003
5003
  "line": 28,
5004
5004
  "character": 3
5005
5005
  },
5006
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5006
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5007
5007
  "name": "FilesStatus",
5008
5008
  "exportNode": {
5009
5009
  "__schema": "TypeSchema",
@@ -5012,7 +5012,7 @@
5012
5012
  "line": 82,
5013
5013
  "character": 1
5014
5014
  },
5015
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5015
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5016
5016
  "name": "FilesStatus",
5017
5017
  "type": {
5018
5018
  "__schema": "TypeLiteralSchema",
@@ -5622,7 +5622,7 @@
5622
5622
  "line": 79,
5623
5623
  "character": 7
5624
5624
  },
5625
- "signature": "(property) autoMergeResolve?: \"ours\" | \"theirs\" | \"manual\" | undefined",
5625
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
5626
5626
  "name": "autoMergeResolve",
5627
5627
  "type": {
5628
5628
  "__schema": "TypeRefSchema",
@@ -5846,7 +5846,7 @@
5846
5846
  "line": 79,
5847
5847
  "character": 7
5848
5848
  },
5849
- "signature": "(property) autoMergeResolve?: \"ours\" | \"theirs\" | \"manual\" | undefined",
5849
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
5850
5850
  "name": "autoMergeResolve",
5851
5851
  "type": {
5852
5852
  "__schema": "TypeRefSchema",
@@ -6040,7 +6040,7 @@
6040
6040
  "_legacy": {
6041
6041
  "scope": "teambit.component",
6042
6042
  "name": "merging",
6043
- "version": "1.0.509"
6043
+ "version": "1.0.510"
6044
6044
  },
6045
6045
  "_scope": "teambit.component"
6046
6046
  }
@@ -6860,7 +6860,7 @@
6860
6860
  "componentId": {
6861
6861
  "scope": "teambit.component",
6862
6862
  "name": "sources",
6863
- "version": "0.0.68"
6863
+ "version": "0.0.69"
6864
6864
  }
6865
6865
  },
6866
6866
  "isOptional": false
@@ -7113,7 +7113,7 @@
7113
7113
  "componentId": {
7114
7114
  "scope": "teambit.component",
7115
7115
  "name": "sources",
7116
- "version": "0.0.68"
7116
+ "version": "0.0.69"
7117
7117
  }
7118
7118
  },
7119
7119
  "isOptional": false
@@ -7158,7 +7158,7 @@
7158
7158
  "componentId": {
7159
7159
  "scope": "teambit.scope",
7160
7160
  "name": "objects",
7161
- "version": "0.0.16"
7161
+ "version": "0.0.17"
7162
7162
  }
7163
7163
  },
7164
7164
  "isOptional": false
@@ -7351,7 +7351,7 @@
7351
7351
  "componentId": {
7352
7352
  "scope": "teambit.component",
7353
7353
  "name": "sources",
7354
- "version": "0.0.68"
7354
+ "version": "0.0.69"
7355
7355
  }
7356
7356
  },
7357
7357
  "isOptional": false
@@ -7428,7 +7428,7 @@
7428
7428
  "componentId": {
7429
7429
  "scope": "teambit.component",
7430
7430
  "name": "sources",
7431
- "version": "0.0.68"
7431
+ "version": "0.0.69"
7432
7432
  }
7433
7433
  },
7434
7434
  "isOptional": false
@@ -7505,7 +7505,7 @@
7505
7505
  "componentId": {
7506
7506
  "scope": "teambit.scope",
7507
7507
  "name": "objects",
7508
- "version": "0.0.16"
7508
+ "version": "0.0.17"
7509
7509
  }
7510
7510
  },
7511
7511
  "isOptional": false
@@ -7616,7 +7616,7 @@
7616
7616
  "componentId": {
7617
7617
  "scope": "teambit.legacy",
7618
7618
  "name": "scope",
7619
- "version": "0.0.16"
7619
+ "version": "0.0.17"
7620
7620
  }
7621
7621
  },
7622
7622
  "isOptional": false
@@ -7641,7 +7641,7 @@
7641
7641
  "componentId": {
7642
7642
  "scope": "teambit.scope",
7643
7643
  "name": "objects",
7644
- "version": "0.0.16"
7644
+ "version": "0.0.17"
7645
7645
  }
7646
7646
  },
7647
7647
  "isOptional": false
@@ -7726,7 +7726,7 @@
7726
7726
  "componentId": {
7727
7727
  "scope": "teambit.scope",
7728
7728
  "name": "objects",
7729
- "version": "0.0.16"
7729
+ "version": "0.0.17"
7730
7730
  }
7731
7731
  },
7732
7732
  "isOptional": false
@@ -7755,7 +7755,7 @@
7755
7755
  "componentId": {
7756
7756
  "scope": "teambit.legacy",
7757
7757
  "name": "scope",
7758
- "version": "0.0.16"
7758
+ "version": "0.0.17"
7759
7759
  }
7760
7760
  },
7761
7761
  "isOptional": false
@@ -7780,7 +7780,7 @@
7780
7780
  "componentId": {
7781
7781
  "scope": "teambit.scope",
7782
7782
  "name": "objects",
7783
- "version": "0.0.16"
7783
+ "version": "0.0.17"
7784
7784
  }
7785
7785
  },
7786
7786
  "isOptional": false
@@ -7865,7 +7865,7 @@
7865
7865
  "componentId": {
7866
7866
  "scope": "teambit.scope",
7867
7867
  "name": "objects",
7868
- "version": "0.0.16"
7868
+ "version": "0.0.17"
7869
7869
  }
7870
7870
  },
7871
7871
  "isOptional": false
@@ -8556,7 +8556,7 @@
8556
8556
  "componentId": {
8557
8557
  "scope": "teambit.component",
8558
8558
  "name": "snap-distance",
8559
- "version": "0.0.17"
8559
+ "version": "0.0.18"
8560
8560
  }
8561
8561
  },
8562
8562
  "isOptional": false
@@ -8813,7 +8813,7 @@
8813
8813
  "componentId": {
8814
8814
  "scope": "teambit.scope",
8815
8815
  "name": "objects",
8816
- "version": "0.0.16"
8816
+ "version": "0.0.17"
8817
8817
  }
8818
8818
  },
8819
8819
  "isOptional": false
@@ -8863,7 +8863,7 @@
8863
8863
  "componentId": {
8864
8864
  "scope": "teambit.scope",
8865
8865
  "name": "objects",
8866
- "version": "0.0.16"
8866
+ "version": "0.0.17"
8867
8867
  }
8868
8868
  },
8869
8869
  "isOptional": false
@@ -8969,7 +8969,7 @@
8969
8969
  "line": 82,
8970
8970
  "character": 1
8971
8971
  },
8972
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8972
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8973
8973
  "name": "FilesStatus",
8974
8974
  "type": {
8975
8975
  "__schema": "TypeLiteralSchema",
@@ -10374,7 +10374,7 @@
10374
10374
  "line": 222,
10375
10375
  "character": 5
10376
10376
  },
10377
- "signature": "(property) mergeStrategy: \"ours\" | \"theirs\" | \"manual\"",
10377
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
10378
10378
  "name": "mergeStrategy",
10379
10379
  "type": {
10380
10380
  "__schema": "TypeRefSchema",
@@ -10611,7 +10611,7 @@
10611
10611
  "line": 222,
10612
10612
  "character": 5
10613
10613
  },
10614
- "signature": "(property) mergeStrategy: \"ours\" | \"theirs\" | \"manual\"",
10614
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
10615
10615
  "name": "mergeStrategy",
10616
10616
  "type": {
10617
10617
  "__schema": "TypeRefSchema",
@@ -11427,7 +11427,7 @@
11427
11427
  "line": 54,
11428
11428
  "character": 3
11429
11429
  },
11430
- "signature": "(property) strategy: \"ours\" | \"theirs\" | \"manual\"",
11430
+ "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
11431
11431
  "name": "strategy",
11432
11432
  "type": {
11433
11433
  "__schema": "TypeRefSchema",
@@ -11460,7 +11460,7 @@
11460
11460
  "componentId": {
11461
11461
  "scope": "teambit.scope",
11462
11462
  "name": "objects",
11463
- "version": "0.0.16"
11463
+ "version": "0.0.17"
11464
11464
  }
11465
11465
  },
11466
11466
  "isOptional": false
@@ -11485,7 +11485,7 @@
11485
11485
  "componentId": {
11486
11486
  "scope": "teambit.scope",
11487
11487
  "name": "objects",
11488
- "version": "0.0.16"
11488
+ "version": "0.0.17"
11489
11489
  }
11490
11490
  },
11491
11491
  "isOptional": false
@@ -11571,7 +11571,7 @@
11571
11571
  "componentId": {
11572
11572
  "scope": "teambit.component",
11573
11573
  "name": "merging",
11574
- "version": "1.0.509"
11574
+ "version": "1.0.510"
11575
11575
  },
11576
11576
  "taggedModuleExports": []
11577
11577
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.509",
3
+ "version": "1.0.510",
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.509"
9
+ "version": "1.0.510"
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.1086",
21
- "@teambit/config-merger": "0.0.376",
22
- "@teambit/global-config": "0.0.1089",
20
+ "@teambit/cli": "0.0.1087",
21
+ "@teambit/config-merger": "0.0.377",
22
+ "@teambit/global-config": "0.0.1090",
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.17",
28
- "@teambit/importer": "1.0.509",
29
- "@teambit/legacy.consumer-component": "0.0.17",
30
- "@teambit/legacy.scope": "0.0.16",
31
- "@teambit/logger": "0.0.1179",
32
- "@teambit/scope.objects": "0.0.16",
33
- "@teambit/scope": "1.0.509",
34
- "@teambit/workspace": "1.0.509",
35
- "@teambit/checkout": "1.0.509",
36
- "@teambit/component-writer": "1.0.509",
37
- "@teambit/config": "0.0.1260",
38
- "@teambit/dependency-resolver": "1.0.509",
39
- "@teambit/install": "1.0.509",
40
- "@teambit/legacy.component-list": "0.0.70",
41
- "@teambit/legacy.consumer": "0.0.16",
42
- "@teambit/pkg.modules.component-package-name": "0.0.23",
43
- "@teambit/remove": "1.0.509",
44
- "@teambit/snapping": "1.0.509",
27
+ "@teambit/component.snap-distance": "0.0.18",
28
+ "@teambit/importer": "1.0.510",
29
+ "@teambit/legacy.consumer-component": "0.0.18",
30
+ "@teambit/legacy.scope": "0.0.17",
31
+ "@teambit/logger": "0.0.1180",
32
+ "@teambit/scope.objects": "0.0.17",
33
+ "@teambit/scope": "1.0.510",
34
+ "@teambit/workspace": "1.0.510",
35
+ "@teambit/checkout": "1.0.510",
36
+ "@teambit/component-writer": "1.0.510",
37
+ "@teambit/config": "0.0.1261",
38
+ "@teambit/dependency-resolver": "1.0.510",
39
+ "@teambit/install": "1.0.510",
40
+ "@teambit/legacy.component-list": "0.0.71",
41
+ "@teambit/legacy.consumer": "0.0.17",
42
+ "@teambit/pkg.modules.component-package-name": "0.0.24",
43
+ "@teambit/remove": "1.0.510",
44
+ "@teambit/snapping": "1.0.510",
45
45
  "@teambit/toolbox.path.path": "0.0.5",
46
46
  "@teambit/legacy.cli.prompts": "0.0.9",
47
- "@teambit/component.sources": "0.0.68",
47
+ "@teambit/component.sources": "0.0.69",
48
48
  "@teambit/toolbox.crypto.sha1": "0.0.4",
49
49
  "@teambit/toolbox.string.eol": "0.0.2"
50
50
  },