@teambit/harmony.content.cli-reference 2.0.139 → 2.0.141

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 (9) hide show
  1. package/cli-reference.docs.mdx +1 -1
  2. package/cli-reference.json +61 -71
  3. package/cli-reference.mdx +2 -4
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +61 -71
  6. package/dist/cli-reference.mdx.js +20 -48
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1704943037068.js → preview-1705115706389.js} +2 -2
  9. package/package.json +2 -2
package/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.24'
2
+ description: 'Bit command synopses. Bit version: 1.6.26'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/cli-reference.json CHANGED
@@ -660,6 +660,21 @@
660
660
  }
661
661
  ]
662
662
  },
663
+ {
664
+ "name": "component-issues",
665
+ "alias": "",
666
+ "options": [
667
+ [
668
+ "j",
669
+ "json",
670
+ "output issues in json format"
671
+ ]
672
+ ],
673
+ "description": "list available component-issues",
674
+ "extendedDescription": "",
675
+ "group": "development",
676
+ "private": true
677
+ },
663
678
  {
664
679
  "name": "show <component-name>",
665
680
  "alias": "",
@@ -696,21 +711,6 @@
696
711
  }
697
712
  ]
698
713
  },
699
- {
700
- "name": "component-issues",
701
- "alias": "",
702
- "options": [
703
- [
704
- "j",
705
- "json",
706
- "output issues in json format"
707
- ]
708
- ],
709
- "description": "list available component-issues",
710
- "extendedDescription": "",
711
- "group": "development",
712
- "private": true
713
- },
714
714
  {
715
715
  "name": "envs",
716
716
  "alias": "env",
@@ -847,42 +847,6 @@
847
847
  }
848
848
  ]
849
849
  },
850
- {
851
- "name": "graph [id]",
852
- "alias": "",
853
- "options": [
854
- [
855
- "i",
856
- "image <image>",
857
- "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
858
- ],
859
- [
860
- "r",
861
- "remote [remoteName]",
862
- "remote name (name is optional, leave empty when id is specified)"
863
- ],
864
- [
865
- "",
866
- "all-versions",
867
- "enter all components versions into the graph, not only latest"
868
- ],
869
- [
870
- "",
871
- "layout <name>",
872
- "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
873
- ],
874
- [
875
- "j",
876
- "json",
877
- "json format"
878
- ]
879
- ],
880
- "description": "generate an image file with the workspace components' dependencies graph",
881
- "extendedDescription": "",
882
- "group": "discover",
883
- "private": false,
884
- "remoteOp": true
885
- },
886
850
  {
887
851
  "name": "start [component-pattern]",
888
852
  "alias": "c",
@@ -948,6 +912,42 @@
948
912
  "group": "development",
949
913
  "private": true
950
914
  },
915
+ {
916
+ "name": "graph [id]",
917
+ "alias": "",
918
+ "options": [
919
+ [
920
+ "i",
921
+ "image <image>",
922
+ "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
923
+ ],
924
+ [
925
+ "r",
926
+ "remote [remoteName]",
927
+ "remote name (name is optional, leave empty when id is specified)"
928
+ ],
929
+ [
930
+ "",
931
+ "all-versions",
932
+ "enter all components versions into the graph, not only latest"
933
+ ],
934
+ [
935
+ "",
936
+ "layout <name>",
937
+ "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
938
+ ],
939
+ [
940
+ "j",
941
+ "json",
942
+ "json format"
943
+ ]
944
+ ],
945
+ "description": "generate an image file with the workspace components' dependencies graph",
946
+ "extendedDescription": "",
947
+ "group": "discover",
948
+ "private": false,
949
+ "remoteOp": true
950
+ },
951
951
  {
952
952
  "name": "scope <sub-command>",
953
953
  "alias": "",
@@ -3142,31 +3142,11 @@
3142
3142
  "interactive-merge",
3143
3143
  "when a component is modified and the merge process found conflicts, display options to resolve them"
3144
3144
  ],
3145
- [
3146
- "",
3147
- "ours",
3148
- "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
3149
- ],
3150
- [
3151
- "",
3152
- "theirs",
3153
- "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
3154
- ],
3155
- [
3156
- "",
3157
- "manual",
3158
- "DEPRECATED. use --auto-merge-resolve"
3159
- ],
3160
3145
  [
3161
3146
  "",
3162
3147
  "auto-merge-resolve <merge-strategy>",
3163
3148
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3164
3149
  ],
