@teambit/harmony.content.cli-reference 2.0.138 → 2.0.140
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.docs.mdx +1 -1
- package/cli-reference.json +15 -20
- package/cli-reference.mdx +8 -9
- package/dist/cli-reference.docs.mdx +1 -1
- package/dist/cli-reference.json +15 -20
- package/dist/cli-reference.mdx.js +35 -48
- package/dist/cli-reference.mdx.js.map +1 -1
- package/dist/{preview-1704880813005.js → preview-1705029264950.js} +2 -2
- package/package.json +2 -2
package/cli-reference.docs.mdx
CHANGED
package/cli-reference.json
CHANGED
|
@@ -2429,6 +2429,11 @@
|
|
|
2429
2429
|
"force",
|
|
2430
2430
|
"ignore local changes/versions. eject component/s even when they are staged or modified. Note: unexported tags/snaps will be lost"
|
|
2431
2431
|
],
|
|
2432
|
+
[
|
|
2433
|
+
"x",
|
|
2434
|
+
"skip-dependency-installation",
|
|
2435
|
+
"do not auto-install dependencies"
|
|
2436
|
+
],
|
|
2432
2437
|
[
|
|
2433
2438
|
"j",
|
|
2434
2439
|
"json",
|
|
@@ -3137,31 +3142,11 @@
|
|
|
3137
3142
|
"interactive-merge",
|
|
3138
3143
|
"when a component is modified and the merge process found conflicts, display options to resolve them"
|
|
3139
3144
|
],
|
|
3140
|
-
[
|
|
3141
|
-
"",
|
|
3142
|
-
"ours",
|
|
3143
|
-
"DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
|
|
3144
|
-
],
|
|
3145
|
-
[
|
|
3146
|
-
"",
|
|
3147
|
-
"theirs",
|
|
3148
|
-
"DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
|
|
3149
|
-
],
|
|
3150
|
-
[
|
|
3151
|
-
"",
|
|
3152
|
-
"manual",
|
|
3153
|
-
"DEPRECATED. use --auto-merge-resolve"
|
|
3154
|
-
],
|
|
3155
3145
|
[
|
|
3156
3146
|
"",
|
|
3157
3147
|
"auto-merge-resolve <merge-strategy>",
|
|
3158
3148
|
"in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3159
3149
|
],
|
|
3160
|
-
[
|
|
3161
|
-
"r",
|
|
3162
|
-
"reset",
|
|
3163
|
-
"revert changes that were not snapped/tagged"
|
|
3164
|
-
],
|
|
3165
3150
|
[
|
|
3166
3151
|
"a",
|
|
3167
3152
|
"all",
|
|
@@ -3181,6 +3166,16 @@
|
|
|
3181
3166
|
"x",
|
|
3182
3167
|
"skip-dependency-installation",
|
|
3183
3168
|
"do not auto-install dependencies of the imported components"
|
|
3169
|
+
],
|
|
3170
|
+
[
|
|
3171
|
+
"",
|
|
3172
|
+
"force-ours",
|
|
3173
|
+
"regardless of conflicts, ignore theirs changes and keep our local files intact"
|
|
3174
|
+
],
|
|
3175
|
+
[
|
|
3176
|
+
"",
|
|
3177
|
+
"force-theirs",
|
|
3178
|
+
"regardless of conflicts, ignore our local changes and use theirs files"
|
|
3184
3179
|
]
|
|
3185
3180
|
],
|
|
3186
3181
|
"description": "switch between component versions or remove local changes",
|
package/cli-reference.mdx
CHANGED
|
@@ -293,15 +293,13 @@ when on a lane, "checkout head" only checks out components on this lane. to upda
|
|
|
293
293
|
| **Option** | **Option alias** | **Description** |
|
|
294
294
|
| --------------------------------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------------- |
|
|
295
295
|
| `--interactive-merge` | `-i` | when a component is modified and the merge process found conflicts, display options to resolve them |
|
|
296
|
-
| `--ours` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact |
|
|
297
|
-
| `--theirs` | | DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code |
|
|
298
|
-
| `--manual` | | DEPRECATED. use --auto-merge-resolve |
|
|
299
296
|
| `--auto-merge-resolve <merge-strategy>` | | in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual] |
|
|
300
|
-
| `--reset` | `-r` | revert changes that were not snapped/tagged |
|
|
301
297
|
| `--all` | `-a` | all components |
|
|
302
298
|
| `--workspace-only` | `-e` | only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace |
|
|
303
299
|
| `--verbose` | `-v` | showing verbose output for inspection |
|
|
304
300
|
| `--skip-dependency-installation` | `-x` | do not auto-install dependencies of the imported components |
|
|
301
|
+
| `--force-ours` | | regardless of conflicts, ignore theirs changes and keep our local files intact |
|
|
302
|
+
| `--force-theirs` | | regardless of conflicts, ignore our local changes and use theirs files |
|
|
305
303
|
|
|
306
304
|
---
|
|
307
305
|
|
|
@@ -646,11 +644,12 @@ By default the component files will be removed from the workspace
|
|
|
646
644
|
| ------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
|
|
647
645
|
| `component-pattern` | component name, component id, or component pattern. use component pattern to select multiple components. wrap the pattern with quotes. use comma to separate patterns and "!" to exclude. e.g. "ui/\*\*, !ui/button". use `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern. |
|
|
648
646
|
|
|
649
|
-
| **Option**
|
|
650
|
-
|
|
|
651
|
-
| `--force`
|
|
652
|
-
| `--
|
|
653
|
-
| `--
|
|
647
|
+
| **Option** | **Option alias** | **Description** |
|
|
648
|
+
| -------------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------------------- |
|
|
649
|
+
| `--force` | `-f` | ignore local changes/versions. eject component/s even when they are staged or modified. Note: unexported tags/snaps will be lost |
|
|
650
|
+
| `--skip-dependency-installation` | `-x` | do not auto-install dependencies |
|
|
651
|
+
| `--json` | `-j` | print the results in JSON format |
|
|
652
|
+
| `--keep-files` | | keep the component files in the workspace intact |
|
|
654
653
|
|
|
655
654
|
---
|
|
656
655
|
|
package/dist/cli-reference.json
CHANGED
|
@@ -2429,6 +2429,11 @@
|
|
|
2429
2429
|
"force",
|
|
2430
2430
|
"ignore local changes/versions. eject component/s even when they are staged or modified. Note: unexported tags/snaps will be lost"
|
|
2431
2431
|
],
|
|
2432
|
+
[
|
|
2433
|
+
"x",
|
|
2434
|
+
"skip-dependency-installation",
|
|
2435
|
+
"do not auto-install dependencies"
|
|
2436
|
+
],
|
|
2432
2437
|
[
|
|
2433
2438
|
"j",
|
|
2434
2439
|
"json",
|
|
@@ -3137,31 +3142,11 @@
|
|
|
3137
3142
|
"interactive-merge",
|
|
3138
3143
|
"when a component is modified and the merge process found conflicts, display options to resolve them"
|
|
3139
3144
|
],
|
|
3140
|
-
[
|
|
3141
|
-
"",
|
|
3142
|
-
"ours",
|
|
3143
|
-
"DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
|
|
3144
|
-
],
|
|
3145
|
-
[
|
|
3146
|
-
"",
|
|
3147
|
-
"theirs",
|
|
3148
|
-
"DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
|
|
3149
|
-
],
|
|
3150
|
-
[
|
|
3151
|
-
"",
|
|
3152
|
-
"manual",
|
|
3153
|
-
"DEPRECATED. use --auto-merge-resolve"
|
|
3154
|
-
],
|
|
3155
3145
|
[
|
|
3156
3146
|
"",
|
|
3157
3147
|
"auto-merge-resolve <merge-strategy>",
|
|
3158
3148
|
"in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
|
|
3159
3149
|
],
|
|
3160
|
-
[
|
|
3161
|
-
"r",
|
|
3162
|
-
"reset",
|
|
3163
|
-
"revert changes that were not snapped/tagged"
|
|
3164
|
-
],
|
|
3165
3150
|
[
|
|
3166
3151
|
"a",
|
|
3167
3152
|
"all",
|
|
@@ -3181,6 +3166,16 @@
|
|
|
3181
3166
|
"x",
|
|
3182
3167
|
"skip-dependency-installation",
|
|
3183
3168
|
"do not auto-install dependencies of the imported components"
|
|
3169
|
+
],
|
|
3170
|
+
[
|
|
3171
|
+
"",
|
|
3172
|
+
"force-ours",
|
|
3173
|
+
"regardless of conflicts, ignore theirs changes and keep our local files intact"
|
|
3174
|
+
],
|
|
3175
|
+
[
|
|
3176
|
+
"",
|
|
3177
|
+
"force-theirs",
|
|
3178
|
+
"regardless of conflicts, ignore our local changes and use theirs files"
|
|
3184
3179
|
]
|
|
3185
3180
|
],
|
|
3186
3181
|
"description": "switch between component versions or remove local changes",
|
|
@@ -1512,127 +1512,99 @@ function MDXContent(_ref) {
|
|
|
1512
1512
|
"align": null
|
|
1513
1513
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1514
1514
|
parentName: "td"
|
|
1515
|
-
}, "--
|
|
1515
|
+
}, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
|
|
1516
1516
|
parentName: "tr",
|
|
1517
1517
|
"align": "center"
|
|
1518
1518
|
}), (0, _react2.mdx)("td", {
|
|
1519
1519
|
parentName: "tr",
|
|
1520
1520
|
"align": null
|
|
1521
|
-
}, "
|
|
1521
|
+
}, "in case of merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
|
|
1522
1522
|
parentName: "tbody"
|
|
1523
1523
|
}, (0, _react2.mdx)("td", {
|
|
1524
1524
|
parentName: "tr",
|
|
1525
1525
|
"align": null
|
|
1526
1526
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1527
1527
|
parentName: "td"
|
|
1528
|
-
}, "--
|
|
1528
|
+
}, "--all")), (0, _react2.mdx)("td", {
|
|
1529
1529
|
parentName: "tr",
|
|
1530
1530
|
"align": "center"
|
|
1531
|
-
}), (0, _react2.mdx)("td", {
|
|
1532
|
-
parentName: "tr",
|
|
1533
|
-
"align": null
|
|
1534
|
-
}, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
|
|
1535
|
-
parentName: "tbody"
|
|
1536
|
-
}, (0, _react2.mdx)("td", {
|
|
1537
|
-
parentName: "tr",
|
|
1538
|
-
"align": null
|
|
1539
1531
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1540
1532
|
parentName: "td"
|
|
1541
|
-
}, "
|
|
1542
|
-
parentName: "tr",
|
|
1543
|
-
"align": "center"
|
|
1544
|
-
}), (0, _react2.mdx)("td", {
|
|
1545
|
-
parentName: "tr",
|
|
1546
|
-
"align": null
|
|
1547
|
-
}, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
|
|
1548
|
-
parentName: "tbody"
|
|
1549
|
-
}, (0, _react2.mdx)("td", {
|
|
1550
|
-
parentName: "tr",
|
|
1551
|
-
"align": null
|
|
1552
|
-
}, (0, _react2.mdx)("inlineCode", {
|
|
1553
|
-
parentName: "td"
|
|
1554
|
-
}, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
|
|
1555
|
-
parentName: "tr",
|
|
1556
|
-
"align": "center"
|
|
1557
|
-
}), (0, _react2.mdx)("td", {
|
|
1533
|
+
}, "-a")), (0, _react2.mdx)("td", {
|
|
1558
1534
|
parentName: "tr",
|
|
1559
1535
|
"align": null
|
|
1560
|
-
}, "
|
|
1536
|
+
}, "all components")), (0, _react2.mdx)("tr", {
|
|
1561
1537
|
parentName: "tbody"
|
|
1562
1538
|
}, (0, _react2.mdx)("td", {
|
|
1563
1539
|
parentName: "tr",
|
|
1564
1540
|
"align": null
|
|
1565
1541
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1566
1542
|
parentName: "td"
|
|
1567
|
-
}, "--
|
|
1543
|
+
}, "--workspace-only")), (0, _react2.mdx)("td", {
|
|
1568
1544
|
parentName: "tr",
|
|
1569
1545
|
"align": "center"
|
|
1570
1546
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1571
1547
|
parentName: "td"
|
|
1572
|
-
}, "-
|
|
1548
|
+
}, "-e")), (0, _react2.mdx)("td", {
|
|
1573
1549
|
parentName: "tr",
|
|
1574
1550
|
"align": null
|
|
1575
|
-
}, "
|
|
1551
|
+
}, "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace")), (0, _react2.mdx)("tr", {
|
|
1576
1552
|
parentName: "tbody"
|
|
1577
1553
|
}, (0, _react2.mdx)("td", {
|
|
1578
1554
|
parentName: "tr",
|
|
1579
1555
|
"align": null
|
|
1580
1556
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1581
1557
|
parentName: "td"
|
|
1582
|
-
}, "--
|
|
1558
|
+
}, "--verbose")), (0, _react2.mdx)("td", {
|
|
1583
1559
|
parentName: "tr",
|
|
1584
1560
|
"align": "center"
|
|
1585
1561
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1586
1562
|
parentName: "td"
|
|
1587
|
-
}, "-
|
|
1563
|
+
}, "-v")), (0, _react2.mdx)("td", {
|
|
1588
1564
|
parentName: "tr",
|
|
1589
1565
|
"align": null
|
|
1590
|
-
}, "
|
|
1566
|
+
}, "showing verbose output for inspection")), (0, _react2.mdx)("tr", {
|
|
1591
1567
|
parentName: "tbody"
|
|
1592
1568
|
}, (0, _react2.mdx)("td", {
|
|
1593
1569
|
parentName: "tr",
|
|
1594
1570
|
"align": null
|
|
1595
1571
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1596
1572
|
parentName: "td"
|
|
1597
|
-
}, "--
|
|
1573
|
+
}, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
|
|
1598
1574
|
parentName: "tr",
|
|
1599
1575
|
"align": "center"
|
|
1600
1576
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1601
1577
|
parentName: "td"
|
|
1602
|
-
}, "-
|
|
1578
|
+
}, "-x")), (0, _react2.mdx)("td", {
|
|
1603
1579
|
parentName: "tr",
|
|
1604
1580
|
"align": null
|
|
1605
|
-
}, "
|
|
1581
|
+
}, "do not auto-install dependencies of the imported components")), (0, _react2.mdx)("tr", {
|
|
1606
1582
|
parentName: "tbody"
|
|
1607
1583
|
}, (0, _react2.mdx)("td", {
|
|
1608
1584
|
parentName: "tr",
|
|
1609
1585
|
"align": null
|
|
1610
1586
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1611
1587
|
parentName: "td"
|
|
1612
|
-
}, "--
|
|
1588
|
+
}, "--force-ours")), (0, _react2.mdx)("td", {
|
|
1613
1589
|
parentName: "tr",
|
|
1614
1590
|
"align": "center"
|
|
1615
|
-
}, (0, _react2.mdx)("
|
|
1616
|
-
parentName: "td"
|
|
1617
|
-
}, "-v")), (0, _react2.mdx)("td", {
|
|
1591
|
+
}), (0, _react2.mdx)("td", {
|
|
1618
1592
|
parentName: "tr",
|
|
1619
1593
|
"align": null
|
|
1620
|
-
}, "
|
|
1594
|
+
}, "regardless of conflicts, ignore theirs changes and keep our local files intact")), (0, _react2.mdx)("tr", {
|
|
1621
1595
|
parentName: "tbody"
|
|
1622
1596
|
}, (0, _react2.mdx)("td", {
|
|
1623
1597
|
parentName: "tr",
|
|
1624
1598
|
"align": null
|
|
1625
1599
|
}, (0, _react2.mdx)("inlineCode", {
|
|
1626
1600
|
parentName: "td"
|
|
1627
|
-
}, "--
|
|
1601
|
+
}, "--force-theirs")), (0, _react2.mdx)("td", {
|
|
1628
1602
|
parentName: "tr",
|
|
1629
1603
|
"align": "center"
|
|
1630
|
-
}, (0, _react2.mdx)("
|
|
1631
|
-
parentName: "td"
|
|
1632
|
-
}, "-x")), (0, _react2.mdx)("td", {
|
|
1604
|
+
}), (0, _react2.mdx)("td", {
|
|
1633
1605
|
parentName: "tr",
|
|
1634
1606
|
"align": null
|
|
1635
|
-
}, "
|
|
1607
|
+
}, "regardless of conflicts, ignore our local changes and use theirs files")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "clear-cache"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
|
|
1636
1608
|
parentName: "p"
|
|
1637
1609
|
}, "Alias"), ": ", (0, _react2.mdx)("inlineCode", {
|
|
1638
1610
|
parentName: "p"
|
|
@@ -3135,6 +3107,21 @@ function MDXContent(_ref) {
|
|
|
3135
3107
|
"align": null
|
|
3136
3108
|
}, (0, _react2.mdx)("inlineCode", {
|
|
3137
3109
|
parentName: "td"
|
|
3110
|
+
}, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
|
|
3111
|
+
parentName: "tr",
|
|
3112
|
+
"align": "center"
|
|
3113
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
3114
|
+
parentName: "td"
|
|
3115
|
+
}, "-x")), (0, _react2.mdx)("td", {
|
|
3116
|
+
parentName: "tr",
|
|
3117
|
+
"align": null
|
|
3118
|
+
}, "do not auto-install dependencies")), (0, _react2.mdx)("tr", {
|
|
3119
|
+
parentName: "tbody"
|
|
3120
|
+
}, (0, _react2.mdx)("td", {
|
|
3121
|
+
parentName: "tr",
|
|
3122
|
+
"align": null
|
|
3123
|
+
}, (0, _react2.mdx)("inlineCode", {
|
|
3124
|
+
parentName: "td"
|
|
3138
3125
|
}, "--json")), (0, _react2.mdx)("td", {
|
|
3139
3126
|
parentName: "tr",
|
|
3140
3127
|
"align": "center"
|