happy

@@ -5,14 +5,21 @@
  */
  */
 
 
 'use strict';
 'use strict';
+
+const os = require('os');
 const path = require('path');
 const path = require('path');
 const shelljs = require('shelljs');
 const shelljs = require('shelljs');
 const _ = require('lodash');
 const _ = require('lodash');
 const webpack = require('webpack');
 const webpack = require('webpack');
+const HappyPack = require('happypack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const scss = require('postcss-scss');
 const scss = require('postcss-scss');
 const postcssConfig = require('./postcss.config.js');
 const postcssConfig = require('./postcss.config.js');
 
 
+const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line
+    size: os.cpus().length
+});
+
 const hbsLoader = {
 const hbsLoader = {
     loader: 'handlebars-loader',
     loader: 'handlebars-loader',
     options: {
     options: {
@@ -125,13 +132,23 @@ module.exports = (env) => {
                 path.join(__dirname, '../js')
                 path.join(__dirname, '../js')
             ],
             ],
             alias: {
             alias: {
-                vue: 'vue/dist/vue.js'
+                vue: 'vue/dist/vue.common.js'
             }
             }
         },
         },
         stats: {
         stats: {
             children: false
             children: false
         },
         },
         plugins: [
         plugins: [
+            new HappyPack({
+                id: 'js',
+                threadPool: happyThreadPool,
+                loaders: ['babel-loader'],
+            }),
+            new HappyPack({
+                id: 'hbs',
+                threadPool: happyThreadPool,
+                loaders: [hbsLoader]
+            }),
             new webpack.optimize.CommonsChunkPlugin({
             new webpack.optimize.CommonsChunkPlugin({
                 name: 'libs',
                 name: 'libs',
                 filename: 'libs.js'
                 filename: 'libs.js'
@@ -141,9 +158,6 @@ module.exports = (env) => {
                 jQuery: 'yoho-jquery',
                 jQuery: 'yoho-jquery',
                 'window.jQuery': 'yoho-jquery'
                 'window.jQuery': 'yoho-jquery'
             })
             })
-        ],
-        extends: {
-            hbsLoader
-        }
+        ]
     };
     };
 };
 };

@@ -5,17 +5,12 @@ const path = require('path');
 const shelljs = require('shelljs');
 const shelljs = require('shelljs');
 const _ = require('lodash');
 const _ = require('lodash');
 const webpack = require('webpack');
 const webpack = require('webpack');
-const HappyPack = require('happypack');
 const UglifyJsParallelPlugin = require('webpack-uglify-parallel');
 const UglifyJsParallelPlugin = require('webpack-uglify-parallel');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const config = require('../../package.json');
 const config = require('../../package.json');
 const distDir = path.join(__dirname, `../dist/${config.name}/${config.version}`);
 const distDir = path.join(__dirname, `../dist/${config.name}/${config.version}`);
 let baseConfig = require('./webpack.base.config.js');
 let baseConfig = require('./webpack.base.config.js');
 
 
-const happyThreadPool = HappyPack.ThreadPool({ // eslint-disable-line
-    size: os.cpus().length
-});
-
 // cope img font
 // cope img font
 shelljs.mkdir('-p', distDir);
 shelljs.mkdir('-p', distDir);
 shelljs.cp('-R', path.join(__dirname, '../img/'), distDir);
 shelljs.cp('-R', path.join(__dirname, '../img/'), distDir);
@@ -29,21 +24,16 @@ _.mergeWith(baseConfig, {
     },
     },
     plugins: [
     plugins: [
         new ExtractTextPlugin('[name].css'),
         new ExtractTextPlugin('[name].css'),
-        new HappyPack({
-            id: 'js',
-            threadPool: happyThreadPool,
-            loaders: ['babel-loader'],
-        }),
-        new HappyPack({
-            id: 'hbs',
-            threadPool: happyThreadPool,
-            loaders: [baseConfig.extends.hbsLoader]
-        }),
         new webpack.DefinePlugin({
         new webpack.DefinePlugin({
             'process.env': {
             'process.env': {
                 NODE_ENV: '"production"'
                 NODE_ENV: '"production"'
             }
             }
         }),
         }),
+        new webpack.optimize.UglifyJsPlugin({
+            compress: {
+                warnings: false
+            }
+        }),
         new UglifyJsParallelPlugin({
         new UglifyJsParallelPlugin({
             workers: os.cpus().length,
             workers: os.cpus().length,
             compress: {
             compress: {
@@ -58,6 +48,4 @@ _.mergeWith(baseConfig, {
     }
     }
 });
 });
 
 
-delete baseConfig.extends;
-
 module.exports = baseConfig;
 module.exports = baseConfig;