lint: "Split initialized 'var' declarations"

bin/npm-cli.js

@@ -22,15 +22,15 @@
   log.info('it worked if it ends with', 'ok')
 
   var path = require('path')
-    , log = require('npmlog')
-    , npm = require('../lib/npm.js')
-    , npmconf = require('../lib/config/core.js')
-    , errorHandler = require('../lib/utils/error-handler.js')
-
-    , configDefs = npmconf.defs
-    , shorthands = configDefs.shorthands
-    , types = configDefs.types
-    , nopt = require('nopt')
+  var log = require('npmlog')
+  var npm = require('../lib/npm.js')
+  var npmconf = require('../lib/config/core.js')
+  var errorHandler = require('../lib/utils/error-handler.js')
+
+  var configDefs = npmconf.defs
+  var shorthands = configDefs.shorthands
+  var types = configDefs.types
+  var nopt = require('nopt')
 
   // if npm is called as "npmg" or "npm_g", then
   // run in global mode.

bin/read-package-json.js

@@ -5,8 +5,8 @@ if (argv.length < 3) {
 }
 
 var fs = require('fs')
-  , file = argv[2]
-  , readJson = require('read-package-json')
+var file = argv[2]
+var readJson = require('read-package-json')
 
 readJson(file, function (er, data) {
   if (er) throw er

html/static/toc.js

@@ -7,10 +7,10 @@
           && el.id
     })
   var l = 2
