@mpxjs/webpack-plugin 2.8.45 → 2.8.47

package/lib/platform/template/wx/index.js

@@ -193,14 +193,7 @@ module.exports = function getSpec ({ warn, error }) {
           // 不过滤的话每一个属性都要 parse
           el.attrsList.filter(item => this.test.test(item.name)).forEach((item) => {
             const parsed = parseMustache(item.value)
-            if (item.name === 'wx:style') {
-              styleBinding.push(parsed.result)
-            // item.name === 'style'
-            } else if (parsed.hasBinding || parsed.result.indexOf('rpx') > -1) {
-              styleBinding.push(parsed.result)
-            } else {
-              styleBinding.push(JSON.stringify(item.value))
-            }
+            styleBinding.push(parsed.result)
           })
           return {
             name: ':style',
@@ -295,18 +288,39 @@ module.exports = function getSpec ({ warn, error }) {
         },
         swan ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
+          const prefix = match[1]
           const eventName = match[2]
-          runRules(eventRules, eventName, { mode: 'swan' })
+          const modifierStr = match[3] || ''
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'swan' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'swan' })
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
         },
         qq ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
+          const prefix = match[1]
           const eventName = match[2]
-          runRules(eventRules, eventName, { mode: 'qq' })
+          const modifierStr = match[3] || ''
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'qq' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'qq' })
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
         },
         jd ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
+          const prefix = match[1]
           const eventName = match[2]
-          runRules(eventRules, eventName, { mode: 'jd' })
+          const modifierStr = match[3] || ''
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'jd' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'jd' })
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
         },
         // tt ({ name, value }, { eventRules }) {
         //   const match = this.test.exec(name)
@@ -322,15 +336,33 @@ module.exports = function getSpec ({ warn, error }) {
         // },
         tt ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
+          const prefix = match[1]
           const eventName = match[2]
-          runRules(eventRules, eventName, { mode: 'tt' })
+          const modifierStr = match[3] || ''
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'tt' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'tt' })
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
         },
         dd ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
+          const prefix = match[1]
           const eventName = match[2]
-          runRules(eventRules, eventName, { mode: 'dd' })
+          const modifierStr = match[3] || ''
+          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'dd' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'dd' })
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
         },
         web ({ name, value }, { eventRules, el }) {
+          if (parseMustache(value).hasBinding) {
+            error('Web environment does not support mustache binding in event props!')
+            return
+          }
           const match = this.test.exec(name)
           const prefix = match[1]
           const eventName = match[2]

package/lib/runtime/components/web/mpx-keep-alive.vue

@@ -30,9 +30,7 @@
   }
 
   function getVnodeKey (vnode) {
-    if (vnode && vnode.componentOptions) {
-      return vnode.componentOptions.Ctor.cid + (vnode.componentOptions.tag ? ('::' + (vnode.componentOptions.tag)) : '')
-    }
+    return vnode.tag + (vnode.key ? `::${vnode.key}` : '')
   }
 
   export default {
@@ -44,12 +42,13 @@
       if (!isBrowser) {
         return vnode || (slot && slot[0])
       }
-      const vnodeKey = getVnodeKey(vnode)
       const router = global.__mpxRouter
-      if (vnodeKey && router && vnode.data.routerView) {
+      if (router) {
+        // 存在routeCount的情况下修改vnode.key避免patch时复用旧节点实例
+        if (router.currentRoute.query.routeCount) vnode.key = router.currentRoute.query.routeCount
+        const vnodeKey = getVnodeKey(vnode)
         if (router.needCache) {
           router.needCache.vnode = vnode
-          router.needCache.vnodeKey = vnodeKey
           router.needCache = null
         }
 
@@ -69,25 +68,17 @@
 
         const stack = router.stack
         if (stack.length) {
-          // 只要历史栈缓存中存在对应的页面存活实例，就进行复用
+          // 只要历史栈缓存中存在对应的页面存活实例且vnodeKey相同，就进行复用
           for (let i = stack.length; i > 0; i--) {
             const current = stack[i - 1]
-            if (current.vnode && current.vnodeKey === vnodeKey && current.vnode.componentInstance) {
+            if (current.vnode && getVnodeKey(current.vnode) === vnodeKey && current.vnode.componentInstance) {
               vnode.componentInstance = current.vnode.componentInstance
-              // 避免组件实例复用但是vnode.key不一致带来的bad case
-              vnode.key = current.vnode.key
               break
             }
           }
         }
 
-        if (router.__mpxAction) {
-          if (router.__mpxAction.type === 'reLaunch') {
-            // reLaunch时修改新vnode的key, 确保任何情况下都新创建组件实例
-            vnode.key = (vnode.key || '') + router.__mpxAction.reLaunchCount
-          }
-          router.__mpxAction = null
-        }
+        if (router.__mpxAction) router.__mpxAction = null
         vnode.data.keepAlive = true
       }
 

package/lib/runtime/optionProcessor.js

@@ -159,7 +159,7 @@ export default function processOption (
               return next({
                 path: action.path,
                 query: {
-                  reLaunchCount: action.reLaunchCount
+                  routeCount: action.routeCount
                 },
                 replace: true
               })

package/lib/template-compiler/compiler.js

@@ -878,6 +878,7 @@ function moveBaseDirective (target, from, isDelete = true) {
 }
 
 function stringify (str) {
+  if (mode === 'web') str = str.replace(/'/g, '"')
   return JSON.stringify(str)
 }
 
@@ -988,7 +989,7 @@ function parseFuncStr2 (str) {
       if (subIndex) {
         const index1 = ret.index + subIndex
         const index2 = index1 + 6
-        args = args.substring(0, index1) + JSON.stringify(eventIdentifier) + args.substring(index2)
+        args = args.substring(0, index1) + stringify(eventIdentifier) + args.substring(index2)
       }
     }
     return {
@@ -1016,7 +1017,7 @@ function stringifyWithResolveComputed (modelValue) {
       computedStack.push(char)
       if (computedStack.length === 1) {
         fragment += '.'
-        result.push(JSON.stringify(fragment))
+        result.push(stringify(fragment))
         fragment = ''
         continue
       }
@@ -1033,7 +1034,7 @@ function stringifyWithResolveComputed (modelValue) {
     fragment += char
   }
   if (fragment !== '') {
-    result.push(JSON.stringify(fragment))
+    result.push(stringify(fragment))
   }
   return result.join('+')
 }
@@ -1696,7 +1697,7 @@ function processWebExternalClassesHack (el, options) {
     options.externalClasses.forEach((className) => {
       const index = classNames.indexOf(className)
       if (index > -1) {
-        replacements.push(`$attrs[${JSON.stringify(className)}]`)
+        replacements.push(`$attrs[${stringify(className)}]`)
         classNames.splice(index, 1)
       }
     })
@@ -1730,13 +1731,13 @@ function processWebExternalClassesHack (el, options) {
         options.externalClasses.forEach((className) => {
           const index = classNames.indexOf(className)
           if (index > -1) {
-            replacements.push(`$attrs[${JSON.stringify(className)}]`)
+            replacements.push(`$attrs[${stringify(className)}]`)
             classNames.splice(index, 1)
           }
         })
 
         if (classNames.length) {
-          replacements.unshift(JSON.stringify(classNames.join(' ')))
+          replacements.unshift(stringify(classNames.join(' ')))
         }
 
         addAttrs(el, [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.45",
+  "version": "2.8.47",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "b60613d3d5bfd85c7c7b28b81afbf4494c8b2c6f"
+  "gitHead": "9069d7f3931841a7e3acaf990464813a3b6ccb0c"
 }