@teambit/harmony.content.cli-reference 1.95.195 → 1.95.197

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 (11) hide show
  1. package/cli-reference.docs.mdx +1 -1
  2. package/cli-reference.json +32 -17
  3. package/cli-reference.mdx +93 -90
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +32 -17
  6. package/dist/cli-reference.mdx.js +52 -19
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1691551061589.js → preview-1691723880005.js} +2 -2
  9. package/package-tar/teambit-harmony.content.cli-reference-1.95.197.tgz +0 -0
  10. package/package.json +2 -2
  11. package/package-tar/teambit-harmony.content.cli-reference-1.95.195.tgz +0 -0
package/dist/cli-reference.json CHANGED
@@ -2315,7 +2315,7 @@
2315
2315
  [
2316
2316
  "i",
2317
2317
  "ignore-issues [issues]",
2318
- "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2318
+ "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2319
2319
  ],
2320
2320
  [
2321
2321
  "I",
@@ -2428,7 +2428,7 @@
2428
2428
  [
2429
2429
  "i",
2430
2430
  "ignore-issues [issues]",
2431
- "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2431
+ "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2432
2432
  ],
2433
2433
  [
2434
2434
  "a",
@@ -2574,7 +2574,7 @@
2574
2574
  [
2575
2575
  "i",
2576
2576
  "ignore-issues [issues]",
2577
- "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2577
+ "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2578
2578
  ],
2579
2579
  [
2580
2580
  "I",
@@ -2635,7 +2635,7 @@
2635
2635
  [
2636
2636
  "i",
2637
2637
  "ignore-issues [issues]",
2638
- "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2638
+ "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
2639
2639
  ],
2640
2640
  [
2641
2641
  "j",
@@ -2658,19 +2658,24 @@
2658
2658
  "when a component is modified and the merge process found conflicts, display options to resolve them"
2659
2659
  ],
2660
2660
  [
2661
- "o",
2661
+ "",
2662
2662
  "ours",
2663
- "in case of a conflict, override the used version with the current modification"
2663
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2664
2664
  ],
2665
2665
  [
2666
- "t",
2666
+ "",
2667
2667
  "theirs",
2668
- "in case of a conflict, override the current modification with the specified version"
2668
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2669
2669
  ],
2670
2670
  [
2671
- "m",
2671
+ "",
2672
2672
  "manual",
2673
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2673
+ "DEPRECATED. use --auto-merge-resolve"
2674
+ ],
2675
+ [
2676
+ "",
2677
+ "auto-merge-resolve <merge-strategy>",
2678
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2674
2679
  ],
2675
2680
  [
2676
2681
  "r",
@@ -2872,17 +2877,22 @@
2872
2877
  [
2873
2878
  "",
2874
2879
  "ours",
2875
- "in case of a conflict, override the used version with the current modification"
2880
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
2876
2881
  ],
2877
2882
  [
2878
2883
  "",
2879
2884
  "theirs",
2880
- "in case of a conflict, override the current modification with the specified version"
2885
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
2881
2886
  ],
2882
2887
  [
2883
2888
  "",
2884
2889
  "manual",
2885
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
2890
+ "DEPRECATED. use --auto-merge-resolve"
2891
+ ],
2892
+ [
2893
+ "",
2894
+ "auto-merge-resolve <merge-strategy>",
2895
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
2886
2896
  ],
2887
2897
  [
2888
2898
  "",
@@ -3246,7 +3256,7 @@
3246
3256
  [
3247
3257
  "",
3248
3258
  "update-main",
3249
- "NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main"
3259
+ "EXPERIMENTAL. mark as removed on main after merging this lane into main"
3250
3260
  ]
3251
3261
  ],
3252
3262
  "description": "remove components when on a lane",
@@ -3267,17 +3277,22 @@
3267
3277
  [
3268
3278
  "",
3269
3279
  "ours",
3270
- "in case of a conflict, override the used version with the current modification"
3280
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact"
3271
3281
  ],
3272
3282
  [
3273
3283
  "",
3274
3284
  "theirs",
3275
- "in case of a conflict, override the current modification with the specified version"
3285
+ "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code"
3276
3286
  ],
3277
3287
  [
3278
3288
  "",
3279
3289
  "manual",
3280
- "in case of a conflict, leave the files with a conflict state to resolve them manually later"
3290
+ "DEPRECATED. use --auto-merge-resolve"
3291
+ ],
3292
+ [
3293
+ "",
3294
+ "auto-merge-resolve <merge-strategy>",
3295
+ "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
3281
3296
  ],
3282
3297
  [
3283
3298
  "",
package/dist/cli-reference.mdx.js CHANGED
@@ -1463,12 +1463,10 @@ function MDXContent(_ref) {
1463
1463
  }, "--ours")), (0, _react2.mdx)("td", {
1464
1464
  parentName: "tr",
1465
1465
  "align": "center"
1466
- }, (0, _react2.mdx)("inlineCode", {
1467
- parentName: "td"
1468
- }, "-o")), (0, _react2.mdx)("td", {
1466
+ }), (0, _react2.mdx)("td", {
1469
1467
  parentName: "tr",
1470
1468
  "align": null
1471
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
1469
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
1472
1470
  parentName: "tbody"
1473
1471
  }, (0, _react2.mdx)("td", {
1474
1472
  parentName: "tr",
@@ -1478,12 +1476,10 @@ function MDXContent(_ref) {
1478
1476
  }, "--theirs")), (0, _react2.mdx)("td", {
1479
1477
  parentName: "tr",
1480
1478
  "align": "center"
1481
- }, (0, _react2.mdx)("inlineCode", {
1482
- parentName: "td"
1483
- }, "-t")), (0, _react2.mdx)("td", {
1479
+ }), (0, _react2.mdx)("td", {
1484
1480
  parentName: "tr",
1485
1481
  "align": null
1486
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
1482
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
1487
1483
  parentName: "tbody"
1488
1484
  }, (0, _react2.mdx)("td", {
1489
1485
  parentName: "tr",
@@ -1493,12 +1489,23 @@ function MDXContent(_ref) {
1493
1489
  }, "--manual")), (0, _react2.mdx)("td", {
1494
1490
  parentName: "tr",
1495
1491
  "align": "center"
1492
+ }), (0, _react2.mdx)("td", {
1493
+ parentName: "tr",
1494
+ "align": null
1495
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
1496
+ parentName: "tbody"
1497
+ }, (0, _react2.mdx)("td", {
1498
+ parentName: "tr",
1499
+ "align": null
1496
1500
  }, (0, _react2.mdx)("inlineCode", {
1497
1501
  parentName: "td"
1498
- }, "-m")), (0, _react2.mdx)("td", {
1502
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
1503
+ parentName: "tr",
1504
+ "align": "center"
1505
+ }), (0, _react2.mdx)("td", {
1499
1506
  parentName: "tr",
1500
1507
  "align": null
1501
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
1508
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
1502
1509
  parentName: "tbody"
1503
1510
  }, (0, _react2.mdx)("td", {
1504
1511
  parentName: "tr",
@@ -5334,7 +5341,7 @@ function MDXContent(_ref) {
5334
5341
  }), (0, _react2.mdx)("td", {
5335
5342
  parentName: "tr",
5336
5343
  "align": null
5337
- }, "NOT IMPLEMENTED YET. mark as removed on main after merging this lane into main")))), (0, _react2.mdx)("h3", null, "lane merge"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5344
+ }, "EXPERIMENTAL. mark as removed on main after merging this lane into main")))), (0, _react2.mdx)("h3", null, "lane merge"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5338
5345
  parentName: "p"
5339
5346
  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
5340
5347
  parentName: "p"
@@ -5416,7 +5423,7 @@ function MDXContent(_ref) {
5416
5423
  }), (0, _react2.mdx)("td", {
5417
5424
  parentName: "tr",
5418
5425
  "align": null
5419
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
5426
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
5420
5427
  parentName: "tbody"
5421
5428
  }, (0, _react2.mdx)("td", {
5422
5429
  parentName: "tr",
@@ -5429,7 +5436,7 @@ function MDXContent(_ref) {
5429
5436
  }), (0, _react2.mdx)("td", {
5430
5437
  parentName: "tr",
5431
5438
  "align": null
5432
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
5439
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
5433
5440
  parentName: "tbody"
5434
5441
  }, (0, _react2.mdx)("td", {
5435
5442
  parentName: "tr",
@@ -5442,7 +5449,20 @@ function MDXContent(_ref) {
5442
5449
  }), (0, _react2.mdx)("td", {
5443
5450
  parentName: "tr",
5444
5451
  "align": null
5445
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
5452
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
5453
+ parentName: "tbody"
5454
+ }, (0, _react2.mdx)("td", {
5455
+ parentName: "tr",
5456
+ "align": null
5457
+ }, (0, _react2.mdx)("inlineCode", {
5458
+ parentName: "td"
5459
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
5460
+ parentName: "tr",
5461
+ "align": "center"
5462
+ }), (0, _react2.mdx)("td", {
5463
+ parentName: "tr",
5464
+ "align": null
5465
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
5446
5466
  parentName: "tbody"
5447
5467
  }, (0, _react2.mdx)("td", {
5448
5468
  parentName: "tr",
@@ -6456,7 +6476,7 @@ function MDXContent(_ref) {
6456
6476
  }), (0, _react2.mdx)("td", {
6457
6477
  parentName: "tr",
6458
6478
  "align": null
6459
- }, "in case of a conflict, override the used version with the current modification")), (0, _react2.mdx)("tr", {
6479
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will leave the current code intact")), (0, _react2.mdx)("tr", {
6460
6480
  parentName: "tbody"
6461
6481
  }, (0, _react2.mdx)("td", {
6462
6482
  parentName: "tr",
@@ -6469,7 +6489,7 @@ function MDXContent(_ref) {
6469
6489
  }), (0, _react2.mdx)("td", {
6470
6490
  parentName: "tr",
6471
6491
  "align": null
6472
- }, "in case of a conflict, override the current modification with the specified version")), (0, _react2.mdx)("tr", {
6492
+ }, "DEPRECATED. use --auto-merge-resolve. In the future, this flag will override the current code with the incoming code")), (0, _react2.mdx)("tr", {
6473
6493
  parentName: "tbody"
6474
6494
  }, (0, _react2.mdx)("td", {
6475
6495
  parentName: "tr",
@@ -6482,7 +6502,20 @@ function MDXContent(_ref) {
6482
6502
  }), (0, _react2.mdx)("td", {
6483
6503
  parentName: "tr",
6484
6504
  "align": null
6485
- }, "in case of a conflict, leave the files with a conflict state to resolve them manually later")), (0, _react2.mdx)("tr", {
6505
+ }, "DEPRECATED. use --auto-merge-resolve")), (0, _react2.mdx)("tr", {
6506
+ parentName: "tbody"
6507
+ }, (0, _react2.mdx)("td", {
6508
+ parentName: "tr",
6509
+ "align": null
6510
+ }, (0, _react2.mdx)("inlineCode", {
6511
+ parentName: "td"
6512
+ }, "--auto-merge-resolve <merge-strategy>")), (0, _react2.mdx)("td", {
6513
+ parentName: "tr",
6514
+ "align": "center"
6515
+ }), (0, _react2.mdx)("td", {
6516
+ parentName: "tr",
6517
+ "align": null
6518
+ }, "in case of a conflict, resolve according to the strategy: ", "[ours, theirs, manual]")), (0, _react2.mdx)("tr", {
6486
6519
  parentName: "tbody"
6487
6520
  }, (0, _react2.mdx)("td", {
6488
6521
  parentName: "tr",
@@ -8410,7 +8443,7 @@ function MDXContent(_ref) {
8410
8443
  }, "-i")), (0, _react2.mdx)("td", {
8411
8444
  parentName: "tr",
8412
8445
  "align": null
8413
- }, "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore: ", "[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
8446
+ }, "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore: ", "[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
8414
8447
  parentName: "tbody"
8415
8448
  }, (0, _react2.mdx)("td", {
8416
8449
  parentName: "tr",
@@ -9074,7 +9107,7 @@ function MDXContent(_ref) {
9074
9107
  }, "-i")), (0, _react2.mdx)("td", {
9075
9108
  parentName: "tr",
9076
9109
  "align": null
9077
- }, "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore: ", "[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
9110
+ }, "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore: ", "[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, MissingComponents, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
9078
9111
  parentName: "tbody"
9079
9112
  }, (0, _react2.mdx)("td", {
9080
9113
  parentName: "tr",