Use npm to load config

Fixes #5.
kevva · May 23, 2017 · 522f6c4 · 522f6c4
1 parent a7226ad
commit 522f6c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/index.js b/index.js
@@ -1,13 +1,14 @@
 'use strict';
-const conf = require('rc')('npm');
+const npmconf = require('npm/lib/config/core');
+const pify = require('pify');
 
-module.exports = () => {
+module.exports = () => pify(npmconf.load)().then(conf => {
 	return process.env.HTTPS_PROXY ||
 		process.env.https_proxy ||
 		process.env.HTTP_PROXY ||
 		process.env.http_proxy ||
-		conf['https-proxy'] ||
-		conf['http-proxy'] ||
-		conf.proxy ||
+		conf.get('https-proxy') ||
+		conf.get('http-proxy') ||
+		conf.get('proxy') ||
 		null;
-};
+});
diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
     "proxy"
   ],
   "dependencies": {
-    "rc": "^1.1.2"
+    "npm": "^4.6.1",
+    "pify": "^2.3.0"
   },
   "devDependencies": {
     "ava": "*",

diff --git a/test.js b/test.js
@@ -1,9 +1,9 @@
 import test from 'ava';
-import m from './';
+import m from '.';
 
-test(t => {
+test(async t => {
 	const proxy = process.env.HTTP_PROXY;
 	process.env.HTTP_PROXY = 'http://192.168.0.1:8080';
-	t.is(m(), 'http://192.168.0.1:8080');
+	t.is(await m(), 'http://192.168.0.1:8080');
 	process.env.HTTP_PROXY = proxy;
 });