Completely remove dontFlattenConfig option.

See https://github.com/balderdashy/sails/blob/master/ROADMAP.md#sails-config-dont-flatten-config-will-be-deprecated
balderdashy · Sep 30, 2016 · 56c9b5b · 56c9b5b
1 parent d5ba8e8
commit 56c9b5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git a/lib/hooks/moduleloader/index.js b/lib/hooks/moduleloader/index.js
@@ -248,7 +248,7 @@ module.exports = function(sails) {
             exclude   : ['locales'].concat(_.map(sails.config.moduleloader.configExt, function (extension){ return 'local.'+extension; })),
             excludeDirs: /(locales|env)$/,
             filter    : new RegExp('(.+)\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
-            flatten: !(sails.config.dontFlattenConfig),
+            flatten   : true,
             identity  : false
           }, cb);
         },
@@ -271,7 +271,7 @@ module.exports = function(sails) {
             dirname   : path.resolve( sails.config.paths.config || path.resolve(sails.config.appPath, 'config'), 'env', env ),
             filter    : new RegExp('(.+)\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
             optional  : true,
-            flatten: !(sails.config.dontFlattenConfig),
+            flatten   : true,
             identity  : false
           }, cb);
         }],
@@ -286,7 +286,7 @@ module.exports = function(sails) {
             dirname   : path.resolve( sails.config.paths.config || path.resolve(sails.config.appPath, 'config'), 'env' ),
             filter    : new RegExp('^' + env + '\\.(' + sails.config.moduleloader.configExt.join('|') + ')$'),
             optional  : true,
-            flatten: !(sails.config.dontFlattenConfig),
+            flatten   : true,
             identity  : false
           }, cb);
         }]

diff --git a/test/integration/hook.userconfig.test.js b/test/integration/hook.userconfig.test.js
@@ -56,29 +56,6 @@ describe('hooks :: ', function() {
 
     });
 
-    describe('with \'dontFlattenConfig\' true', function() {
-
-      var sailsApp;
-      it('should use filenames in subfolders as keys', function(done) {
-
-        sailsApp = Sails();
-        sailsApp.load({hooks:{grunt:false}, dontFlattenConfig: true}, function(err, sails) {
-          if (err) { return callback(err); }
-          assert.equal(sails.config.foo, 'goo');
-          assert.equal(sails.config.bar.foo, 'bar');
-          assert.equal(sails.config.bar.abc, 123);
-          assert.equal(typeof(sails.config.abc), 'undefined');
-          return done();
-        });
-
-      });
-
-      after(function (done){
-        sailsApp.lower(done);
-      });
-
-    });
-
     describe('in development environment', function() {
 
       var sails;