@teambit/merging 1.0.371 → 1.0.373

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 +16 -16
  4. /package/dist/{preview-1722880610382.js → preview-1723000713766.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.371" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.component/merging@1.0.373" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -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]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
4792
4792
  "name": "FilesStatus",
4793
4793
  "type": {
4794
4794
  "__schema": "TypeLiteralSchema",
@@ -5814,7 +5814,7 @@
5814
5814
  "_legacy": {
5815
5815
  "scope": "teambit.component",
5816
5816
  "name": "merging",
5817
- "version": "1.0.371"
5817
+ "version": "1.0.373"
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]: \"unchanged\" | \"manual\" | \"updated\" | \"added\" | \"removed\" | \"overridden\" | \"merged\" | \"binaryConflict\" | \"remainDeleted\" | \"deletedConflict\";\n}",
8639
8639
  "name": "FilesStatus",
8640
8640
  "type": {
8641
8641
  "__schema": "TypeLiteralSchema",
@@ -11058,7 +11058,7 @@
11058
11058
  "componentId": {
11059
11059
  "scope": "teambit.component",
11060
11060
  "name": "merging",
11061
- "version": "1.0.371"
11061
+ "version": "1.0.373"
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.371",
3
+ "version": "1.0.373",
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.371"
9
+ "version": "1.0.373"
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.948",
21
- "@teambit/config-merger": "0.0.238",
22
- "@teambit/global-config": "0.0.951",
20
+ "@teambit/cli": "0.0.950",
21
+ "@teambit/config-merger": "0.0.240",
22
+ "@teambit/global-config": "0.0.953",
23
23
  "@teambit/git.modules.git-executable": "0.0.1",
24
24
  "@teambit/legacy.utils": "0.0.4",
25
- "@teambit/importer": "1.0.371",
26
- "@teambit/logger": "0.0.1041",
27
- "@teambit/scope": "1.0.371",
28
- "@teambit/workspace": "1.0.371",
29
- "@teambit/checkout": "1.0.371",
30
- "@teambit/component-writer": "1.0.371",
31
- "@teambit/config": "0.0.1122",
32
- "@teambit/dependency-resolver": "1.0.371",
33
- "@teambit/install": "1.0.371",
25
+ "@teambit/importer": "1.0.373",
26
+ "@teambit/logger": "0.0.1043",
27
+ "@teambit/scope": "1.0.373",
28
+ "@teambit/workspace": "1.0.373",
29
+ "@teambit/checkout": "1.0.373",
30
+ "@teambit/component-writer": "1.0.373",
31
+ "@teambit/config": "0.0.1124",
32
+ "@teambit/dependency-resolver": "1.0.373",
33
+ "@teambit/install": "1.0.373",
34
34
  "@teambit/legacy.component-list": "0.0.19",
35
35
  "@teambit/pkg.modules.component-package-name": "0.0.3",
36
- "@teambit/remove": "1.0.371",
37
- "@teambit/snapping": "1.0.371",
36
+ "@teambit/remove": "1.0.373",
37
+ "@teambit/snapping": "1.0.373",
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.18",