@teambit/harmony.content.cli-reference 1.95.73 → 1.95.75

package/cli-reference.json

@@ -1281,6 +1281,68 @@
       }
     ]
   },
+  {
+    "name": "resume-export <export-id> <remotes...>",
+    "alias": "",
+    "options": [],
+    "description": "EXPERIMENTAL. resume failed export",
+    "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client got in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
+    "group": "collaborate",
+    "private": true,
+    "remoteOp": true
+  },
+  {
+    "name": "export [component-patterns...]",
+    "alias": "e",
+    "options": [
+      [
+        "e",
+        "eject",
+        "replace the exported components with their corresponding packages (to use these components without further maintaining them)"
+      ],
+      [
+        "a",
+        "all",
+        "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
+      ],
+      [
+        "",
+        "all-versions",
+        "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
+      ],
+      [
+        "",
+        "origin-directly",
+        "EXPERIMENTAL. avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
+      ],
+      [
+        "",
+        "resume <string>",
+        "in case the previous export failed and suggested to resume with an export-id, enter the id"
+      ],
+      [
+        "",
+        "ignore-missing-artifacts",
+        "EXPERIMENTAL. don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
+      ],
+      [
+        "j",
+        "json",
+        "show output in json format"
+      ]
+    ],
+    "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  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,
+    "arguments": [
+      {
+        "name": "component-patterns...",
+        "description": "component IDs, component names, or component patterns (separated by space). Use patterns to export groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
+      }
+    ]
+  },
   {
     "name": "import [component-patterns...]",
     "alias": "",
@@ -2037,7 +2099,7 @@
           [
             "f",
             "force",
-            "removes the component from the scope, even if used as a dependency. WARNING: components that depend on this component will corrupt"
+            "removes the lane even when the lane was not merged yet"
           ],
           [
             "s",
@@ -2288,6 +2350,47 @@
     "group": "ungrouped",
     "private": true
   },
+  {
+    "name": "_merge-lane <lane> [pattern]",
+    "alias": "",
+    "options": [
+      [
+        "",
+        "push",
+        "export the updated objects to the original scopes once done"
+      ],
+      [
+        "",
+        "keep-readme",
+        "skip deleting the lane readme component after merging"
+      ],
+      [
+        "",
+        "no-squash",
+        "EXPERIMENTAL. relevant for merging lanes into main, which by default squash."
+      ],
+      [
+        "",
+        "include-deps",
+        "EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components"
+      ]
+    ],
+    "description": "merge a remote lane into main via a bare-scope (not workspace)",
+    "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command",
+    "group": "ungrouped",
+    "private": true,
+    "remoteOp": true,
+    "arguments": [
+      {
+        "name": "lane",
+        "description": "lane-id to merge to main"
+      },
+      {
+        "name": "pattern",
+        "description": "EXPERIMENTAL. partially merge the lane with the specified component-pattern"
+      }
+    ]
+  },
   {
     "name": "dependencies <sub-command>",
     "alias": "deps",
@@ -3316,68 +3419,6 @@
       }
     ]
   },
-  {
-    "name": "resume-export <export-id> <remotes...>",
-    "alias": "",
-    "options": [],
-    "description": "EXPERIMENTAL. resume failed export",
-    "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client got in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
-    "group": "collaborate",
-    "private": true,
-    "remoteOp": true
-  },
-  {
-    "name": "export [component-patterns...]",
-    "alias": "e",
-    "options": [
-      [
-        "e",
-        "eject",
-        "replace the exported components with their corresponding packages (to use these components without further maintaining them)"
-      ],
-      [
-        "a",
-        "all",
-        "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
-      ],
-      [
-        "",
-        "all-versions",
-        "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
-      ],
-      [
-        "",
-        "origin-directly",
-        "EXPERIMENTAL. avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
-      ],
-      [
-        "",
-        "resume <string>",
-        "in case the previous export failed and suggested to resume with an export-id, enter the id"
-      ],
-      [
-        "",
-        "ignore-missing-artifacts",
-        "EXPERIMENTAL. don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
-      ],
-      [
-        "j",
-        "json",
-        "show output in json format"
-      ]
-    ],
-    "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  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,
-    "arguments": [
-      {
-        "name": "component-patterns...",
-        "description": "component IDs, component names, or component patterns (separated by space). Use patterns to export groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
-      }
-    ]
-  },
   {
     "name": "update-dependencies <data>",
     "alias": "",

package/dist/cli-reference.json

@@ -1281,6 +1281,68 @@
             }
         ]
     },
