fix web error && fix dds

didi · Sep 30, 2021 · cf2cf11 · cf2cf11
1 parent 88c0511
commit cf2cf11
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/webpack-plugin/lib/runtime/optionProcessor.js b/packages/webpack-plugin/lib/runtime/optionProcessor.js
@@ -247,21 +247,23 @@ export default function processOption (
       })
       // 处理visibilitychange时触发当前活跃页面组件的onshow/onhide
       if (inBrowser) {
-        const errorHandler = function (e, fromVue) {
+        const errorHandler = function (args, fromVue) {
           if (global.__mpxAppCbs && global.__mpxAppCbs.error && global.__mpxAppCbs.error.length) {
             global.__mpxAppCbs.error.forEach((cb) => {
-              cb(e)
+              cb.apply(null, args)
             })
           } else if (fromVue) {
-            throw e
+            throw args[0]
           }
         }
-        Vue.config.errorHandler = function (e) {
-          return errorHandler(e, true)
+        Vue.config.errorHandler = (...args) => {
+          return errorHandler(args, true)
         }
-        window.addEventListener('error', errorHandler)
-        window.addEventListener('unhandledrejection', event => {
-          errorHandler(event.reason)
+        window.addEventListener('error', (event) => {
+          return errorHandler([event.error, event])
+        })
+        window.addEventListener('unhandledrejection', (event) => {
+          return errorHandler([event.reason, event])
         })
         document.addEventListener('visibilitychange', function () {
           const vnode = global.__mpxRouter && global.__mpxRouter.__mpxActiveVnode

diff --git a/packages/webpack-plugin/lib/wxs/wxs-pre-loader.js b/packages/webpack-plugin/lib/wxs/wxs-pre-loader.js
@@ -67,7 +67,8 @@ module.exports = function (content) {
           (property.name === 'constructor' || property.value === 'constructor') &&
           !(t.isMemberExpression(path.parent) && path.parentKey === 'object')
         ) {
-          path.replaceWith(t.logicalExpression('||', t.memberExpression(path.node, t.identifier('name'), path.node)))
+          path.replaceWith(t.logicalExpression('||', t.memberExpression(path.node, t.identifier('name')), path.node))
+          path.skip()
         }
       }
     })
@@ -82,6 +83,7 @@ module.exports = function (content) {
           !(t.isMemberExpression(path.parent) && path.parentKey === 'object')
         ) {
           path.replaceWith(t.memberExpression(path.node, t.identifier('name')))
+          path.skip()
         }
       },
       CallExpression (path) {