@teambit/merging 1.0.245 → 1.0.246
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.
|
@@ -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.
|
|
3
|
+
<testsuite name="teambit.component/merging@1.0.246" tests="0" failures="0" errors="0" skipped="0"/>
|
|
4
4
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -2952,7 +2952,7 @@
|
|
|
2952
2952
|
"line": 82,
|
|
2953
2953
|
"character": 1
|
|
2954
2954
|
},
|
|
2955
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"
|
|
2955
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
2956
2956
|
"name": "FilesStatus",
|
|
2957
2957
|
"type": {
|
|
2958
2958
|
"__schema": "TypeLiteralSchema",
|
|
@@ -3953,7 +3953,7 @@
|
|
|
3953
3953
|
"_legacy": {
|
|
3954
3954
|
"scope": "teambit.component",
|
|
3955
3955
|
"name": "merging",
|
|
3956
|
-
"version": "1.0.
|
|
3956
|
+
"version": "1.0.246"
|
|
3957
3957
|
},
|
|
3958
3958
|
"_scope": "teambit.component"
|
|
3959
3959
|
}
|
|
@@ -5129,7 +5129,7 @@
|
|
|
5129
5129
|
"line": 82,
|
|
5130
5130
|
"character": 1
|
|
5131
5131
|
},
|
|
5132
|
-
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"
|
|
5132
|
+
"signature": "type FilesStatus = {\n [fileName: string]: \"unchanged\" | \"manual\" | \"added\" | \"updated\" | \"merged\" | \"binaryConflict\" | \"removed\" | \"overridden\" | \"remainDeleted\" | \"deletedConflict\";\n}",
|
|
5133
5133
|
"name": "FilesStatus",
|
|
5134
5134
|
"type": {
|
|
5135
5135
|
"__schema": "TypeLiteralSchema",
|
|
@@ -7582,7 +7582,7 @@
|
|
|
7582
7582
|
"componentId": {
|
|
7583
7583
|
"scope": "teambit.component",
|
|
7584
7584
|
"name": "merging",
|
|
7585
|
-
"version": "1.0.
|
|
7585
|
+
"version": "1.0.246"
|
|
7586
7586
|
},
|
|
7587
7587
|
"taggedModuleExports": []
|
|
7588
7588
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merging",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.246",
|
|
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.
|
|
9
|
+
"version": "1.0.246"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -17,18 +17,18 @@
|
|
|
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.
|
|
20
|
+
"@teambit/config-merger": "0.0.113",
|
|
21
21
|
"@teambit/global-config": "0.0.865",
|
|
22
|
-
"@teambit/importer": "1.0.
|
|
22
|
+
"@teambit/importer": "1.0.246",
|
|
23
23
|
"@teambit/logger": "0.0.955",
|
|
24
|
-
"@teambit/scope": "1.0.
|
|
25
|
-
"@teambit/workspace": "1.0.
|
|
26
|
-
"@teambit/checkout": "1.0.
|
|
27
|
-
"@teambit/component-writer": "1.0.
|
|
28
|
-
"@teambit/config": "0.0.
|
|
29
|
-
"@teambit/install": "1.0.
|
|
30
|
-
"@teambit/remove": "1.0.
|
|
31
|
-
"@teambit/snapping": "1.0.
|
|
24
|
+
"@teambit/scope": "1.0.246",
|
|
25
|
+
"@teambit/workspace": "1.0.246",
|
|
26
|
+
"@teambit/checkout": "1.0.246",
|
|
27
|
+
"@teambit/component-writer": "1.0.246",
|
|
28
|
+
"@teambit/config": "0.0.997",
|
|
29
|
+
"@teambit/install": "1.0.246",
|
|
30
|
+
"@teambit/remove": "1.0.246",
|
|
31
|
+
"@teambit/snapping": "1.0.246"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/lodash": "4.14.165",
|
|
File without changes
|