@mpxjs/webpack-plugin 2.10.22 → 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/lib/template-compiler/compiler.js

@@ -849,9 +849,13 @@ function parse (template, options) {
   })
 
   if (!tagNames.has('component') && !tagNames.has('template') && options.checkUsingComponents) {
+    // usingComponents 与 tagNames 均为 rulesRunner 处理后的名字（capitalToHyphen / mpx-com- 前缀已对齐），
+    // 反向排除 globalComponents 以避免对仅在 app 注册的组件误报「未使用」
+    const globalComponents = options.globalComponents || []
+    const componentPlaceholder = options.componentPlaceholder || []
     const arr = []
     usingComponents.forEach((item) => {
-      if (!tagNames.has(item) && !options.globalComponents.includes(item) && !options.componentPlaceholder.includes(item)) {
+      if (!tagNames.has(item) && !globalComponents.includes(item) && !componentPlaceholder.includes(item)) {
         arr.push(item)
       }
     })

package/lib/utils/source-location.js

@@ -1,6 +1,10 @@
 const path = require('path')
 const { codeFrameColumns } = require('@babel/code-frame')
-const { SourceMapConsumer } = require('source-map')
+const {
+  TraceMap,
+  originalPositionFor: traceOriginalPositionFor,
+  sourceContentFor
+} = require('@jridgewell/trace-mapping')
 
 function offsetToPosition (source, offset) {
   const before = source.slice(0, offset)
@@ -45,25 +49,17 @@ function createCodeFrame (source, loc) {
 function originalPositionFor (map, loc) {
   loc = normalizeLoc(loc)
   if (!map || !loc || !loc.start) return
-  if (typeof map === 'string') {
-    try {
-      map = JSON.parse(map)
-    } catch (e) {
-      return
-    }
-  }
-  let consumer
+  let tracer
   try {
-    consumer = new SourceMapConsumer(map)
+    tracer = new TraceMap(map)
   } catch (e) {
     return
   }
-  const original = consumer.originalPositionFor({
+  const original = traceOriginalPositionFor(tracer, {
     line: loc.start.line,
     column: Math.max((loc.start.column || 1) - 1, 0)
   })
   if (!original || !original.source || !original.line) return
-  const sourceIndex = map.sources && map.sources.indexOf(original.source)
   return {
     file: original.source,
     loc: {
@@ -72,7 +68,7 @@ function originalPositionFor (map, loc) {
         column: (original.column || 0) + 1
       }
     },
-    source: sourceIndex > -1 && map.sourcesContent && map.sourcesContent[sourceIndex],
+    source: sourceContentFor(tracer, original.source) || undefined,
     generatedLoc: loc
   }
 }

package/lib/web/index.js

@@ -23,6 +23,7 @@ module.exports = function ({
   usingComponentsInfo,
   originalUsingComponents,
   componentGenerics,
+  componentPlaceholder,
   autoScope,
   callback
 }) {
@@ -72,7 +73,8 @@ module.exports = function ({
             ctorType,
             usingComponentsInfo,
             originalUsingComponents,
-            componentGenerics
+            componentGenerics,
+            componentPlaceholder
           }, callback)
         },
         (callback) => {

package/lib/web/processTemplate.js

@@ -15,7 +15,8 @@ module.exports = function (template, {
   ctorType,
   usingComponentsInfo,
   originalUsingComponents,
-  componentGenerics
+  componentGenerics,
+  componentPlaceholder
 }, callback) {
   const mpx = loaderContext.getMpx()
   const {
@@ -99,6 +100,7 @@ module.exports = function (template, {
           i18n: null,
           // 与 template-compiler/index 一致：usingComponentsInfo 已合并 globalComponentsInfo，此处白名单避免对仅 app 注册的组件误报「未使用」
           globalComponents: Object.keys(globalComponents || {}),
+          componentPlaceholder,
           // web模式下实现抽象组件
           componentGenerics,
           hasVirtualHost,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.22",
+  "version": "2.10.24-test.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -28,7 +28,8 @@
     "@better-scroll/slide": "^2.5.1",
     "@better-scroll/wheel": "^2.5.1",
     "@better-scroll/zoom": "^2.5.1",
-    "@mpxjs/perf": "^2.10.22",
+    "@jridgewell/trace-mapping": "^0.3.25",
+    "@mpxjs/perf": "^2.10.24",
     "@mpxjs/template-engine": "^2.8.7",
     "@mpxjs/utils": "^2.10.21",
     "acorn": "^8.11.3",
@@ -106,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"
@@ -114,5 +115,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "7328bd1e5d833ddac5130982c9565d17ada55d1b"
+  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
 }

package/LICENSE

@@ -1,433 +0,0 @@
-                              Apache License
-
-                        Version 2.0, January 2004
-
-                     http://www.apache.org/licenses/
-
-
-
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-
-
-
-1. Definitions.
-
-
-
-
-   "License" shall mean the terms and conditions for use, reproduction,
-
-   and distribution as defined by Sections 1 through 9 of this document.
-
-
-
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-
-   the copyright owner that is granting the License.
-
-
-
-
-   "Legal Entity" shall mean the union of the acting entity and all
-
-   other entities that control, are controlled by, or are under common
-
-   control with that entity. For the purposes of this definition,
-
-   "control" means (i) the power, direct or indirect, to cause the
-
-   direction or management of such entity, whether by contract or
-
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-
-
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-
-   exercising permissions granted by this License.
-
-
-
-
-   "Source" form shall mean the preferred form for making modifications,
-
-   including but not limited to software source code, documentation
-
-   source, and configuration files.
-
-
-
-
-   "Object" form shall mean any form resulting from mechanical
-
-   transformation or translation of a Source form, including but
-
-   not limited to compiled object code, generated documentation,
-
-   and conversions to other media types.
-
-
-
-
-   "Work" shall mean the work of authorship, whether in Source or
-
-   Object form, made available under the License, as indicated by a
-
-   copyright notice that is included in or attached to the work
-
-   (an example is provided in the Appendix below).
-
-
-
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-
-   form, that is based on (or derived from) the Work and for which the
-
-   editorial revisions, annotations, elaborations, or other modifications
-
-   represent, as a whole, an original work of authorship. For the purposes
-
-   of this License, Derivative Works shall not include works that remain
-
-   separable from, or merely link (or bind by name) to the interfaces of,
-
-   the Work and Derivative Works thereof.
-
-
-
-
-   "Contribution" shall mean any work of authorship, including
-
-   the original version of the Work and any modifications or additions
-
-   to that Work or Derivative Works thereof, that is intentionally
-
-   submitted to Licensor for inclusion in the Work by the copyright owner
-
-   or by an individual or Legal Entity authorized to submit on behalf of
-
-   the copyright owner. For the purposes of this definition, "submitted"
-
-   means any form of electronic, verbal, or written communication sent
-
-   to the Licensor or its representatives, including but not limited to
-
-   communication on electronic mailing lists, source code control systems,
-
-   and issue tracking systems that are managed by, or on behalf of, the
-
-   Licensor for the purpose of discussing and improving the Work, but
-
-   excluding communication that is conspicuously marked or otherwise
-
-   designated in writing by the copyright owner as "Not a Contribution."
-
-
-
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-
-   on behalf of whom a Contribution has been received by Licensor and
-
-   subsequently incorporated within the Work.
-
-
-
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-
-   this License, each Contributor hereby grants to You a perpetual,
-
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
-   copyright license to reproduce, prepare Derivative Works of,
-
-   publicly display, publicly perform, sublicense, and distribute the
-
-   Work and such Derivative Works in Source or Object form.
-
-
-
-
-3. Grant of Patent License. Subject to the terms and conditions of
-
-   this License, each Contributor hereby grants to You a perpetual,
-
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
-   (except as stated in this section) patent license to make, have made,
-
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-
-   where such license applies only to those patent claims licensable
-
-   by such Contributor that are necessarily infringed by their
-
-   Contribution(s) alone or by combination of their Contribution(s)
-
-   with the Work to which such Contribution(s) was submitted. If You
-
-   institute patent litigation against any entity (including a
-
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-
-   or a Contribution incorporated within the Work constitutes direct
-
-   or contributory patent infringement, then any patent licenses
-
-   granted to You under this License for that Work shall terminate
-
-   as of the date such litigation is filed.
-
-
-
-
-4. Redistribution. You may reproduce and distribute copies of the
-
-   Work or Derivative Works thereof in any medium, with or without
-
-   modifications, and in Source or Object form, provided that You
-
-   meet the following conditions:
-
-
-
-
-   (a) You must give any other recipients of the Work or
-
-       Derivative Works a copy of this License; and
-
-
-
-
-   (b) You must cause any modified files to carry prominent notices
-
-       stating that You changed the files; and
-
-
-
-
-   (c) You must retain, in the Source form of any Derivative Works
-
-       that You distribute, all copyright, patent, trademark, and
-
-       attribution notices from the Source form of the Work,
-
-       excluding those notices that do not pertain to any part of
-
-       the Derivative Works; and
-
-
-
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-
-       distribution, then any Derivative Works that You distribute must
-
-       include a readable copy of the attribution notices contained
-
-       within such NOTICE file, excluding those notices that do not
-
-       pertain to any part of the Derivative Works, in at least one
-
-       of the following places: within a NOTICE text file distributed
-
-       as part of the Derivative Works; within the Source form or
-
-       documentation, if provided along with the Derivative Works; or,
-
-       within a display generated by the Derivative Works, if and
-
-       wherever such third-party notices normally appear. The contents
-
-       of the NOTICE file are for informational purposes only and
-
-       do not modify the License. You may add Your own attribution
-
-       notices within Derivative Works that You distribute, alongside
-
-       or as an addendum to the NOTICE text from the Work, provided
-
-       that such additional attribution notices cannot be construed
-
-       as modifying the License.
-
-
-
-
-   You may add Your own copyright statement to Your modifications and
-
-   may provide additional or different license terms and conditions
-
-   for use, reproduction, or distribution of Your modifications, or
-
-   for any such Derivative Works as a whole, provided Your use,
-
-   reproduction, and distribution of the Work otherwise complies with
-
-   the conditions stated in this License.
-
-
-
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-
-   any Contribution intentionally submitted for inclusion in the Work
-
-   by You to the Licensor shall be under the terms and conditions of
-
-   this License, without any additional terms or conditions.
-
-   Notwithstanding the above, nothing herein shall supersede or modify
-
-   the terms of any separate license agreement you may have executed
-
-   with Licensor regarding such Contributions.
-
-
-
-
-6. Trademarks. This License does not grant permission to use the trade
-
-   names, trademarks, service marks, or product names of the Licensor,
-
-   except as required for reasonable and customary use in describing the
-
-   origin of the Work and reproducing the content of the NOTICE file.
-
-
-
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-
-   agreed to in writing, Licensor provides the Work (and each
-
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-
-   implied, including, without limitation, any warranties or conditions
-
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-
-   appropriateness of using or redistributing the Work and assume any
-
-   risks associated with Your exercise of permissions under this License.
-
-
-
-
-8. Limitation of Liability. In no event and under no legal theory,
-
-   whether in tort (including negligence), contract, or otherwise,
-
-   unless required by applicable law (such as deliberate and grossly
-
-   negligent acts) or agreed to in writing, shall any Contributor be
-
-   liable to You for damages, including any direct, indirect, special,
-
-   incidental, or consequential damages of any character arising as a
-
-   result of this License or out of the use or inability to use the
-
-   Work (including but not limited to damages for loss of goodwill,
-
-   work stoppage, computer failure or malfunction, or any and all
-
-   other commercial damages or losses), even if such Contributor
-
-   has been advised of the possibility of such damages.
-
-
-
-
-9. Accepting Warranty or Additional Liability. While redistributing
-
-   the Work or Derivative Works thereof, You may choose to offer,
-
-   and charge a fee for, acceptance of support, warranty, indemnity,
-
-   or other liability obligations and/or rights consistent with this
-
-   License. However, in accepting such obligations, You may act only
-
-   on Your own behalf and on Your sole responsibility, not on behalf
-
-   of any other Contributor, and only if You agree to indemnify,
-
-   defend, and hold each Contributor harmless for any liability
-
-   incurred by, or claims asserted against, such Contributor by reason
-
-   of your accepting any such warranty or additional liability.
-
-
-
-
-END OF TERMS AND CONDITIONS
-
-
-
-
-APPENDIX: How to apply the Apache License to your work.
-
-
-
-
-   To apply the Apache License to your work, attach the following
-
-   boilerplate notice, with the fields enclosed by brackets "{}"
-
-   replaced with your own identifying information. (Don't include
-
-   the brackets!)  The text should be enclosed in the appropriate
-
-   comment syntax for the file format. We also recommend that a
-
-   file or class name and description of purpose be included on the
-
-   same "printed page" as the copyright notice for easier
-
-   identification within third-party archives.
-
-
-
-
-Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
-
-
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-
-
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-
-
-
-Unless required by applicable law or agreed to in writing, software
-
-distributed under the License is distributed on an "AS IS" BASIS,
-
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and
-
-limitations under the License.