@teambit/merging 1.0.286 → 1.0.287

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 (4) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +11 -11
  3. package/package.json +13 -13
  4. /package/dist/{preview-1716790497683.js → preview-1716866592572.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -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.286" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.287" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -1586,7 +1586,7 @@
1586
1586
  "line": 221,
1587
1587
  "character": 5
1588
1588
  },
1589
- "signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
1589
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1590
1590
  "name": "mergeStrategy",
1591
1591
  "type": {
1592
1592
  "__schema": "TypeRefSchema",
@@ -1785,7 +1785,7 @@
1785
1785
  "line": 221,
1786
1786
  "character": 5
1787
1787
  },
1788
- "signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
1788
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1789
1789
  "name": "mergeStrategy",
1790
1790
  "type": {
1791
1791
  "__schema": "TypeRefSchema",
@@ -3216,7 +3216,7 @@
3216
3216
  "line": 84,
3217
3217
  "character": 1
3218
3218
  },
3219
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
3219
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
3220
3220
  "name": "FilesStatus",
3221
3221
  "type": {
3222
3222
  "__schema": "TypeLiteralSchema",
@@ -3816,7 +3816,7 @@
3816
3816
  "line": 76,
3817
3817
  "character": 7
3818
3818
  },
3819
- "signature": "(property) autoMergeResolve?: \"manual\" | \"ours\" | \"theirs\" | undefined",
3819
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
3820
3820
  "name": "autoMergeResolve",
3821
3821
  "type": {
3822
3822
  "__schema": "TypeRefSchema",
@@ -4041,7 +4041,7 @@
4041
4041
  "line": 76,
4042
4042
  "character": 7
4043
4043
  },
4044
- "signature": "(property) autoMergeResolve?: \"manual\" | \"ours\" | \"theirs\" | undefined",
4044
+ "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
4045
4045
  "name": "autoMergeResolve",
4046
4046
  "type": {
4047
4047
  "__schema": "TypeRefSchema",
@@ -4236,7 +4236,7 @@
4236
4236
  "_legacy": {
4237
4237
  "scope": "teambit.component",
4238
4238
  "name": "merging",
4239
- "version": "1.0.286"
4239
+ "version": "1.0.287"
4240
4240
  },
4241
4241
  "_scope": "teambit.component"
4242
4242
  }
@@ -5412,7 +5412,7 @@
5412
5412
  "line": 84,
5413
5413
  "character": 1
5414
5414
  },
5415
- "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5415
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5416
5416
  "name": "FilesStatus",
5417
5417
  "type": {
5418
5418
  "__schema": "TypeLiteralSchema",
@@ -6880,7 +6880,7 @@
6880
6880
  "line": 221,
6881
6881
  "character": 5
6882
6882
  },
6883
- "signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
6883
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
6884
6884
  "name": "mergeStrategy",
6885
6885
  "type": {
6886
6886
  "__schema": "TypeRefSchema",
@@ -7079,7 +7079,7 @@
7079
7079
  "line": 221,
7080
7080
  "character": 5
7081
7081
  },
7082
- "signature": "(property) mergeStrategy: \"manual\" | \"ours\" | \"theirs\"",
7082
+ "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
7083
7083
  "name": "mergeStrategy",
7084
7084
  "type": {
7085
7085
  "__schema": "TypeRefSchema",
@@ -7867,7 +7867,7 @@
7867
7867
  "line": 58,
7868
7868
  "character": 3
7869
7869
  },
7870
- "signature": "(property) strategy: \"manual\" | \"ours\" | \"theirs\"",
7870
+ "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
7871
7871
  "name": "strategy",
7872
7872
  "type": {
7873
7873
  "__schema": "TypeRefSchema",
@@ -8004,7 +8004,7 @@
8004
8004
  "componentId": {
8005
8005
  "scope": "teambit.component",
8006
8006
  "name": "merging",
8007
- "version": "1.0.286"
8007
+ "version": "1.0.287"
8008
8008
  },
8009
8009
  "taggedModuleExports": []
8010
8010
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.286",
3
+ "version": "1.0.287",
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.286"
9
+ "version": "1.0.287"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,19 +17,19 @@
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
19
  "@teambit/cli": "0.0.865",
20
- "@teambit/config-merger": "0.0.153",
20
+ "@teambit/config-merger": "0.0.154",
21
21
  "@teambit/global-config": "0.0.868",
22
- "@teambit/importer": "1.0.286",
22
+ "@teambit/importer": "1.0.287",
23
23
  "@teambit/logger": "0.0.958",
24
- "@teambit/scope": "1.0.286",
25
- "@teambit/workspace": "1.0.286",
26
- "@teambit/checkout": "1.0.286",
27
- "@teambit/component-writer": "1.0.286",
28
- "@teambit/config": "0.0.1037",
29
- "@teambit/dependency-resolver": "1.0.286",
30
- "@teambit/install": "1.0.286",
31
- "@teambit/remove": "1.0.286",
32
- "@teambit/snapping": "1.0.286"
24
+ "@teambit/scope": "1.0.287",
25
+ "@teambit/workspace": "1.0.287",
26
+ "@teambit/checkout": "1.0.287",
27
+ "@teambit/component-writer": "1.0.287",
28
+ "@teambit/config": "0.0.1038",
29
+ "@teambit/dependency-resolver": "1.0.287",
30
+ "@teambit/install": "1.0.287",
31
+ "@teambit/remove": "1.0.287",
32
+ "@teambit/snapping": "1.0.287"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/lodash": "4.14.165",