Merge remote-tracking branch 'origin/master'

project/.gitignore

+node_modules
+dist
+.DS_Store
\ No newline at end of file

project/config/webpack.common.config.js

 const path = require('path');
 const fs = require("fs");
+const HtmlJsToES5Plugin = require("./HtmlJsToES5Plugin");
+
 
 const { SPARK_CONFIG_DIR_KEY, SPARK_CONFIG } = require('./scripts/constant');
 const HtmlWebpackPlugin = require("html-webpack-plugin");

project/sparkrc.js

@@ -9,5 +9,5 @@ module.exports ={
   "IMAGE_Q1": 0.6,
   "IMAGE_Q2": 0.8,
   "RES_PATH": "/src/assets/",
-  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/sparkproject-1615946260312/1615947628444"
+  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/sparkproject-1615946260312/1615963701459"
 }
\ No newline at end of file

project/sparkrescfg.json

-{"assetsPathArr":["//yun.duiba.com.cn/spark/v2/sparkproject-1615946260312/1615947628444/index/index_bg.png"]}
\ No newline at end of file
+{"assetsPathArr":["//yun.duiba.com.cn/spark/v2/sparkproject-1615946260312/1615963701459/index/index_bg.png"]}
\ No newline at end of file