@teambit/harmony.content.cli-reference 1.95.70 → 1.95.71

package/cli-reference.json

@@ -1311,6 +1311,93 @@
       }
     ]
   },
+  {
+    "name": "import [component-patterns...]",
+    "alias": "",
+    "options": [
+      [
+        "p",
+        "path <path>",
+        "import components into a specific directory (a relative path in the workspace)"
+      ],
+      [
+        "o",
+        "objects",
+        "import components objects to the local scope without checkout (without writing them to the file system). This is a default behavior for import with no id argument"
+      ],
+      [
+        "d",
+        "display-dependencies",
+        "display the imported dependencies"
+      ],
+      [
+        "O",
+        "override",
+        "override local changes"
+      ],
+      [
+        "v",
+        "verbose",
+        "show verbose output for inspection"
+      ],
+      [
+        "j",
+        "json",
+        "return the output as JSON"
+      ],
+      [
+        "",
+        "conf",
+        "write the configuration file (component.json) of the component"
+      ],
+      [
+        "",
+        "skip-npm-install",
+        "DEPRECATED. use \"--skip-dependency-installation\" instead"
+      ],
+      [
+        "",
+        "skip-dependency-installation",
+        "do not install packages of the imported components"
+      ],
+      [
+        "m",
+        "merge [strategy]",
+        "merge local changes with the imported version. strategy should be \"theirs\", \"ours\" or \"manual\""
+      ],
+      [
+        "",
+        "dependencies",
+        "EXPERIMENTAL. import all dependencies and write them to the workspace"
+      ],
+      [
+        "",
+        "dependents",
+        "EXPERIMENTAL. import the components' dependents. this enables changes to propagate from (modified) components to their dependents"
+      ],
+      [
+        "",
+        "save-in-lane",
+        "EXPERIMENTAL. when checked out to a lane and the component is not on the remote-lane, save it in the lane (default to save on main)"
+      ],
+      [
+        "",
+        "all-history",
+        "relevant for fetching all components objects. avoid optimizations, fetch all history versions, always"
+      ]
+    ],
+    "description": "import components from their remote scopes to the local workspace",
+    "extendedDescription": "https://bit.dev/docs/components/importing-components\nyou can use a pattern for multiple ids, such as bit import \"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 or component patterns (separated by space). Use patterns to import groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
+      }
+    ]
+  },
   {
     "name": "install [packages...]",
     "alias": "in",
@@ -2098,6 +2185,11 @@
             "no-snap",
             "do not auto snap in case the merge completed without conflicts"
           ],
+          [
+            "",
+            "tag",
+            "tag all lane components after merging into main (also tag-merge in case of snap-merge)"
+          ],
           [
             "",
             "build",
@@ -2150,7 +2242,7 @@
           ]
         ],
         "description": "merge a local or a remote lane",
-        "extendedDescription": "if the <lane> exists locally, it will be merged from the local lane.\notherwise, it will fetch the lane from the remote and merge it.\nin case the <lane> exists locally but you want to merge the remote version of it, use --remote flag",
+        "extendedDescription": "if the <lane> exists locally, it will be merged from the local lane.\notherwise, it will fetch the lane from the remote and merge it.\nin case the <lane> exists locally but you want to merge the remote version of it, use --remote flag.\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead",
         "private": true,
         "remoteOp": true,
         "arguments": [
@@ -2334,93 +2426,6 @@
     "remoteOp": true,
     "skipWorkspace": true
   },