3165
- [
3166
- "r",
3167
- "reset",
3168
- "revert changes that were not snapped/tagged"
3169
- ],
3170
3150
  [
3171
3151
  "a",
3172
3152
  "all",
@@ -3186,6 +3166,16 @@
3186
3166
  "x",
3187
3167
  "skip-dependency-installation",
3188
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"
3189
3179
  ]
3190
3180
  ],
3191
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
 
package/dist/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 1.6.24'
2
+ description: 'Bit command synopses. Bit version: 1.6.26'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/dist/cli-reference.json CHANGED
@@ -660,6 +660,21 @@
660
660
  }
661
661
  ]
662
662
  },
663
+ {
664
+ "name": "component-issues",
665
+ "alias": "",
666
+ "options": [
667
+ [
668
+ "j",
669
+ "json",
670
+ "output issues in json format"
671
+ ]
672
+ ],
673
+ "description": "list available component-issues",
674
+ "extendedDescription": "",
675
+ "group": "development",
676
+ "private": true
677
+ },
663
678
  {
664
679
  "name": "show <component-name>",
665
680
  "alias": "",
@@ -696,21 +711,6 @@
696
711
  }
697
712
  ]
698
713
  },
699
- {
700
- "name": "component-issues",
701
- "alias": "",
702
- "options": [
703
- [
704
- "j",
705
- "json",
706
- "output issues in json format"
707
- ]
708
- ],
709
- "description": "list available component-issues",
710
- "extendedDescription": "",
711
- "group": "development",
712
- "private": true
713
- },
714
714
  {
715
715
  "name": "envs",
716
716
  "alias": "env",
@@ -847,42 +847,6 @@
847
847
  }
848
848
  ]
849
849
  },
850
- {
851
- "name": "graph [id]",
852
- "alias": "",
853
- "options": [
854
- [
855
- "i",
856
- "image <image>",
857
- "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
858
- ],
859
- [
860
- "r",
861
- "remote [remoteName]",
862
- "remote name (name is optional, leave empty when id is specified)"
863
- ],
864
- [
865
- "",
866
- "all-versions",
867
- "enter all components versions into the graph, not only latest"
868
- ],
869
- [
870
- "",
871
- "layout <name>",
872
- "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
873
- ],
874
- [
875
- "j",
876
- "json",
877
- "json format"
878
- ]
879
- ],
880
- "description": "generate an image file with the workspace components' dependencies graph",
881
- "extendedDescription": "",
882
- "group": "discover",
883
- "private": false,
884
- "remoteOp": true
885
- },
886
850
  {
887
851
  "name": "start [component-pattern]",
888
852
  "alias": "c",
@@ -948,6 +912,42 @@
948
912
  "group": "development",
949
913
  "private": true
950
914
  },
915
+ {
916
+ "name": "graph [id]",
917
+ "alias": "",
918
+ "options": [
919
+ [
920
+ "i",
921
+ "image <image>",
922
+ "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
923
+ ],
924
+ [
925
+ "r",
926
+ "remote [remoteName]",
927
+ "remote name (name is optional, leave empty when id is specified)"
928
+ ],
929
+ [
930
+ "",
931
+ "all-versions",
932
+ "enter all components versions into the graph, not only latest"
933
+ ],
934
+ [
935
+ "",
936
+ "layout <name>",
937
+ "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
938
+ ],
939
+ [
940
+ "j",
941
+ "json",
942
+ "json format"
943
+ ]
944
+ ],
945
+ "description": "generate an image file with the workspace components' dependencies graph",
946
+ "extendedDescription": "",
947
+ "group": "discover",
948
+ "private": false,
949
+ "remoteOp": true
950
+ },
951
951
  {
952
952
  "name": "scope <sub-command>",
953
953
  "alias": "",
@@ -3142,31 +3142,11 @@
3142
3142
  "interactive-merge",
3143
3143
  "when a component is modified and the merge process found conflicts, display options to resolve them"
3144
3144
  ],
3145
- [
3146
- "",
3147
- "ours",
3148
- "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
3149
- ],
3150
- [
3151
- "",
3152
- "theirs",
3153
- "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
3154
- ],
3155
- [
3156
- "",
3157
- "manual",
3158
- "DEPRECATED. use --auto-merge-resolve"
3159
- ],
3160
3145
  [
3161
3146
  "",
3162
3147
  "auto-merge-resolve <merge-strategy>",
3163
3148
  "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
3164
3149
  ],
