update to 1.2.0

Author: zhigang.li

.eslintignore

@@ -1,2 +1,3 @@
-src/vendors.js
-src/libs/table2excel.js
+src/vendors
+src/libs/table2excel.js
+build

.gitignore

@@ -5,4 +5,5 @@ node_modules
 .history
 .DS_Store
 \.settings/
-src/config/env.js
+src/config/env.js
+dist

README.md

@@ -65,7 +65,7 @@ npm run build
         - 导出为Xls文件
     - 表格转图片
 - 错误页面
-    - 401页面
+    - 403页面
     - 404页面
     - 500页面
 - 高级路由

src/config/config.js renamed to build/config.js

@@ -0,0 +1 @@
+export default "production";

build/env.js

@@ -1,31 +1,34 @@
 const path = require('path');
+const os = require('os');
 const webpack = require('webpack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const HappyPack = require('happypack');
+var happyThreadPool = HappyPack.ThreadPool({ size: os.cpus().length });
 
 function resolve (dir) {
     return path.join(__dirname, dir);
 }
 
 module.exports = {
     entry: {
-        main: './src/main',
-        vendors: './src/vendors'
+        main: '@/main',
+        'vender-base': '@/vendors/vendors.base.js',
+        'vender-exten': '@/vendors/vendors.exten.js'
     },
     output: {
-        path: path.join(__dirname, '../dist')
+        path: path.resolve(__dirname, '../dist/dist')
     },
     module: {
-        rules: [{
+        rules: [
+            {
                 test: /\.vue$/,
                 loader: 'vue-loader',
                 options: {
                     loaders: {
-
                         less: ExtractTextPlugin.extract({
                             use: ['css-loader?minimize', 'autoprefixer-loader', 'less-loader'],
                             fallback: 'vue-style-loader'
                         }),
-
                         css: ExtractTextPlugin.extract({
                             use: ['css-loader', 'autoprefixer-loader'],
                             fallback: 'vue-style-loader'
@@ -42,20 +45,25 @@ module.exports = {
                 loader: 'babel-loader',
                 exclude: /node_modules/
             },
+            {
+                test: /\.js[x]?$/,
+                include: [resolve('src')],
+                exclude: /node_modules/,
+                loader: 'happypack/loader?id=happybabel'
+            },
             {
                 test: /\.css$/,
                 use: ExtractTextPlugin.extract({
                     use: ['css-loader?minimize', 'autoprefixer-loader'],
                     fallback: 'style-loader'
                 })
             },
-            
             {
-                test: /\.less/,
+                test: /\.less$/,
                 use: ExtractTextPlugin.extract({
-                    use: ['autoprefixer-loader', 'less-loader'],
+                    use: ['css-hot-loader', 'autoprefixer-loader', 'less-loader'],
                     fallback: 'style-loader'
-                })
+                }),
             },
 
             {
@@ -68,11 +76,20 @@ module.exports = {
             }
         ]
     },
+    plugins: [
+        new HappyPack({
+            id: 'happybabel',
+            loaders: ['babel-loader'],
+            threadPool: happyThreadPool,
+            cache: true,
+            verbose: true
+        })
+    ],
     resolve: {
         extensions: ['.js', '.vue'],
         alias: {
             'vue': 'vue/dist/vue.esm.js',
-            '@': resolve('../src')
+            '@': resolve('../src'),
         }
     }
 };

build/webpack.base.config.js

@@ -1,11 +1,13 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const merge = require('webpack-merge');
 const webpackBaseConfig = require('./webpack.base.config.js');
 const fs = require('fs');
+const package = require('../package.json');
 
-fs.open('./src/config/env.js', 'w', function(err, fd) {
+fs.open('./env.js', 'w', function(err, fd) {
     const buf = 'export default "development";';
     fs.write(fd, buf, 0, buf.length, 0, function(err, written, buffer) {});
 });
@@ -23,13 +25,26 @@ module.exports = merge(webpackBaseConfig, {
             allChunks: true
         }),
         new webpack.optimize.CommonsChunkPlugin({
-            name: 'vendors',
-            filename: 'vendors.js'
+            name: ['vender-exten', 'vender-base'],
+            minChunks: Infinity
         }),
         new HtmlWebpackPlugin({
+            title: 'iView admin v' + package.version,
             filename: '../index.html',
             template: './src/template/index.ejs',
             inject: false
+        }),
+        new CopyWebpackPlugin([
+            {
+                from: 'src/views/main_components/theme-switch/theme'
+            },
+            {
+                from: 'src/views/my_components/text-editor/tinymce'
+            }
+        ], {
+            ignore: [
+                'text-editor.vue'
+            ]
         })
     ]
 });

build/webpack.dev.config.js

@@ -1,29 +1,38 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const cleanWebpackPlugin = require('clean-webpack-plugin');
 const merge = require('webpack-merge');
 const webpackBaseConfig = require('./webpack.base.config.js');
 const fs = require('fs');
+const path = require('path');
+const package = require('../package.json');
 
-fs.open('./src/config/env.js', 'w', function(err, fd) {
+fs.open('./build/env.js', 'w', function(err, fd) {
     const buf = 'export default "production";';
     fs.write(fd, buf, 0, buf.length, 0, function(err, written, buffer) {});
 });
 
 module.exports = merge(webpackBaseConfig, {
     output: {
-        publicPath: 'https://iview.github.io/iview-admin/dist/',
+        publicPath: 'https://lison16.github.io/test-iva-gh-page/dist/',
         filename: '[name].[hash].js',
         chunkFilename: '[name].[hash].chunk.js'
     },
     plugins: [
+        new cleanWebpackPlugin(['dist/*'], {
+            root: path.resolve(__dirname, '../')
+        }),
         new ExtractTextPlugin({
             filename: '[name].[hash].css',
             allChunks: true
         }),
         new webpack.optimize.CommonsChunkPlugin({
-            name: 'vendors',
-            filename: 'vendors.[hash].js'
+            // name: 'vendors',
+            // filename: 'vendors.[hash].js'
+            name: ['vender-exten', 'vender-base'],
+            minChunks: Infinity
         }),
         new webpack.DefinePlugin({
             'process.env': {
@@ -35,8 +44,35 @@ module.exports = merge(webpackBaseConfig, {
                 warnings: false
             }
         }),
+        new CopyWebpackPlugin([
+            {
+                from: 'src/styles/simplemde.min.css'
+            },
+            {
+                from: 'src/styles/cropper.min.css'
+            },
+            {
+                from: 'td_icon.ico'
+            },
+            {
+                from: 'src/styles/fonts',
+                to: 'fonts'
+            },
+            {
+                from: 'src/views/main_components/theme-switch/theme'
+            },
+            {
+                from: 'src/views/my_components/text-editor/tinymce'
+            }
+        ], {
+            ignore: [
+                'text-editor.vue'
+            ]
+        }),
         new HtmlWebpackPlugin({
-            filename: '../index_prod.html',
+            title: 'iView admin v' + package.version,
+            favicon: './td_icon.ico',
+            filename: '../index.html',
             template: './src/template/index.ejs',
             inject: false
         })