Support config-local.json overrides config.json

2017-06-30 21:02:09 -07:00
parent f370d7674e
commit cc41cc1e3b
3 changed files with 18 additions and 1 deletions
--- a/resources/assets/build/config.js
+++ b/resources/assets/build/config.js
@@ -2,7 +2,9 @@ const path = require('path');
 const { argv } = require('yargs');
 const merge = require('webpack-merge');

-const userConfig = require('../config');
+const desire = require('./util/desire');
+
+const userConfig = merge(desire(`${__dirname}/../config`), desire(`${__dirname}/../config-local`));

 const isProduction = !!((argv.env && argv.env.production) || argv.p);
 const rootPath = (userConfig.paths && userConfig.paths.root)