Skip to content

Revise for consistency and readability #188

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

Closed
wants to merge 9 commits into from
Closed

Revise for consistency and readability #188

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5061598
move declaration of changelog up with the others
elidoran Apr 15, 2019
26f60fd
change from const to let so we can color them if needed
elidoran Apr 15, 2019
4442107
create variables for remaining parts of output text
elidoran Apr 15, 2019
a255363
colorize all variables inside single block
elidoran Apr 15, 2019
3f8e663
eliminate unnecessary useColor ternary statements
elidoran Apr 15, 2019
c01af1a
remove remaining ternary statement by moving it to a variable; arrow
elidoran Apr 15, 2019
9dd157f
useColor is used once now so move its value to the if statement
elidoran Apr 15, 2019
f1b1acd
reformat notify message construction now that all the ternary express…
elidoran Apr 15, 2019
d9008c5
move useUnicode declaration up a scope and reuse it below
elidoran Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions bin/npm-cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
conf._exit = true
npm.load(conf, function (er) {
if (er) return errorHandler(er)
const useUnicode = npm.config.get('unicode')
if (
!isGlobalNpmUpdate &&
npm.config.get('update-notifier') &&
Expand All @@ -89,12 +90,19 @@
!isCI
) {
const color = require('ansicolors')
const useColor = npm.config.get('color')
const useUnicode = npm.config.get('unicode')
const old = notifier.update.current
const latest = notifier.update.latest
let old = notifier.update.current
let latest = notifier.update.latest
let type = notifier.update.type
if (useColor) {
let changelogLabel = 'Changelog:'
let changelog = `https://github.com/npm/cli/releases/tag/v${latest}`
let installCommand = `npm install -g ${pkg.name}`
const arrow = useUnicode ? '→' : '->'
if (npm.config.get('color')) {
old = color.red(old)
latest = color.green(latest)
changelogLabel = color.yellow(changelogLabel)
changelog = color.cyan(changelog)
installCommand = color.green(installCommand)
switch (type) {
case 'major':
type = color.red(type)
Expand All @@ -107,23 +115,11 @@
break
}
}
const changelog = `https://github.com/npm/cli/releases/tag/v${latest}`
notifier.notify({
message: `New ${type} version of ${pkg.name} available! ${
useColor ? color.red(old) : old
} ${useUnicode ? '→' : '->'} ${
useColor ? color.green(latest) : latest
}\n` +
`${
useColor ? color.yellow('Changelog:') : 'Changelog:'
} ${
useColor ? color.cyan(changelog) : changelog
}\n` +
`Run ${
useColor
? color.green(`npm install -g ${pkg.name}`)
: `npm i -g ${pkg.name}`
} to update!`
message:
`New ${type} version of ${pkg.name} available! ${old} ${arrow} ${latest}\n` +
`${changelogLabel} ${changelog}\n` +
`Run ${installCommand} to update!`
})
}
}
Expand All @@ -138,11 +134,11 @@
) {
console.error(
`\n ${
npm.config.get('unicode') ? '🎵 ' : ''
useUnicode ? '🎵 ' : ''
} I Have the Honour to Be Your Obedient Servant,${
npm.config.get('unicode') ? '🎵 ' : ''
useUnicode ? '🎵 ' : ''
} ~ npm ${
npm.config.get('unicode') ? '📜🖋 ' : ''
useUnicode ? '📜🖋 ' : ''
}\n`
)
}
Expand Down