@teambit/merging 1.0.379 → 1.0.381

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 +12 -12
  3. package/package.json +16 -16
  4. /package/dist/{preview-1723386924285.js → preview-1723519217877.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.379" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.381" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -1176,7 +1176,7 @@
1176
1176
  "line": 8,
1177
1177
  "character": 1
1178
1178
  },
1179
- "signature": "type MergeStrategy = \"theirs\" | \"ours\" | \"manual\"",
1179
+ "signature": "type MergeStrategy = \"manual\" | \"theirs\" | \"ours\"",
1180
1180
  "name": "MergeStrategy",
1181
1181
  "type": {
1182
1182
  "__schema": "TypeOperatorSchema",
@@ -3262,7 +3262,7 @@
3262
3262
  "line": 219,
3263
3263
  "character": 5
3264
3264
  },
3265
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
3265
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
3266
3266
  "name": "mergeStrategy",
3267
3267
  "type": {
3268
3268
  "__schema": "TypeRefSchema",
@@ -3459,7 +3459,7 @@
3459
3459
  "line": 219,
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",
@@ -4788,7 +4788,7 @@
4788
4788
  "line": 82,
4789
4789
  "character": 1
4790
4790
  },
4791
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
4791
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"added\" | \"removed\" | \"unchanged\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
4792
4792
  "name": "FilesStatus",
4793
4793
  "type": {
4794
4794
  "__schema": "TypeLiteralSchema",
@@ -5396,7 +5396,7 @@
5396
5396
  "line": 76,
5397
5397
  "character": 7
5398
5398
  },
5399
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
5399
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
5400
5400
  "name": "autoMergeResolve",
5401
5401
  "type": {
5402
5402
  "__schema": "TypeRefSchema",
@@ -5620,7 +5620,7 @@
5620
5620
  "line": 76,
5621
5621
  "character": 7
5622
5622
  },
5623
- "signature": "(property) autoMergeResolve?: \"theirs\" | \"ours\" | \"manual\" | undefined",
5623
+ "signature": "(property) autoMergeResolve?: \"manual\" | \"theirs\" | \"ours\" | undefined",
5624
5624
  "name": "autoMergeResolve",
5625
5625
  "type": {
5626
5626
  "__schema": "TypeRefSchema",
@@ -5814,7 +5814,7 @@
5814
5814
  "_legacy": {
5815
5815
  "scope": "teambit.component",
5816
5816
  "name": "merging",
5817
- "version": "1.0.379"
5817
+ "version": "1.0.381"
5818
5818
  },
5819
5819
  "_scope": "teambit.component"
5820
5820
  }
@@ -8635,7 +8635,7 @@
8635
8635
  "line": 82,
8636
8636
  "character": 1
8637
8637
  },
8638
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8638
+ "signature": "type FilesStatus = {\n [fileName: string]: \"manual\" | \"added\" | \"removed\" | \"unchanged\" | \"updated\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8639
8639
  "name": "FilesStatus",
8640
8640
  "type": {
8641
8641
  "__schema": "TypeLiteralSchema",
@@ -10012,7 +10012,7 @@
10012
10012
  "line": 219,
10013
10013
  "character": 5
10014
10014
  },
10015
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
10015
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
10016
10016
  "name": "mergeStrategy",
10017
10017
  "type": {
10018
10018
  "__schema": "TypeRefSchema",
@@ -10209,7 +10209,7 @@
10209
10209
  "line": 219,
10210
10210
  "character": 5
10211
10211
  },
10212
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
10212
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
10213
10213
  "name": "mergeStrategy",
10214
10214
  "type": {
10215
10215
  "__schema": "TypeRefSchema",
@@ -10922,7 +10922,7 @@
10922
10922
  "line": 56,
10923
10923
  "character": 3
10924
10924
  },
10925
- "signature": "(property) strategy: \"theirs\" | \"ours\" | \"manual\"",
10925
+ "signature": "(property) strategy: \"manual\" | \"theirs\" | \"ours\"",
10926
10926
  "name": "strategy",
10927
10927
  "type": {
10928
10928
  "__schema": "TypeRefSchema",
@@ -11058,7 +11058,7 @@
11058
11058
  "componentId": {
11059
11059
  "scope": "teambit.component",
11060
11060
  "name": "merging",
11061
- "version": "1.0.379"
11061
+ "version": "1.0.381"
11062
11062
  },
11063
11063
  "taggedModuleExports": []
11064
11064
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.379",
3
+ "version": "1.0.381",
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.379"
9
+ "version": "1.0.381"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,24 +17,24 @@
17
17
  "@teambit/component-id": "1.2.0",
18
18
  "@teambit/lane-id": "0.0.311",
19
19
  "@teambit/harmony": "0.4.6",
20
- "@teambit/cli": "0.0.956",
21
- "@teambit/config-merger": "0.0.246",
22
- "@teambit/global-config": "0.0.959",
20
+ "@teambit/cli": "0.0.958",
21
+ "@teambit/config-merger": "0.0.248",
22
+ "@teambit/global-config": "0.0.961",
23
23
  "@teambit/git.modules.git-executable": "0.0.1",
24
24
  "@teambit/legacy.utils": "0.0.4",
25
- "@teambit/importer": "1.0.379",
26
- "@teambit/logger": "0.0.1049",
27
- "@teambit/scope": "1.0.379",
28
- "@teambit/workspace": "1.0.379",
29
- "@teambit/checkout": "1.0.379",
30
- "@teambit/component-writer": "1.0.379",
31
- "@teambit/config": "0.0.1130",
32
- "@teambit/dependency-resolver": "1.0.379",
33
- "@teambit/install": "1.0.379",
25
+ "@teambit/importer": "1.0.381",
26
+ "@teambit/logger": "0.0.1051",
27
+ "@teambit/scope": "1.0.381",
28
+ "@teambit/workspace": "1.0.381",
29
+ "@teambit/checkout": "1.0.381",
30
+ "@teambit/component-writer": "1.0.381",
31
+ "@teambit/config": "0.0.1132",
32
+ "@teambit/dependency-resolver": "1.0.381",
33
+ "@teambit/install": "1.0.381",
34
34
  "@teambit/legacy.component-list": "0.0.21",
35
35
  "@teambit/pkg.modules.component-package-name": "0.0.3",
36
- "@teambit/remove": "1.0.379",
37
- "@teambit/snapping": "1.0.379",
36
+ "@teambit/remove": "1.0.381",
37
+ "@teambit/snapping": "1.0.381",
38
38
  "@teambit/toolbox.path.path": "0.0.2",
39
39
  "@teambit/legacy.cli.prompts": "0.0.1",
40
40
  "@teambit/component.sources": "0.0.20",