Browse Source

Merge branch 'master' into add/piping

master
Guillermo Rauch 9 years ago
parent
commit
7d005c3a33
  1. 3
      bin/now-deploy
  2. 2
      lib/index.js

3
bin/now-deploy

@ -103,6 +103,7 @@ const apiUrl = argv.url || 'https://api.zeit.co';
const isTTY = process.stdout.isTTY; const isTTY = process.stdout.isTTY;
const quiet = !isTTY; const quiet = !isTTY;
const config = cfg.read(); const config = cfg.read();
const alwaysForwardNpm = config.forwardNpm;
if (argv.h || argv.help) { if (argv.h || argv.help) {
help(); help();
@ -147,7 +148,7 @@ async function sync (token) {
await now.create(path, { await now.create(path, {
forceNew, forceNew,
forceSync, forceSync,
forwardNpm, forwardNpm: alwaysForwardNpm || forwardNpm,
quiet quiet
}); });
} catch (err) { } catch (err) {

2
lib/index.js

@ -65,7 +65,7 @@ export default class Now extends EventEmitter {
const nowProperties = pkg.now || {}; const nowProperties = pkg.now || {};
forwardNpm = forwardNpm || nowProperties['forward-npm']; forwardNpm = forwardNpm || nowProperties['forwardNpm'];
// Read .npmrc // Read .npmrc
let npmrc = {}; let npmrc = {};

Loading…
Cancel
Save