-    , toc = document.createElement('ul')
+  var toc = document.createElement('ul')
   toc.innerHTML = els.map(function (el) {
     var i = el.tagName.charAt(1)
-      , out = ''
+    var out = ''
     while (i > l) {
       out += '<ul>'
       l ++

lib/adduser.js

@@ -1,11 +1,10 @@
-
 module.exports = adduser
 
 var log = require('npmlog')
-  , npm = require('./npm.js')
-  , read = require('read')
-  , userValidate = require('npm-user-validate')
-  , crypto
+var npm = require('./npm.js')
+var read = require('read')
+var userValidate = require('npm-user-validate')
+var crypto
 
 try {
   crypto = process.binding('crypto') && require('crypto')
@@ -22,8 +21,8 @@ function adduser (args, cb) {
           , p : creds.password || ''
           , e : creds.email || ''
           }
-    , u = {}
-    , fns = [readUsername, readPassword, readEmail, save]
+  var u = {}
+  var fns = [readUsername, readPassword, readEmail, save]
 
   loop()
   function loop (er) {

lib/bin.js

@@ -8,7 +8,7 @@ bin.usage = 'npm bin [--global]'
 function bin (args, silent, cb) {
   if (typeof cb !== 'function') cb = silent, silent = false
   var b = npm.bin
-    , PATH = osenv.path()
+  var PATH = osenv.path()
 
   if (!silent) console.log(b)
   process.nextTick(cb.bind(this, null, b))

lib/bugs.js

@@ -3,11 +3,11 @@ module.exports = bugs
 bugs.usage = 'npm bugs [<pkgname>]'
 
 var npm = require('./npm.js')
-  , log = require('npmlog')
-  , opener = require('opener')
-  , fetchPackageMetadata = require('./fetch-package-metadata.js')
-  , mapToRegistry = require('./utils/map-to-registry.js')
-  , registry = npm.registry
+var log = require('npmlog')
+var opener = require('opener')
+var fetchPackageMetadata = require('./fetch-package-metadata.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
+var registry = npm.registry
 
 bugs.completion = function (opts, cb) {
   // FIXME: there used to be registry completion here, but it stopped making

lib/build.js

@@ -8,19 +8,19 @@
 // This runs AFTER install or link are completed.
 
 var npm = require('./npm.js')
-  , log = require('npmlog')
-  , chain = require('slide').chain
-  , fs = require('graceful-fs')
-  , path = require('path')
-  , lifecycle = require('./utils/lifecycle.js')
-  , readJson = require('read-package-json')
-  , link = require('./utils/link.js')
-  , linkIfExists = link.ifExists
-  , cmdShim = require('cmd-shim')
-  , cmdShimIfExists = cmdShim.ifExists
-  , asyncMap = require('slide').asyncMap
-  , ini = require('ini')
-  , writeFile = require('write-file-atomic')
+var log = require('npmlog')
+var chain = require('slide').chain
+var fs = require('graceful-fs')
+var path = require('path')
+var lifecycle = require('./utils/lifecycle.js')
+var readJson = require('read-package-json')
+var link = require('./utils/link.js')
+var linkIfExists = link.ifExists
+var cmdShim = require('cmd-shim')
+var cmdShimIfExists = cmdShim.ifExists
+var asyncMap = require('slide').asyncMap
+var ini = require('ini')
+var writeFile = require('write-file-atomic')
 
 module.exports = build
 build.usage = 'npm build [<folder>]'
@@ -110,14 +110,14 @@ var linkStuff = build.linkStuff = function (pkg, folder, global, didRB, cb) {
 
 function shouldWarn(pkg, folder, global, cb) {
   var parent = path.dirname(folder)
-    , top = parent === npm.dir
-    , cwd = npm.localPrefix
+  var top = parent === npm.dir
+  var cwd = npm.localPrefix
 
   readJson(path.resolve(cwd, 'package.json'), function(er, topPkg) {
     if (er) return cb(er)
 
     var linkedPkg = path.basename(cwd)
-      , currentPkg = path.basename(folder)
+    var currentPkg = path.basename(folder)
 
     // current searched package is the linked package on first call
     if (linkedPkg !== currentPkg) {
@@ -142,7 +142,7 @@ function rebuildBundles (pkg, folder, parent, gtop, cb) {
 
   var deps = Object.keys(pkg.dependencies || {})
              .concat(Object.keys(pkg.devDependencies || {}))
-    , bundles = pkg.bundleDependencies || pkg.bundledDependencies || []
+  var bundles = pkg.bundleDependencies || pkg.bundledDependencies || []
 
   fs.readdir(path.resolve(folder, 'node_modules'), function (er, files) {
     // error means no bundles
@@ -197,7 +197,7 @@ function linkBins (pkg, folder, parent, gtop, cb) {
         }
         if (er || !gtop) return cb(er)
         var dest = path.resolve(binRoot, b)
-          , out = npm.config.get('parseable')
+        var out = npm.config.get('parseable')
                 ? dest + '::' + src + ':BINFILE'
                 : dest + ' -> ' + src
         log.clearProgress()

lib/cache.js

@@ -61,27 +61,27 @@ cache.clean = clean
 cache.read = read
 
 var npm = require('./npm.js')
-  , fs = require('graceful-fs')
-  , writeFileAtomic = require('write-file-atomic')
-  , assert = require('assert')
-  , rm = require('./utils/gently-rm.js')
-  , readJson = require('read-package-json')
-  , log = require('npmlog')
-  , path = require('path')
-  , asyncMap = require('slide').asyncMap
-  , tar = require('./utils/tar.js')
-  , fileCompletion = require('./utils/completion/file-completion.js')
-  , deprCheck = require('./utils/depr-check.js')
-  , addNamed = require('./cache/add-named.js')
-  , addLocal = require('./cache/add-local.js')
-  , addRemoteTarball = require('./cache/add-remote-tarball.js')
-  , addRemoteGit = require('./cache/add-remote-git.js')
-  , inflight = require('inflight')
-  , realizePackageSpecifier = require('realize-package-specifier')
-  , npa = require('npm-package-arg')
-  , getStat = require('./cache/get-stat.js')
-  , cachedPackageRoot = require('./cache/cached-package-root.js')
-  , mapToRegistry = require('./utils/map-to-registry.js')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var assert = require('assert')
+var rm = require('./utils/gently-rm.js')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var path = require('path')
+var asyncMap = require('slide').asyncMap
+var tar = require('./utils/tar.js')
+var fileCompletion = require('./utils/completion/file-completion.js')
+var deprCheck = require('./utils/depr-check.js')
+var addNamed = require('./cache/add-named.js')
+var addLocal = require('./cache/add-local.js')
+var addRemoteTarball = require('./cache/add-remote-tarball.js')
+var addRemoteGit = require('./cache/add-remote-git.js')
+var inflight = require('inflight')
+var realizePackageSpecifier = require('realize-package-specifier')
+var npa = require('npm-package-arg')
+var getStat = require('./cache/get-stat.js')
+var cachedPackageRoot = require('./cache/cached-package-root.js')
+var mapToRegistry = require('./utils/map-to-registry.js')
 
 cache.usage = 'npm cache add <tarball file>'
             + '\nnpm cache add <folder>'

lib/cache/add-local-tarball.js

@@ -1,21 +1,21 @@
 var mkdir = require('mkdirp')
-  , assert = require('assert')
-  , fs = require('graceful-fs')
-  , writeFileAtomic = require('write-file-atomic')
-  , path = require('path')
-  , sha = require('sha')
-  , npm = require('../npm.js')
-  , log = require('npmlog')
-  , tar = require('../utils/tar.js')
-  , pathIsInside = require('path-is-inside')
-  , getCacheStat = require('./get-stat.js')
-  , cachedPackageRoot = require('./cached-package-root.js')
-  , chownr = require('chownr')
-  , inflight = require('inflight')
-  , once = require('once')
-  , writeStream = require('fs-write-stream-atomic')
-  , tempFilename = require('../utils/temp-filename.js')
-  , rimraf = require('rimraf')
+var assert = require('assert')
+var fs = require('graceful-fs')
+var writeFileAtomic = require('write-file-atomic')
+var path = require('path')
+var sha = require('sha')
+var npm = require('../npm.js')
+var log = require('npmlog')
+var tar = require('../utils/tar.js')
+var pathIsInside = require('path-is-inside')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var chownr = require('chownr')
+var inflight = require('inflight')
+var once = require('once')
+var writeStream = require('fs-write-stream-atomic')
+var tempFilename = require('../utils/temp-filename.js')
+var rimraf = require('rimraf')
 
 module.exports = addLocalTarball
 

lib/cache/add-local.js

@@ -1,20 +1,20 @@
 var assert = require('assert')
-  , path = require('path')
-  , mkdir = require('mkdirp')
-  , chownr = require('chownr')
-  , pathIsInside = require('path-is-inside')
-  , readJson = require('read-package-json')
-  , log = require('npmlog')
-  , npm = require('../npm.js')
-  , tar = require('../utils/tar.js')
-  , deprCheck = require('../utils/depr-check.js')
-  , getCacheStat = require('./get-stat.js')
-  , cachedPackageRoot = require('./cached-package-root.js')
-  , addLocalTarball = require('./add-local-tarball.js')
-  , sha = require('sha')
-  , inflight = require('inflight')
-  , lifecycle = require('../utils/lifecycle.js')
-  , iferr = require('iferr')
+var path = require('path')
+var mkdir = require('mkdirp')
+var chownr = require('chownr')
+var pathIsInside = require('path-is-inside')
+var readJson = require('read-package-json')
+var log = require('npmlog')
+var npm = require('../npm.js')
+var tar = require('../utils/tar.js')
+var deprCheck = require('../utils/depr-check.js')
+var getCacheStat = require('./get-stat.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var addLocalTarball = require('./add-local-tarball.js')
+var sha = require('sha')
+var inflight = require('inflight')
+var lifecycle = require('../utils/lifecycle.js')
+var iferr = require('iferr')
 
 module.exports = addLocal
 

lib/cache/add-named.js

@@ -1,18 +1,18 @@
 var path = require('path')
-  , assert = require('assert')
-  , fs = require('graceful-fs')
-  , http = require('http')
-  , log = require('npmlog')
-  , semver = require('semver')
-  , readJson = require('read-package-json')
-  , url = require('url')
-  , npm = require('../npm.js')
-  , deprCheck = require('../utils/depr-check.js')
-  , inflight = require('inflight')
-  , addRemoteTarball = require('./add-remote-tarball.js')
-  , cachedPackageRoot = require('./cached-package-root.js')
-  , mapToRegistry = require('../utils/map-to-registry.js')
-  , pulseTillDone = require('../utils/pulse-till-done.js')
+var assert = require('assert')
+var fs = require('graceful-fs')
+var http = require('http')
+var log = require('npmlog')
+var semver = require('semver')
+var readJson = require('read-package-json')
+var url = require('url')
+var npm = require('../npm.js')
+var deprCheck = require('../utils/depr-check.js')
+var inflight = require('inflight')
+var addRemoteTarball = require('./add-remote-tarball.js')
+var cachedPackageRoot = require('./cached-package-root.js')
+var mapToRegistry = require('../utils/map-to-registry.js')
+var pulseTillDone = require('../utils/pulse-till-done.js')
 
 
 module.exports = addNamed
@@ -99,8 +99,8 @@ function addNameTag (name, tag, data, cb) {
 
 function engineFilter (data) {
   var npmv = npm.version
-    , nodev = npm.config.get('node-version')
-    , strict = npm.config.get('engine-strict')
+  var nodev = npm.config.get('node-version')
+  var strict = npm.config.get('engine-strict')
 
   if (!nodev || npm.config.get('force')) return data
 

lib/cache/add-remote-tarball.js

@@ -1,16 +1,16 @@
 var mkdir = require('mkdirp')
-  , assert = require('assert')
-  , log = require('npmlog')
-  , path = require('path')
-  , sha = require('sha')
-  , retry = require('retry')
-  , createWriteStream = require('fs-write-stream-atomic')
-  , npm = require('../npm.js')
-  , inflight = require('inflight')
-  , addLocalTarball = require('./add-local-tarball.js')
-  , cacheFile = require('npm-cache-filename')
-  , rimraf = require('rimraf')
-  , pulseTillDone = require('../utils/pulse-till-done.js')
+var assert = require('assert')
+var log = require('npmlog')
+var path = require('path')
+var sha = require('sha')
+var retry = require('retry')
+var createWriteStream = require('fs-write-stream-atomic')
+var npm = require('../npm.js')
+var inflight = require('inflight')
+var addLocalTarball = require('./add-local-tarball.js')
+var cacheFile = require('npm-cache-filename')
+var rimraf = require('rimraf')
+var pulseTillDone = require('../utils/pulse-till-done.js')
 
 module.exports = addRemoteTarball