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

package/lib/runtime/components/react/mpx-simple-text.tsx

@@ -6,12 +6,12 @@ import { TextPassThroughContext } from './context'
 import * as perf from '@mpxjs/perf'
 
 const SimpleText = (props: TextProps): JSX.Element => {
-  let stopTotal: (() => void) | undefined
-  if (__mpx_perf_framework__) stopTotal = perf.scope('simple-text:render:total')
+  let idTotal = -1
+  if (__mpx_perf_framework__) idTotal = perf.scopeStart('simple-text:render:total')
 
   // ───── style 阶段 ─────
-  let stopStyle: (() => void) | undefined
-  if (__mpx_perf_framework__) stopStyle = perf.scope('simple-text:render:style')
+  let idStyle = -1
+  if (__mpx_perf_framework__) idStyle = perf.scopeStart('simple-text:render:style')
   const inheritedText = useContext(TextPassThroughContext)
   const mergedStyle = extendObject({}, inheritedText?.textStyle, props.style)
   let hasBoxSizingAffectingStyle = false
@@ -36,11 +36,11 @@ const SimpleText = (props: TextProps): JSX.Element => {
       disabled: isStringOnly
     }
   )
-  if (__mpx_perf_framework__) stopStyle!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
-  let stopInnerProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopInnerProps = perf.scope('simple-text:render:innerProps')
+  let idInnerProps = -1
+  if (__mpx_perf_framework__) idInnerProps = perf.scopeStart('simple-text:render:innerProps')
   const innerProps = useInnerProps(
     extendObject(
       {},
@@ -51,11 +51,11 @@ const SimpleText = (props: TextProps): JSX.Element => {
       }
     )
   )
-  if (__mpx_perf_framework__) stopInnerProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idInnerProps)
 
   // ───── createElement 阶段 ─────
-  let stopCreate: (() => void) | undefined
-  if (__mpx_perf_framework__) stopCreate = perf.scope('simple-text:render:createElement')
+  let idCreate = -1
+  if (__mpx_perf_framework__) idCreate = perf.scopeStart('simple-text:render:createElement')
   const result = createElement(Text, innerProps, wrapChildren(
     { children },
     {
@@ -63,9 +63,9 @@ const SimpleText = (props: TextProps): JSX.Element => {
       textPassThrough: childTextPassThrough
     }
   ))
-  if (__mpx_perf_framework__) stopCreate!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idCreate)
 
-  if (__mpx_perf_framework__) stopTotal!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idTotal)
   return result
 }
 

package/lib/runtime/components/react/mpx-simple-view.tsx

@@ -5,12 +5,12 @@ import useInnerProps from './getInnerListeners'
 import * as perf from '@mpxjs/perf'
 
 const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
-  let stopTotal: (() => void) | undefined
-  if (__mpx_perf_framework__) stopTotal = perf.scope('simple-view:render:total')
+  let idTotal = -1
+  if (__mpx_perf_framework__) idTotal = perf.scopeStart('simple-view:render:total')
 
   // ───── style 阶段 ─────
-  let stopStyle: (() => void) | undefined
-  if (__mpx_perf_framework__) stopStyle = perf.scope('simple-view:render:style')
+  let idStyle = -1
+  if (__mpx_perf_framework__) idStyle = perf.scopeStart('simple-view:render:style')
   const { textProps, innerProps: props = {} } = splitProps(simpleViewProps)
 
   let hasBoxSizingAffectingStyle = false
@@ -20,11 +20,11 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
     }
   })
   const textPassThrough = useTextPassThroughValue(textStyle as TextStyle, textProps)
-  if (__mpx_perf_framework__) stopStyle!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
-  let stopInnerProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopInnerProps = perf.scope('simple-view:render:innerProps')
+  let idInnerProps = -1
+  if (__mpx_perf_framework__) idInnerProps = perf.scopeStart('simple-view:render:innerProps')
   const innerProps = useInnerProps(
     extendObject(
       {},
@@ -34,11 +34,11 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
       }
     )
   )
-  if (__mpx_perf_framework__) stopInnerProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idInnerProps)
 
   // ───── createElement 阶段 ─────
-  let stopCreate: (() => void) | undefined
-  if (__mpx_perf_framework__) stopCreate = perf.scope('simple-view:render:createElement')
+  let idCreate = -1
+  if (__mpx_perf_framework__) idCreate = perf.scopeStart('simple-view:render:createElement')
   const result = createElement(View, innerProps, wrapChildren(
     props,
     {
@@ -46,9 +46,9 @@ const SimpleView = (simpleViewProps: ViewProps): JSX.Element => {
       textPassThrough
     }
   ))
-  if (__mpx_perf_framework__) stopCreate!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idCreate)
 
