@teambit/checkout 1.0.264 → 1.0.266
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="2" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.component/checkout@1.0.
|
|
3
|
+
<testsuite name="teambit.component/checkout@1.0.266" tests="2" failures="0" errors="0" skipped="0">
|
|
4
4
|
<testcase classname="dist/checkout.spec.js" name="should bring the files back"/>
|
|
5
|
-
<testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.
|
|
5
|
+
<testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.056"/>
|
|
6
6
|
</testsuite>
|
|
7
7
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
|
@@ -4798,7 +4798,7 @@
|
|
|
4798
4798
|
}
|
|
4799
4799
|
},
|
|
4800
4800
|
"isOptional": true,
|
|
4801
|
-
"defaultValue": "[\n [\n 'i',\n 'interactive-merge',\n 'when a component is modified and the merge process found conflicts, display options to resolve them',\n ],\n [\n '',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n ['a', 'all', 'all components'],\n [\n 'e',\n 'workspace-only',\n \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n ],\n ['v', 'verbose', 'showing verbose output for inspection'],\n ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n ['', 'force-ours', 'do not merge, preserve local files as is'],\n ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n ] as CommandOptions"
|
|
4801
|
+
"defaultValue": "[\n [\n 'i',\n 'interactive-merge',\n 'when a component is modified and the merge process found conflicts, display options to resolve them',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n ['a', 'all', 'all components'],\n [\n 'e',\n 'workspace-only',\n \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n ],\n ['v', 'verbose', 'showing verbose output for inspection'],\n ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n ['', 'force-ours', 'do not merge, preserve local files as is'],\n ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n ] as CommandOptions"
|
|
4802
4802
|
},
|
|
4803
4803
|
{
|
|
4804
4804
|
"__schema": "VariableLikeSchema",
|
|
@@ -5375,7 +5375,7 @@
|
|
|
5375
5375
|
"_legacy": {
|
|
5376
5376
|
"scope": "teambit.component",
|
|
5377
5377
|
"name": "checkout",
|
|
5378
|
-
"version": "1.0.
|
|
5378
|
+
"version": "1.0.266"
|
|
5379
5379
|
},
|
|
5380
5380
|
"_scope": "teambit.component"
|
|
5381
5381
|
}
|
|
@@ -5478,7 +5478,7 @@
|
|
|
5478
5478
|
"componentId": {
|
|
5479
5479
|
"scope": "teambit.component",
|
|
5480
5480
|
"name": "checkout",
|
|
5481
|
-
"version": "1.0.
|
|
5481
|
+
"version": "1.0.266"
|
|
5482
5482
|
},
|
|
5483
5483
|
"taggedModuleExports": []
|
|
5484
5484
|
}
|
package/dist/checkout-cmd.js
CHANGED
|
@@ -72,7 +72,7 @@ class CheckoutCmd {
|
|
|
72
72
|
\`bit checkout reset [component-pattern]\` => remove local modifications from the specified ids (or all components when --all is used). also, if a component dir is deleted from the filesystem, it'll be restored
|
|
73
73
|
when on a lane, "checkout head" only checks out components on this lane. to update main components, run "bit lane merge main"`);
|
|
74
74
|
_defineProperty(this, "alias", 'U');
|
|
75
|
-
_defineProperty(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['', 'auto-merge-resolve <merge-strategy>', 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['a', 'all', 'all components'], ['e', 'workspace-only', "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"], ['v', 'verbose', 'showing verbose output for inspection'], ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'], ['', 'force-ours', 'do not merge, preserve local files as is'], ['', 'force-theirs', 'do not merge, just overwrite with incoming files']]);
|
|
75
|
+
_defineProperty(this, "options", [['i', 'interactive-merge', 'when a component is modified and the merge process found conflicts, display options to resolve them'], ['r', 'auto-merge-resolve <merge-strategy>', 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]'], ['', 'manual', 'same as "--auto-merge-resolve manual". in case of merge conflict, write the files with the conflict markers'], ['a', 'all', 'all components'], ['e', 'workspace-only', "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"], ['v', 'verbose', 'showing verbose output for inspection'], ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'], ['', 'force-ours', 'do not merge, preserve local files as is'], ['', 'force-theirs', 'do not merge, just overwrite with incoming files']]);
|
|
76
76
|
_defineProperty(this, "loader", true);
|
|
77
77
|
}
|
|
78
78
|
async report([to, componentPattern], {
|
package/dist/checkout-cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_merging","_constants","_componentId","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","forceOurs","forceTheirs","autoMergeResolve","manual","all","workspaceOnly","verbose","skipDependencyInstallation","revert","BitError","HEAD","checkoutProps","promptMergeOptions","mergeStrategy","isLane","skipNpmInstall","head","LATEST","latest","reset","main","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","workspaceConfigUpdateResult","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getWsConfigUpdateLogs","logs","logsStr","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictStr","yellow","getSuccessfulOutput","newLine","switchedOrReverted","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","checkedOutStr","unchangedLegitimatelyStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr","compact","getRemovedOutput","getAddedOutput","getWorkspaceConfigUpdateOutput","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionResults,\n applyVersionReport,\n conflictSummaryReport,\n installationErrorOutput,\n compilationErrorOutput,\n getRemovedOutput,\n getAddedOutput,\n getWorkspaceConfigUpdateOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\n\nexport class CheckoutCmd implements Command {\n name = 'checkout <to> [component-pattern]';\n arguments = [\n {\n name: 'to',\n description:\n \"permitted values: [head, latest, reset, specific-version]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes\",\n },\n {\n name: 'component-pattern',\n description: COMPONENT_PATTERN_HELP,\n },\n ];\n description = 'switch between component versions or remove local changes';\n helpUrl = 'reference/components/merging-changes#checkout-snaps-to-the-working-directory';\n group = 'development';\n extendedDescription = `\n\\`bit checkout <version> [component-pattern]\\` => checkout the specified ids (or all components when --all is used) to the specified version\n\\`bit checkout head [component-pattern]\\` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n\\`bit checkout latest [component-pattern]\\` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n\\`bit checkout reset [component-pattern]\\` => remove local modifications from the specified ids (or all components when --all is used). also, if a component dir is deleted from the filesystem, it'll be restored\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"`;\n alias = 'U';\n options = [\n [\n 'i',\n 'interactive-merge',\n 'when a component is modified and the merge process found conflicts, display options to resolve them',\n ],\n [\n '',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n ['a', 'all', 'all components'],\n [\n 'e',\n 'workspace-only',\n \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n ],\n ['v', 'verbose', 'showing verbose output for inspection'],\n ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n ['', 'force-ours', 'do not merge, preserve local files as is'],\n ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private checkout: CheckoutMain) {}\n\n async report(\n [to, componentPattern]: [string, string],\n {\n interactiveMerge = false,\n forceOurs,\n forceTheirs,\n autoMergeResolve,\n manual,\n all = false,\n workspaceOnly = false,\n verbose = false,\n skipDependencyInstallation = false,\n revert = false,\n }: {\n interactiveMerge?: boolean;\n forceOurs?: boolean;\n forceTheirs?: boolean;\n autoMergeResolve?: MergeStrategy;\n manual?: boolean;\n all?: boolean;\n workspaceOnly?: boolean;\n verbose?: boolean;\n skipDependencyInstallation?: boolean;\n revert?: boolean;\n }\n ) {\n if (forceOurs && forceTheirs) {\n throw new BitError('please use either --force-ours or --force-theirs, not both');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n if (workspaceOnly && to !== HEAD) {\n throw new BitError('--workspace-only is only relevant when running \"bit checkout head\" on a lane');\n }\n const checkoutProps: CheckoutProps = {\n promptMergeOptions: interactiveMerge,\n mergeStrategy: autoMergeResolve,\n all,\n verbose,\n isLane: false,\n skipNpmInstall: skipDependencyInstallation,\n workspaceOnly,\n revert,\n forceOurs,\n forceTheirs,\n };\n if (to === HEAD) checkoutProps.head = true;\n else if (to === LATEST) checkoutProps.latest = true;\n else if (to === 'reset') checkoutProps.reset = true;\n else if (to === 'main') checkoutProps.main = true;\n else {\n if (!ComponentID.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n checkoutProps.version = to;\n }\n\n const checkoutResults = await this.checkout.checkoutByCLIValues(componentPattern || '', checkoutProps);\n return checkoutOutput(checkoutResults, checkoutProps);\n }\n}\n\nexport function checkoutOutput(\n checkoutResults: ApplyVersionResults,\n checkoutProps: CheckoutProps,\n alternativeTitle?: string\n) {\n const {\n components,\n version,\n failedComponents,\n removedComponents,\n addedComponents,\n leftUnresolvedConflicts,\n workspaceConfigUpdateResult,\n newFromLane,\n newFromLaneAdded,\n installationError,\n compilationError,\n }: ApplyVersionResults = checkoutResults;\n\n const { head, reset, latest, main, revert, verbose, all } = checkoutProps;\n\n // components that failed for no legitimate reason. e.g. merge-conflict.\n const realFailedComponents = (failedComponents || []).filter((f) => !f.unchangedLegitimately);\n if (realFailedComponents.length) {\n throw new Error('checkout should throw in case of errors');\n }\n // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n const notCheckedOutComponents = failedComponents || [];\n\n const getNotCheckedOutOutput = () => {\n if (!notCheckedOutComponents.length) return '';\n if (!verbose && all) {\n return chalk.green(\n `checkout was not needed for ${chalk.bold(\n notCheckedOutComponents.length.toString()\n )} components (use --verbose to get more details)\\n`\n );\n }\n const title = 'checkout was not required for the following component(s)';\n const body = notCheckedOutComponents\n .map((failedComponent) => `${failedComponent.id.toString()} - ${failedComponent.unchangedMessage}`)\n .join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n };\n const getWsConfigUpdateLogs = () => {\n const logs = workspaceConfigUpdateResult?.logs;\n if (!logs || !logs.length) return '';\n const logsStr = logs.join('\\n');\n return `${chalk.underline('verbose logs of workspace config update')}\\n${logsStr}`;\n };\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nfix the conflicts above manually and then run \"bit install\".\nonce ready, snap/tag the components to persist the changes`;\n const conflictSummary = conflictSummaryReport(components);\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n const getSuccessfulOutput = () => {\n if (!components || !components.length) return '';\n const newLine = '\\n';\n const switchedOrReverted = revert ? 'reverted' : 'switched';\n if (components.length === 1) {\n const component = components[0];\n const componentName = reset ? component.id.toString() : component.id.toStringWithoutVersion();\n if (reset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n const title =\n alternativeTitle ||\n `successfully ${switchedOrReverted} ${chalk.bold(componentName)} to version ${chalk.bold(\n // @ts-ignore version is defined when !reset\n head || latest ? component.id.version : version\n )}`;\n return chalk.bold(title) + newLine + applyVersionReport(components, false);\n }\n if (reset) {\n const title = 'successfully reset the following components\\n\\n';\n const body = components.map((component) => chalk.bold(component.id.toString())).join('\\n');\n return chalk.underline(title) + body;\n }\n const getVerOutput = () => {\n if (head) return 'their head version';\n if (latest) return 'their latest version';\n if (main) return 'their main version';\n // @ts-ignore version is defined when !reset\n return `version ${chalk.bold(version)}`;\n };\n const versionOutput = getVerOutput();\n const title =\n alternativeTitle || `successfully ${switchedOrReverted} ${components.length} components to ${versionOutput}`;\n const showVersion = head || reset;\n return chalk.bold(title) + newLine + applyVersionReport(components, true, showVersion);\n };\n const getNewOnLaneOutput = () => {\n if (!newFromLane?.length) return '';\n const title = newFromLaneAdded\n ? `successfully added the following components from the lane`\n : `the following components exist on the lane but were not added to the workspace. omit --workspace-only flag to add them`;\n const body = newFromLane.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n };\n const getSummary = () => {\n const checkedOut = components?.length || 0;\n const notCheckedOutLegitimately = notCheckedOutComponents.length;\n const title = chalk.bold.underline('Summary');\n const checkedOutStr = `\\nTotal Changed: ${chalk.bold(checkedOut.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(notCheckedOutLegitimately.toString())}`;\n const newOnLaneNum = newFromLane?.length || 0;\n const newOnLaneAddedStr = newFromLaneAdded ? ' (added)' : ' (not added)';\n const newOnLaneStr = newOnLaneNum\n ? `\\nNew on lane${newOnLaneAddedStr}: ${chalk.bold(newOnLaneNum.toString())}`\n : '';\n\n return title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;\n };\n\n return compact([\n getWsConfigUpdateLogs(),\n getNotCheckedOutOutput(),\n getSuccessfulOutput(),\n getRemovedOutput(removedComponents),\n getAddedOutput(addedComponents),\n getNewOnLaneOutput(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n installationErrorOutput(installationError),\n compilationErrorOutput(compilationError),\n ]).join('\\n\\n');\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_merging","_constants","_componentId","_bitError","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","r","e","Symbol","toPrimitive","call","TypeError","String","Number","CheckoutCmd","constructor","checkout","name","description","COMPONENT_PATTERN_HELP","report","to","componentPattern","interactiveMerge","forceOurs","forceTheirs","autoMergeResolve","manual","all","workspaceOnly","verbose","skipDependencyInstallation","revert","BitError","HEAD","checkoutProps","promptMergeOptions","mergeStrategy","isLane","skipNpmInstall","head","LATEST","latest","reset","main","ComponentID","isValidVersion","version","checkoutResults","checkoutByCLIValues","checkoutOutput","exports","alternativeTitle","components","failedComponents","removedComponents","addedComponents","leftUnresolvedConflicts","workspaceConfigUpdateResult","newFromLane","newFromLaneAdded","installationError","compilationError","realFailedComponents","filter","f","unchangedLegitimately","length","Error","notCheckedOutComponents","getNotCheckedOutOutput","chalk","green","bold","toString","title","body","map","failedComponent","id","unchangedMessage","join","underline","getWsConfigUpdateLogs","logs","logsStr","getConflictSummary","suggestion","conflictSummary","conflictSummaryReport","conflictStr","yellow","getSuccessfulOutput","newLine","switchedOrReverted","component","componentName","toStringWithoutVersion","applyVersionReport","getVerOutput","versionOutput","showVersion","getNewOnLaneOutput","getSummary","checkedOut","notCheckedOutLegitimately","checkedOutStr","unchangedLegitimatelyStr","newOnLaneNum","newOnLaneAddedStr","newOnLaneStr","compact","getRemovedOutput","getAddedOutput","getWorkspaceConfigUpdateOutput","installationErrorOutput","compilationErrorOutput"],"sources":["checkout-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport {\n ApplyVersionResults,\n applyVersionReport,\n conflictSummaryReport,\n installationErrorOutput,\n compilationErrorOutput,\n getRemovedOutput,\n getAddedOutput,\n getWorkspaceConfigUpdateOutput,\n} from '@teambit/merging';\nimport { COMPONENT_PATTERN_HELP, HEAD, LATEST } from '@teambit/legacy/dist/constants';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ComponentID } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { CheckoutMain, CheckoutProps } from './checkout.main.runtime';\n\nexport class CheckoutCmd implements Command {\n name = 'checkout <to> [component-pattern]';\n arguments = [\n {\n name: 'to',\n description:\n \"permitted values: [head, latest, reset, specific-version]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes\",\n },\n {\n name: 'component-pattern',\n description: COMPONENT_PATTERN_HELP,\n },\n ];\n description = 'switch between component versions or remove local changes';\n helpUrl = 'reference/components/merging-changes#checkout-snaps-to-the-working-directory';\n group = 'development';\n extendedDescription = `\n\\`bit checkout <version> [component-pattern]\\` => checkout the specified ids (or all components when --all is used) to the specified version\n\\`bit checkout head [component-pattern]\\` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n\\`bit checkout latest [component-pattern]\\` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n\\`bit checkout reset [component-pattern]\\` => remove local modifications from the specified ids (or all components when --all is used). also, if a component dir is deleted from the filesystem, it'll be restored\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"`;\n alias = 'U';\n options = [\n [\n 'i',\n 'interactive-merge',\n 'when a component is modified and the merge process found conflicts, display options to resolve them',\n ],\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n ['a', 'all', 'all components'],\n [\n 'e',\n 'workspace-only',\n \"only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace\",\n ],\n ['v', 'verbose', 'showing verbose output for inspection'],\n ['x', 'skip-dependency-installation', 'do not auto-install dependencies of the imported components'],\n ['', 'force-ours', 'do not merge, preserve local files as is'],\n ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private checkout: CheckoutMain) {}\n\n async report(\n [to, componentPattern]: [string, string],\n {\n interactiveMerge = false,\n forceOurs,\n forceTheirs,\n autoMergeResolve,\n manual,\n all = false,\n workspaceOnly = false,\n verbose = false,\n skipDependencyInstallation = false,\n revert = false,\n }: {\n interactiveMerge?: boolean;\n forceOurs?: boolean;\n forceTheirs?: boolean;\n autoMergeResolve?: MergeStrategy;\n manual?: boolean;\n all?: boolean;\n workspaceOnly?: boolean;\n verbose?: boolean;\n skipDependencyInstallation?: boolean;\n revert?: boolean;\n }\n ) {\n if (forceOurs && forceTheirs) {\n throw new BitError('please use either --force-ours or --force-theirs, not both');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n if (workspaceOnly && to !== HEAD) {\n throw new BitError('--workspace-only is only relevant when running \"bit checkout head\" on a lane');\n }\n const checkoutProps: CheckoutProps = {\n promptMergeOptions: interactiveMerge,\n mergeStrategy: autoMergeResolve,\n all,\n verbose,\n isLane: false,\n skipNpmInstall: skipDependencyInstallation,\n workspaceOnly,\n revert,\n forceOurs,\n forceTheirs,\n };\n if (to === HEAD) checkoutProps.head = true;\n else if (to === LATEST) checkoutProps.latest = true;\n else if (to === 'reset') checkoutProps.reset = true;\n else if (to === 'main') checkoutProps.main = true;\n else {\n if (!ComponentID.isValidVersion(to)) throw new BitError(`the specified version \"${to}\" is not a valid version`);\n checkoutProps.version = to;\n }\n\n const checkoutResults = await this.checkout.checkoutByCLIValues(componentPattern || '', checkoutProps);\n return checkoutOutput(checkoutResults, checkoutProps);\n }\n}\n\nexport function checkoutOutput(\n checkoutResults: ApplyVersionResults,\n checkoutProps: CheckoutProps,\n alternativeTitle?: string\n) {\n const {\n components,\n version,\n failedComponents,\n removedComponents,\n addedComponents,\n leftUnresolvedConflicts,\n workspaceConfigUpdateResult,\n newFromLane,\n newFromLaneAdded,\n installationError,\n compilationError,\n }: ApplyVersionResults = checkoutResults;\n\n const { head, reset, latest, main, revert, verbose, all } = checkoutProps;\n\n // components that failed for no legitimate reason. e.g. merge-conflict.\n const realFailedComponents = (failedComponents || []).filter((f) => !f.unchangedLegitimately);\n if (realFailedComponents.length) {\n throw new Error('checkout should throw in case of errors');\n }\n // components that weren't checked out for legitimate reasons, e.g. up-to-date.\n const notCheckedOutComponents = failedComponents || [];\n\n const getNotCheckedOutOutput = () => {\n if (!notCheckedOutComponents.length) return '';\n if (!verbose && all) {\n return chalk.green(\n `checkout was not needed for ${chalk.bold(\n notCheckedOutComponents.length.toString()\n )} components (use --verbose to get more details)\\n`\n );\n }\n const title = 'checkout was not required for the following component(s)';\n const body = notCheckedOutComponents\n .map((failedComponent) => `${failedComponent.id.toString()} - ${failedComponent.unchangedMessage}`)\n .join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n };\n const getWsConfigUpdateLogs = () => {\n const logs = workspaceConfigUpdateResult?.logs;\n if (!logs || !logs.length) return '';\n const logsStr = logs.join('\\n');\n return `${chalk.underline('verbose logs of workspace config update')}\\n${logsStr}`;\n };\n const getConflictSummary = () => {\n if (!components || !components.length || !leftUnresolvedConflicts) return '';\n const title = `files with conflicts summary\\n`;\n const suggestion = `\\n\\nfix the conflicts above manually and then run \"bit install\".\nonce ready, snap/tag the components to persist the changes`;\n const conflictSummary = conflictSummaryReport(components);\n return chalk.underline(title) + conflictSummary.conflictStr + chalk.yellow(suggestion);\n };\n const getSuccessfulOutput = () => {\n if (!components || !components.length) return '';\n const newLine = '\\n';\n const switchedOrReverted = revert ? 'reverted' : 'switched';\n if (components.length === 1) {\n const component = components[0];\n const componentName = reset ? component.id.toString() : component.id.toStringWithoutVersion();\n if (reset) return `successfully reset ${chalk.bold(componentName)}\\n`;\n const title =\n alternativeTitle ||\n `successfully ${switchedOrReverted} ${chalk.bold(componentName)} to version ${chalk.bold(\n // @ts-ignore version is defined when !reset\n head || latest ? component.id.version : version\n )}`;\n return chalk.bold(title) + newLine + applyVersionReport(components, false);\n }\n if (reset) {\n const title = 'successfully reset the following components\\n\\n';\n const body = components.map((component) => chalk.bold(component.id.toString())).join('\\n');\n return chalk.underline(title) + body;\n }\n const getVerOutput = () => {\n if (head) return 'their head version';\n if (latest) return 'their latest version';\n if (main) return 'their main version';\n // @ts-ignore version is defined when !reset\n return `version ${chalk.bold(version)}`;\n };\n const versionOutput = getVerOutput();\n const title =\n alternativeTitle || `successfully ${switchedOrReverted} ${components.length} components to ${versionOutput}`;\n const showVersion = head || reset;\n return chalk.bold(title) + newLine + applyVersionReport(components, true, showVersion);\n };\n const getNewOnLaneOutput = () => {\n if (!newFromLane?.length) return '';\n const title = newFromLaneAdded\n ? `successfully added the following components from the lane`\n : `the following components exist on the lane but were not added to the workspace. omit --workspace-only flag to add them`;\n const body = newFromLane.join('\\n');\n return `${chalk.underline(title)}\\n${body}`;\n };\n const getSummary = () => {\n const checkedOut = components?.length || 0;\n const notCheckedOutLegitimately = notCheckedOutComponents.length;\n const title = chalk.bold.underline('Summary');\n const checkedOutStr = `\\nTotal Changed: ${chalk.bold(checkedOut.toString())}`;\n const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(notCheckedOutLegitimately.toString())}`;\n const newOnLaneNum = newFromLane?.length || 0;\n const newOnLaneAddedStr = newFromLaneAdded ? ' (added)' : ' (not added)';\n const newOnLaneStr = newOnLaneNum\n ? `\\nNew on lane${newOnLaneAddedStr}: ${chalk.bold(newOnLaneNum.toString())}`\n : '';\n\n return title + checkedOutStr + unchangedLegitimatelyStr + newOnLaneStr;\n };\n\n return compact([\n getWsConfigUpdateLogs(),\n getNotCheckedOutOutput(),\n getSuccessfulOutput(),\n getRemovedOutput(removedComponents),\n getAddedOutput(addedComponents),\n getNewOnLaneOutput(),\n getWorkspaceConfigUpdateOutput(workspaceConfigUpdateResult),\n getConflictSummary(),\n getSummary(),\n installationErrorOutput(installationError),\n compilationErrorOutput(compilationError),\n ]).join('\\n\\n');\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/checkout",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.266",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/checkout",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "checkout",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.266"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
"@teambit/component-id": "1.2.0",
|
|
17
17
|
"@teambit/harmony": "0.4.6",
|
|
18
18
|
"@teambit/cli": "0.0.863",
|
|
19
|
-
"@teambit/merging": "1.0.
|
|
20
|
-
"@teambit/component-writer": "1.0.
|
|
21
|
-
"@teambit/importer": "1.0.
|
|
19
|
+
"@teambit/merging": "1.0.266",
|
|
20
|
+
"@teambit/component-writer": "1.0.266",
|
|
21
|
+
"@teambit/importer": "1.0.266",
|
|
22
22
|
"@teambit/logger": "0.0.956",
|
|
23
|
-
"@teambit/remove": "1.0.
|
|
24
|
-
"@teambit/workspace": "1.0.
|
|
23
|
+
"@teambit/remove": "1.0.266",
|
|
24
|
+
"@teambit/workspace": "1.0.266"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/lodash": "4.14.165",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@teambit/harmony.envs.core-aspect-env": "0.0.33",
|
|
36
36
|
"@teambit/component.testing.mock-components": "0.0.201",
|
|
37
37
|
"@teambit/harmony.testing.load-aspect": "0.0.196",
|
|
38
|
-
"@teambit/snapping": "1.0.
|
|
38
|
+
"@teambit/snapping": "1.0.266",
|
|
39
39
|
"@teambit/workspace.testing.mock-workspace": "0.0.27"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
File without changes
|