@teambit/harmony.content.cli-reference 1.95.194 → 1.95.196

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 +9 -4
  3. package/cli-reference.mdx +47 -46
  4. package/dist/cli-reference.docs.mdx +1 -1
  5. package/dist/cli-reference.json +9 -4
  6. package/dist/cli-reference.mdx.js +16 -3
  7. package/dist/cli-reference.mdx.js.map +1 -1
  8. package/dist/{preview-1691523857630.js → preview-1691637443382.js} +2 -2
  9. package/package-tar/teambit-harmony.content.cli-reference-1.95.196.tgz +0 -0
  10. package/package.json +2 -2
  11. package/package-tar/teambit-harmony.content.cli-reference-1.95.194.tgz +0 -0
package/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 0.2.18'
2
+ description: 'Bit command synopses. Bit version: 0.2.20'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
package/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",
@@ -3348,6 +3348,11 @@
3348
3348
  "",
3349
3349
  "resolve-unrelated [merge-strategy]",
3350
3350
  "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
3351
+ ],
3352
+ [
3353
+ "",
3354
+ "include-non-lane-comps",
3355
+ "when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
3351
3356
  ]
3352
3357
  ],
3353
3358
  "description": "merge a local or a remote lane",
package/cli-reference.mdx CHANGED
@@ -1134,6 +1134,7 @@ it will snap-merge these components to complete the merge. use "no-snap" to opt-
1134
1134
  | `--skip-fetch` | | use the current target-lane if exits locally without updating it from the remote |
1135
1135
  | `--include-deps` | | relevant for "--pattern" and "--workspace". merge also dependencies of the given components |
1136
1136
  | `--resolve-unrelated [merge-strategy]` | | relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be "ours" (default) or "theirs" |
1137
+ | `--include-non-lane-comps` | | when merging main, include workspace components that are not on the lane (by default only lane components are merged) |
1137
1138
 
1138
1139
  ### lane merge-abort
1139
1140
 
