@teambit/harmony.content.cli-reference 1.95.59 → 1.95.62

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.json +13 -3
  2. package/cli-reference.mdx +2 -1
  3. package/dist/cli-reference.json +13 -3
  4. package/dist/cli-reference.mdx.js +14 -1
  5. package/dist/cli-reference.mdx.js.map +1 -1
  6. package/package-tar/teambit-harmony.content.cli-reference-1.95.62.tgz +0 -0
  7. package/package.json +4 -6
  8. package/{preview-1661398415639.js → preview-1662020726651.js} +2 -2
  9. package/package-tar/teambit-harmony.content.cli-reference-1.95.59.tgz +0 -0
package/cli-reference.json CHANGED
@@ -1373,10 +1373,15 @@
1373
1373
  "name": "remove <component-pattern>",
1374
1374
  "alias": "rm",
1375
1375
  "options": [
1376
+ [
1377
+ "",
1378
+ "soft",
1379
+ "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated"
1380
+ ],
1376
1381
  [
1377
1382
  "r",
1378
1383
  "remote",
1379
- "remove a component from a remote scope"
1384
+ "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
1380
1385
  ],
1381
1386
  [
1382
1387
  "t",
@@ -2105,8 +2110,8 @@
2105
2110
  ],
2106
2111
  [
2107
2112
  "",
2108
- "squash",
2109
- "EXPERIMENTAL. squash multiple snaps. keep the last one only"
2113
+ "no-squash",
2114
+ "EXPERIMENTAL. relevant for merging lanes into main, which by default squash."
2110
2115
  ],
2111
2116
  [
2112
2117
  "",
@@ -2127,6 +2132,11 @@
2127
2132
  "",
2128
2133
  "include-deps",
2129
2134
  "EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
2135
+ ],
2136
+ [
2137
+ "",
2138
+ "resolve-unrelated [merge-strategy]",
2139
+ "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\""
2130
2140
  ]
2131
2141
  ],
2132
2142
  "description": "merge a local or a remote lane",
package/cli-reference.mdx CHANGED
@@ -970,7 +970,8 @@ for example: "http://localhost:3000", "file:///tmp/local-scope"
970
970
 
971
971
  | **Option** | **Option alias** | **Description** |
972
972
  | ---------------- | :--------------: | ---------------------------------------------------------------------------------------------------------------------------------- |
973
- | `--remote` | `-r` | remove a component from a remote scope |
973
+ | `--soft` | | EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated |
974
+ | `--remote` | `-r` | remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export) |
974
975
  | `--track` | `-t` | keep tracking component in .bitmap (default = false), helps transform a tagged-component to new |
975
976
  | `--delete-files` | `-d` | DEPRECATED (this is now the default). delete local component files |
976
977
  | `--keep-files` | | keep component files (just untrack the component) |
package/dist/cli-reference.json CHANGED
@@ -1373,10 +1373,15 @@
1373
1373
  "name": "remove <component-pattern>",
1374
1374
  "alias": "rm",
1375
1375
  "options": [
1376
+ [
1377
+ "",
1378
+ "soft",
1379
+ "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated"
1380
+ ],
1376
1381
  [
1377
1382
  "r",
1378
1383
  "remote",
1379
- "remove a component from a remote scope"
1384
+ "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)"
1380
1385
  ],
1381
1386
  [
1382
1387
  "t",
@@ -2105,8 +2110,8 @@
2105
2110
  ],
2106
2111
  [
2107
2112
  "",
2108
- "squash",
2109
- "EXPERIMENTAL. squash multiple snaps. keep the last one only"
2113
+ "no-squash",
2114
+ "EXPERIMENTAL. relevant for merging lanes into main, which by default squash."
2110
2115
  ],
2111
2116
  [
2112
2117
  "",
@@ -2127,6 +2132,11 @@
2127
2132
  "",
2128
2133
  "include-deps",
2129
2134
  "EXPERIMENTAL. relevant for \"--pattern\" and \"--workspace\". merge also dependencies of the given components"
2135
+ ],
2136
+ [
2137
+ "",
2138
+ "resolve-unrelated [merge-strategy]",
2139
+ "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\""
2130
2140
  ]
2131
2141
  ],
2132
2142
  "description": "merge a local or a remote lane",
package/dist/cli-reference.mdx.js CHANGED
@@ -4350,6 +4350,19 @@ function MDXContent(_ref) {
4350
4350
  "align": null
4351
4351
  }, (0, _react2.mdx)("inlineCode", {
4352
4352
  parentName: "td"
4353
+ }, "--soft")), (0, _react2.mdx)("td", {
4354
+ parentName: "tr",
4355
+ "align": "center"
4356
+ }), (0, _react2.mdx)("td", {
4357
+ parentName: "tr",
4358
+ "align": null
4359
+ }, "EXPERIMENTAL. mark the component as deleted. after tag/snap and export the remote will be updated")), (0, _react2.mdx)("tr", {
4360
+ parentName: "tbody"
4361
+ }, (0, _react2.mdx)("td", {
4362
+ parentName: "tr",
4363
+ "align": null
4364
+ }, (0, _react2.mdx)("inlineCode", {
4365
+ parentName: "td"
4353
4366
  }, "--remote")), (0, _react2.mdx)("td", {
4354
4367
  parentName: "tr",
4355
4368
  "align": "center"
@@ -4358,7 +4371,7 @@ function MDXContent(_ref) {
4358
4371
  }, "-r")), (0, _react2.mdx)("td", {
4359
4372
  parentName: "tr",
4360
4373
  "align": null
4361
- }, "remove a component from a remote scope")), (0, _react2.mdx)("tr", {
4374
+ }, "remove a component completely from a remote scope (Careful! this is a permanent change. prefer --soft and tag+export)")), (0, _react2.mdx)("tr", {
4362
4375
  parentName: "tbody"
4363
4376
  }, (0, _react2.mdx)("td", {
4364
4377
  parentName: "tr",