@mpxjs/webpack-plugin 2.10.24-beta.1 → 2.10.24-test.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.24-beta.1",
+  "version": "2.10.24-test.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -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"

package/lib/resolver/ExtendComponentsPlugin.js

@@ -1,91 +0,0 @@
-const path = require('path')
-const toPosix = require('../utils/to-posix')
-const EXTEND_COMPONENT_PATH_REGEXP = /\/lib\/runtime\/components\/extends\//
-const EXTEND_COMPONENT_TARGET_SUB_PATH = 'lib/runtime/components/react/dist/'
-const EXTEND_COMPONENTS = {
-  'section-list': ['ios', 'android', 'harmony']
-}
-
-/**
- * 扩展组件路径解析插件
- * 将 @mpxjs/webpack-plugin/lib/runtime/components/extends/[component-name] 格式的路径
- * 解析为对应平台的实际组件路径
- */
-module.exports = class ExtendComponentsPlugin {
-  constructor (source, mode, target, compiler) {
-    this.source = source
-    this.target = target
-    this.mode = mode
-    this.currentCompilation = null
-    compiler.hooks.thisCompilation.tap('ExtendComponentsPlugin', (compilation) => {
-      this.currentCompilation = compilation
-    })
-  }
-
-  apply (resolver) {
-    const target = resolver.ensureHook(this.target)
-    const mode = this.mode
-
-    const pushError = (err) => {
-      if (this.currentCompilation) {
-        this.currentCompilation.errors.push(err)
-      }
-    }
-
-    resolver.getHook(this.source).tapAsync('ExtendComponentsPlugin', (request, resolveContext, callback) => {
-      if (request.__mpxResolvedExtendComponent) return callback()
-
-      const componentName = getComponentName(request)
-      if (!componentName) {
-        return callback()
-      }
-
-      // 检查组件是否在配置中
-      const supportedModes = EXTEND_COMPONENTS[componentName]
-      if (!supportedModes) {
-        pushError(new Error(`Extended component "${componentName}" was not found. Available extended components: ${Object.keys(EXTEND_COMPONENTS).join(', ')}`))
-        return callback()
-      }
-
-      // 获取当前模式下的组件路径
-      if (!supportedModes.includes(mode)) {
-        pushError(new Error(`Extended component "${componentName}" cannot be used on the ${mode} platform. Supported platforms include: ${supportedModes.join(', ')}`))
-        return callback()
-      }
-      const targetSubPath = `${EXTEND_COMPONENT_TARGET_SUB_PATH}mpx-${componentName}.jsx`
-      const targetRelativePath = `./${targetSubPath}`
-      const targetPath = path.join(request.descriptionFileRoot, targetSubPath)
-
-      const redirectRequest = Object.assign({}, request, {
-        path: targetPath,
-        relativePath: targetRelativePath,
-        __mpxResolvedExtendComponent: true
-      })
-
-      resolver.doResolve(
-        target,
-        redirectRequest,
-        `resolve extend component: ${componentName} to ${targetPath}`,
-        resolveContext,
-        (err, result) => {
-          if (err) {
-            pushError(err)
-            return callback()
-          }
-          if (!result) {
-            pushError(new Error(`Extended component "${componentName}" resolved to "${targetPath}", but the target file was not found.`))
-            return callback()
-          }
-          callback(null, result)
-        }
-      )
-    })
-  }
-}
-
-function getComponentName (request) {
-  if (!request.path) return
-  const requestPath = toPosix(request.path)
-  if (!EXTEND_COMPONENT_PATH_REGEXP.test(requestPath)) return
-  return path.basename(requestPath, path.extname(requestPath))
-}

package/lib/runtime/components/extends/section-list.mpx

@@ -1,14 +0,0 @@
-<!--
-  Placeholder for @mpxjs/webpack-plugin/lib/runtime/components/extends/section-list.
-  ExtendComponentsPlugin should always redirect requests away from this file at
-  build time. Reaching this module means the plugin failed to redirect — most
-  likely because section-list is not supported on the current platform, or
-  ExtendComponentsPlugin is not registered on the resolver.
--->
-<template></template>
-
-<script>
-  import { error } from '@mpxjs/utils'
-  error('section-list extend placeholder reached at runtime, ExtendComponentsPlugin redirect failed. See build log for the original error.')
-  export default {}
-</script>

package/lib/runtime/components/react/dist/mpx-section-list.d.ts

@@ -1,56 +0,0 @@
-/// <reference types="react" />
-import { GestureHandler } from './utils';
-interface ListItem {
-    isSectionHeader?: boolean;
-    isSectionFooter?: boolean;
-    [key: string]: any;
-}
-interface ItemHeightType {
-    value?: number;
-    getter?: (item: any, index: number) => number;
-}
-interface MpxSectionListProps {
-    enhanced?: boolean;
-    bounces?: boolean;
-    height?: number | string;
-    width?: number | string;
-    generichash?: string;
-    style?: Record<string, any>;
-    'scroll-event-throttle'?: number;
-    'list-data'?: ListItem[];
-    'item-height'?: ItemHeightType;
-    'section-header-height'?: ItemHeightType;
-    'section-footer-height'?: ItemHeightType;
-    'list-header-data'?: any;
-    'list-header-height'?: number;
-    'use-list-header'?: boolean;
-    'list-footer-data'?: any;
-    'use-list-footer'?: boolean;
-    'genericrecycle-item'?: string;
-    'genericsection-header'?: string;
-    'genericsection-footer'?: string;
-    'genericlist-header'?: string;
-    'genericlist-footer'?: string;
-    'enable-var'?: boolean;
-    'external-var-context'?: any;
-    'parent-font-size'?: number;
-    'parent-width'?: number;
-    'parent-height'?: number;
-    'enable-sticky'?: boolean;
-    'enable-back-to-top'?: boolean;
-    'end-reached-threshold'?: number;
-    'refresher-enabled'?: boolean;
-    'show-scrollbar'?: boolean;
-    'refresher-triggered'?: boolean;
-    'enable-item-exposure'?: boolean;
-    'item-exposure-threshold'?: number;
-    'wait-for'?: Array<GestureHandler>;
-    'simultaneous-handlers'?: Array<GestureHandler>;
-    bindrefresherrefresh?: (event: any) => void;
-    bindscrolltolower?: (event: any) => void;
-    bindscroll?: (event: any) => void;
-    binditemexposure?: (event: any) => void;
-    [key: string]: any;
-}
-declare const _SectionList: import("react").ForwardRefExoticComponent<Omit<MpxSectionListProps, "ref"> & import("react").RefAttributes<any>>;
-export default _SectionList;