@teambit/merging 1.0.490 → 1.0.491

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-1733875472461.js → preview-1733887202407.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.490" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.491" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -5259,7 +5259,7 @@
5259
5259
  "line": 28,
5260
5260
  "character": 3
5261
5261
  },
5262
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5262
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5263
5263
  "name": "FilesStatus",
5264
5264
  "exportNode": {
5265
5265
  "__schema": "TypeSchema",
@@ -5268,7 +5268,7 @@
5268
5268
  "line": 82,
5269
5269
  "character": 1
5270
5270
  },
5271
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5271
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5272
5272
  "name": "FilesStatus",
5273
5273
  "type": {
5274
5274
  "__schema": "TypeLiteralSchema",
@@ -6300,7 +6300,7 @@
6300
6300
  "_legacy": {
6301
6301
  "scope": "teambit.component",
6302
6302
  "name": "merging",
6303
- "version": "1.0.490"
6303
+ "version": "1.0.491"
6304
6304
  },
6305
6305
  "_scope": "teambit.component"
6306
6306
  }
@@ -9359,7 +9359,7 @@
9359
9359
  "line": 82,
9360
9360
  "character": 1
9361
9361
  },
9362
- "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9362
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9363
9363
  "name": "FilesStatus",
9364
9364
  "type": {
9365
9365
  "__schema": "TypeLiteralSchema",
@@ -12125,7 +12125,7 @@
12125
12125
  "componentId": {
12126
12126
  "scope": "teambit.component",
12127
12127
  "name": "merging",
12128
- "version": "1.0.490"
12128
+ "version": "1.0.491"
12129
12129
  },
12130
12130
  "taggedModuleExports": []
12131
12131
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.490",
3
+ "version": "1.0.491",
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.490"
9
+ "version": "1.0.491"
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.1067",
21
- "@teambit/config-merger": "0.0.357",
22
- "@teambit/global-config": "0.0.1070",
20
+ "@teambit/cli": "0.0.1068",
21
+ "@teambit/config-merger": "0.0.358",
22
+ "@teambit/global-config": "0.0.1071",
23
23
  "@teambit/legacy.constants": "0.0.2",
24
24
  "@teambit/git.modules.git-executable": "0.0.3",
25
25
  "@teambit/legacy.logger": "0.0.2",
26
26
  "@teambit/legacy.utils": "0.0.9",
27
27
  "@teambit/component.snap-distance": "0.0.3",
28
- "@teambit/importer": "1.0.490",
28
+ "@teambit/importer": "1.0.491",
29
29
  "@teambit/legacy.consumer-component": "0.0.4",
30
30
  "@teambit/legacy.scope": "0.0.3",
31
- "@teambit/logger": "0.0.1160",
31
+ "@teambit/logger": "0.0.1161",
32
32
  "@teambit/scope.objects": "0.0.3",
33
- "@teambit/scope": "1.0.490",
34
- "@teambit/workspace": "1.0.490",
35
- "@teambit/checkout": "1.0.490",
36
- "@teambit/component-writer": "1.0.490",
37
- "@teambit/config": "0.0.1241",
38
- "@teambit/dependency-resolver": "1.0.490",
39
- "@teambit/install": "1.0.490",
33
+ "@teambit/scope": "1.0.491",
34
+ "@teambit/workspace": "1.0.491",
35
+ "@teambit/checkout": "1.0.491",
36
+ "@teambit/component-writer": "1.0.491",
37
+ "@teambit/config": "0.0.1242",
38
+ "@teambit/dependency-resolver": "1.0.491",
39
+ "@teambit/install": "1.0.491",
40
40
  "@teambit/legacy.component-list": "0.0.57",
41
41
  "@teambit/legacy.consumer": "0.0.3",
42
42
  "@teambit/pkg.modules.component-package-name": "0.0.10",
43
- "@teambit/remove": "1.0.490",
44
- "@teambit/snapping": "1.0.490",
43
+ "@teambit/remove": "1.0.491",
44
+ "@teambit/snapping": "1.0.491",
45
45
  "@teambit/toolbox.path.path": "0.0.5",
46
46
  "@teambit/legacy.cli.prompts": "0.0.7",
47
47
  "@teambit/component.sources": "0.0.55",