@mpxjs/webpack-plugin 2.10.16-beta.6 → 2.10.16-perf.1

package/lib/runtime/components/react/mpx-picker-view-column/pickerViewColumnItem.tsx

@@ -1,6 +1,6 @@
-import React, { useMemo } from 'react'
+import React, { useEffect } from 'react'
 import { LayoutChangeEvent } from 'react-native'
-import Reanimated, { Extrapolation, interpolate, useAnimatedStyle } from 'react-native-reanimated'
+import Reanimated, { Extrapolation, interpolate, useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
 import { extendObject } from '../utils'
 import { createFaces } from './pickerViewFaces'
 import { usePickerViewColumnAnimationContext, usePickerViewStyleContext } from '../mpx-picker-view/pickerVIewContext'
@@ -28,16 +28,20 @@ const PickerViewColumnItem: React.FC<PickerColumnItemProps> = ({
 }) => {
   const textStyleFromAncestor = usePickerViewStyleContext()
   const offsetYShared = usePickerViewColumnAnimationContext()
-  const facesShared = useMemo(() => createFaces(itemHeight, visibleCount), [itemHeight, visibleCount])
+  const facesShared = useSharedValue(createFaces(itemHeight, visibleCount))
+
+  useEffect(() => {
+    facesShared.value = createFaces(itemHeight, visibleCount)
+  }, [itemHeight])
 
   const animatedStyles = useAnimatedStyle(() => {
-    const inputRange = facesShared.map((f) => itemHeight * (index + f.index))
+    const inputRange = facesShared.value.map((f) => itemHeight * (index + f.index))
     return {
-      opacity: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.opacity), Extrapolation.CLAMP),
+      opacity: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.opacity), Extrapolation.CLAMP),
       transform: [
-        { translateY: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.offsetY), Extrapolation.EXTEND) },
-        { rotateX: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.deg), Extrapolation.CLAMP) + 'deg' },
-        { scale: interpolate(offsetYShared.value, inputRange, facesShared.map((x) => x.scale), Extrapolation.EXTEND) }
+        { translateY: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.offsetY), Extrapolation.EXTEND) },
+        { rotateX: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.deg), Extrapolation.CLAMP) + 'deg' },
+        { scale: interpolate(offsetYShared.value, inputRange, facesShared.value.map((x) => x.scale), Extrapolation.EXTEND) }
       ]
     }
   })

package/lib/runtime/components/react/mpx-portal/index.tsx

@@ -1,25 +1,19 @@
 import { ReactNode, useContext, useEffect, useRef } from 'react'
-import { PortalContext, ProviderContext, RouteContext, VarContext } from '../context'
+import { PortalContext, RouteContext, VarContext } from '../context'
 import PortalHost, { portal } from './portal-host'
 
 export type PortalProps = {
   children?: ReactNode
 }
 