+    {
+        "name": "resume-export <export-id> <remotes...>",
+        "alias": "",
+        "options": [],
+        "description": "EXPERIMENTAL. resume failed export",
+        "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client got in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
+        "group": "collaborate",
+        "private": true,
+        "remoteOp": true
+    },
+    {
+        "name": "export [component-patterns...]",
+        "alias": "e",
+        "options": [
+            [
+                "e",
+                "eject",
+                "replace the exported components with their corresponding packages (to use these components without further maintaining them)"
+            ],
+            [
+                "a",
+                "all",
+                "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
+            ],
+            [
+                "",
+                "all-versions",
+                "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
+            ],
+            [
+                "",
+                "origin-directly",
+                "EXPERIMENTAL. avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
+            ],
+            [
+                "",
+                "resume <string>",
+                "in case the previous export failed and suggested to resume with an export-id, enter the id"
+            ],
+            [
+                "",
+                "ignore-missing-artifacts",
+                "EXPERIMENTAL. don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
+            ],
+            [
+                "j",
+                "json",
+                "show output in json format"
+            ]
+        ],
+        "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  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,
+        "arguments": [
+            {
+                "name": "component-patterns...",
+                "description": "component IDs, component names, or component patterns (separated by space). Use patterns to export groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
+            }
+        ]
+    },
     {
         "name": "import [component-patterns...]",
         "alias": "",
@@ -2037,7 +2099,7 @@
                     [
                         "f",
                         "force",
-                        "removes the component from the scope, even if used as a dependency. WARNING: components that depend on this component will corrupt"
+                        "removes the lane even when the lane was not merged yet"
                     ],
                     [
                         "s",
@@ -2288,6 +2350,47 @@
         "group": "ungrouped",
         "private": true
     },
+    {
+        "name": "_merge-lane <lane> [pattern]",
+        "alias": "",
+        "options": [
+            [
+                "",
+                "push",
+                "export the updated objects to the original scopes once done"
+            ],
+            [
+                "",
+                "keep-readme",
+                "skip deleting the lane readme component after merging"
+            ],
+            [
+                "",
+                "no-squash",
+                "EXPERIMENTAL. relevant for merging lanes into main, which by default squash."
+            ],
+            [
+                "",
+                "include-deps",
+                "EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components"
+            ]
+        ],
+        "description": "merge a remote lane into main via a bare-scope (not workspace)",
+        "extendedDescription": "to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command",
+        "group": "ungrouped",
+        "private": true,
+        "remoteOp": true,
+        "arguments": [
+            {
+                "name": "lane",
+                "description": "lane-id to merge to main"
+            },
+            {
+                "name": "pattern",
+                "description": "EXPERIMENTAL. partially merge the lane with the specified component-pattern"
+            }
+        ]
+    },
     {
         "name": "dependencies <sub-command>",
         "alias": "deps",
@@ -3316,68 +3419,6 @@
             }
         ]
     },
-    {
-        "name": "resume-export <export-id> <remotes...>",
-        "alias": "",
-        "options": [],
-        "description": "EXPERIMENTAL. resume failed export",
-        "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client got in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
-        "group": "collaborate",
-        "private": true,
-        "remoteOp": true
-    },
-    {
-        "name": "export [component-patterns...]",
-        "alias": "e",
-        "options": [
-            [
-                "e",
-                "eject",
-                "replace the exported components with their corresponding packages (to use these components without further maintaining them)"
-            ],
-            [
-                "a",
-                "all",
-                "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
-            ],
-            [
-                "",
-                "all-versions",
-                "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
-            ],
-            [
-                "",
-                "origin-directly",
-                "EXPERIMENTAL. avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
-            ],
-            [
-                "",
-                "resume <string>",
-                "in case the previous export failed and suggested to resume with an export-id, enter the id"
-            ],
-            [
-                "",
-                "ignore-missing-artifacts",
-                "EXPERIMENTAL. don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
-            ],
-            [
-                "j",
-                "json",
-                "show output in json format"
-            ]
-        ],
-        "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  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,
-        "arguments": [
-            {
-                "name": "component-patterns...",
-                "description": "component IDs, component names, or component patterns (separated by space). Use patterns to export groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
-            }
-        ]
-    },
     {
         "name": "update-dependencies <data>",
         "alias": "",