@teambit/merging 1.0.174 → 1.0.176

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 +12 -12
  4. /package/dist/{preview-1708958940676.js → preview-1709090190973.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.174" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.176" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -1399,7 +1399,7 @@
1399
1399
  "line": 218,
1400
1400
  "character": 5
1401
1401
  },
1402
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1402
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
1403
1403
  "name": "mergeStrategy",
1404
1404
  "type": {
1405
1405
  "__schema": "TypeRefSchema",
@@ -1615,7 +1615,7 @@
1615
1615
  "line": 218,
1616
1616
  "character": 5
1617
1617
  },
1618
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1618
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
1619
1619
  "name": "mergeStrategy",
1620
1620
  "type": {
1621
1621
  "__schema": "TypeRefSchema",
@@ -2863,7 +2863,7 @@
2863
2863
  "line": 82,
2864
2864
  "character": 1
2865
2865
  },
2866
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
2866
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
2867
2867
  "name": "FilesStatus",
2868
2868
  "type": {
2869
2869
  "__schema": "TypeLiteralSchema",
@@ -3440,7 +3440,7 @@
3440
3440
  "line": 76,
3441
3441
  "character": 7
3442
3442
  },
3443
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
3443
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
3444
3444
  "name": "autoMergeResolve",
3445
3445
  "type": {
3446
3446
  "__schema": "TypeRefSchema",
@@ -3664,7 +3664,7 @@
3664
3664
  "line": 76,
3665
3665
  "character": 7
3666
3666
  },
3667
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
3667
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
3668
3668
  "name": "autoMergeResolve",
3669
3669
  "type": {
3670
3670
  "__schema": "TypeRefSchema",
@@ -3858,7 +3858,7 @@
3858
3858
  "_legacy": {
3859
3859
  "scope": "teambit.component",
3860
3860
  "name": "merging",
3861
- "version": "1.0.174"
3861
+ "version": "1.0.176"
3862
3862
  },
3863
3863
  "_scope": "teambit.component"
3864
3864
  }
@@ -4991,7 +4991,7 @@
4991
4991
  "line": 82,
4992
4992
  "character": 1
4993
4993
  },
4994
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
4994
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"unchanged\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
4995
4995
  "name": "FilesStatus",
4996
4996
  "type": {
4997
4997
  "__schema": "TypeLiteralSchema",
@@ -6355,7 +6355,7 @@
6355
6355
  "line": 218,
6356
6356
  "character": 5
6357
6357
  },
6358
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
6358
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
6359
6359
  "name": "mergeStrategy",
6360
6360
  "type": {
6361
6361
  "__schema": "TypeRefSchema",
@@ -6571,7 +6571,7 @@
6571
6571
  "line": 218,
6572
6572
  "character": 5
6573
6573
  },
6574
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
6574
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
6575
6575
  "name": "mergeStrategy",
6576
6576
  "type": {
6577
6577
  "__schema": "TypeRefSchema",
@@ -7239,7 +7239,7 @@
7239
7239
  "line": 56,
7240
7240
  "character": 3
7241
7241
  },
7242
- "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
7242
+ "signature": "(property) strategy: \"manual\" | \"theirs\" | \"ours\"",
7243
7243
  "name": "strategy",
7244
7244
  "type": {
7245
7245
  "__schema": "TypeRefSchema",
@@ -7375,7 +7375,7 @@
7375
7375
  "componentId": {
7376
7376
  "scope": "teambit.component",
7377
7377
  "name": "merging",
7378
- "version": "1.0.174"
7378
+ "version": "1.0.176"
7379
7379
  },
7380
7380
  "taggedModuleExports": []
7381
7381
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.174",
3
+ "version": "1.0.176",
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.174"
9
+ "version": "1.0.176"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,18 +17,18 @@
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
19
  "@teambit/cli": "0.0.851",
20
- "@teambit/config-merger": "0.0.41",
20
+ "@teambit/config-merger": "0.0.43",
21
21
  "@teambit/global-config": "0.0.854",
22
- "@teambit/importer": "1.0.174",
22
+ "@teambit/importer": "1.0.176",
23
23
  "@teambit/logger": "0.0.944",
24
- "@teambit/scope": "1.0.174",
25
- "@teambit/workspace": "1.0.174",
26
- "@teambit/checkout": "1.0.174",
27
- "@teambit/component-writer": "1.0.174",
28
- "@teambit/config": "0.0.925",
29
- "@teambit/install": "1.0.174",
30
- "@teambit/remove": "1.0.174",
31
- "@teambit/snapping": "1.0.174"
24
+ "@teambit/scope": "1.0.176",
25
+ "@teambit/workspace": "1.0.176",
26
+ "@teambit/checkout": "1.0.176",
27
+ "@teambit/component-writer": "1.0.176",
28
+ "@teambit/config": "0.0.927",
29
+ "@teambit/install": "1.0.176",
30
+ "@teambit/remove": "1.0.176",
31
+ "@teambit/snapping": "1.0.176"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@types/lodash": "4.14.165",