-const Portal = ({ children }: PortalProps): null => {
+const Portal = ({ children }:PortalProps): null => {
   const manager = useContext(PortalContext)
   const keyRef = useRef<any>(null)
   const { pageId } = useContext(RouteContext) || {}
   const varContext = useContext(VarContext)
-  const parentProvides = useContext(ProviderContext)
-
   if (varContext) {
     children = (<VarContext.Provider value={varContext} key='varContextWrap'>{children}</VarContext.Provider>)
   }
-  if (parentProvides) {
-    children = (<ProviderContext.Provider value={parentProvides} key='providerContextWrap'>{children}</ProviderContext.Provider>)
-  }
-
   useEffect(() => {
     manager.update(keyRef.current, children)
   }, [children])

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

@@ -159,6 +159,9 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
   const simultaneousHandlers = flatGesture(originSimultaneousHandlers)
   const waitForHandlers = flatGesture(waitFor)
 
+  const snapScrollTop = useRef(0)
+  const snapScrollLeft = useRef(0)
+
   const [refreshing, setRefreshing] = useState(false)
 
   const [enableScroll, setEnableScroll] = useState(true)
@@ -265,12 +268,16 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
     warn('scroll-x and scroll-y cannot be set to true at the same time, Mpx will use the value of scroll-y as the criterion')
   }
   useEffect(() => {
-    initialTimeout.current = setTimeout(() => {
-      scrollToOffset(scrollLeft, scrollTop)
-    }, 0)
-
-    return () => {
-      initialTimeout.current && clearTimeout(initialTimeout.current)
+    if (
+      snapScrollTop.current !== scrollTop || snapScrollLeft.current !== scrollLeft
+    ) {
+      initialTimeout.current = setTimeout(() => {
+        scrollToOffset(scrollLeft, scrollTop)
+      }, 0)
+
+      return () => {
+        initialTimeout.current && clearTimeout(initialTimeout.current)
+      }
     }
   }, [scrollTop, scrollLeft])
 
@@ -474,6 +481,10 @@ const _ScrollView = forwardRef<HandlerRef<ScrollView & View, ScrollViewProps>, S
   function scrollToOffset (x = 0, y = 0, animated = scrollWithAnimation) {
     if (scrollViewRef.current) {
       scrollViewRef.current.scrollTo({ x, y, animated })
+      scrollOptions.current.scrollLeft = x
+      scrollOptions.current.scrollTop = y
+      snapScrollLeft.current = x
+      snapScrollTop.current = y
     }
   }
 

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

@@ -2,41 +2,15 @@
 /**
  * ✔ selectable
  * ✘ space
- * ✔ decode
+ * ✘ decode
  */
 import { Text, TextStyle, TextProps } from 'react-native'
-import { useRef, forwardRef, ReactNode, JSX, createElement, Children } from 'react'
+import { useRef, forwardRef, ReactNode, JSX, createElement } from 'react'
 import Portal from './mpx-portal'
 import useInnerProps from './getInnerListeners'
 import useNodesRef, { HandlerRef } from './useNodesRef' // 引入辅助函数
 import { useTransformStyle, wrapChildren, extendObject } from './utils'
 
-const decodeMap = {
-  '&lt;': '<',
-  '&gt;': '>',
-  '&quot;': '"',
-  '&amp;': '&',
-  '&#39;': '\'',
-  '&nbsp;': ' '
-}
-
-const encodedRe = /&(?:lt|gt|quot|amp|#39|nbsp);/g
-function decode (value: string) {
-  if (value != null) {
-    return value.replace(encodedRe, function (match) {
-      return decodeMap[match as keyof typeof decodeMap]
-    })
-  }
-}
-
-function getDecodedChildren (children: ReactNode) {
-  return Children.map(children, (child) => {
-    if (typeof child === 'string') {
-      return decode(child)
-    }
-    return child
-  })
-}
 interface _TextProps extends TextProps {
   style?: TextStyle
   children?: ReactNode
@@ -47,7 +21,6 @@ interface _TextProps extends TextProps {
   'parent-font-size'?: number
   'parent-width'?: number
   'parent-height'?: number
-  decode?: boolean
 }
 
 const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref): JSX.Element => {
@@ -60,8 +33,7 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
     'user-select': userSelect,
     'parent-font-size': parentFontSize,
     'parent-width': parentWidth,
-    'parent-height': parentHeight,
-    decode
+    'parent-height': parentHeight
   } = props
 
   const {
@@ -94,17 +66,12 @@ const _Text = forwardRef<HandlerRef<Text, _TextProps>, _TextProps>((props, ref):
       }
     ),
     [
-      'user-select',
-      'decode'
+      'user-select'
     ]
   )
 
-  const children = decode ? getDecodedChildren(props.children) : props.children
-
   let finalComponent:JSX.Element = createElement(Text, innerProps, wrapChildren(
-    extendObject({}, props, {
-      children
-    }),
+    props,
     {
       hasVarDec,
       varContext: varContextRef.current

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

@@ -501,7 +501,7 @@ function parseBgImage (text: string): {
   type?: 'image' | 'linear'
   src?: string
 } {
-  if (!text || text === 'none') return {}
+  if (!text) return {}
 
   const src = parseUrl(text)
   if (src) return { src, type: 'image' }

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

@@ -226,7 +226,7 @@ const _WebView = forwardRef<HandlerRef<WebView, WebViewProps>, WebViewProps>((pr
         }
         break
       case 'postMessage':
-        bindmessage && bindmessage(getCustomEvent('message', {}, { // RN组件销毁顺序与小程序不一致，所以改成和支付宝消息一致
+        bindmessage && bindmessage(getCustomEvent('messsage', {}, { // RN组件销毁顺序与小程序不一致，所以改成和支付宝消息一致
           detail: {
             data: params[0]?.data
           }

package/lib/runtime/components/react/types/common.d.ts

@@ -18,22 +18,3 @@ export type ExtendedFunctionComponent = FunctionComponent & {
 }
 
 export type AnyFunc = (...args: ReadonlyArray<any>) => any
-
-declare global {
-  interface PageConfig {
-    /**
-     * 是否自定义导航栏
-     */
-    navigationStyle?: 'custom'
-    /**
-     * 标题栏样式
-     */
-    navigationBarTextStyle?: 'white' | 'black' | '#ffffff' | '#000000'
-    /**
-     * 页面标题
-     */
-    navigationBarTitleText?: string
-
-    [key: string]: any
-  }
-}

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

@@ -215,33 +215,24 @@ function resolveVar (input: string, varContext: Record<string, any>) {
   const parsed = parseFunc(input, 'var')
   const replaced = new ReplaceSource(input)
 
-  for (const { start, end, args } of parsed) {
+  parsed.forEach(({ start, end, args }) => {
     const varName = args[0]
-    const fallback = args[1]
+    const fallback = args[1] || ''
     let varValue = hasOwn(varContext, varName) ? varContext[varName] : fallback
-    if (varValue === undefined) return
     if (varUseRegExp.test(varValue)) {
-      varValue = resolveVar(varValue, varContext)
-      if (varValue === undefined) return
+      varValue = '' + resolveVar(varValue, varContext)
     } else {
-      varValue = global.__formatValue(varValue)
+      varValue = '' + global.__formatValue(varValue)
     }
     replaced.replace(start, end - 1, varValue)
-  }
-
+  })
   return global.__formatValue(replaced.source())
 }
 
 function transformVar (styleObj: Record<string, any>, varKeyPaths: Array<Array<string>>, varContext: Record<string, any>, visitOther: (arg: VisitorArg) => void) {
   varKeyPaths.forEach((varKeyPath) => {
     setStyle(styleObj, varKeyPath, ({ target, key, value }) => {
-      const resolved = resolveVar(value, varContext)
-      if (resolved === undefined) {
-        delete target[key]
-        error(`Can not resolve css var at ${varKeyPath.join('.')}:${value}.`)
-        return
-      }
-      target[key] = resolved
+      target[key] = resolveVar(value, varContext)
       visitOther({ target, key, value: target[key], keyPath: varKeyPath })
     })
   })

package/lib/runtime/stringify.wxs

@@ -45,7 +45,7 @@ function objectKeys (obj) {
 }
 
 function genRegExp (str, flags) {
-  if (!__mpx_wxs__ || __mpx_mode__ === 'ks') {
+  if (!__mpx_wxs__) {
     return new RegExp(str, flags)
   } else {
     return getRegExp(str, flags)
@@ -234,4 +234,4 @@ module.exports = {
     var parsedStaticStyle = typeof staticStyle === 'string' ? parseStyleText(staticStyle) : {}
     return genStyleText(extend(parsedStaticStyle, normalizedDynamicStyle))
   }
-}
+}

package/lib/script-setup-compiler/index.js

@@ -98,7 +98,7 @@ function compileScriptSetup (
   ) {
     if (node) {
       throw new Error(
-        `[Mpx script error]: ${msg}\n\n${filePath}\n${formatCodeFrame(
+        `[@mpxjs/webpack-plugin script-setup-compiler] ${msg}\n\n${filePath}\n${formatCodeFrame(
           content,
           node.start + startOffset,
           end
@@ -106,7 +106,7 @@ function compileScriptSetup (
       )
     } else {
       throw new Error(
-        `[Mpx script error]: ${msg}\n\n${filePath}\n`
+        `[@mpxjs/webpack-plugin script-setup-compiler] ${msg}\n\n${filePath}\n`
       )
     }
   }

package/lib/style-compiler/index.js

@@ -18,8 +18,7 @@ module.exports = function (css, map) {
   const { resourcePath, queryObj } = parseRequest(this.resource)
   const mpx = this.getMpx()
   const mpxStyleOptions = (queryObj.mpxStyleOptions && JSON.parse(queryObj.mpxStyleOptions)) || {}
-  const id = queryObj.moduleId || mpxStyleOptions.mid || mpx.getModuleId(resourcePath, false, (queryObj.moduleId || mpxStyleOptions.mid) ? null : this)
-
+  const id = queryObj.moduleId || mpxStyleOptions.mid || mpx.getModuleId(resourcePath)
   const appInfo = mpx.appInfo
   const defs = mpx.defs
   const mode = mpx.mode
@@ -56,7 +55,7 @@ module.exports = function (css, map) {
     }
 
     if (isReact(mode)) {
-      plugins.push(transSpecial({ id, transPage: true }))
+      plugins.push(transSpecial({ id }))
     }
 
     // plugins.push(pluginCondStrip({

package/lib/style-compiler/load-postcss-config.js

@@ -29,7 +29,7 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
       if (err.message.indexOf('No PostCSS Config found') >= 0) {
         return
       }
-      loaderContext.emitWarning(`[Mpx style warning]: Error loading PostCSS config: ${err.message}`)
+      loaderContext.emitWarning(`Error loading PostCSS config: ${err.message}`)
     })
   }
 

package/lib/style-compiler/plugins/trans-special.js

@@ -1,8 +1,7 @@
 const selectorParser = require('postcss-selector-parser')
-const { MPX_TAG_PAGE_SELECTOR } = require('../../utils/const')
 // trans-special
 
-module.exports = ({ id, transPage = false }) => {
+module.exports = ({ id }) => {
   return {
     postcssPlugin: 'trans-special',
     Once: (root) => {
@@ -14,14 +13,7 @@ module.exports = ({ id, transPage = false }) => {
               if (/^:host$/.test(n.value)) {
                 const compoundSelectors = n.nodes
                 n.replaceWith(selectorParser.className({
-                  value: `host-${id}`
-                }))
-                selector.insertAfter(n, compoundSelectors)
-              }
-              if (transPage && /^page$/.test(n.value)) {
-                const compoundSelectors = n.nodes || []
-                n.replaceWith(selectorParser.className({
-                  value: MPX_TAG_PAGE_SELECTOR
+                  value: 'host-' + id
                 }))
                 selector.insertAfter(n, compoundSelectors)
               }

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

@@ -1,10 +1,5 @@
-const fs = require('fs/promises')
-const parseRequest = require('../utils/parse-request')
-const atImport = require('postcss-import')
-const { default: postcss } = require('postcss')
-
 class Node {
-  constructor(type, condition = null) {
+  constructor (type, condition = null) {
     this.type = type // 'If', 'ElseIf', 'Else' 或 'Text'
     this.condition = condition // If 或 Elif 的条件
     this.children = []
@@ -13,7 +8,7 @@ class Node {
 }
 
 // 提取 css string 为 token
-function tokenize(cssString) {
+function tokenize (cssString) {
   const regex = /\/\*\s*@mpx-(if|elif|else|endif)(?:\s*\((.*?)\))?\s*\*\//g
   const tokens = []
   let lastIndex = 0
@@ -42,12 +37,12 @@ function tokenize(cssString) {
 }
 
 // parse：将生成的 token 数组构造成嵌套的 AST
-function parse(cssString) {
+function parse (cssString) {
   const tokens = tokenize(cssString)
   const ast = []
   const nodeStack = []
   let currentChildren = ast
-  tokens.forEach((token) => {
+  tokens.forEach(token => {
     if (token.type === 'text') {
       const node = new Node('Text')
       node.value = token.content
@@ -59,7 +54,7 @@ function parse(cssString) {
       currentChildren = node.children
     } else if (token.type === 'elif') {
       if (nodeStack.length === 0) {
-        throw new Error('[Mpx style error]: elif without a preceding if')
+        throw new Error('elif without a preceding if')
       }
       currentChildren = nodeStack[nodeStack.length - 1]
       const node = new Node('ElseIf', token.condition)
@@ -67,7 +62,7 @@ function parse(cssString) {
       currentChildren = node.children
     } else if (token.type === 'else') {
       if (nodeStack.length === 0) {
-        throw new Error('[Mpx style error]: else without a preceding if')
+        throw new Error('else without a preceding if')
       }
       currentChildren = nodeStack[nodeStack.length - 1]
       const node = new Node('Else')
@@ -82,23 +77,23 @@ function parse(cssString) {
   return ast
 }
 
-function evaluateCondition(condition, defs) {
+function evaluateCondition (condition, defs) {
   try {
     const keys = Object.keys(defs)
-    const values = keys.map((key) => defs[key])
+    const values = keys.map(key => defs[key])
     /* eslint-disable no-new-func */
     const func = new Function(...keys, `return (${condition});`)
     return func(...values)
   } catch (e) {
-    console.error(`[Mpx style error]:Error evaluating condition: ${condition}`, e)
+    console.error(`Error evaluating condition: ${condition}`, e)
     return false
   }
 }
 
-function traverseAndEvaluate(ast, defs) {
+function traverseAndEvaluate (ast, defs) {
   let output = ''
   let batchedIf = false
-  function traverse(nodes) {
+  function traverse (nodes) {
     for (const node of nodes) {
       if (node.type === 'Text') {
         output += node.value
@@ -123,168 +118,10 @@ function traverseAndEvaluate(ast, defs) {
   return output
 }
 
-/**
- *
- * @param {string} content
- * @param {Record<string, any>} defs
- * @returns
- */
-function stripCondition(content, defs) {
-  const ast = parse(content)
-  const result = traverseAndEvaluate(ast, defs)
-  return result
-}
-
-/**
- * @typedef {Object} StripByPostcssOption
- * @property {string} lang 样式语法格式
- * @property {string} resourcePath 文件路径
- * @property {string} css 源文件
- * @property {Record<string, any>} defs 条件定义
- * @property {import('webpack').LoaderContext<any>['resolve']} resolve webpack resolve 方法
- */
-
-/**
- * @typedef {Object} AtImportConfig
- * @property {string} from 当前文件路径
- * @property {(filename: string) => Promise<string> | string;} load 加载文件内容的函数
- * @property {(id: string, base: string) => Promise<string | null> | string | null;} resolve 解析文件路径的函数
- */
-
-/**
- *
- * @param {Function} callback
- * @param {string} name
- * @returns
- */
-const shouldInstallWarning = (callback, name) => {
-  return () => {
-    try {
-      return callback()
-    } catch (error) {
-      throw new Error(
-        `[mpx-strip-conditional-loader]: ${name} is not installed, please install it first.\norginal Error: ${
-          error?.message ?? error.toString()
-        }`,
-        {
-          cause: error
-        }
-      )
-    }
-  }
-}
-/**
- *
- * @typedef {import('postcss').ProcessOptions} ProcessOptions
- * @typedef {import('postcss').Root} Root
- *
- * @type {Record<string, ProcessOptions['syntax']>}
- */
-const styleSyntaxProcesserMap = {
-  stylus: shouldInstallWarning(() => require('postcss-styl'), 'postcss-styl'),
-  less: shouldInstallWarning(() => require('postcss-less'), 'postcss-less'),
-  scss: shouldInstallWarning(() => require('postcss-scss'), 'postcss-scss')
-}
-
-/**
- * @param {StripByPostcssOption} options
- */
-async function stripByPostcss(options) {
-  const syntax = styleSyntaxProcesserMap[options.lang]?.()
-  const defs = options.defs ?? {}
-
-  function stripContentCondition(content) {
-    content = stripCondition(content, defs)
-
-    if (options.lang === 'stylus') {
-      content = content.replace(/\t/g, '  ')
-    }
-
-    return content
-  }
-
-  const afterConditionStrip = stripContentCondition(options.css, defs)
-
-    /**
-   * @type {import('postcss').AcceptedPlugin[]}
-   */
-  const plugins = [
-    atImport({
-      async load(filename) {
-        let content = await fs.readFile(filename, 'utf-8')
-        const processer = postcss(plugins)
-
-        content = stripContentCondition(content, defs)
-
-        const { css } = await processer.process(content, {
-          syntax,
-          from: filename,
-          to: options.resourcePath
-        })
-        return css
-      },
-      resolve: (id, base) => {
-        return new Promise((resolve, reject) => {
-          options.resolve(base, id, (err, res) => {
-            if (err) return reject(err)
-            if (typeof res !== 'string') {
-              return reject(
-                new Error(
-                  `[mpx-strip-conditional-loader]: Cannot resolve ${id} from ${base}`
-                )
-              )
-            }
-            resolve(res)
-          })
-        })
-      }
-    }),
-    {
-      // less/scss syntax 在 postcss 重新生成 css 后，`//` 注释后面不会保留换行，会和后续的 css 语句和注释连在一起，导致后续语法错误
-      postcssPlugin: 'mpx-strip-conditional-loader-append-command',
-      CommentExit(comment) {
-        if (!comment.raws.right) {
-          comment.raws.right = '\n'
-          return
-        }
-
-        if (!comment.raws.right.startsWith('\n')) {
-          comment.raws.right = '\n' + comment.raws.right
-        }
-      }
-    }
-  ]
-
-  const processer = postcss(plugins)
-  return processer.process(afterConditionStrip, {
-    from: options.resourcePath,
-    syntax
-  })
-}
-
-/**
- *
- * @this {import('webpack').LoaderContext<any>}
- * @param {string} css
- */
-module.exports = async function (css) {
+module.exports = function (css) {
   this.cacheable()
-
-  const callback = this.async()
-
   const mpx = this.getMpx()
-  const { resourcePath, queryObj } = parseRequest(this.resource)
-
-  const result = await stripByPostcss({
-    lang: queryObj.lang,
-    resourcePath,
-    css,
-    defs: mpx.defs,
-    resolve: this.resolve.bind(this)
-  })
-
-  callback(null, result.css, result.map)
+  const defs = mpx.defs
+  const ast = parse(css)
+  return traverseAndEvaluate(ast, defs)
 }
-
-module.exports.stripByPostcss = stripByPostcss
-module.exports.stripCondition = stripCondition

package/lib/template-compiler/bind-this.js

@@ -258,7 +258,7 @@ module.exports = {
     })
     return {
       code: pCollectKeys.map((key) => {
-        return isSimpleKey(key) ? `mpx_sc(${JSON.stringify(key)});` : `mpx_c(${JSON.stringify(key)});`
+        return isSimpleKey(key) ? `_sc(${JSON.stringify(key)});` : `_c(${JSON.stringify(key)});`
       }).join('\n'),
       propKeys: [...propKeySet]
     }
@@ -436,7 +436,7 @@ module.exports = {
         exit (path) {
           if (path.collectInfo) {
             const { isSimple, key } = path.collectInfo
-            const callee = isSimple ? t.identifier('mpx_sc') : t.identifier('mpx_c')
+            const callee = isSimple ? t.identifier('_sc') : t.identifier('_c')
             const replaceNode = renderReduce
               ? t.callExpression(callee, [key])
               : t.callExpression(callee, [key, path.node])