embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

relocate webpack.config.js under lib/pipeline/

This commit is contained in:
Michael Bradley, Jr 2018-08-17 16:47:37 -05:00
parent 2e96557875
commit e1fb746aa7
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cmd_controller.js
View File

@ -409,7 +409,7 @@ class EmbarkController {
ejectWebpack() { ejectWebpack() {
var fs = require('../lib/core/fs.js'); var fs = require('../lib/core/fs.js');
var dappConfig = fs.dappPath('webpack.config.js'); var dappConfig = fs.dappPath('webpack.config.js');
var embarkConfig = fs.embarkPath('webpack.config.js'); var embarkConfig = fs.embarkPath('lib/pipeline', 'webpack.config.js');
if (fs.existsSync(dappConfig)) { if (fs.existsSync(dappConfig)) {
console.error(`${dappConfig} ${__('already exists')}`.bold.red); console.error(`${dappConfig} ${__('already exists')}`.bold.red);
console.error(__('not overwritten, rename or re/move the file and re-run this command').yellow); console.error(__('not overwritten, rename or re/move the file and re-run this command').yellow);

0
webpack.config.js → lib/pipeline/webpack.config.js
View File

2
lib/pipeline/webpackProcess.js
View File

@ -39,7 +39,7 @@ class WebpackProcess extends ProcessWrapper {
} }
const dappConfigPath = fs.dappPath('webpack.config.js'); const dappConfigPath = fs.dappPath('webpack.config.js');
const defaultConfigPath = fs.embarkPath('webpack.config.js'); const defaultConfigPath = fs.embarkPath('lib/pipeline', 'webpack.config.js');
let config, configPath; let config, configPath;
try { try {