@teambit/merging 1.0.498 → 1.0.499

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 +5 -5
  3. package/package.json +16 -16
  4. /package/dist/{preview-1734578336546.js → preview-1734664696801.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.498" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.499" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -5003,7 +5003,7 @@
5003
5003
  "line": 28,
5004
5004
  "character": 3
5005
5005
  },
5006
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5006
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5007
5007
  "name": "FilesStatus",
5008
5008
  "exportNode": {
5009
5009
  "__schema": "TypeSchema",
@@ -5012,7 +5012,7 @@
5012
5012
  "line": 82,
5013
5013
  "character": 1
5014
5014
  },
5015
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5015
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5016
5016
  "name": "FilesStatus",
5017
5017
  "type": {
5018
5018
  "__schema": "TypeLiteralSchema",
@@ -6040,7 +6040,7 @@
6040
6040
  "_legacy": {
6041
6041
  "scope": "teambit.component",
6042
6042
  "name": "merging",
6043
- "version": "1.0.498"
6043
+ "version": "1.0.499"
6044
6044
  },
6045
6045
  "_scope": "teambit.component"
6046
6046
  }
@@ -8969,7 +8969,7 @@
8969
8969
  "line": 82,
8970
8970
  "character": 1
8971
8971
  },
8972
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8972
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8973
8973
  "name": "FilesStatus",
8974
8974
  "type": {
8975
8975
  "__schema": "TypeLiteralSchema",
@@ -11571,7 +11571,7 @@
11571
11571
  "componentId": {
11572
11572
  "scope": "teambit.component",
11573
11573
  "name": "merging",
11574
- "version": "1.0.498"
11574
+ "version": "1.0.499"
11575
11575
  },
11576
11576
  "taggedModuleExports": []
11577
11577
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.498",
3
+ "version": "1.0.499",
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.498"
9
+ "version": "1.0.499"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -17,31 +17,31 @@
17
17
  "@teambit/component-id": "1.2.2",
18
18
  "@teambit/lane-id": "0.0.311",
19
19
  "@teambit/harmony": "0.4.6",
20
- "@teambit/cli": "0.0.1075",
21
- "@teambit/config-merger": "0.0.365",
22
- "@teambit/global-config": "0.0.1078",
20
+ "@teambit/cli": "0.0.1076",
21
+ "@teambit/config-merger": "0.0.366",
22
+ "@teambit/global-config": "0.0.1079",
23
23
  "@teambit/legacy.constants": "0.0.3",
24
24
  "@teambit/git.modules.git-executable": "0.0.4",
25
25
  "@teambit/legacy.logger": "0.0.5",
26
26
  "@teambit/legacy.utils": "0.0.11",
27
27
  "@teambit/component.snap-distance": "0.0.9",
28
- "@teambit/importer": "1.0.498",
28
+ "@teambit/importer": "1.0.499",
29
29
  "@teambit/legacy.consumer-component": "0.0.10",
30
30
  "@teambit/legacy.scope": "0.0.9",
31
- "@teambit/logger": "0.0.1168",
31
+ "@teambit/logger": "0.0.1169",
32
32
  "@teambit/scope.objects": "0.0.9",
33
- "@teambit/scope": "1.0.498",
34
- "@teambit/workspace": "1.0.498",
35
- "@teambit/checkout": "1.0.498",
36
- "@teambit/component-writer": "1.0.498",
37
- "@teambit/config": "0.0.1249",
38
- "@teambit/dependency-resolver": "1.0.498",
39
- "@teambit/install": "1.0.498",
33
+ "@teambit/scope": "1.0.499",
34
+ "@teambit/workspace": "1.0.499",
35
+ "@teambit/checkout": "1.0.499",
36
+ "@teambit/component-writer": "1.0.499",
37
+ "@teambit/config": "0.0.1250",
38
+ "@teambit/dependency-resolver": "1.0.499",
39
+ "@teambit/install": "1.0.499",
40
40
  "@teambit/legacy.component-list": "0.0.63",
41
41
  "@teambit/legacy.consumer": "0.0.9",
42
42
  "@teambit/pkg.modules.component-package-name": "0.0.16",
43
- "@teambit/remove": "1.0.498",
44
- "@teambit/snapping": "1.0.498",
43
+ "@teambit/remove": "1.0.499",
44
+ "@teambit/snapping": "1.0.499",
45
45
  "@teambit/toolbox.path.path": "0.0.5",
46
46
  "@teambit/legacy.cli.prompts": "0.0.8",
47
47
  "@teambit/component.sources": "0.0.61",