Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: show more information during publish dry-run #4726

Merged
merged 3 commits into from Apr 13, 2022
Merged

fix: show more information during publish dry-run #4726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57d65ee
fix: show more information during publish dry-run
lukekarrys Apr 11, 2022
bcb5b28
fixup! fix: show more information during publish dry-run
lukekarrys Apr 11, 2022
068d8b2
fixup! fix: show more information during publish dry-run
lukekarrys Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions lib/commands/publish.js
View file
Open in desktop
Expand Up @@ -102,19 +102,20 @@ class Publish extends BaseCommand {
logTar(pkgContents, { unicode })
}

const resolved = npa.resolve(manifest.name, manifest.version)
const registry = npmFetch.pickRegistry(resolved, opts)
const creds = this.npm.config.getCredentialsByURI(registry)
const outputRegistry = replaceInfo(registry)
if (!creds.token && !creds.username) {
throw Object.assign(
new Error(`This command requires you to be logged in to ${outputRegistry}`), {
code: 'ENEEDAUTH',
}
)
}
lukekarrys marked this conversation as resolved.
Show resolved Hide resolved
log.notice('', `Publishing to ${outputRegistry}${dryRun ? ' (dry-run)' : ''}`)

if (!dryRun) {
const resolved = npa.resolve(manifest.name, manifest.version)
const registry = npmFetch.pickRegistry(resolved, opts)
const creds = this.npm.config.getCredentialsByURI(registry)
const outputRegistry = replaceInfo(registry)
if (!creds.token && !creds.username) {
throw Object.assign(
new Error(`This command requires you to be logged in to ${outputRegistry}`), {
code: 'ENEEDAUTH',
}
)
}
log.notice('', `Publishing to ${outputRegistry}`)
await otplease(opts, opts => libpub(manifest, tarballData, opts))
}

Expand Down
17 changes: 10 additions & 7 deletions test/lib/commands/publish.js
View file
Open in desktop
Expand Up @@ -163,9 +163,9 @@ t.test('if loglevel=info and json, should not output package contents', async t

t.test(
/* eslint-disable-next-line max-len */
'if loglevel=silent and dry-run, should not output package contents or publish or validate credentials, should log tarball contents',
'if loglevel=silent and dry-run, should not output package contents or publish, should log tarball contents',
async t => {
t.plan(1)
t.plan(2)

const testDir = t.testdir({
'package.json': JSON.stringify(
Expand Down Expand Up @@ -199,8 +199,9 @@ t.test(
throw new Error('should not output in dry run mode')
},
}, t)
npm.config.getCredentialsByURI = () => {
throw new Error('should not call getCredentialsByURI in dry run')
npm.config.getCredentialsByURI = uri => {
t.same(uri, npm.config.get('registry'), 'gets credentials for expected registry')
return { token: 'some.registry.token' }
}

const publish = new Publish(npm)
Expand All @@ -213,7 +214,7 @@ t.test(
/* eslint-disable-next-line max-len */
'if loglevel=info and dry-run, should not publish, should log package contents and log tarball contents',
async t => {
t.plan(2)
t.plan(3)

const testDir = t.testdir({
'package.json': JSON.stringify(
Expand Down Expand Up @@ -247,9 +248,11 @@ t.test(
t.pass('output fn is called')
},
}, t)
npm.config.getCredentialsByURI = () => {
throw new Error('should not call getCredentialsByURI in dry run')
npm.config.getCredentialsByURI = uri => {
t.same(uri, npm.config.get('registry'), 'gets credentials for expected registry')
return { token: 'some.registry.token' }
}

const publish = new Publish(npm)

await publish.exec([testDir])
Expand Down