npm - @teambit/harmony.content.cli-reference - Versions diffs - 1.95.69 → 1.95.71 - Mend

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

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

package/cli-reference.json +98 -88
package/cli-reference.mdx +1 -0
package/dist/cli-reference.json +98 -88
package/dist/cli-reference.mdx.js +13 -0
package/dist/cli-reference.mdx.js.map +1 -1
package/package-tar/teambit-harmony.content.cli-reference-1.95.71.tgz +0 -0
package/package.json +2 -2
package/{preview-1662608124038.js → preview-1663126549096.js} +4 -2
package/package-tar/teambit-harmony.content.cli-reference-1.95.69.tgz +0 -0

package/cli-reference.json CHANGED Viewed

@@ -1267,6 +1267,11 @@
         "remote",
         "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
       ],
+      [
+        "",
+        "from-lane",
+        "revert to main if exists on currently checked out lane, otherwise, remove it"
+      ],
       [
         "t",
         "track",
@@ -1306,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",
@@ -2093,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",
@@ -2145,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": [
@@ -2329,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/cli-reference.mdx CHANGED Viewed

@@ -968,6 +968,7 @@ for example: "http://localhost:3000", "file:///tmp/local-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)              |
+| `--from-lane`    |                  | revert to main if exists on currently checked out lane, otherwise, remove it                                                       |
 | `--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 CHANGED Viewed

@@ -1267,6 +1267,11 @@
                 "remote",
                 "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
             ],
+            [
+                "",
+                "from-lane",
+                "revert to main if exists on currently checked out lane, otherwise, remove it"
+            ],
             [
                 "t",
                 "track",
@@ -1306,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",
@@ -2093,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",
@@ -2145,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": [
@@ -2329,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.mdx.js CHANGED Viewed

@@ -4346,6 +4346,19 @@ function MDXContent(_ref) {
     "align": null
   }, (0, _react2.mdx)("inlineCode", {
     parentName: "td"
+  }, "--from-lane")), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": "center"
+  }), (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, "revert to main if exists on currently checked out lane, otherwise, remove it")), (0, _react2.mdx)("tr", {
+    parentName: "tbody"
+  }, (0, _react2.mdx)("td", {
+    parentName: "tr",
+    "align": null
+  }, (0, _react2.mdx)("inlineCode", {
+    parentName: "td"
   }, "--track")), (0, _react2.mdx)("td", {
     parentName: "tr",
     "align": "center"