-  if (__mpx_perf_framework__) stopTotal!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idTotal)
   return result
 }
 

package/lib/runtime/components/react/mpx-text.tsx

@@ -53,12 +53,12 @@ interface _TextProps extends TextProps {
 }
 
 const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref): JSX.Element => {
-  let stopTotal: (() => void) | undefined
-  if (__mpx_perf_framework__) stopTotal = perf.scope('text:render:total')
+  let idTotal = -1
+  if (__mpx_perf_framework__) idTotal = perf.scopeStart('text:render:total')
 
   // ───── props 阶段 ─────
-  let stopProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopProps = perf.scope('text:render:props')
+  let idProps = -1
+  if (__mpx_perf_framework__) idProps = perf.scopeStart('text:render:props')
   const inheritedText = useContext(TextPassThroughContext)
   const mergedProps = extendObject({}, inheritedText?.pendingTextProps, props)
   const {
@@ -73,11 +73,11 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
     'parent-height': parentHeight,
     decode
   } = mergedProps
-  if (__mpx_perf_framework__) stopProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idProps)
 
   // ───── style 阶段 ─────
-  let stopStyle: (() => void) | undefined
-  if (__mpx_perf_framework__) stopStyle = perf.scope('text:render:style')
+  let idStyle = -1
+  if (__mpx_perf_framework__) idStyle = perf.scopeStart('text:render:style')
   const {
     normalStyle,
     hasVarDec,
@@ -112,11 +112,11 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
       disabled: isStringOnly
     }
   )
-  if (__mpx_perf_framework__) stopStyle!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
-  let stopInnerProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopInnerProps = perf.scope('text:render:innerProps')
+  let idInnerProps = -1
+  if (__mpx_perf_framework__) idInnerProps = perf.scopeStart('text:render:innerProps')
   const innerProps = useInnerProps(
     extendObject(
       {},
@@ -133,11 +133,11 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
       'decode'
     ]
   )
-  if (__mpx_perf_framework__) stopInnerProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idInnerProps)
 
   // ───── createElement 阶段 ─────
-  let stopCreate: (() => void) | undefined
-  if (__mpx_perf_framework__) stopCreate = perf.scope('text:render:createElement')
+  let idCreate = -1
+  if (__mpx_perf_framework__) idCreate = perf.scopeStart('text:render:createElement')
   let finalComponent:JSX.Element = createElement(Text, innerProps, wrapChildren(
     extendObject({}, mergedProps, {
       children
@@ -152,9 +152,9 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
   if (hasPositionFixed) {
     finalComponent = createElement(Portal, null, finalComponent)
   }
-  if (__mpx_perf_framework__) stopCreate!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idCreate)
 
-  if (__mpx_perf_framework__) stopTotal!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idTotal)
   return finalComponent
 })
 

package/lib/runtime/components/react/mpx-view.tsx

