@teambit/merging 1.0.514 → 1.0.516

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.514" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.516" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
@@ -887,7 +887,7 @@
887
887
  "componentId": {
888
888
  "scope": "teambit.legacy",
889
889
  "name": "scope",
890
- "version": "0.0.20"
890
+ "version": "0.0.21"
891
891
  }
892
892
  },
893
893
  "isOptional": false
@@ -1024,7 +1024,7 @@
1024
1024
  "componentId": {
1025
1025
  "scope": "teambit.legacy",
1026
1026
  "name": "scope",
1027
- "version": "0.0.20"
1027
+ "version": "0.0.21"
1028
1028
  }
1029
1029
  },
1030
1030
  "isOptional": false
@@ -1219,7 +1219,7 @@
1219
1219
  "line": 17,
1220
1220
  "character": 3
1221
1221
  },
1222
- "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
1222
+ "signature": "type MergeStrategy = \"manual\" | \"theirs\" | \"ours\"",
1223
1223
  "name": "MergeStrategy",
1224
1224
  "exportNode": {
1225
1225
  "__schema": "TypeSchema",
@@ -1228,7 +1228,7 @@
1228
1228
  "line": 8,
1229
1229
  "character": 1
1230
1230
  },
1231
- "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
1231
+ "signature": "type MergeStrategy = \"manual\" | \"theirs\" | \"ours\"",
1232
1232
  "name": "MergeStrategy",
1233
1233
  "type": {
1234
1234
  "__schema": "TypeOperatorSchema",
@@ -1418,7 +1418,7 @@
1418
1418
  "componentId": {
1419
1419
  "scope": "teambit.component",
1420
1420
  "name": "sources",
1421
- "version": "0.0.72"
1421
+ "version": "0.0.73"
1422
1422
  }
1423
1423
  },
1424
1424
  "isOptional": false
@@ -1614,7 +1614,7 @@
1614
1614
  "componentId": {
1615
1615
  "scope": "teambit.component",
1616
1616
  "name": "sources",
1617
- "version": "0.0.72"
1617
+ "version": "0.0.73"
1618
1618
  }
1619
1619
  },
1620
1620
  "isOptional": true
@@ -1696,7 +1696,7 @@
1696
1696
  "componentId": {
1697
1697
  "scope": "teambit.component",
1698
1698
  "name": "sources",
1699
- "version": "0.0.72"
1699
+ "version": "0.0.73"
1700
1700
  }
1701
1701
  },
1702
1702
  "isOptional": false
@@ -1942,7 +1942,7 @@
1942
1942
  "componentId": {
1943
1943
  "scope": "teambit.component",
1944
1944
  "name": "sources",
1945
- "version": "0.0.72"
1945
+ "version": "0.0.73"
1946
1946
  }
1947
1947
  },
1948
1948
  "isOptional": false
@@ -2024,7 +2024,7 @@
2024
2024
  "componentId": {
2025
2025
  "scope": "teambit.component",
2026
2026
  "name": "sources",
2027
- "version": "0.0.72"
2027
+ "version": "0.0.73"
2028
2028
  }
2029
2029
  },
2030
2030
  "isOptional": false
@@ -3251,7 +3251,7 @@
3251
3251
  "componentId": {
3252
3252
  "scope": "teambit.legacy",
3253
3253
  "name": "consumer",
3254
- "version": "0.0.20"
3254
+ "version": "0.0.21"
3255
3255
  }
3256
3256
  },
3257
3257
  "isOptional": false,
@@ -3459,7 +3459,7 @@
3459
3459
  "line": 222,
3460
3460
  "character": 5
3461
3461
  },
3462
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
3462
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
3463
3463
  "name": "mergeStrategy",
3464
3464
  "type": {
3465
3465
  "__schema": "TypeRefSchema",
@@ -3700,7 +3700,7 @@
3700
3700
  "line": 222,
3701
3701
  "character": 5
3702
3702
  },
3703
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
3703
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
3704
3704
  "name": "mergeStrategy",
3705
3705
  "type": {
3706
3706
  "__schema": "TypeRefSchema",
@@ -4248,7 +4248,7 @@
4248
4248
  "componentId": {
4249
4249
  "scope": "teambit.legacy",
4250
4250
  "name": "component-list",
4251
- "version": "0.0.74"
4251
+ "version": "0.0.75"
4252
4252
  }
4253
4253
  },
