Merge pull request #1413 from delitescere/bump-deps

Bump almost all deps and remove npmconf

package.json

@@ -52,24 +52,23 @@
   "dependencies": {
     "async-foreach": "^0.1.3",
     "chalk": "^1.1.1",
-    "cross-spawn": "^2.0.0",
-    "gaze": "^0.5.1",
+    "cross-spawn-async": "^2.1.9",
+    "gaze": "^1.0.0",
     "get-stdin": "^4.0.1",
-    "glob": "^6.0.2",
-    "got": "^5.4.1",
-    "meow": "^3.3.0",
+    "glob": "^7.0.3",
+    "got": "^5.5.0",
+    "meow": "^3.7.0",
     "mkdirp": "^0.5.1",
-    "nan": "^2.0.8",
-    "node-gyp": "^3.3.0",
-    "npmconf": "^2.1.2",
-    "sass-graph": "^2.0.1"
+    "nan": "^2.2.0",
+    "node-gyp": "^3.3.1",
+    "sass-graph": "^2.1.1"
   },
   "devDependencies": {
-    "coveralls": "^2.11.4",
-    "istanbul": "^0.4.1",
-    "jshint": "^2.8.0",
-    "mocha": "^2.3.4",
-    "mocha-lcov-reporter": "^1.0.0",
-    "rimraf": "^2.4.2"
+    "coveralls": "^2.11.8",
+    "istanbul": "^0.4.2",
+    "jshint": "^2.9.1",
+    "mocha": "^2.4.5",
+    "mocha-lcov-reporter": "^1.2.0",
+    "rimraf": "^2.5.2"
   }
 }

scripts/build.js

@@ -7,7 +7,7 @@ var eol = require('os').EOL,
     fs = require('fs'),
     mkdir = require('mkdirp'),
     path = require('path'),
-    spawn = require('cross-spawn');
+    spawn = require('cross-spawn-async');
 
 require('../lib/extensions');
 

scripts/install.js

@@ -5,7 +5,6 @@
 var fs = require('fs'),
     eol = require('os').EOL,
     mkdir = require('mkdirp'),
-    npmconf = require('npmconf'),
     path = require('path'),
     got = require('got'),
     pkg = require('../package.json');
@@ -63,25 +62,17 @@ function download(url, dest, cb) {
  */
 
 function applyProxy(options, cb) {
-  npmconf.load({}, function (er, conf) {
-    var proxyUrl;
+  var env = process.env;
 
-    if (!er) {
-      proxyUrl = conf.get('https-proxy') ||
-                 conf.get('proxy') ||
-                 conf.get('http-proxy');
-    }
-
-    var env = process.env;
+  options.proxy = env.npm_config_https_proxy ||
+                  env.npm_config_proxy ||
+                  env.npm_config_http_proxy ||
+                  env.HTTPS_PROXY ||
+                  env.https_proxy ||
+                  env.HTTP_PROXY ||
+                  env.http_proxy;
 
-    options.proxy = proxyUrl ||
-                    env.HTTPS_PROXY ||
-                    env.https_proxy ||
-                    env.HTTP_PROXY ||
-                    env.http_proxy;
-
-    cb(options);
-  });
+  cb(options);
 }
 
 /**
@@ -123,7 +114,7 @@ if (process.env.SKIP_SASS_BINARY_DOWNLOAD_FOR_CI) {
 }
 
 /**
- * If binary does not exsit, download it
+ * If binary does not exist, download it
  */
 
 checkAndDownloadBinary();

test/cli.js

@@ -5,7 +5,7 @@ var assert = require('assert'),
     glob = require('glob'),
     rimraf = require('rimraf'),
     stream = require('stream'),
-    spawn = require('cross-spawn'),
+    spawn = require('cross-spawn-async'),
     cli = path.join(__dirname, '..', 'bin', 'node-sass'),
     fixture = path.join.bind(null, __dirname, 'fixtures'),
     LIBSASS_VERSION = null;