@mpxjs/webpack-plugin 2.6.112 → 2.6.113

package/lib/runtime/stringify.wxs

@@ -120,6 +120,8 @@ function stringifyArray (value) {
 }
 
 var mpxDashReg = genRegExp('(.+)MpxDash$')
+// 转义字符在wxs正则中存在平台兼容性问题，用[$]规避使用转义字符
+var mpxDashReplaceReg = genRegExp('[$]', 'g')
 
 function stringifyObject (value) {
   var res = ''
@@ -129,7 +131,7 @@ function stringifyObject (value) {
     if (value[key]) {
       if (res) res += ' '
       if (mpxDashReg.test(key)) {
-        key = hump2dash(mpxDashReg.exec(key)[1])
+        key = mpxDashReg.exec(key)[1].replace(mpxDashReplaceReg, '-')
       }
       res += key
     }

package/lib/template-compiler/compiler.js

@@ -1761,7 +1761,9 @@ function processClass (el, meta) {
   staticClass = staticClass.replace(/\s+/g, ' ')
   if (dynamicClass) {
     let staticClassExp = parseMustache(staticClass).result
-    let dynamicClassExp = transDynamicClassExpr(parseMustache(dynamicClass).result)
+    let dynamicClassExp = transDynamicClassExpr(parseMustache(dynamicClass).result, {
+      error: error$1
+    })
     addAttrs(el, [{
       name: targetType,
       // swan中externalClass是通过编译时静态实现，因此需要保留原有的staticClass形式避免externalClass失效

package/lib/template-compiler/trans-dynamic-class-expr.js

@@ -1,27 +1,32 @@
 const babylon = require('@babel/parser')
 const t = require('@babel/types')
 const generate = require('@babel/generator').default
-const dash2hump = require('../utils/hump-dash').dash2hump
 
-module.exports = function transDynamicClassExpr (expr) {
-  expr = babylon.parseExpression(expr, {
-    plugins: [
-      'objectRestSpread'
-    ]
-  })
-  if (t.isObjectExpression(expr)) {
-    expr.properties.forEach((property) => {
-      if (t.isObjectProperty(property) && !property.computed) {
-        const propertyName = property.key.name || property.key.value
-        if (/-/.test(propertyName)) {
-          property.key = t.identifier(dash2hump(propertyName) + 'MpxDash')
-        } else {
-          property.key = t.identifier(propertyName)
-        }
-      }
+module.exports = function transDynamicClassExpr (expr, { error } = {}) {
+  try {
+    const ast = babylon.parseExpression(expr, {
+      plugins: [
+        'objectRestSpread'
+      ]
     })
+    if (t.isObjectExpression(ast)) {
+      ast.properties.forEach((property) => {
+        if (t.isObjectProperty(property) && !property.computed) {
+          const propertyName = property.key.name || property.key.value
+          if (/-/.test(propertyName)) {
+            if (/\$/.test(propertyName)) {
+              error(`Dynamic classname [${propertyName}] is not supported, which includes [-] char and [$] char at the same time.`)
+            } else {
+              property.key = t.identifier(propertyName.replace(/-/g, '$$') + 'MpxDash')
+            }
+          }
+        }
+      })
+    }
+    return generate(ast, {
+      compact: true
+    }).code
+  } catch (e) {
+    return expr
   }
-  return generate(expr, {
-    compact: true
-  }).code
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.112",
+  "version": "2.6.113",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -81,5 +81,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "961b7a70cba62f8192ecf6b4007a0d7a9c52f97e"
+  "gitHead": "05ebd038f9f72d8a12dbae6c6f7685dbfa19f1b8"
 }