yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated messy config solution for Waterline

Browse Source
This commit is contained in:
loicsaintroch 2016-01-27 00:28:39 +01:00
parent 88eb7fe54c
commit 1d1cba79a5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/configuration/hooks/_config/index.js
View File

@ -5,7 +5,6 @@
*/ */
// Node.js core. // Node.js core.
const fs = require('fs');
const path = require('path'); const path = require('path');
// Public node modules. // Public node modules.
@ -105,7 +104,7 @@ module.exports = function (strapi) {
config['config/functions/*'] config['config/functions/*']
); );
// Remove cache // Remove cache.
delete require.cache[path.resolve(strapi.config.appPath, 'package.json')]; delete require.cache[path.resolve(strapi.config.appPath, 'package.json')];
// Local `package.json`. // Local `package.json`.
@ -126,15 +125,6 @@ module.exports = function (strapi) {
}); });
} }
// Make sure the ORM config are equals to the databases file
// (aiming to not have issue with adapters when rebuilding the dictionary).
// It's kind of messy, for now, but it works fine. If someone has a better
// solution we'd be glad to accept a Pull Request.
if (!strapi.config.dry) {
const ormConfig = JSON.parse(fs.readFileSync(path.resolve(strapi.config.appPath, strapi.config.paths.config, 'environments', strapi.config.environment, 'databases.json')));
strapi.config.orm = ormConfig.orm;
}
// Save different environments because we need it in the Strapi Studio. // Save different environments because we need it in the Strapi Studio.
strapi.config.environments = config['config/environments/**'] || {}; strapi.config.environments = config['config/environments/**'] || {};