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

5d41e451 · wildfirecode13 · c8940c5a · 3811b321 · 5d41e451 · 5d41e451
Commit 5d41e451 authored Mar 17, 2021 by wildfirecode13
Showing with 16 additions and 6 deletions

HtmlJsToES5Plugin.js project/config/HtmlJsToES5Plugin.js +2 -2

webpack.common.config.js project/config/webpack.common.config.js +0 -2

index.html project/public/index.html +14 -2

No files found.
--- a/project/config/HtmlJsToES5Plugin.js
+++ b/project/config/HtmlJsToES5Plugin.js
@@ -31,5 +31,5 @@ class HtmlJsToES5Plugin {
 	}
 }
-exports.default = HtmlJsToES5Plugin;
+// exports.default = HtmlJsToES5Plugin;
-module.exports = exports['default'];
+module.exports = HtmlJsToES5Plugin;
--- a/project/config/webpack.common.config.js
+++ b/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");

--- a/project/public/index.html
+++ b/project/public/index.html
@@ -38,8 +38,8 @@
    function getUrlParam(name) {
      var search = window.location.search;
      var matched = search
-        .slice(1)
+          .slice(1)
-        .match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
+          .match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
      return search.length ? matched && matched[2] : null;
    }
@@ -48,6 +48,18 @@
      // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
    }
  </script>
+  <script>
+    async function a (){
+    }
+    async function b (){
+      await a();
+    }
+    b();
+  </script>
 </head>
 <body>