webpack config enhancements

cncjs · Mar 4, 2017 · 52f1f50 · 52f1f50
1 parent 3c0470e
commit 52f1f50
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -8,7 +8,7 @@
     "settings": {
         "import/resolver": {
             "webpack": {
-                "config": "../webpack.config.base.js"
+                "config": "../webpack.webconfig.base.js"
             }
         }
     }

diff --git a/gulp/tasks/app.js b/gulp/tasks/app.js
@@ -14,7 +14,7 @@ export default (options) => {
             throw new gutil.PluginError('app:build-dev', err);
         }
 
-        const webpackConfig = require('../../webpack.backend-config.development.js');
+        const webpackConfig = require('../../webpack.appconfig.development.js');
         webpack(webpackConfig, (err, stats) => {
             if (err) {
                 throw new gutil.PluginError('app:build', err);
@@ -41,7 +41,7 @@ export default (options) => {
             throw new gutil.PluginError('app:build', err);
         }
 
-        const webpackConfig = require('../../webpack.backend-config.production.js');
+        const webpackConfig = require('../../webpack.appconfig.production.js');
         webpack(webpackConfig, (err, stats) => {
             if (err) {
                 throw new gutil.PluginError('app:build', err);

diff --git a/gulp/tasks/web.js b/gulp/tasks/web.js
@@ -1,8 +1,6 @@
 import gulp from 'gulp';
 import gutil from 'gulp-util';
 import webpack from 'webpack';
-import webpackDevelopmentConfig from '../../webpack.config.development';
-import webpackProductionConfig from '../../webpack.config.production';
 
 export default (options) => {
     gulp.task('web:i18n', ['i18next:web']);
@@ -16,7 +14,7 @@ export default (options) => {
             throw new gutil.PluginError('web:build-dev', err);
         }
 
-        const webpackConfig = webpackDevelopmentConfig;
+        const webpackConfig = require('../../webpack.webconfig.development.js');
         webpack(webpackConfig, (err, stats) => {
             if (err) {
                 throw new gutil.PluginError('web:build-dev', err);
@@ -45,7 +43,7 @@ export default (options) => {
             throw new gutil.PluginError('web:build-prod', err);
         }
 
-        const webpackConfig = webpackProductionConfig;
+        const webpackConfig = require('../../webpack.webconfig.production.js');
         webpack(webpackConfig, (err, stats) => {
             if (err) {
                 throw new gutil.PluginError('web:build-prod', err);

diff --git a/src/app/webpack-dev-server.js b/src/app/webpack-dev-server.js
@@ -1,6 +1,6 @@
 import webpack from 'webpack';
 import webpackMiddleware from 'webpack-dev-middleware';
-import config from '../../webpack.config.development';
+import config from '../../webpack.webconfig.development';
 
 const webpackDevServer = (app) => {
     // https://github.com/webpack/webpack-dev-middleware

diff --git a/webpack.backend-config.development.js → webpack.appconfig.development.js b/webpack.backend-config.development.js → webpack.appconfig.development.js
diff --git a/webpack.backend-config.production.js → webpack.appconfig.production.js b/webpack.backend-config.production.js → webpack.appconfig.production.js
diff --git a/webpack.config.base.js → webpack.webconfig.base.js b/webpack.config.base.js → webpack.webconfig.base.js
diff --git a/webpack.config.development.js → webpack.webconfig.development.js b/webpack.config.development.js → webpack.webconfig.development.js
@@ -13,8 +13,8 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var HtmlWebpackPluginAddons = require('html-webpack-plugin-addons');
 var nib = require('nib');
 var stylusLoader = require('stylus-loader');
-var baseConfig = require('./webpack.config.base');
-var languages = require('./webpack.config.i18n').languages;
+var baseConfig = require('./webpack.webconfig.base');
+var languages = require('./webpack.webconfig.i18n').languages;
 var pkg = require('./package.json');
 
 var webpackConfig = Object.assign({}, baseConfig, {

diff --git a/webpack.config.i18n.js → webpack.webconfig.i18n.js b/webpack.config.i18n.js → webpack.webconfig.i18n.js
diff --git a/webpack.config.production.js → webpack.webconfig.production.js b/webpack.config.production.js → webpack.webconfig.production.js
@@ -14,8 +14,8 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var HtmlWebpackPluginAddons = require('html-webpack-plugin-addons');
 var nib = require('nib');
 var stylusLoader = require('stylus-loader');
-var baseConfig = require('./webpack.config.base');
-var languages = require('./webpack.config.i18n').languages;
+var baseConfig = require('./webpack.webconfig.base');
+var languages = require('./webpack.webconfig.i18n').languages;
 var pkg = require('./package.json');
 
 // Use publicPath for production