Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/testspark317

project/.eslintrc.js

+module.exports = {
+    "parser": "babel-eslint",
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:all"
+    ],
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true
+        },
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "react"
+    ],
+    "rules": {
+    }
+};
\ No newline at end of file

project/config/webpack.common.config.js

@@ -8,7 +8,6 @@ const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const ProgressBarPlugin = require("progress-bar-webpack-plugin");
-
 const HtmlJsToES5Plugin = require("./HtmlJsToES5Plugin");
 
 
@@ -87,7 +86,7 @@ module.exports = function (isProd) {
             rules: [
                 // 提前进行eslint, 默认从下往上，通过enforce pre提前
                 isEslint && {
-                    test: /\.js|jsx/,
+                    test: /\.(js|jsx)$/,
                     enforce: "pre",
                     loader: "eslint-loader",
                     options: {

project/public/index.html

@@ -9,10 +9,16 @@
   <script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script>
   <script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script>
   <script>
-
-    let a = () => {
-      console.log(a);
+    console.log(`${123}456${789}`)
+    const [a,b] = [1,2]
+  </script>
+  <script>
+  let testFunc2 = () => {
+      const str2 = 'hello';
+      console.log(str2)
     }
+  </script>
+  <script>
 
     function getApp() {
       return {

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/1615963701459"
+  "RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/sparkproject-1615946260312/1615970526293"
 }
\ No newline at end of file

project/sparkrescfg.json

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

project/src/api/index.js

@@ -4,7 +4,7 @@ import {callApi} from '@spark/api-base'
 import {Toast} from '@spark/ui'
 
 import {isFromShare, newUser} from 'duiba-utils';
-
+var c = a+b;
 let mergeData = {
 	user_type: newUser ? '0' : '1',
 	is_from_share: isFromShare ? '0' : '1',