Merge pull request #104 from mwessner/'configObject'-initialization

jackfranklin · jackfranklin · commit 420bd6748cf2 · 2016-04-13T08:46:47.000+01:00
Changed 'configObject' initilization statement to call 'requireFn()' …
diff --git a/index.js b/index.js
@@ -50,7 +50,7 @@ module.exports = function(options) {
     requireFn = require;
   }
 
-  configObject = (typeof config === 'string') ? require(config) : config;
+  configObject = (typeof config === 'string') ? requireFn(config) : config;
 
   if(!configObject) {
     throw new Error('Could not find dependencies. Do you have a package.json file in your project?');
diff --git a/package.json b/package.json
@@ -31,7 +31,8 @@
     "Connor Peet",
     "Dorian Camilleri",
     "Carlos Henrique",
-    "iamfrontender <iamfrontender@gmail.com>"
+    "iamfrontender <iamfrontender@gmail.com>",
+    "mwessner"
   ],
   "license": "MIT",
   "dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ module.exports = function(options) {`
`50`	`50`	`requireFn = require;`
`51`	`51`	`}`
`52`	`52`
`53`		`- configObject = (typeof config === 'string') ? require(config) : config;`
	`53`	`+ configObject = (typeof config === 'string') ? requireFn(config) : config;`
`54`	`54`
`55`	`55`	`if(!configObject) {`
`56`	`56`	`throw new Error('Could not find dependencies. Do you have a package.json file in your project?');`