@teambit/merging 1.0.255 → 1.0.257

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 +4 -4
  3. package/package.json +13 -13
  4. /package/dist/{preview-1714188128543.js → preview-1714360874807.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.255" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.257" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -3091,7 +3091,7 @@
3091
3091
  "line": 84,
3092
3092
  "character": 1
3093
3093
  },
3094
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
3094
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
3095
3095
  "name": "FilesStatus",
3096
3096
  "type": {
3097
3097
  "__schema": "TypeLiteralSchema",
@@ -4092,7 +4092,7 @@
4092
4092
  "_legacy": {
4093
4093
  "scope": "teambit.component",
4094
4094
  "name": "merging",
4095
- "version": "1.0.255"
4095
+ "version": "1.0.257"
4096
4096
  },
4097
4097
  "_scope": "teambit.component"
4098
4098
  }
@@ -5268,7 +5268,7 @@
5268
5268
  "line": 84,
5269
5269
  "character": 1
5270
5270
  },
5271
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"merged\" | \"binaryConflict\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5271
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5272
5272
  "name": "FilesStatus",
5273
5273
  "type": {
5274
5274
  "__schema": "TypeLiteralSchema",
@@ -7860,7 +7860,7 @@
7860
7860
  "componentId": {
7861
7861
  "scope": "teambit.component",
7862
7862
  "name": "merging",
7863
- "version": "1.0.255"
7863
+ "version": "1.0.257"
7864
7864
  },
7865
7865
  "taggedModuleExports": []
7866
7866
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.255",
3
+ "version": "1.0.257",
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.255"
9
+ "version": "1.0.257"
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.862",
20
- "@teambit/config-merger": "0.0.122",
20
+ "@teambit/config-merger": "0.0.124",
21
21
  "@teambit/global-config": "0.0.865",
22
- "@teambit/importer": "1.0.255",
22
+ "@teambit/importer": "1.0.257",
23
23
  "@teambit/logger": "0.0.955",
24
- "@teambit/scope": "1.0.255",
25
- "@teambit/workspace": "1.0.255",
26
- "@teambit/checkout": "1.0.255",
27
- "@teambit/component-writer": "1.0.255",
28
- "@teambit/config": "0.0.1006",
29
- "@teambit/dependency-resolver": "1.0.255",
30
- "@teambit/install": "1.0.255",
31
- "@teambit/remove": "1.0.255",
32
- "@teambit/snapping": "1.0.255"
24
+ "@teambit/scope": "1.0.257",
25
+ "@teambit/workspace": "1.0.257",
26
+ "@teambit/checkout": "1.0.257",
27
+ "@teambit/component-writer": "1.0.257",
28
+ "@teambit/config": "0.0.1008",
29
+ "@teambit/dependency-resolver": "1.0.257",
30
+ "@teambit/install": "1.0.257",
31
+ "@teambit/remove": "1.0.257",
32
+ "@teambit/snapping": "1.0.257"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/lodash": "4.14.165",