4254
4254
  "isOptional": true,
@@ -4690,7 +4690,7 @@
4690
4690
  "componentId": {
4691
4691
  "scope": "teambit.component",
4692
4692
  "name": "snap-distance",
4693
- "version": "0.0.21"
4693
+ "version": "0.0.22"
4694
4694
  }
4695
4695
  },
4696
4696
  "isOptional": true
@@ -4974,7 +4974,7 @@
4974
4974
  "componentId": {
4975
4975
  "scope": "teambit.legacy",
4976
4976
  "name": "consumer-component",
4977
- "version": "0.0.21"
4977
+ "version": "0.0.22"
4978
4978
  }
4979
4979
  }
4980
4980
  },
@@ -5287,7 +5287,7 @@
5287
5287
  "line": 28,
5288
5288
  "character": 3
5289
5289
  },
5290
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5290
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"added\" | \"removed\" | \"unchanged\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5291
5291
  "name": "FilesStatus",
5292
5292
  "exportNode": {
5293
5293
  "__schema": "TypeSchema",
@@ -5296,7 +5296,7 @@
5296
5296
  "line": 82,
5297
5297
  "character": 1
5298
5298
  },
5299
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5299
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"added\" | \"removed\" | \"unchanged\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5300
5300
  "name": "FilesStatus",
5301
5301
  "type": {
5302
5302
  "__schema": "TypeLiteralSchema",
@@ -5910,7 +5910,7 @@
5910
5910
  "line": 79,
5911
5911
  "character": 7
5912
5912
  },
5913
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
5913
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
5914
5914
  "name": "autoMergeResolve",
5915
5915
  "type": {
5916
5916
  "__schema": "TypeRefSchema",
@@ -6134,7 +6134,7 @@
6134
6134
  "line": 79,
6135
6135
  "character": 7
6136
6136
  },
6137
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
6137
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
6138
6138
  "name": "autoMergeResolve",
6139
6139
  "type": {
6140
6140
  "__schema": "TypeRefSchema",
@@ -6328,7 +6328,7 @@
6328
6328
  "_legacy": {
6329
6329
  "scope": "teambit.component",
6330
6330
  "name": "merging",
6331
- "version": "1.0.514"
6331
+ "version": "1.0.516"
6332
6332
  },
6333
6333
  "_scope": "teambit.component"
6334
6334
  }
@@ -7179,7 +7179,7 @@
7179
7179
  "componentId": {
7180
7180
  "scope": "teambit.component",
7181
7181
  "name": "sources",
7182
- "version": "0.0.72"
7182
+ "version": "0.0.73"
7183
7183
  }
7184
7184
  },
7185
7185
  "isOptional": false
@@ -7375,7 +7375,7 @@
7375
7375
  "componentId": {
7376
7376
  "scope": "teambit.component",
7377
7377
  "name": "sources",
7378
- "version": "0.0.72"
7378
+ "version": "0.0.73"
7379
7379
  }
7380
7380
  },
7381
7381
  "isOptional": true
@@ -7457,7 +7457,7 @@
7457
7457
  "componentId": {
7458
7458
  "scope": "teambit.component",
7459
7459
  "name": "sources",
7460
- "version": "0.0.72"
7460
+ "version": "0.0.73"
7461
7461
  }
7462
7462
  },
7463
7463
  "isOptional": false
@@ -7703,7 +7703,7 @@
7703
7703
  "componentId": {
7704
7704
  "scope": "teambit.component",
7705
7705
  "name": "sources",
7706
- "version": "0.0.72"
7706
+ "version": "0.0.73"
7707
7707
  }
7708
7708
  },
7709
7709
  "isOptional": false
@@ -7785,7 +7785,7 @@
7785
7785
  "componentId": {
7786
7786
  "scope": "teambit.component",
7787
7787
  "name": "sources",
7788
- "version": "0.0.72"
7788
+ "version": "0.0.73"
7789
7789
  }
7790
7790
  },
7791
7791
  "isOptional": false
