diff --git a/bin/now-deploy.js b/bin/now-deploy.js index c789330..732481e 100755 --- a/bin/now-deploy.js +++ b/bin/now-deploy.js @@ -17,7 +17,7 @@ const dotenv = require('dotenv') const copy = require('../lib/copy') const login = require('../lib/login') const cfg = require('../lib/cfg') -const {version} = require('../package') +const {version} = require('../lib/pkg') const Logger = require('../lib/build-logger') const Now = require('../lib') const toHumanPath = require('../lib/utils/to-human-path') diff --git a/bin/now.js b/bin/now.js index 1b9777d..0350a56 100755 --- a/bin/now.js +++ b/bin/now.js @@ -7,10 +7,10 @@ const {resolve} = require('path') const nodeVersion = require('node-version') const updateNotifier = require('update-notifier') const chalk = require('chalk') -const pkgUp = require('pkg-up') // Ours const {error} = require('../lib/error') +const pkg = require('../lib/pkg') // Throw an error if node version is too low if (nodeVersion.major < 6) { @@ -18,23 +18,18 @@ if (nodeVersion.major < 6) { process.exit(1) } -pkgUp().then(packagePath => { - const pkg = require(packagePath) +if (!process.pkg) { + const notifier = updateNotifier({pkg}) + const update = notifier.update - // Only check for updates in the npm version - if (!process.pkg && pkg.dist) { - const notifier = updateNotifier({pkg}) - const update = notifier.update + if (update) { + let message = `Update available! ${chalk.red(update.current)} → ${chalk.green(update.latest)} \n` + message += `Run ${chalk.magenta('npm i -g now')} to update!\n` + message += `${chalk.magenta('Changelog:')} https://github.com/zeit/now-cli/releases/tag/${update.latest}` - if (update) { - let message = `Update available! ${chalk.red(update.current)} → ${chalk.green(update.latest)} \n` - message += `Run ${chalk.magenta('npm i -g now')} to update!\n` - message += `${chalk.magenta('Changelog:')} https://github.com/zeit/now-cli/releases/tag/${update.latest}` - - notifier.notify({message}) - } + notifier.notify({message}) } -}) +} // This command will be run if no other sub command is specified const defaultCommand = 'deploy' diff --git a/lib/login.js b/lib/login.js index c97ed03..a6cc06d 100644 --- a/lib/login.js +++ b/lib/login.js @@ -10,7 +10,7 @@ const readEmail = require('email-prompt') const ora = require('ora') // Ours -const pkg = require('../package') +const pkg = require('../lib/pkg') const ua = require('./ua') const cfg = require('./cfg') diff --git a/lib/pkg.js b/lib/pkg.js new file mode 100644 index 0000000..11234dd --- /dev/null +++ b/lib/pkg.js @@ -0,0 +1,4 @@ +module.exports = { + version: '4.5.3', + name: 'now' +} diff --git a/lib/ua.js b/lib/ua.js index 28712e9..fc4b75b 100644 --- a/lib/ua.js +++ b/lib/ua.js @@ -2,6 +2,6 @@ const os = require('os') // Ours -const {version} = require('../package') +const {version} = require('../lib/pkg') module.exports = `now ${version} node-${process.version} ${os.platform()} (${os.arch()})` diff --git a/package.json b/package.json index 871b836..e32255b 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,6 @@ "node-fetch": "1.6.3", "node-version": "1.0.0", "ora": "1.1.0", - "pkg-up": "1.0.0", "progress": "1.1.8", "psl": "1.1.16", "resumer": "0.0.0",