-  {
-    "name": "import [component-patterns...]",
-    "alias": "",
-    "options": [
-      [
-        "p",
-        "path <path>",
-        "import components into a specific directory (a relative path in the workspace)"
-      ],
-      [
-        "o",
-        "objects",
-        "import components objects to the local scope without checkout (without writing them to the file system). This is a default behavior for import with no id argument"
-      ],
-      [
-        "d",
-        "display-dependencies",
-        "display the imported dependencies"
-      ],
-      [
-        "O",
-        "override",
-        "override local changes"
-      ],
-      [
-        "v",
-        "verbose",
-        "show verbose output for inspection"
-      ],
-      [
-        "j",
-        "json",
-        "return the output as JSON"
-      ],
-      [
-        "",
-        "conf",
-        "write the configuration file (component.json) of the component"
-      ],
-      [
-        "",
-        "skip-npm-install",
-        "DEPRECATED. use \"--skip-dependency-installation\" instead"
-      ],
-      [
-        "",
-        "skip-dependency-installation",
-        "do not install packages of the imported components"
-      ],
-      [
-        "m",
-        "merge [strategy]",
-        "merge local changes with the imported version. strategy should be \"theirs\", \"ours\" or \"manual\""
-      ],
-      [
-        "",
-        "dependencies",
-        "EXPERIMENTAL. import all dependencies and write them to the workspace"
-      ],
-      [
-        "",
-        "dependents",
-        "EXPERIMENTAL. import the components' dependents. this enables changes to propagate from (modified) components to their dependents"
-      ],
-      [
-        "",
-        "save-in-lane",
-        "EXPERIMENTAL. when checked out to a lane and the component is not on the remote-lane, save it in the lane (default to save on main)"
-      ],
-      [
-        "",
-        "all-history",
-        "relevant for fetching all components objects. avoid optimizations, fetch all history versions, always"
-      ]
-    ],
-    "description": "import components from their remote scopes to the local workspace",
-    "extendedDescription": "https://bit.dev/docs/components/importing-components\nyou can use a pattern for multiple ids, such as bit import \"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 or component patterns (separated by space). Use patterns to import groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
-      }
-    ]
-  },
   {
     "name": "create <template-name> <component-names...>",
     "alias": "",

package/dist/cli-reference.json

@@ -1311,6 +1311,93 @@
             }
         ]
     },
+    {
+        "name": "import [component-patterns...]",
+        "alias": "",
+        "options": [
+            [
+                "p",
+                "path <path>",
+                "import components into a specific directory (a relative path in the workspace)"
+            ],
+            [
+                "o",
+                "objects",
+                "import components objects to the local scope without checkout (without writing them to the file system). This is a default behavior for import with no id argument"
+            ],
+            [
+                "d",
+                "display-dependencies",
+                "display the imported dependencies"
+            ],
+            [
+                "O",
+                "override",
+                "override local changes"
+            ],
+            [
+                "v",
+                "verbose",
+                "show verbose output for inspection"
+            ],
+            [
+                "j",
+                "json",
+                "return the output as JSON"
+            ],
+            [
+                "",
+                "conf",
+                "write the configuration file (component.json) of the component"
+            ],
+            [
+                "",
+                "skip-npm-install",
+                "DEPRECATED. use \"--skip-dependency-installation\" instead"
+            ],
+            [
+                "",
+                "skip-dependency-installation",
+                "do not install packages of the imported components"
+            ],
+            [
+                "m",
+                "merge [strategy]",
+                "merge local changes with the imported version. strategy should be \"theirs\", \"ours\" or \"manual\""
+            ],
+            [
+                "",
+                "dependencies",
+                "EXPERIMENTAL. import all dependencies and write them to the workspace"
+            ],
+            [
+                "",
+                "dependents",
+                "EXPERIMENTAL. import the components' dependents. this enables changes to propagate from (modified) components to their dependents"
+            ],
+            [
+                "",
+                "save-in-lane",
+                "EXPERIMENTAL. when checked out to a lane and the component is not on the remote-lane, save it in the lane (default to save on main)"
+            ],
+            [
+                "",
+                "all-history",
+                "relevant for fetching all components objects. avoid optimizations, fetch all history versions, always"
+            ]
+        ],
+        "description": "import components from their remote scopes to the local workspace",
+        "extendedDescription": "https://bit.dev/docs/components/importing-components\nyou can use a pattern for multiple ids, such as bit import \"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 or component patterns (separated by space). Use patterns to import groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
+            }
+        ]
+    },
     {
         "name": "install [packages...]",
         "alias": "in",
@@ -2098,6 +2185,11 @@
                         "no-snap",
                         "do not auto snap in case the merge completed without conflicts"
                     ],
