@teambit/harmony.content.cli-reference 1.95.51 → 1.95.54
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.
- package/cli-reference.json +36 -16
- package/cli-reference.mdx +13 -11
- package/dist/cli-reference.json +36 -16
- package/dist/cli-reference.mdx.js +27 -1
- package/dist/cli-reference.mdx.js.map +1 -1
- package/package-tar/teambit-harmony.content.cli-reference-1.95.54.tgz +0 -0
- package/package.json +2 -2
- package/{preview-1659756525406.js → preview-1660275011373.js} +2 -2
- package/package-tar/teambit-harmony.content.cli-reference-1.95.51.tgz +0 -0
package/cli-reference.json
CHANGED
|
@@ -839,6 +839,21 @@
|
|
|
839
839
|
"group": "general",
|
|
840
840
|
"private": false
|
|
841
841
|
},
|
|
842
|
+
{
|
|
843
|
+
"name": "globals",
|
|
844
|
+
"alias": "",
|
|
845
|
+
"options": [
|
|
846
|
+
[
|
|
847
|
+
"j",
|
|
848
|
+
"json",
|
|
849
|
+
"json format"
|
|
850
|
+
]
|
|
851
|
+
],
|
|
852
|
+
"description": "list all globals",
|
|
853
|
+
"extendedDescription": "",
|
|
854
|
+
"group": "workspace",
|
|
855
|
+
"private": false
|
|
856
|
+
},
|
|
842
857
|
{
|
|
843
858
|
"name": "show <component-name>",
|
|
844
859
|
"alias": "",
|
|
@@ -975,21 +990,6 @@
|
|
|
975
990
|
}
|
|
976
991
|
]
|
|
977
992
|
},
|
|
978
|
-
{
|
|
979
|
-
"name": "globals",
|
|
980
|
-
"alias": "",
|
|
981
|
-
"options": [
|
|
982
|
-
[
|
|
983
|
-
"j",
|
|
984
|
-
"json",
|
|
985
|
-
"json format"
|
|
986
|
-
]
|
|
987
|
-
],
|
|
988
|
-
"description": "list all globals",
|
|
989
|
-
"extendedDescription": "",
|
|
990
|
-
"group": "workspace",
|
|
991
|
-
"private": false
|
|
992
|
-
},
|
|
993
993
|
{
|
|
994
994
|
"name": "start [type] [pattern]",
|
|
995
995
|
"alias": "c",
|
|
@@ -1451,7 +1451,7 @@
|
|
|
1451
1451
|
]
|
|
1452
1452
|
},
|
|
1453
1453
|
{
|
|
1454
|
-
"name": "set <component-pattern> <package
|
|
1454
|
+
"name": "set <component-pattern> <package...>",
|
|
1455
1455
|
"alias": "",
|
|
1456
1456
|
"options": [
|
|
1457
1457
|
[
|
|
@@ -2245,6 +2245,16 @@
|
|
|
2245
2245
|
"build",
|
|
2246
2246
|
"in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
|
|
2247
2247
|
],
|
|
2248
|
+
[
|
|
2249
|
+
"",
|
|
2250
|
+
"verbose",
|
|
2251
|
+
"show details of components that were not merged legitimately"
|
|
2252
|
+
],
|
|
2253
|
+
[
|
|
2254
|
+
"",
|
|
2255
|
+
"skip-dependency-installation",
|
|
2256
|
+
"do not install packages of the imported components"
|
|
2257
|
+
],
|
|
2248
2258
|
[
|
|
2249
2259
|
"m",
|
|
2250
2260
|
"message <message>",
|
|
@@ -3030,6 +3040,16 @@
|
|
|
3030
3040
|
"squash",
|
|
3031
3041
|
"EXPERIMENTAL. squash multiple snaps. keep the last one only"
|
|
3032
3042
|
],
|
|
3043
|
+
[
|
|
3044
|
+
"",
|
|
3045
|
+
"verbose",
|
|
3046
|
+
"show details of components that were not merged legitimately"
|
|
3047
|
+
],
|
|
3048
|
+
[
|
|
3049
|
+
"",
|
|
3050
|
+
"skip-dependency-installation",
|
|
3051
|
+
"do not install packages of the imported components"
|
|
3052
|
+
],
|
|
3033
3053
|
[
|
|
3034
3054
|
"",
|
|
3035
3055
|
"include-deps",
|
package/cli-reference.mdx
CHANGED
|
@@ -397,7 +397,7 @@ https://bit.dev/docs/config/bit-config
|
|
|
397
397
|
|
|
398
398
|
### dependencies set
|
|
399
399
|
|
|
400
|
-
**Usage**: `dependencies set <component-pattern> <package
|
|
400
|
+
**Usage**: `dependencies set <component-pattern> <package...>`
|
|
401
401
|
|
|
402
402
|
**Description**: set a dependency to component(s)
|
|
403
403
|
|
|
@@ -821,16 +821,18 @@ merge changes of different component versions
|
|
|
821
821
|
|
|
822
822
|
`bit merge [values...]`
|
|
823
823
|
|
|
824
|
-
| **Option**
|
|
825
|
-
|
|
|
826
|
-
| `--ours`
|
|
827
|
-
| `--theirs`
|
|
828
|
-
| `--manual`
|
|
829
|
-
| `--abort`
|
|
830
|
-
| `--resolve`
|
|
831
|
-
| `--no-snap`
|
|
832
|
-
| `--build`
|
|
833
|
-
| `--
|
|
824
|
+
| **Option** | **Option alias** | **Description** |
|
|
825
|
+
| -------------------------------- | :--------------: | ------------------------------------------------------------------------------------------- |
|
|
826
|
+
| `--ours` | | in case of a conflict, override the used version with the current modification |
|
|
827
|
+
| `--theirs` | | in case of a conflict, override the current modification with the specified version |
|
|
828
|
+
| `--manual` | | in case of a conflict, leave the files with a conflict state to resolve them manually later |
|
|
829
|
+
| `--abort` | | EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began |
|
|
830
|
+
| `--resolve` | | EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes |
|
|
831
|
+
| `--no-snap` | | EXPERIMENTAL. do not auto snap in case the merge completed without conflicts |
|
|
832
|
+
| `--build` | | in case of snap during the merge, run the build-pipeline (similar to bit snap --build) |
|
|
833
|
+
| `--verbose` | | show details of components that were not merged legitimately |
|
|
834
|
+
| `--skip-dependency-installation` | | do not install packages of the imported components |
|
|
835
|
+
| `--message <message>` | `-m` | EXPERIMENTAL. override the default message for the auto snap |
|
|
834
836
|
|
|
835
837
|
---
|
|
836
838
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -839,6 +839,21 @@
|
|
|
839
839
|
"group": "general",
|
|
840
840
|
"private": false
|
|
841
841
|
},
|
|
842
|
+
{
|
|
843
|
+
"name": "globals",
|
|
844
|
+
"alias": "",
|
|
845
|
+
"options": [
|
|
846
|
+
[
|
|
847
|
+
"j",
|
|
848
|
+
"json",
|
|
849
|
+
"json format"
|
|
850
|
+
]
|
|
851
|
+
],
|
|
852
|
+
"description": "list all globals",
|
|
853
|
+
"extendedDescription": "",
|
|
854
|
+
"group": "workspace",
|
|
855
|
+
"private": false
|
|
856
|
+
},
|
|
842
857
|
{
|
|
843
858
|
"name": "show <component-name>",
|
|
844
859
|
"alias": "",
|
|
@@ -975,21 +990,6 @@
|
|
|
975
990
|
}
|
|
976
991
|
]
|
|
977
992
|
},
|
|
978
|
-
{
|
|
979
|
-
"name": "globals",
|
|
980
|
-
"alias": "",
|
|
981
|
-
"options": [
|
|
982
|
-
[
|
|
983
|
-
"j",
|
|
984
|
-
"json",
|
|
985
|
-
"json format"
|
|
986
|
-
]
|
|
987
|
-
],
|
|
988
|
-
"description": "list all globals",
|
|
989
|
-
"extendedDescription": "",
|
|
990
|
-
"group": "workspace",
|
|
991
|
-
"private": false
|
|
992
|
-
},
|
|
993
993
|
{
|
|
994
994
|
"name": "start [type] [pattern]",
|
|
995
995
|
"alias": "c",
|
|
@@ -1451,7 +1451,7 @@
|
|
|
1451
1451
|
]
|
|
1452
1452
|
},
|
|
1453
1453
|
{
|
|
1454
|
-
"name": "set <component-pattern> <package
|
|
1454
|
+
"name": "set <component-pattern> <package...>",
|
|
1455
1455
|
"alias": "",
|
|
1456
1456
|
"options": [
|
|
1457
1457
|
[
|
|
@@ -2245,6 +2245,16 @@
|
|
|
2245
2245
|
"build",
|
|
2246
2246
|
"in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
|
|
2247
2247
|
],
|
|
2248
|
+
[
|
|
2249
|
+
"",
|
|
2250
|
+
"verbose",
|
|
2251
|
+
"show details of components that were not merged legitimately"
|
|
2252
|
+
],
|
|
2253
|
+
[
|
|
2254
|
+
"",
|
|
2255
|
+
"skip-dependency-installation",
|
|
2256
|
+
"do not install packages of the imported components"
|
|
2257
|
+
],
|
|
2248
2258
|
[
|
|
2249
2259
|
"m",
|
|
2250
2260
|
"message <message>",
|
|
@@ -3030,6 +3040,16 @@
|
|
|
3030
3040
|
"squash",
|
|
3031
3041
|
"EXPERIMENTAL. squash multiple snaps. keep the last one only"
|
|
3032
3042
|
],
|
|
3043
|
+
[
|
|
3044
|
+
"",
|
|
3045
|
+
"verbose",
|
|
3046
|
+
"show details of components that were not merged legitimately"
|
|
3047
|
+
],
|
|
3048
|
+
[
|
|
3049
|
+
"",
|
|
3050
|
+
"skip-dependency-installation",
|
|
3051
|
+
"do not install packages of the imported components"
|
|
3052
|
+
],
|
|
3033
3053
|
[
|
|
3034
3054
|
"",
|
|
3035
3055
|
"include-deps",
|
|
@@ -1681,7 +1681,7 @@ function MDXContent(_ref) {
|
|
|
1681
1681
|
parentName: "p"
|
|
1682
1682
|
}, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
1683
1683
|
parentName: "p"
|
|
1684
|
-
}, "dependencies set <component-pattern> <package
|
|
1684
|
+
}, "dependencies set <component-pattern> <package...>")), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
1685
1685
|
parentName: "p"
|
|
1686
1686
|
}, "Description"), ": set a dependency to component(s)"), (0, _react2.mdx)("table", null, (0, _react2.mdx)("thead", {
|
|
1687
1687
|
parentName: "table"
|
|
@@ -3796,6 +3796,32 @@ function MDXContent(_ref) {
|
|
|
3796
3796
|
"align": null
|
|
3797
3797
|
}, (0, _react2.mdx)("inlineCode", {
|
|
3798
3798
|
parentName: "td"
|
|
3799
|
+
}, "--verbose")), (0, _react2.mdx)("td", {
|
|
3800
|
+
parentName: "tr",
|
|
3801
|
+
"align": "center"
|
|
3802
|
+
}), (0, _react2.mdx)("td", {
|
|
3803
|
+
parentName: "tr",
|
|
3804
|
+
"align": null
|
|
3805
|
+
}, "show details of components that were not merged legitimately")), (0, _react2.mdx)("tr", {
|
|
3806
|
+
parentName: "tbody"
|
|
3807
|
+
}, (0, _react2.mdx)("td", {
|
|
3808
|
+
parentName: "tr",
|
|
3809
|
+
"align": null
|
|
3810
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
3811
|
+
parentName: "td"
|
|
3812
|
+
}, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
|
|
3813
|
+
parentName: "tr",
|
|
3814
|
+
"align": "center"
|
|
3815
|
+
}), (0, _react2.mdx)("td", {
|
|
3816
|
+
parentName: "tr",
|
|
3817
|
+
"align": null
|
|
3818
|
+
}, "do not install packages of the imported components")), (0, _react2.mdx)("tr", {
|
|
3819
|
+
parentName: "tbody"
|
|
3820
|
+
}, (0, _react2.mdx)("td", {
|
|
3821
|
+
parentName: "tr",
|
|
3822
|
+
"align": null
|
|
3823
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
3824
|
+
parentName: "td"
|
|
3799
3825
|
}, "--message <message>")), (0, _react2.mdx)("td", {
|
|
3800
3826
|
parentName: "tr",
|
|
3801
3827
|
"align": "center"
|