@teambit/harmony.content.cli-reference 1.95.58 → 1.95.61

package/cli-reference.json

@@ -1373,10 +1373,15 @@
     "name": "remove <component-pattern>",
     "alias": "rm",
     "options": [
+      [
+        "",
+        "soft",
+        "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated"
+      ],
       [
         "r",
         "remote",
-        "remove a component from a remote scope"
+        "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
       ],
       [
         "t",
@@ -2127,6 +2132,11 @@
             "",
             "include-deps",
             "EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
+          ],
+          [
+            "",
+            "resolve-unrelated [merge-strategy]",
+            "EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
           ]
         ],
         "description": "merge a local or a remote lane",
@@ -3347,7 +3357,7 @@
       ]
     ],
     "description": "export components from the workspace to remote scopes",
-    "extendedDescription": "bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well\n`bit export [id...]` => export the given ids to their current scope\n\nhttps://bit.dev/docs/components/exporting-components\nyou can use a pattern for multiple ids, such as bit export remote-scope \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
+    "extendedDescription": "bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well\n  `bit export [id...]` => export the given ids to their current scope\n  you can use a pattern for multiple ids, such as bit export remote-scope \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
     "group": "collaborate",
     "private": false,
     "remoteOp": true,

package/cli-reference.mdx

@@ -558,10 +558,8 @@ use `bit pattern --help` to understand patterns better and `bit pattern <pattern
 **Workspace only**: yes  
 **Description**: export components from the workspace to remote scopes  
 bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well  
-`bit export [id...]` => export the given ids to their current scope
-
-https://bit.dev/docs/components/exporting-components  
-you can use a pattern for multiple ids, such as bit export remote-scope "utils/\*". (wrap the pattern with quotes to avoid collision with shell commands)
+ `bit export [id...]` => export the given ids to their current scope  
+ you can use a pattern for multiple ids, such as bit export remote-scope "utils/\*". (wrap the pattern with quotes to avoid collision with shell commands)
 
 `bit export [component-patterns...]`
 
@@ -972,7 +970,8 @@ for example: "http://localhost:3000", "file:///tmp/local-scope"
 
 | **Option**       | **Option alias** | **Description**                                                                                                                    |
 | ---------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------- |
-| `--remote`       |       `-r`       | remove a component from a remote scope                                                                                             |
+| `--soft`         |                  | EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated                                  |
+| `--remote`       |       `-r`       | remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)              |
 | `--track`        |       `-t`       | keep tracking component in .bitmap (default = false), helps transform a tagged-component to new                                    |
 | `--delete-files` |       `-d`       | DEPRECATED (this is now the default). delete local component files                                                                 |
 | `--keep-files`   |                  | keep component files (just untrack the component)                                                                                  |

package/dist/cli-reference.json

@@ -1373,10 +1373,15 @@
         "name": "remove <component-pattern>",
         "alias": "rm",
         "options": [
+            [
+                "",
+                "soft",
+                "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated"
+            ],
             [
                 "r",
                 "remote",
-                "remove a component from a remote scope"
+                "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
             ],
             [
                 "t",
@@ -2127,6 +2132,11 @@
                         "",
                         "include-deps",
                         "EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
+                    ],
+                    [
+                        "",
+                        "resolve-unrelated [merge-strategy]",
+                        "EXPERIMENTAL. relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
                     ]
                 ],
                 "description": "merge a local or a remote lane",
@@ -3347,7 +3357,7 @@
             ]
         ],
         "description": "export components from the workspace to remote scopes",
-        "extendedDescription": "bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well\n`bit export [id...]` => export the given ids to their current scope\n\nhttps://bit.dev/docs/components/exporting-components\nyou can use a pattern for multiple ids, such as bit export remote-scope \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
+        "extendedDescription": "bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well\n  `bit export [id...]` => export the given ids to their current scope\n  you can use a pattern for multiple ids, such as bit export remote-scope \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
         "group": "collaborate",
         "private": false,
         "remoteOp": true,

package/dist/cli-reference.mdx.js

@@ -2174,12 +2174,9 @@ function MDXContent(_ref) {
     parentName: "p"
   }), "\n", "bit export => export all staged components to their current scope, if checked out to a lane, export the lane as well", (0, _react2.mdx)("br", {
     parentName: "p"
-  }), "\n", (0, _react2.mdx)("inlineCode", {
+  }), "\n", "", (0, _react2.mdx)("inlineCode", {
     parentName: "p"
-  }, "bit export [id...]"), " => export the given ids to their current scope"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("a", {
-    parentName: "p",
-    "href": "https://bit.dev/docs/components/exporting-components"
-  }, "https://bit.dev/docs/components/exporting-components"), (0, _react2.mdx)("br", {
+  }, "bit export [id...]"), " => export the given ids to their current scope", (0, _react2.mdx)("br", {
     parentName: "p"
   }), "\n", "you can use a pattern for multiple ids, such as bit export remote-scope \"utils/", "*", "\". (wrap the pattern with quotes to avoid collision with shell commands)"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("inlineCode", {
     parentName: "p"
@@ -4353,6 +4350,19 @@ function MDXContent(_ref) {
     "align": null
   }, (0, _react2.mdx)("inlineCode", {
     parentName: "td"
+  }, "--soft")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
   }, "--remote")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": "center"
@@ -4361,7 +4371,7 @@ function MDXContent(_ref) {
   }, "-r")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": null
-  }, "remove a component from a remote scope")), (0, _react2.mdx)("tr", {
+  }, "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)")), (0, _react2.mdx)("tr", {
     parentName: "tbody"
   }, (0, _react2.mdx)("td", {
     parentName: "tr",