refactor webpack common / develop config

ProjectEvergreen · Apr 18, 2019 · 57e6b23 · 57e6b23
1 parent e1943b7
commit 57e6b23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/packages/cli/config/webpack.config.develop.js b/packages/cli/config/webpack.config.develop.js
@@ -3,10 +3,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const FilewatcherPlugin = require('filewatcher-webpack-plugin');
 const generateCompilation = require('../lib/compile');
+const webpackMerge = require('webpack-merge');
 
 const host = 'localhost';
 const port = 1981;
-const publicPath = '/';
 let isRebuilding = false;
 
 const rebuild = async() => {
@@ -24,11 +24,13 @@ const rebuild = async() => {
 };
 
 module.exports = (context) => {
+  const commonConfig = require(path.join(__dirname, '..', './config/webpack.config.common.js'))(context);
+  const publicPath = commonConfig.output.publicPath;
+
+  return webpackMerge(commonConfig, {
 
-  return {
     mode: 'development',
 
-    // TODO magic strings - .greenwood, app, app.js
     entry: [
       `webpack-dev-server/client?http://${host}:${port}`,
       path.join(context.scratchDir, 'app', 'app.js')
@@ -74,5 +76,5 @@ module.exports = (context) => {
         publicPath
       })
     ]
-  };
+  });
 };
diff --git a/packages/cli/tasks/develop.js b/packages/cli/tasks/develop.js
@@ -1,15 +1,12 @@
 const path = require('path');
 const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
-const webpackMerge = require('webpack-merge');
 
 module.exports = runDevServer = async ({ context }) => {
   return new Promise(async (resolve, reject) => {
 
     try {
-      const commonConfig = require(path.join(__dirname, '..', './config/webpack.config.common.js'))(context);
-      const devConfig = require(path.join(__dirname, '..', './config/webpack.config.develop.js'))(context);
-      const webpackConfig = webpackMerge(commonConfig, devConfig);
+      const webpackConfig = require(path.join(__dirname, '..', './config/webpack.config.develop.js'))(context);
       const devServerConfig = webpackConfig.devServer;
 
       let compiler = webpack(webpackConfig);