@mpxjs/webpack-plugin 2.10.24 → 2.11.0

package/lib/runtime/i18n.wxs

@@ -217,15 +217,16 @@ function parsePath (pathStr) {
     property = ''
   }
 
+  if (pathStr.indexOf('[') === -1 && pathStr.indexOf(']') === -1) {
+    // 对于简单数据路径，直接分割，避免无意义的解析
+    return pathStr.split('.')
+  }
+
   var curStack = genStack()
   var targetStacks = []
   var property = ''
   var index = 0
 
-  if (genRegExp('^[^[]]+$').test(pathStr)) {
-    // 对于简单数据路径，直接分割，避免无意义的解析
-    return pathStr.split('.')
-  }
   while (index < pathStr.length) {
     var char = pathStr[index]
     // 当前遍历引号内的字符串时
@@ -271,11 +272,16 @@ function getMessage (messages, locale, fallbackLocale, key) {
 
 function resolve (messages, locale, key) {
   if (messages && messages[locale] && key) {
-    var format = getPathValue(messages[locale], key)
-    if (format == null) {
-      format = messages[locale][key]
-    }
-    return format
+    var localeMessages = messages[locale]
+    // 优先按「字面量 key」直查：形如 "1000+ reviews" 的扁平 key 含 '+'，若先走 getPathValue
+    // 会被 parsePath 当成算术表达式求值（'1000' + undefined = NaN），导致翻译失败。
+    // 字面量命中即返回，未命中再交给 getPathValue 解析嵌套路径（如 "nav.home"）。
+    // 注意：这会让「扁平 key 与同名嵌套路径冲突」时由 nested 优先变为 flat 优先。
+    if (isDef(localeMessages[key])) return localeMessages[key]
+    var format = getPathValue(localeMessages, key)
+    // 含 '+' 的 key 在当前语言缺失时，getPathValue 仍可能返回 NaN。NaN 会被 isDef 当成
+    // 「已定义」而中断 getMessage 的 fallback，故归一成 undefined 以保留回退（format !== format 仅 NaN 成立）。
+    return format !== format ? undefined : format
   }
 }
 

package/lib/style-compiler/strip-conditional.js

@@ -13,11 +13,26 @@ class Node {
 function keepLines(content) {
   return content.replace(/([^\r\n]*)(\r\n|\r|\n|$)/g, (all, line, lineBreak) => {
     if (!all) return ''
+    // 空行 / 纯空白行直接保留换行：directive 自身被 blankDirective 抹平后，
+    // 其前后 text token 里夹缝 \n 形成的"空行"如果再放占位注释，会变成 col 0 的
+    // /* mpx-style-pad-placeholder */，破坏 stylus / sass 的 indent 结构。
+    // 这里产生的连续空行最多只有 directive 链长度量级（个位数），远低于 stylus
+    // lexer 栈溢出阈值，安全。
+    if (!line.trim()) return lineBreak
     const indent = (/^[ \t]*/.exec(line) || [''])[0]
     return `${indent}/* ${STYLE_PAD_PLACEHOLDER} */${lineBreak}`
   })
 }
 
+// 仅保留换行、清掉所有非换行字符，让条件编译指令本身的列位置在
+// 缩进敏感的预处理器（stylus / sass）中完全透明。
+// 不能直接把整段都换成空行 —— stylus 的 lexer 在遇到大量连续空行时
+// 会递归判定 outdent 层级，触发调用栈溢出；因此被剥离的"内容"仍走
+// keepLines 走占位注释，只让"指令"这一行（通常 1 行）变成空行。
+function blankDirective(content) {
+  return content.replace(/[^\r\n]+/g, '')
+}
+
 // 提取 css string 为 token
 function tokenize(cssString) {
   // Support /* ... */, // ..., and <!-- ... --> styles
@@ -123,22 +138,22 @@ function traverseAndEvaluate(ast, defs) {
         output += active ? node.value : keepLines(node.value)
       } else if (node.type === 'If') {
         // 直接判断 If 节点
-        output += keepLines(node.value)
+        output += blankDirective(node.value)
         const currentMatched = active && evaluateCondition(node.condition, defs)
         output += traverse(node.children, currentMatched)
         batchedIf = currentMatched
       } else if (node.type === 'ElseIf') {
-        output += keepLines(node.value)
+        output += blankDirective(node.value)
         const currentMatched = active && !batchedIf && evaluateCondition(node.condition, defs)
         output += traverse(node.children, currentMatched)
         batchedIf = batchedIf || currentMatched
       } else if (node.type === 'Else') {
-        output += keepLines(node.value)
+        output += blankDirective(node.value)
         const currentMatched = active && !batchedIf
         output += traverse(node.children, currentMatched)
         batchedIf = true
       } else if (node.type === 'EndIf') {
-        output += keepLines(node.value)
+        output += blankDirective(node.value)
       }
     }
     return output

package/lib/template-compiler/compiler.js

@@ -20,6 +20,8 @@ const { capitalToHyphen } = require('../utils/string')
 const { isNativeMiniTag } = require('../utils/dom-tag-config')
 const { offsetToLoc } = require('../utils/source-location')
 
+const MPX_HOST_REF = '__mpxHost'
+
 const no = function () {
   return false
 }
@@ -2816,6 +2818,10 @@ function getVirtualHostRoot (options, meta) {
           {
             name: 'ishost',
             value: '{{true}}'
+          },
+          {
+            name: config[mode].directive.ref,
+            value: MPX_HOST_REF
           }
         ])
         processElement(rootView, rootView, options, meta)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.24",
+  "version": "2.11.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -29,9 +29,9 @@
     "@better-scroll/wheel": "^2.5.1",
     "@better-scroll/zoom": "^2.5.1",
     "@jridgewell/trace-mapping": "^0.3.25",
-    "@mpxjs/perf": "^2.10.24",
+    "@mpxjs/perf": "^2.11.0",
     "@mpxjs/template-engine": "^2.8.7",
-    "@mpxjs/utils": "^2.10.21",
+    "@mpxjs/utils": "^2.11.0",
     "acorn": "^8.11.3",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -93,7 +93,7 @@
   },
   "devDependencies": {
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.21",
+    "@mpxjs/api-proxy": "^2.11.0",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/glob": "^8.1.0",
@@ -107,7 +107,7 @@
     "react-native-svg": "^15.8.0",
     "react-native-video": "^6.9.0",
     "react-native-vision-camera": "^4.7.2",
-    "react-native-webview": "^13.12.2",
+    "react-native-webview": "^13.17.0",
     "rimraf": "^6.0.1",
     "vue": "^2.7.16",
     "webpack": "^5.75.0"
@@ -115,5 +115,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "0fd557e03e51d93231c063f9145ec0ff0746c935"
+  "gitHead": "14548ee8e1f00f6be64f848e4fbdab194d642bf6"
 }