3165
- [
3166
- "r",
3167
- "reset",
3168
- "revert changes that were not snapped/tagged"
3169
- ],
3170
3150
  [
3171
3151
  "a",
3172
3152
  "all",
@@ -3186,6 +3166,16 @@
3186
3166
  "x",
3187
3167
  "skip-dependency-installation",
3188
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"
3189
3179
  ]
3190
3180
  ],
3191
3181
  "description": "switch between component versions or remove local changes",
package/dist/cli-reference.mdx.js CHANGED
@@ -1512,127 +1512,99 @@ function MDXContent(_ref) {
1512
1512
  "align": null
1513
1513
  }, (0, _react2.mdx)("inlineCode", {
1514
1514
  parentName: "td"
1515
- }, "--ours")), (0, _react2.mdx)("td", {
1516
- parentName: "tr",
1517
- "align": "center"
1518
- }), (0, _react2.mdx)("td", {
1519
- parentName: "tr",
1520
- "align": null
1521
- }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
1522
- parentName: "tbody"
1523
- }, (0, _react2.mdx)("td", {
1524
- parentName: "tr",
1525
- "align": null
1526
- }, (0, _react2.mdx)("inlineCode", {
1527
- parentName: "td"
1528
- }, "--theirs")), (0, _react2.mdx)("td", {
1515
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
1529
1516
  parentName: "tr",
1530
1517
  "align": "center"
1531
1518
  }), (0, _react2.mdx)("td", {
1532
1519
  parentName: "tr",
1533
1520
  "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", {
1521
+ }, "in case of merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
1535
1522
  parentName: "tbody"
1536
1523
  }, (0, _react2.mdx)("td", {
1537
1524
  parentName: "tr",
1538
1525
  "align": null
1539
1526
  }, (0, _react2.mdx)("inlineCode", {
1540
1527
  parentName: "td"
1541
- }, "--manual")), (0, _react2.mdx)("td", {
1528
+ }, "--all")), (0, _react2.mdx)("td", {
1542
1529
  parentName: "tr",
1543
1530
  "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
1531
  }, (0, _react2.mdx)("inlineCode", {
1553
1532
  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
- }, "in case of merge conflict, resolve according to the provided strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
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
- }, "--reset")), (0, _react2.mdx)("td", {
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
- }, "-r")), (0, _react2.mdx)("td", {
1548
+ }, "-e")), (0, _react2.mdx)("td", {
1573
1549
  parentName: "tr",
1574
1550
  "align": null
1575
- }, "revert changes that were not snapped/tagged")), (0, _react2.mdx)("tr", {
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
- }, "--all")), (0, _react2.mdx)("td", {
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
- }, "-a")), (0, _react2.mdx)("td", {
1563
+ }, "-v")), (0, _react2.mdx)("td", {
1588
1564
  parentName: "tr",
1589
1565
  "align": null
1590
- }, "all components")), (0, _react2.mdx)("tr", {
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
- }, "--workspace-only")), (0, _react2.mdx)("td", {
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
- }, "-e")), (0, _react2.mdx)("td", {
1578
+ }, "-x")), (0, _react2.mdx)("td", {
1603
1579
  parentName: "tr",
1604
1580
  "align": null
1605
- }, "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", {
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
- }, "--verbose")), (0, _react2.mdx)("td", {
1588
+ }, "--force-ours")), (0, _react2.mdx)("td", {
1613
1589
  parentName: "tr",
1614
1590
  "align": "center"
1615
- }, (0, _react2.mdx)("inlineCode", {
1616
- parentName: "td"
1617
- }, "-v")), (0, _react2.mdx)("td", {
1591
+ }), (0, _react2.mdx)("td", {
1618
1592
  parentName: "tr",
1619
1593
  "align": null
1620
- }, "showing verbose output for inspection")), (0, _react2.mdx)("tr", {
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
- }, "--skip-dependency-installation")), (0, _react2.mdx)("td", {
1601
+ }, "--force-theirs")), (0, _react2.mdx)("td", {
1628
1602
  parentName: "tr",
1629
1603
  "align": "center"
1630
- }, (0, _react2.mdx)("inlineCode", {
1631
- parentName: "td"
1632
- }, "-x")), (0, _react2.mdx)("td", {
1604
+ }), (0, _react2.mdx)("td", {
1633
1605
  parentName: "tr",
1634
1606
  "align": null
1635
- }, "do not auto-install dependencies of the imported components")))), (0, _react2.mdx)("hr", null), (0, _react2.mdx)("h2", null, "clear-cache"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
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"