@teambit/merging 1.0.501 → 1.0.503

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-1735010348495.js → preview-1735217145314.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.501" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.503" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -5299,7 +5299,7 @@
5299
5299
  "line": 28,
5300
5300
  "character": 3
5301
5301
  },
5302
- "signature": "type FilesStatus = {\n [fileName: string]: \"removed\" | \"added\" | \"merged\" | \"manual\" | \"updated\" | \"overridden\" | \"unchanged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5302
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5303
5303
  "name": "FilesStatus",
5304
5304
  "exportNode": {
5305
5305
  "__schema": "TypeSchema",
@@ -5308,7 +5308,7 @@
5308
5308
  "line": 82,
5309
5309
  "character": 1
5310
5310
  },
5311
- "signature": "type FilesStatus = {\n [fileName: string]: \"removed\" | \"added\" | \"merged\" | \"manual\" | \"updated\" | \"overridden\" | \"unchanged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5311
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
5312
5312
  "name": "FilesStatus",
5313
5313
  "type": {
5314
5314
  "__schema": "TypeLiteralSchema",
@@ -6340,7 +6340,7 @@
6340
6340
  "_legacy": {
6341
6341
  "scope": "teambit.component",
6342
6342
  "name": "merging",
6343
- "version": "1.0.501"
6343
+ "version": "1.0.503"
6344
6344
  },
6345
6345
  "_scope": "teambit.component"
6346
6346
  }
@@ -9399,7 +9399,7 @@
9399
9399
  "line": 82,
9400
9400
  "character": 1
9401
9401
  },
9402
- "signature": "type FilesStatus = {\n [fileName: string]: \"removed\" | \"added\" | \"merged\" | \"manual\" | \"updated\" | \"overridden\" | \"unchanged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9402
+ "signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
9403
9403
  "name": "FilesStatus",
9404
9404
  "type": {
9405
9405
  "__schema": "TypeLiteralSchema",
@@ -12205,7 +12205,7 @@
12205
12205
  "componentId": {
12206
12206
  "scope": "teambit.component",
12207
12207
  "name": "merging",
12208
- "version": "1.0.501"
12208
+ "version": "1.0.503"
12209
12209
  },
12210
12210
  "taggedModuleExports": []
12211
12211
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.501",
3
+ "version": "1.0.503",
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.501"
9
+ "version": "1.0.503"
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.1078",
21
- "@teambit/config-merger": "0.0.368",
22
- "@teambit/global-config": "0.0.1081",
20
+ "@teambit/cli": "0.0.1080",
21
+ "@teambit/config-merger": "0.0.370",
22
+ "@teambit/global-config": "0.0.1083",
23
23
  "@teambit/legacy.constants": "0.0.4",
24
24
  "@teambit/git.modules.git-executable": "0.0.5",
25
25
  "@teambit/legacy.logger": "0.0.6",
26
26
  "@teambit/legacy.utils": "0.0.12",
27
27
  "@teambit/component.snap-distance": "0.0.12",
28
- "@teambit/importer": "1.0.501",
28
+ "@teambit/importer": "1.0.503",
29
29
  "@teambit/legacy.consumer-component": "0.0.12",
30
30
  "@teambit/legacy.scope": "0.0.11",
31
- "@teambit/logger": "0.0.1171",
31
+ "@teambit/logger": "0.0.1173",
32
32
  "@teambit/scope.objects": "0.0.11",
33
- "@teambit/scope": "1.0.501",
34
- "@teambit/workspace": "1.0.501",
35
- "@teambit/checkout": "1.0.501",
36
- "@teambit/component-writer": "1.0.501",
37
- "@teambit/config": "0.0.1252",
38
- "@teambit/dependency-resolver": "1.0.501",
39
- "@teambit/install": "1.0.501",
33
+ "@teambit/scope": "1.0.503",
34
+ "@teambit/workspace": "1.0.503",
35
+ "@teambit/checkout": "1.0.503",
36
+ "@teambit/component-writer": "1.0.503",
37
+ "@teambit/config": "0.0.1254",
38
+ "@teambit/dependency-resolver": "1.0.503",
39
+ "@teambit/install": "1.0.503",
40
40
  "@teambit/legacy.component-list": "0.0.65",
41
41
  "@teambit/legacy.consumer": "0.0.11",
42
42
  "@teambit/pkg.modules.component-package-name": "0.0.18",
43
- "@teambit/remove": "1.0.501",
44
- "@teambit/snapping": "1.0.501",
43
+ "@teambit/remove": "1.0.503",
44
+ "@teambit/snapping": "1.0.503",
45
45
  "@teambit/toolbox.path.path": "0.0.5",
46
46
  "@teambit/legacy.cli.prompts": "0.0.9",
47
47
  "@teambit/component.sources": "0.0.63",