@@ -7977,7 +7977,7 @@
7977
7977
  "componentId": {
7978
7978
  "scope": "teambit.legacy",
7979
7979
  "name": "scope",
7980
- "version": "0.0.20"
7980
+ "version": "0.0.21"
7981
7981
  }
7982
7982
  },
7983
7983
  "isOptional": false
@@ -8114,7 +8114,7 @@
8114
8114
  "componentId": {
8115
8115
  "scope": "teambit.legacy",
8116
8116
  "name": "scope",
8117
- "version": "0.0.20"
8117
+ "version": "0.0.21"
8118
8118
  }
8119
8119
  },
8120
8120
  "isOptional": false
@@ -8287,7 +8287,7 @@
8287
8287
  "componentId": {
8288
8288
  "scope": "teambit.legacy",
8289
8289
  "name": "scope",
8290
- "version": "0.0.20"
8290
+ "version": "0.0.21"
8291
8291
  }
8292
8292
  },
8293
8293
  "isOptional": false,
@@ -8943,7 +8943,7 @@
8943
8943
  "componentId": {
8944
8944
  "scope": "teambit.component",
8945
8945
  "name": "snap-distance",
8946
- "version": "0.0.21"
8946
+ "version": "0.0.22"
8947
8947
  }
8948
8948
  },
8949
8949
  "isOptional": false
@@ -9048,7 +9048,7 @@
9048
9048
  "componentId": {
9049
9049
  "scope": "teambit.component",
9050
9050
  "name": "snap-distance",
9051
- "version": "0.0.21"
9051
+ "version": "0.0.22"
9052
9052
  }
9053
9053
  },
9054
9054
  "isOptional": true
@@ -9161,7 +9161,7 @@
9161
9161
  "componentId": {
9162
9162
  "scope": "teambit.component",
9163
9163
  "name": "snap-distance",
9164
- "version": "0.0.21"
9164
+ "version": "0.0.22"
9165
9165
  }
9166
9166
  },
9167
9167
  "isOptional": true
@@ -9378,7 +9378,7 @@
9378
9378
  "line": 82,
9379
9379
  "character": 1
9380
9380
  },
9381
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9381
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"added\" | \"removed\" | \"unchanged\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9382
9382
  "name": "FilesStatus",
9383
9383
  "type": {
9384
9384
  "__schema": "TypeLiteralSchema",
@@ -9498,7 +9498,7 @@
9498
9498
  "componentId": {
9499
9499
  "scope": "teambit.legacy",
9500
9500
  "name": "consumer-component",
9501
- "version": "0.0.21"
9501
+ "version": "0.0.22"
9502
9502
  }
9503
9503
  }
9504
9504
  },
@@ -9892,7 +9892,7 @@
9892
9892
  "componentId": {
9893
9893
  "scope": "teambit.legacy",
9894
9894
  "name": "consumer-component",
9895
- "version": "0.0.21"
9895
+ "version": "0.0.22"
9896
9896
  }
9897
9897
  }
9898
9898
  },
@@ -10677,7 +10677,7 @@
10677
10677
  "componentId": {
10678
10678
  "scope": "teambit.legacy",
10679
10679
  "name": "consumer",
10680
- "version": "0.0.20"
10680
+ "version": "0.0.21"
10681
10681
  }
10682
10682
  },
10683
10683
  "isOptional": false,
@@ -10885,7 +10885,7 @@
10885
10885
  "line": 222,
10886
10886
  "character": 5
10887
10887
  },
10888
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
10888
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
10889
10889
  "name": "mergeStrategy",
10890
10890
  "type": {
10891
10891
  "__schema": "TypeRefSchema",
@@ -11126,7 +11126,7 @@
11126
11126
  "line": 222,
11127
11127
  "character": 5
11128
11128
  },
11129
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
11129
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
11130
11130
  "name": "mergeStrategy",
11131
11131
  "type": {
11132
11132
  "__schema": "TypeRefSchema",
@@ -11674,7 +11674,7 @@
11674
11674
  "componentId": {
11675
11675
  "scope": "teambit.legacy",
11676
11676
  "name": "component-list",
11677
- "version": "0.0.74"
11677
+ "version": "0.0.75"
11678
11678
  }
11679
11679
  },
11680
11680
  "isOptional": true,