@@ -1696,22 +1697,22 @@ use `bit pattern --help` to understand patterns better and `bit pattern <pattern
1696
1697
  | ------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
1697
1698
  | `component-pattern` | component name, component id, or component pattern. use component pattern to select multiple components. use comma to separate patterns and "!" to exclude. e.g. "ui/\*\*, !ui/button" wrap the pattern with quotes. By default, all new and modified components are snapped. |
1698
1699
 
1699
- | **Option** | **Option alias** | **Description** |
1700
- | -------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1701
- | `--message <message>` | `-m` | log message describing the latest changes |
1702
- | `--unmodified` | | include unmodified components (by default, only new and modified components are snapped) |
1703
- | `--unmerged` | | complete a merge process by snapping the unmerged components |
1704
- | `--build` | `-b` | not needed for now. run the build pipeline in case the feature-flag build-on-ci is enabled |
1705
- | `--editor [editor]` | | open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim). |
1706
- | `--skip-tests` | | skip running component tests during snap process |
1707
- | `--skip-auto-snap` | | skip auto snapping dependents |
1708
- | `--disable-snap-pipeline` | | skip the snap pipeline |
1709
- | `--force-deploy` | | DEPRECATED. use --ignore-build-error instead |
1710
- | `--ignore-build-errors` | | run the snap pipeline although the build pipeline failed |
1711
- | `--ignore-issues [issues]` | `-i` | 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 "\*". |
1712
- | `--all` | `-a` | DEPRECATED (not needed anymore, it is the default now). snap all new and modified components |
1713
- | `--fail-fast` | | stop pipeline execution on the first failed task (by default a task is skipped only when its dependent failed) |
1714
- | `--force` | `-f` | DEPRECATED (use "--skip-tests" or "--unmodified" instead). force-snap even if tests are failing and even when component has not changed |
1700
+ | **Option** | **Option alias** | **Description** |
1701
+ | -------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1702
+ | `--message <message>` | `-m` | log message describing the latest changes |
1703
+ | `--unmodified` | | include unmodified components (by default, only new and modified components are snapped) |
1704
+ | `--unmerged` | | complete a merge process by snapping the unmerged components |
1705
+ | `--build` | `-b` | not needed for now. run the build pipeline in case the feature-flag build-on-ci is enabled |
1706
+ | `--editor [editor]` | | open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim). |
1707
+ | `--skip-tests` | | skip running component tests during snap process |
1708
+ | `--skip-auto-snap` | | skip auto snapping dependents |
1709
+ | `--disable-snap-pipeline` | | skip the snap pipeline |
1710
+ | `--force-deploy` | | DEPRECATED. use --ignore-build-error instead |
1711
+ | `--ignore-build-errors` | | run the snap pipeline although the build pipeline failed |
1712
+ | `--ignore-issues [issues]` | `-i` | 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 "\*". |
1713
+ | `--all` | `-a` | DEPRECATED (not needed anymore, it is the default now). snap all new and modified components |
1714
+ | `--fail-fast` | | stop pipeline execution on the first failed task (by default a task is skipped only when its dependent failed) |
1715
+ | `--force` | `-f` | DEPRECATED (use "--skip-tests" or "--unmodified" instead). force-snap even if tests are failing and even when component has not changed |
1715
1716
 
1716
1717
  ---
1717
1718
 
@@ -1782,36 +1783,36 @@ if patterns are entered, you can specify a version per pattern using "@" sign, e
1782
1783
  | ----------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------: |
1783
1784
  | `component-patterns...` | a list of component names, IDs or patterns (separated by space). run "bit pattern --help" to get more data about patterns. By default, all modified are tagged. |
1784
1785
 
1785
- | **Option** | **Option alias** | **Description** |
1786
- | ---------------------------- | :--------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1787
- | `--message <message>` | `-m` | a log message describing latest changes |
1788
- | `--unmodified` | `-u` | include unmodified components (by default, only new and modified components are tagged) |
1789
- | `--editor [editor]` | | open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim). |
1790
- | `--ver <version>` | `-v` | tag with the given version |
1791
- | `--increment <level>` | `-l` | options are: [major, premajor, minor, preminor, patch, prepatch, prerelease], default to patch |
1792
- | `--prerelease-id <id>` | | prerelease identifier (e.g. "dev" to get "1.0.0-dev.1") |
1793
- | `--patch` | `-p` | syntactic sugar for "--increment patch" |
1794
- | `--minor` | | syntactic sugar for "--increment minor" |
1795
- | `--major` | | syntactic sugar for "--increment major" |
1796
- | `--pre-release [identifier]` | | syntactic sugar for "--increment prerelease" and `--prerelease-id <identifier>` |
1797
- | `--snapped` | | tag components that their head is a snap (not a tag) |
1798
- | `--unmerged` | | complete a merge process by tagging the unmerged components |
1799
- | `--skip-tests` | | skip running component tests during tag process |
1800
- | `--skip-auto-tag` | | skip auto tagging dependents |
1801
- | `--soft` | | do not persist. only keep note of the changes to be made |
1802
- | `--persist` | | persist the changes generated by --soft tag |
1803
- | `--disable-tag-pipeline` | | skip the tag pipeline to avoid publishing the components |
1804
- | `--force-deploy` | | DEPRECATED. use --ignore-build-error instead |
1805
- | `--ignore-build-errors` | | run the tag pipeline although the build pipeline failed |
1806
- | `--increment-by <number>` | | (default to 1) increment semver flag (patch/minor/major) by. e.g. incrementing patch by 2: 0.0.1 -> 0.0.3. |
1807
- | `--ignore-issues [issues]` | `-i` | 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 "\*". |
1808
- | `--ignore-newest-version` | `-I` | ignore existing of newer versions (default = false) |
1809
- | `--fail-fast` | | stop pipeline execution on the first failed task (by default a task is skipped only when its dependent failed) |
1810
- | `--build` | `-b` | not needed for now. run the pipeline build and complete the tag |
1811
- | `--all [version]` | `-a` | DEPRECATED (not needed anymore, it is the default now). tag all new and modified components |
1812
- | `--scope [version]` | `-s` | DEPRECATED (use "--unmodified" instead). tag all components of the current scope |
1813
- | `--force` | `-f` | DEPRECATED (use "--skip-tests" or "--unmodified" instead). force-tag even if tests are failing and even when component has not changed |
1814
- | `--disable-deploy-pipeline` | | DEPRECATED. use --disable-tag-pipeline instead |
1786
+ | **Option** | **Option alias** | **Description** |
1787
+ | ---------------------------- | :--------------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
1788
+ | `--message <message>` | `-m` | a log message describing latest changes |
1789
+ | `--unmodified` | `-u` | include unmodified components (by default, only new and modified components are tagged) |
1790
+ | `--editor [editor]` | | open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim). |
1791
+ | `--ver <version>` | `-v` | tag with the given version |
1792
+ | `--increment <level>` | `-l` | options are: [major, premajor, minor, preminor, patch, prepatch, prerelease], default to patch |
1793
+ | `--prerelease-id <id>` | | prerelease identifier (e.g. "dev" to get "1.0.0-dev.1") |
1794
+ | `--patch` | `-p` | syntactic sugar for "--increment patch" |
1795
+ | `--minor` | | syntactic sugar for "--increment minor" |
1796
+ | `--major` | | syntactic sugar for "--increment major" |
1797
+ | `--pre-release [identifier]` | | syntactic sugar for "--increment prerelease" and `--prerelease-id <identifier>` |
1798
+ | `--snapped` | | tag components that their head is a snap (not a tag) |
1799
+ | `--unmerged` | | complete a merge process by tagging the unmerged components |
1800
+ | `--skip-tests` | | skip running component tests during tag process |
1801
+ | `--skip-auto-tag` | | skip auto tagging dependents |
1802
+ | `--soft` | | do not persist. only keep note of the changes to be made |
1803
+ | `--persist` | | persist the changes generated by --soft tag |
1804
+ | `--disable-tag-pipeline` | | skip the tag pipeline to avoid publishing the components |
1805
+ | `--force-deploy` | | DEPRECATED. use --ignore-build-error instead |
1806
+ | `--ignore-build-errors` | | run the tag pipeline although the build pipeline failed |
1807
+ | `--increment-by <number>` | | (default to 1) increment semver flag (patch/minor/major) by. e.g. incrementing patch by 2: 0.0.1 -> 0.0.3. |
1808
+ | `--ignore-issues [issues]` | `-i` | 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 "\*". |
1809
+ | `--ignore-newest-version` | `-I` | ignore existing of newer versions (default = false) |
1810
+ | `--fail-fast` | | stop pipeline execution on the first failed task (by default a task is skipped only when its dependent failed) |
1811
+ | `--build` | `-b` | not needed for now. run the pipeline build and complete the tag |
1812
+ | `--all [version]` | `-a` | DEPRECATED (not needed anymore, it is the default now). tag all new and modified components |
1813
+ | `--scope [version]` | `-s` | DEPRECATED (use "--unmodified" instead). tag all components of the current scope |
1814
+ | `--force` | `-f` | DEPRECATED (use "--skip-tests" or "--unmodified" instead). force-tag even if tests are failing and even when component has not changed |
1815
+ | `--disable-deploy-pipeline` | | DEPRECATED. use --disable-tag-pipeline instead |
1815
1816
 
1816
1817
  ---
1817
1818
 
package/dist/cli-reference.docs.mdx CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- description: 'Bit command synopses. Bit version: 0.2.18'
2
+ description: 'Bit command synopses. Bit version: 0.2.20'
3
3
  labels: ['cli', 'mdx', 'docs']
4
4
  ---
5
5
 
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",
@@ -3348,6 +3348,11 @@
3348
3348
  "",
3349
3349
  "resolve-unrelated [merge-strategy]",
3350
3350
  "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
3351
+ ],
3352
+ [
3353
+ "",
3354
+ "include-non-lane-comps",
3355
+ "when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
3351
3356
  ]
3352
3357
  ],
3353
3358
  "description": "merge a local or a remote lane",
package/dist/cli-reference.mdx.js CHANGED
@@ -5628,7 +5628,20 @@ function MDXContent(_ref) {
5628
5628
  }), (0, _react2.mdx)("td", {
5629
5629
  parentName: "tr",
5630
5630
  "align": null
5631
- }, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5631
+ }, "relevant when a component on a lane and the component on main has nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\"")), (0, _react2.mdx)("tr", {
5632
+ parentName: "tbody"
5633
+ }, (0, _react2.mdx)("td", {
5634
+ parentName: "tr",
5635
+ "align": null
5636
+ }, (0, _react2.mdx)("inlineCode", {
5637
+ parentName: "td"
5638
+ }, "--include-non-lane-comps")), (0, _react2.mdx)("td", {
5639
+ parentName: "tr",
5640
+ "align": "center"
5641
+ }), (0, _react2.mdx)("td", {
5642
+ parentName: "tr",
5643
+ "align": null
5644
+ }, "when merging main, include workspace components that are not on the lane (by default only lane components are merged)")))), (0, _react2.mdx)("h3", null, "lane merge-abort"), (0, _react2.mdx)("p", null, (0, _react2.mdx)("strong", {
5632
5645
  parentName: "p"
5633
5646
  }, "Usage"), ": ", (0, _react2.mdx)("inlineCode", {
5634
5647
  parentName: "p"
@@ -8397,7 +8410,7 @@ function MDXContent(_ref) {
8397
8410
  }, "-i")), (0, _react2.mdx)("td", {
8398
8411
  parentName: "tr",
8399
8412
  "align": null
8400
- }, "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", {
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, RemovedDependencies]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
8401
8414
  parentName: "tbody"
8402
8415
  }, (0, _react2.mdx)("td", {
8403
8416
  parentName: "tr",
@@ -9061,7 +9074,7 @@ function MDXContent(_ref) {
9061
9074
  }, "-i")), (0, _react2.mdx)("td", {
9062
9075
  parentName: "tr",
9063
9076
  "align": null
9064
- }, "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", {
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, RemovedDependencies]", " to ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"", "*", "\".")), (0, _react2.mdx)("tr", {
9065
9078
  parentName: "tbody"
9066
9079
  }, (0, _react2.mdx)("td", {
9067
9080
  parentName: "tr",