From e1fb746aa7e41b786907ce3157029bf80e305f36 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 17 Aug 2018 16:47:37 -0500 Subject: [PATCH] relocate webpack.config.js under lib/pipeline/ --- cmd/cmd_controller.js | 2 +- webpack.config.js => lib/pipeline/webpack.config.js | 0 lib/pipeline/webpackProcess.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename webpack.config.js => lib/pipeline/webpack.config.js (100%) diff --git a/cmd/cmd_controller.js b/cmd/cmd_controller.js index 5865526a5..c00a1fd0f 100644 --- a/cmd/cmd_controller.js +++ b/cmd/cmd_controller.js @@ -409,7 +409,7 @@ class EmbarkController { ejectWebpack() { var fs = require('../lib/core/fs.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)) { console.error(`${dappConfig} ${__('already exists')}`.bold.red); console.error(__('not overwritten, rename or re/move the file and re-run this command').yellow); diff --git a/webpack.config.js b/lib/pipeline/webpack.config.js similarity index 100% rename from webpack.config.js rename to lib/pipeline/webpack.config.js diff --git a/lib/pipeline/webpackProcess.js b/lib/pipeline/webpackProcess.js index 336f3c126..d102567fd 100644 --- a/lib/pipeline/webpackProcess.js +++ b/lib/pipeline/webpackProcess.js @@ -39,7 +39,7 @@ class WebpackProcess extends ProcessWrapper { } 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; try {