@@ -12035,7 +12035,7 @@
12035
12035
  "line": 54,
12036
12036
  "character": 3
12037
12037
  },
12038
- "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
12038
+ "signature": "(property) strategy: \"manual\" | \"theirs\" | \"ours\"",
12039
12039
  "name": "strategy",
12040
12040
  "type": {
12041
12041
  "__schema": "TypeRefSchema",
@@ -12177,7 +12177,7 @@
12177
12177
  "componentId": {
12178
12178
  "scope": "teambit.component",
12179
12179
  "name": "merging",
12180
- "version": "1.0.514"
12180
+ "version": "1.0.516"
12181
12181
  },
12182
12182
  "taggedModuleExports": []
12183
12183
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.514",
3
+ "version": "1.0.516",
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.514"
9
+ "version": "1.0.516"
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.312",
19
19
  "@teambit/harmony": "0.4.6",
20
- "@teambit/cli": "0.0.1091",
21
- "@teambit/config-merger": "0.0.381",
22
- "@teambit/global-config": "0.0.1094",
23
- "@teambit/legacy.constants": "0.0.6",
24
- "@teambit/git.modules.git-executable": "0.0.7",
25
- "@teambit/legacy.logger": "0.0.8",
20
+ "@teambit/cli": "0.0.1093",
21
+ "@teambit/config-merger": "0.0.383",
22
+ "@teambit/global-config": "0.0.1096",
23
+ "@teambit/legacy.constants": "0.0.7",
24
+ "@teambit/git.modules.git-executable": "0.0.8",
25
+ "@teambit/legacy.logger": "0.0.9",
26
26
  "@teambit/legacy.utils": "0.0.14",
27
- "@teambit/component.snap-distance": "0.0.21",
28
- "@teambit/importer": "1.0.514",
29
- "@teambit/legacy.consumer-component": "0.0.21",
30
- "@teambit/legacy.scope": "0.0.20",
31
- "@teambit/logger": "0.0.1184",
32
- "@teambit/objects": "0.0.21",
33
- "@teambit/scope": "1.0.514",
34
- "@teambit/workspace": "1.0.514",
35
- "@teambit/checkout": "1.0.514",
36
- "@teambit/component-writer": "1.0.514",
37
- "@teambit/config": "0.0.1265",
38
- "@teambit/dependency-resolver": "1.0.514",
39
- "@teambit/install": "1.0.514",
40
- "@teambit/legacy.component-list": "0.0.74",
41
- "@teambit/legacy.consumer": "0.0.20",
42
- "@teambit/pkg.modules.component-package-name": "0.0.27",
43
- "@teambit/remove": "1.0.514",
44
- "@teambit/snapping": "1.0.514",
27
+ "@teambit/component.snap-distance": "0.0.22",
28
+ "@teambit/importer": "1.0.516",
29
+ "@teambit/legacy.consumer-component": "0.0.22",
30
+ "@teambit/legacy.scope": "0.0.21",
31
+ "@teambit/logger": "0.0.1186",
32
+ "@teambit/objects": "0.0.23",
33
+ "@teambit/scope": "1.0.516",
34
+ "@teambit/workspace": "1.0.516",
35
+ "@teambit/checkout": "1.0.516",
36
+ "@teambit/component-writer": "1.0.516",
37
+ "@teambit/config": "0.0.1267",
38
+ "@teambit/dependency-resolver": "1.0.516",
39
+ "@teambit/install": "1.0.516",
40
+ "@teambit/legacy.component-list": "0.0.75",
41
+ "@teambit/legacy.consumer": "0.0.21",
42
+ "@teambit/pkg.modules.component-package-name": "0.0.28",
43
+ "@teambit/remove": "1.0.516",
44
+ "@teambit/snapping": "1.0.516",
45
45
  "@teambit/toolbox.path.path": "0.0.6",
46
- "@teambit/legacy.cli.prompts": "0.0.11",
47
- "@teambit/component.sources": "0.0.72",
46
+ "@teambit/legacy.cli.prompts": "0.0.12",
47
+ "@teambit/component.sources": "0.0.73",
48
48
  "@teambit/toolbox.crypto.sha1": "0.0.5",
49
49
  "@teambit/toolbox.string.eol": "0.0.3"
50
50
  },