@mpxjs/webpack-plugin 2.9.32 → 2.9.33

package/lib/template-compiler/compiler.js

@@ -104,7 +104,7 @@ let env
 let platformGetTagNamespace
 let filePath
 let refId
-let haveOptionChain = false
+let hasOptionalChain = false
 
 function updateForScopesMap () {
   forScopes.forEach((scope) => {
@@ -165,8 +165,8 @@ const i18nWxsRequest = '~' + i18nWxsLoaderPath + '!' + i18nWxsPath
 const i18nModuleName = '__i18n__'
 const stringifyWxsPath = '~' + normalize.lib('runtime/stringify.wxs')
 const stringifyModuleName = '__stringify__'
-const optionsChainWxsPath = '~' + normalize.lib('runtime/oc.wxs')
-const optionsChainWxsName = '__oc__'
+const optionalChainWxsPath = '~' + normalize.lib('runtime/oc.wxs')
+const optionalChainWxsName = '__oc__'
 
 const tagRES = /(\{\{(?:.|\n|\r)+?\}\})(?!})/
 const tagRE = /\{\{((?:.|\n|\r)+?)\}\}(?!})/
@@ -640,7 +640,7 @@ function parse (template, options) {
   forScopes = []
   forScopesMap = {}
   hasI18n = false
-  haveOptionChain = false
+  hasOptionalChain = false
 
   platformGetTagNamespace = options.getTagNamespace || no
 
@@ -765,8 +765,8 @@ function parse (template, options) {
     }
   }
 
-  if (haveOptionChain) {
-    injectWxs(meta, optionsChainWxsName, optionsChainWxsPath)
+  if (hasOptionalChain) {
+    injectWxs(meta, optionalChainWxsName, optionalChainWxsPath)
   }
 
   injectNodes.forEach((node) => {
@@ -1406,6 +1406,8 @@ function postProcessWxs (el, meta) {
   }
 }
 
+const spreadREG = /\{\s*\.\.\.\s*([^,{]+?)\s*\}/g
+
 function processAttrs (el, options) {
   el.attrsList.forEach((attr) => {
     const isTemplateData = el.tag === 'template' && attr.name === 'data'
@@ -1415,7 +1417,11 @@ function processAttrs (el, options) {
     if (parsed.hasBinding) {
       // 该属性判断用于提供给运行时对于计算属性作为props传递时提出警告
       const isProps = isComponentNode(el, options) && !(attr.name === 'class' || attr.name === 'style')
-      addExp(el, parsed.result, isProps)
+      let result = parsed.result
+      if (isTemplateData) {
+        result = result.replace(spreadREG, '$1')
+      }
+      addExp(el, result, isProps)
       if (parsed.replaced) {
         modifyAttr(el, attr.name, needWrap ? parsed.val.slice(1, -1) : parsed.val)
       }
@@ -2108,15 +2114,12 @@ function processElement (el, root, options, meta) {
   processIf(el)
   processFor(el)
   processRef(el, options, meta)
+  processClass(el, meta)
+  processStyle(el, meta)
+  processBindEvent(el, options)
 
   if (!pass) {
-    processClass(el, meta)
-    processStyle(el, meta)
     processShow(el, options, root)
-  }
-
-  if (!pass) {
-    processBindEvent(el, options)
     processComponentIs(el, options)
   }
 
@@ -2402,7 +2405,7 @@ function genNode (node) {
  * @returns
  */
 function parseOptionChain (str) {
-  const wxsName = `${optionsChainWxsName}.g`
+  const wxsName = `${optionalChainWxsName}.g`
   let optionsRes
   while (optionsRes = /\?\./.exec(str)) {
     const strLength = str.length
@@ -2552,8 +2555,8 @@ function parseOptionChain (str) {
       chainKey += `,'${keyValue}'`
     }
     str = str.slice(0, leftIndex) + `${wxsName}(${chainValue},[${chainKey.slice(1)}])` + str.slice(rightIndex)
-    if (!haveOptionChain) {
-      haveOptionChain = true
+    if (!hasOptionalChain) {
+      hasOptionalChain = true
     }
   }
   return str

package/lib/template-compiler/index.js

@@ -80,6 +80,12 @@ module.exports = function (raw) {
     }
   }
 
+  const result = compiler.serialize(ast)
+
+  if (isNative) {
+    return result
+  }
+
   let resultSource = ''
 
   for (const module in meta.wxsModuleMap) {
@@ -87,12 +93,6 @@ module.exports = function (raw) {
     resultSource += `var ${module} = require(${loaderUtils.stringifyRequest(this, src)});\n`
   }
 
-  const result = compiler.serialize(ast)
-
-  if (isNative) {
-    return result
-  }
-
   resultSource += `
 global.currentInject = {
   moduleId: ${JSON.stringify(moduleId)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.32",
+  "version": "2.9.33",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "61ac5a85a2b75304d8b989d4291b4f606f50d82f"
+  "gitHead": "5a8b6accc9462d4c9a35e06689a6a84903d47c52"
 }