fix easyfiy env

Author: webkong

build/deploy/index.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+const AWS = require('aws-sdk');
+const s3Option = require('./s3Options')('xjp');
+const s3 = new AWS.S3(s3Option);
+const {
+    project
+} = require('../lib/project');
+// 本来打算用aws-sdk的putObject方法来上传文件到s3,但是发现性能一般，要用fs遍历每个层级的文件夹，先放着
+// const projectDistDir = path.resolve(__dirname, '../../dist/' + project);
+// fs.readdirSync(projectDistDir).map(filename => {
+    
+//     console.log(filename);
+// })

build/deploy/s3Options.js

@@ -0,0 +1,28 @@
+//https://docs.aws.amazon.com/zh_cn/general/latest/gr/rande.html
+/**
+ *  常用的region
+    'us-east-1' // 美国东部 弗吉尼亚
+    'ap-south-1' // 亚太地区 孟买
+    'ap-southeast-1' // 亚太地区  新加坡
+ */
+
+let options = {
+    apiVersion: '2006-03-01',
+    endpoint: 'https://s3.amazonaws.com'
+}
+
+module.exports = function (region) {
+    let re = null;
+    switch (region) {
+        case 'fjny':
+            re = 'us-east-1'
+        case 'mm':
+            re = 'us-south-1'
+        case 'xjp':
+            re = 'us-southeast-1'
+    }
+    return {
+        ...options,
+        region: re
+    }
+}

build/lib/multipages.js

@@ -4,7 +4,8 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const HtmlWebpackIncludeAssetsPlugin = require('html-webpack-include-assets-plugin');
 const {
     project,
-    env
+    env,
+    multi
 } = require('./project');
 const config = require('../config/index');
 let reg = /\.\S+$/;
@@ -16,12 +17,12 @@ let VUE = config.vue;
 let minify = undefined;
 // console.log(config);
 if (env === 'prod') {
-    minify = {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true,
-        chunksSortMode: 'dependency'
-    };
+    // minify = {
+    //     removeComments: true,
+    //     collapseWhitespace: true,
+    //     removeAttributeQuotes: true,
+    //     chunksSortMode: 'dependency'
+    // };
     projectDistDir = path.resolve(__dirname, '../../dist/' + project) + '/'; //项目多页面的pages目录
 }
 fs.readdirSync(pagesDir)
@@ -41,6 +42,7 @@ const extraEntry = pagesPath;
 // // 生成HtmlWebpackPlugin
 let extraHtmlWebpackPlugins = [];
 for (let i in pagesPath) {
+    
     extraHtmlWebpackPlugins.push(
         new HtmlWebpackPlugin({
             filename: projectDistDir + i + ".html",
@@ -49,7 +51,7 @@ for (let i in pagesPath) {
             minify: env === 'prod' ? minify : {}
         }),
         new HtmlWebpackIncludeAssetsPlugin({
-            assets: env === 'prod' ? ['vendor.dll.js'] : ['static/js/vendor.dll.js'],
+            assets: env === 'prod' ? ['../static/js/vendor.dll.js'] : ['static/js/vendor.dll.js'],
             append: false
         })
     );

build/webpack/webpack.base.conf.js

@@ -18,20 +18,19 @@ let distProjectDir = path.resolve(__dirname, '../../dist/' + project);
 let optimization = {};
 if (config.vendor && config.vendor.length === 0) {
     optimization = {
-        splitChunks: {
-            cacheGroups: {
-                commons: {
-                    test: /[\\/]node_modules[\\/]/,
-                    name: "vendor",
-                    chunks: "all"
-                }
-            }
-        }
+        // splitChunks: {
+        //     cacheGroups: {
+        //         commons: {
+        //             test: /[\\/]node_modules[\\/]/,
+        //             name: "vendor",
+        //             chunks: "all"
+        //         }
+        //     }
+        // }
     };
 }
 
 const baseConfig = {
-    mode: process.env.NODE_ENV,
     entry: {
         index: projectDir + '/index.js',
         ...extraEntry
@@ -65,7 +64,7 @@ const baseConfig = {
                 test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
                 loader: "url-loader",
                 options: {
-                    limit: 1000,
+                    limit: 5000,
                     // name: env === 'prod' ? "static/images/[name].[hash:5].[ext]" : "static/images/[name].[hash:5].[ext]"
                     name: "static/images/[name].[hash:5].[ext]"
                 }

build/webpack/webpack.dev.conf.js

@@ -25,17 +25,12 @@ let projectDir = path.resolve('./src/' + project);
 let dllRef = [];
 
 if (config.vendor && config.vendor.length > 0) {
-    try {
-        dllRef = [
-            new webpack.DllReferencePlugin({
-                context: __dirname,
-                manifest: require(projectDir + '/static/manifest.json')
-            })
-        ]
-    } catch (error) {
-        throw new Error('There is no manifest.json, need to run <npm run dll xx>')
-    }
-    
+    dllRef = [
+        new webpack.DllReferencePlugin({
+            context: __dirname,
+            manifest: require(projectDir + '/static/manifest.json')
+        })
+    ]
 }
 
 
@@ -100,6 +95,10 @@ const webpackConfig = merge(baseConfig, {
             from: projectDir + '/static/js/',
             to: 'static/js/',
             ignore: ['.*']
+        },{
+            from: projectDir + '/static/images/',
+            to: 'static/images/',
+            ignore: ['.*']
         }]),
         // new CopyWebpackPlugin([{
         //     from: projectDir + '/assets',

build/webpack/webpack.dll.conf.js

@@ -14,7 +14,7 @@ if (conf.vendor.length === 0) {
     throw new Error('Before dll bundle, you must set the key "vendeor" in config.js')
 }
 const dllConfig = {
-    mode: process.env.NODE_ENV,
+    mode: env === 'prod' ? 'production' : 'development',
     entry: {
         'vendor': [...conf.vendor]
     },
@@ -32,12 +32,12 @@ const dllConfig = {
         }),
         //创建dll的时候给html添加相应的代码
 
-        new HtmlWebpackPlugin({
-            filename: projectDir + "/index.html",
-            template: projectDir + "/index.html",
-            chunks: ['vendor'],
-            inject: 'body'
-        }),
+        // new HtmlWebpackPlugin({
+        //     filename: projectDir + "/index.html",
+        //     template: projectDir + "/index.html",
+        //     chunks: ['vendor'],
+        //     inject: 'body'
+        // }),
         // new HtmlWebpackIncludeAssetsPlugin({
         //     assets: env === 'prod' ? ['vendor.dll.js'] : ['/static/js/vendor.dll.js'],
         //     append: false

build/webpack/webpack.prod.conf.js

@@ -19,6 +19,7 @@ const {
 } = require('../lib/project');
 //多页面情况
 let extraHtmlWebpackPlugins = [];
+console.log(multi)
 if (config.multi || multi === 'true') {
     const multiBuilder = require("../lib/multipages");
     extraHtmlWebpackPlugins = multiBuilder.extraHtmlWebpackPlugins;
@@ -134,6 +135,10 @@ const webpackConfig = merge(baseConfig, {
             from: projectDir + '/static/js/',
             to: distProjectDir + '/static/js/',
             ignore: ['.*']
+        },{
+            from: projectDir + '/static/images/',
+            to: 'static/images/',
+            ignore: ['.*']
         }]),
         ...dllRef,
         ...extraGzip