Comparing version 3.0.0 to 3.0.1
{ | ||
"name": "cnf", | ||
"version": "3.0.0", | ||
"version": "3.0.1", | ||
"description": "Configuration loader", | ||
@@ -14,2 +14,3 @@ "scripts": { | ||
"mocha": "^2.2.1", | ||
"mocha-jscs": "4.2.0", | ||
"mocha-jshint": "^2.2.3", | ||
@@ -24,8 +25,5 @@ "sinon": "^1.14.1", | ||
}, | ||
"directories": { | ||
"test": "test" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git://github.com/e-conomic/config.git" | ||
"url": "git://github.com/debitoor/config.git" | ||
}, | ||
@@ -38,5 +36,8 @@ "keywords": [ | ||
"bugs": { | ||
"url": "https://github.com/e-conomic/config/issues" | ||
"url": "https://github.com/debitoor/config/issues" | ||
}, | ||
"homepage": "https://github.com/e-conomic/config" | ||
"homepage": "https://github.com/debitoor/config", | ||
"files": [ | ||
"source" | ||
] | ||
} |
@@ -6,20 +6,20 @@ var fs = require('fs'); | ||
var deepExtend = require('deep-extend'); | ||
var globalConfig; | ||
var globalConfig, globalConfigPath, envFile, envPath; | ||
try { | ||
var envPath = resolve.sync(env + '.app.config.js', { | ||
envPath = resolve.sync(env + '.app.config.js', { | ||
basedir: process.cwd(), | ||
moduleDirectory: 'config' | ||
}); | ||
var envFile = require(envPath); | ||
envFile = require(envPath); | ||
} catch (ex) { | ||
var envPath = resolve.sync(env + '.js', { | ||
envPath = resolve.sync(env + '.js', { | ||
basedir: process.cwd(), | ||
moduleDirectory: 'config' | ||
}); | ||
var envFile = require(envPath); | ||
envFile = require(envPath); | ||
} | ||
try { | ||
var globalConfigPath = resolve.sync('global.app.config.js', { | ||
globalConfigPath = resolve.sync('global.app.config.js', { | ||
basedir: process.cwd(), | ||
@@ -34,7 +34,7 @@ moduleDirectory: 'config' | ||
try { | ||
var globalConfigPath = resolve.sync('global.js', { | ||
globalConfigPath = resolve.sync('global.js', { | ||
basedir: process.cwd(), | ||
moduleDirectory: 'config' | ||
}); | ||
var globalConfig = require(globalConfigPath); | ||
globalConfig = require(globalConfigPath); | ||
envFile = deepExtend(globalConfig, envFile); | ||
@@ -41,0 +41,0 @@ } catch (e) { |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
4874
8
3
107