2.1.1 (#20)

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.1.1 - 2018-01-11
+### Changed
+- add appRelative parameter for path.resolve
+
 ## 2.1.0 - 2018-01-01
 ### Added
 - path resolve

lib/manager.js

@@ -77,11 +77,11 @@ ConfigurationManager.prototype.init = function(env) {
             let configFileName = path + config.prefix + '.' + env + config.ext;
 
             if (fs.existsSync(defaultConfigFileName)) {
-                document = yaml.load(defaultConfigFileName);
+                document = yaml.load(defaultConfigFileName, true);
             }
 
             if(defaultConfigFileName !== configFileName && fs.existsSync(configFileName)) {
-                document = extend(true, document || {}, yaml.load(configFileName));
+                document = extend(true, document || {}, yaml.load(configFileName, true));
             }
         }
 

lib/sections/field/path.js

@@ -27,12 +27,12 @@
 var errors = require('@rduk/errors');
 
 module.exports = {
-    resolve: function(path) {
+    resolve: function(path, appRelative) {
         if (!path || typeof path !== 'string') {
             errors.throwArgumentError('path', path);
         }
 
-        if (/^\w/.test(path)) {
+        if (/^\w/.test(path) && appRelative) {
             path = '~/' + path;
         }
 

lib/sections/field/type.js

@@ -28,7 +28,7 @@ var errors = require('@rduk/errors');
 var path = require('./path');
 
 module.exports = {
-    load: function(filepath) {
-        return require(path.resolve(filepath));
+    load: function(filepath, appRelative) {
+        return require(path.resolve(filepath, appRelative));
     }
 };

lib/sections/field/yaml.js

@@ -29,7 +29,7 @@ var path = require('./path');
 var loadYaml = require('../../utils/loadYaml');
 
 module.exports = {
-    load: function(filepath) {
-        return loadYaml(path.resolve(filepath));
+    load: function(filepath, appRelative) {
+        return loadYaml(path.resolve(filepath, appRelative));
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rduk/configuration",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Manage configuration in your Node.js app",
   "main": "lib/index.js",
   "scripts": {