@@ -703,12 +703,12 @@ function wrapWithChildren (props: _ViewProps, { hasVarDec, enableBackground, bac
 
 const _View = forwardRef<HandlerRef<View, _ViewProps>, _ViewProps>((viewProps, ref): JSX.Element => {
   // 性能探针 - total
-  let stopTotal: (() => void) | undefined
-  if (__mpx_perf_framework__) stopTotal = perf.scope('view:render:total')
+  let idTotal = -1
+  if (__mpx_perf_framework__) idTotal = perf.scopeStart('view:render:total')
 
   // ───── props 阶段 ─────
-  let stopProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopProps = perf.scope('view:render:props')
+  let idProps = -1
+  if (__mpx_perf_framework__) idProps = perf.scopeStart('view:render:props')
   const { textProps, innerProps: props = {} } = splitProps(viewProps)
   let {
     style = {},
@@ -742,11 +742,11 @@ const _View = forwardRef<HandlerRef<View, _ViewProps>, _ViewProps>((viewProps, r
   const { isHover, gesture } = useHover({ enableHover, hoverStartTime, hoverStayTime })
 
   const styleObj: ExtendedViewStyle = extendObject({}, defaultStyle, style, isHover ? hoverStyle as ExtendedViewStyle : {})
-  if (__mpx_perf_framework__) stopProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idProps)
 
   // ───── style 阶段 ─────
-  let stopStyle: (() => void) | undefined
-  if (__mpx_perf_framework__) stopStyle = perf.scope('view:render:style')
+  let idStyle = -1
+  if (__mpx_perf_framework__) idStyle = perf.scopeStart('view:render:style')
   const {
     normalStyle,
     hasSelfPercent,
@@ -796,11 +796,11 @@ const _View = forwardRef<HandlerRef<View, _ViewProps>, _ViewProps>((viewProps, r
     style: viewStyle,
     transitionend
   })
-  if (__mpx_perf_framework__) stopStyle!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idStyle)
 
   // ───── innerProps 阶段 ─────
-  let stopInnerProps: (() => void) | undefined
-  if (__mpx_perf_framework__) stopInnerProps = perf.scope('view:render:innerProps')
+  let idInnerProps = -1
+  if (__mpx_perf_framework__) idInnerProps = perf.scopeStart('view:render:innerProps')
   const innerProps = useInnerProps(
     extendObject(
       {},
@@ -826,11 +826,11 @@ const _View = forwardRef<HandlerRef<View, _ViewProps>, _ViewProps>((viewProps, r
       layoutRef
     }
   )
-  if (__mpx_perf_framework__) stopInnerProps!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idInnerProps)
 
   // ───── createElement 阶段 ─────
-  let stopCreate: (() => void) | undefined
-  if (__mpx_perf_framework__) stopCreate = perf.scope('view:render:createElement')
+  let idCreate = -1
+  if (__mpx_perf_framework__) idCreate = perf.scopeStart('view:render:createElement')
   const childNode = wrapWithChildren(props, {
     hasVarDec,
     enableBackground: enableBackgroundRef.current,
@@ -852,9 +852,9 @@ const _View = forwardRef<HandlerRef<View, _ViewProps>, _ViewProps>((viewProps, r
   if (hasPositionFixed) {
     finalComponent = createElement(Portal, null, finalComponent)
   }
-  if (__mpx_perf_framework__) stopCreate!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idCreate)
 
-  if (__mpx_perf_framework__) stopTotal!()
+  if (__mpx_perf_framework__) perf.scopeEnd(idTotal)
   return finalComponent
 })
 

package/lib/runtime/components/react/mpx-web-view.tsx

@@ -30,6 +30,7 @@ interface WebViewProps {
   binderror?: (event: CommonCallbackEvent) => void
   [x: string]: any
 }
+type WebViewInstance = WebView<{}>
 type Listener = (type: string, callback: (e: Event) => void) => () => void
 
 interface PayloadData {
@@ -77,7 +78,7 @@ const styles = StyleSheet.create({
   }
 })
 
-const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((props, ref): JSX.Element | null => {
+const _WebView = forwardRef<HandlerRef<WebViewInstance, WebViewProps>, WebViewProps>((props, ref): JSX.Element | null => {
   const { src, bindmessage, bindload, binderror } = props
   const mpx = global.__mpx
   const errorText: ErrorTextMap = {
@@ -98,7 +99,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
   const { pageId } = useContext(RouteContext) || {}
   const [pageLoadErr, setPageLoadErr] = useState<boolean>(false)
   const currentPage = useMemo(() => getCurrentPage(pageId), [pageId])
-  const webViewRef = useRef<WebView>(null)
+  const webViewRef = useRef<WebViewInstance>(null)
   const fristLoaded = useRef<boolean>(false)
   const isLoadError = useRef<boolean>(false)
   const isNavigateBack = useRef<boolean>(false)
@@ -123,7 +124,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
     isNavigateBack.current = false
   })
 
-  useNodesRef<WebView, WebViewProps>(props, ref, webViewRef, {
+  useNodesRef<WebViewInstance, WebViewProps>(props, ref, webViewRef, {
     style: defaultWebViewStyle
   })
 

package/lib/runtime/components/react/utils.tsx

@@ -816,6 +816,7 @@ export function usePrevious<T> (value: T): T | undefined {
 export interface GestureHandler {
   nodeRefs?: Array<{ getNodeInstance: () => { nodeRef: unknown } }>
   current?: unknown
+  handlerTag?: number
 }
 
 export function flatGesture (gestures: Array<GestureHandler> = []) {
@@ -824,7 +825,10 @@ export function flatGesture (gestures: Array<GestureHandler> = []) {
       return gesture.nodeRefs
         .map((item: { getNodeInstance: () => any }) => item.getNodeInstance()?.instance?.gestureRef || {})
     }
-    return gesture?.current ? [gesture] : []
+    if (gesture && (gesture.current || gesture.handlerTag !== undefined)) {
+      return [gesture]
+    }
+    return []
   })) || []
 }
 

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-beta.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",
@@ -114,5 +115,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "7328bd1e5d833ddac5130982c9565d17ada55d1b"
+  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
 }