mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-05-12 10:11:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(publish): more information added to the Git check errors/prompt

Browse Source
This commit is contained in:
Zoltan Kochan
2020-09-08 14:16:05 +03:00
parent ebd7f32082
commit 273f11af46
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/empty-eggs-cross.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@pnpm/plugin-commands-publishing": minor
---
More information added to the Git check errors and prompt.

20
packages/plugin-commands-publishing/src/publish.ts
View File

@@ -83,6 +83,8 @@ export function help () {
})
}
const GIT_CHECKS_HINT = 'If you want to disable Git checks on publish, set the "git-checks" setting to "false".'
export async function handler (
opts: Omit<PublishRecursiveOpts, 'workspaceDir'> & {
argv: {
@@ -96,22 +98,30 @@ export async function handler (
) {
if (opts.gitChecks !== false && await isGitRepo()) {
const branch = opts.publishBranch ?? 'master'
if (await getCurrentBranch() !== branch) {
const currentBranch = await getCurrentBranch()
if (currentBranch !== branch) {
const { confirm } = await prompt({
message: `You are not on ${branch} branch, do you want to continue?`,
message: `You're on branch "${currentBranch}" but your "publish-branch" is set to "${branch}". \
Do you want to continue?`,
name: 'confirm',
type: 'confirm',
} as any) as any // eslint-disable-line @typescript-eslint/no-explicit-any
if (!confirm) {
throw new PnpmError('GIT_NOT_CORRECT_BRANCH', `Branch is not on '${branch}'.`)
throw new PnpmError('GIT_NOT_CORRECT_BRANCH', `Branch is not on '${branch}'.`, {
hint: GIT_CHECKS_HINT,
})
}
}
if (!(await isWorkingTreeClean())) {
throw new PnpmError('GIT_NOT_UNCLEAN', 'Unclean working tree. Commit or stash changes first.')
throw new PnpmError('GIT_NOT_UNCLEAN', 'Unclean working tree. Commit or stash changes first.', {
hint: GIT_CHECKS_HINT,
})
}
if (!(await isRemoteHistoryClean())) {
throw new PnpmError('GIT_NOT_LATEST', 'Remote history differs. Please pull changes.')
throw new PnpmError('GIT_NOT_LATEST', 'Remote history differs. Please pull changes.', {
hint: GIT_CHECKS_HINT,
})
}
}
if (opts.recursive && opts.selectedProjectsGraph) {