+                    [
+                        "",
+                        "tag",
+                        "tag all lane components after merging into main (also tag-merge in case of snap-merge)"
+                    ],
                     [
                         "",
                         "build",
@@ -2150,7 +2242,7 @@
                     ]
                 ],
                 "description": "merge a local or a remote lane",
-                "extendedDescription": "if the <lane> exists locally, it will be merged from the local lane.\notherwise, it will fetch the lane from the remote and merge it.\nin case the <lane> exists locally but you want to merge the remote version of it, use --remote flag",
+                "extendedDescription": "if the <lane> exists locally, it will be merged from the local lane.\notherwise, it will fetch the lane from the remote and merge it.\nin case the <lane> exists locally but you want to merge the remote version of it, use --remote flag.\nwhen the current and the other lanes are diverged in history and the files could be merged with no conflicts,\nit will snap-merge these components to complete the merge. use \"no-snap\" to opt-out, or \"tag\" to tag instead",
                 "private": true,
                 "remoteOp": true,
                 "arguments": [
@@ -2334,93 +2426,6 @@
         "remoteOp": true,
         "skipWorkspace": true
     },
-    {
-        "name": "import [component-patterns...]",
-        "alias": "",
-        "options": [
-            [
-                "p",
-                "path <path>",
-                "import components into a specific directory (a relative path in the workspace)"
-            ],
-            [
-                "o",
-                "objects",
-                "import components objects to the local scope without checkout (without writing them to the file system). This is a default behavior for import with no id argument"
-            ],
-            [
-                "d",
-                "display-dependencies",
-                "display the imported dependencies"
-            ],
-            [
-                "O",
-                "override",
-                "override local changes"
-            ],
-            [
-                "v",
-                "verbose",
-                "show verbose output for inspection"
-            ],
-            [
-                "j",
-                "json",
-                "return the output as JSON"
-            ],
-            [
-                "",
-                "conf",
-                "write the configuration file (component.json) of the component"
-            ],
-            [
-                "",
-                "skip-npm-install",
-                "DEPRECATED. use \"--skip-dependency-installation\" instead"
-            ],
-            [
-                "",
-                "skip-dependency-installation",
-                "do not install packages of the imported components"
-            ],
-            [
-                "m",
-                "merge [strategy]",
-                "merge local changes with the imported version. strategy should be \"theirs\", \"ours\" or \"manual\""
-            ],
-            [
-                "",
-                "dependencies",
-                "EXPERIMENTAL. import all dependencies and write them to the workspace"
-            ],
-            [
-                "",
-                "dependents",
-                "EXPERIMENTAL. import the components' dependents. this enables changes to propagate from (modified) components to their dependents"
-            ],
-            [
-                "",
-                "save-in-lane",
-                "EXPERIMENTAL. when checked out to a lane and the component is not on the remote-lane, save it in the lane (default to save on main)"
-            ],
-            [
-                "",
-                "all-history",
-                "relevant for fetching all components objects. avoid optimizations, fetch all history versions, always"
-            ]
-        ],
-        "description": "import components from their remote scopes to the local workspace",
-        "extendedDescription": "https://bit.dev/docs/components/importing-components\nyou can use a pattern for multiple ids, such as bit import \"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 or component patterns (separated by space). Use patterns to import groups of components using a common scope or namespace. E.g., \"utils/*\" (wrap with double quotes)"
-            }
-        ]
-    },
     {
         "name": "create <template-name> <component-names...>",
         "alias": "",