Fix merge configs, change build-dictionary.aggragate to include-all solution

Author: jaumard

libs/config.js

@@ -2,20 +2,18 @@
  * Load config from a directory into a Sails app
  */
 
-var buildDictionary = require('sails-build-dictionary');
 var _ = require('lodash');
 module.exports = function (sails, dir) {
-    buildDictionary.aggregate({
+    var configs = require('include-all')({
         dirname: dir,
         exclude: ['locales', 'local.js', 'local.json', 'local.coffee', 'local.litcoffee'],
-        excludeDirs: /(locales|env)$/,
         filter: /(.+)\.(js|json|coffee|litcoffee)$/,
-        identity: false
-    }, function (err, configs) {
-        sails.config = _.merge(configs, sails.config, function (a, b) {
-            if (_.isArray(a)) {
-                return a.concat(b);
-            }
-        });
+        excludeDirs: /(locales|env)$/,
+    });
+
+    sails.config = _.merge(configs, sails.config, function (a, b) {
+        if (_.isArray(a)) {
+            return a.concat(b);
+        }
     });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-util-mvcsloader",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Load models, controllers, services, policies and config from specified directories and inject them into the main Sails app.",
   "main": "index.js",
   "scripts": {
@@ -47,6 +47,7 @@
   "homepage": "https://github.com/leeroybrun/sails-util-mvcsloader",
   "dependencies": {
     "async": "^0.9.0",
+    "include-all": "^0.1.6",
     "lodash": "^3.5.0",
     "sails-build-dictionary": "^0.10.1",
     "sails-util": "^0.10.6"