@mpxjs/webpack-plugin 2.10.16-beta.7 → 2.10.17

package/lib/utils/merge-visitors.js

@@ -0,0 +1,55 @@
+/**
+ * 链式合并方法的工具函数
+ *
+ * 在多条件分支下使用 Object.assign 会导致同名方法被覆盖，
+ * 这个函数通过创建组合函数来确保所有方法都能按顺序执行。
+ *
+ * @param {Object} target - 目标 visitor 对象
+ * @param {Object} source - 要链式分配的 visitor 方法对象
+ **/
+
+// 辅助函数：将 visitor 的所有钩子添加到结果中
+function mergeVisitorHooks (result, visitor) {
+  result.enter = result.enter.concat(visitor.enter)
+  result.exit = result.exit.concat(visitor.exit)
+  return result
+}
+
+function normalizeVisitor(visitor) {
+  if (Array.isArray(visitor.enter) && Array.isArray(visitor.exit)) {
+    return visitor
+  }
+  if (typeof visitor === 'function') {
+    return { enter: [visitor], exit: [] }
+  }
+
+  if (visitor.enter) {
+    if (!Array.isArray(visitor.enter)) {
+      visitor.enter = [visitor.enter]
+    }
+  } else {
+    visitor.enter = []
+  }
+
+  if (visitor.exit) {
+    if (!Array.isArray(visitor.exit)) {
+      visitor.exit = [visitor.exit]
+    }
+  } else {
+    visitor.exit = []
+  }
+  return visitor
+}
+
+module.exports = function mergeVisitors (target, source) {
+  for (const [key, value] of Object.entries(source)) {
+    if (!target[key]) {
+      target[key] = normalizeVisitor(value)
+    } else {
+      // 合并现有值和新值
+      target[key] = mergeVisitorHooks(normalizeVisitor(target[key]), normalizeVisitor(value))
+    }
+  }
+
+  return target
+}

package/lib/wxs/pre-loader.js

@@ -4,7 +4,7 @@ const t = require('@babel/types')
 const generate = require('@babel/generator').default
 const parseRequest = require('../utils/parse-request')
 const isEmptyObject = require('../utils/is-empty-object')
-const chainAssign = require('../utils/chain-assign')
+const mergeVisitors = require('../utils/merge-visitors')
 const parseQuery = require('loader-utils').parseQuery
 
 module.exports = function (content) {
@@ -31,7 +31,7 @@ module.exports = function (content) {
         '  __mpx_args__[i] = arguments[i];\n' +
         '}'
       ).program.body
-      chainAssign(visitor, {
+      mergeVisitors(visitor, {
         Identifier (path) {
           if (path.node.name === 'arguments') {
             path.node.name = '__mpx_args__'
@@ -66,7 +66,7 @@ module.exports = function (content) {
     }
 
     if (mode !== 'wx') {
-      chainAssign(visitor, {
+      mergeVisitors(visitor, {
         CallExpression (path) {
           const callee = path.node.callee
           if (t.isIdentifier(callee) && callee.name === 'getRegExp') {
@@ -81,7 +81,7 @@ module.exports = function (content) {
   }
 
   if (mode === 'dd') {
-    chainAssign(visitor, {
+    mergeVisitors(visitor, {
       MemberExpression (path) {
         const property = path.node.property
         if (
@@ -96,8 +96,11 @@ module.exports = function (content) {
   }
 
   if (!module.wxs) {
-    chainAssign(visitor, {
+    mergeVisitors(visitor, {
       MemberExpression (path) {
+        if (!t.isMemberExpression(path.node)) {
+          return
+        }
         const property = path.node.property
         if (
           property && (property.name === 'constructor' || property.value === 'constructor') &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.16-beta.7",
+  "version": "2.10.17",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -29,10 +29,7 @@
     "@better-scroll/wheel": "^2.5.1",
     "@better-scroll/zoom": "^2.5.1",
     "@mpxjs/template-engine": "^2.8.7",
-    "@mpxjs/utils": "^2.10.16-beta.7",
-    "postcss-less": "^6.0.0",
-    "postcss-scss": "^4.0.9",
-    "postcss-styl": "^0.12.3",
+    "@mpxjs/utils": "^2.10.17",
     "acorn": "^8.11.3",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -55,12 +52,15 @@
     "object-assign": "^4.1.1",
     "postcss": "^8.4.5",
     "postcss-import": "^16.1.1",
+    "postcss-less": "^6.0.0",
     "postcss-load-config": "^3.1.1",
     "postcss-modules-extract-imports": "^3.0.0",
     "postcss-modules-local-by-default": "^4.0.0",
     "postcss-modules-scope": "^3.0.0",
     "postcss-modules-values": "^4.0.0",
+    "postcss-scss": "^4.0.9",
     "postcss-selector-parser": "^6.0.8",
+    "postcss-styl": "^0.12.3",
     "postcss-value-parser": "^4.0.2",
     "semver": "^7.5.4",
     "source-list-map": "^2.0.0",
@@ -91,7 +91,7 @@
   },
   "devDependencies": {
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.16-beta.7",
+    "@mpxjs/api-proxy": "^2.10.17",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/glob": "^8.1.0",
@@ -105,12 +105,11 @@
     "react-native-safe-area-context": "^4.12.0",
     "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",
     "rimraf": "^6.0.1"
   },
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
+  "gitHead": "33fbd0bb8d4b83555239a8931fabb23022af0866"
 }

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

@@ -1,28 +0,0 @@
-import React from 'react';
-import { Camera } from 'react-native-vision-camera';
-interface CameraProps {
-    mode?: 'normal' | 'scanCode';
-    resolution?: 'low' | 'medium' | 'high';
-    devicePosition?: 'front' | 'back';
-    flash?: 'auto' | 'on' | 'off';
-    frameSize?: 'small' | 'medium' | 'large';
-    style?: Record<string, any>;
-    bindstop?: () => void;
-    binderror?: (error: {
-        message: string;
-    }) => void;
-    bindinitdone?: (result: {
-        type: string;
-        data: string;
-    }) => void;
-    bindscancode?: (result: {
-        type: string;
-        data: string;
-    }) => void;
-}
-type HandlerRef<T, P> = {
-    current: T | null;
-};
-declare const _camera: React.ForwardRefExoticComponent<CameraProps & React.RefAttributes<HandlerRef<Camera, CameraProps>>>;
-export default _camera;
-//# sourceMappingURL=mpx-camera.d.ts.map

package/lib/runtime/components/react/dist/mpx-camera.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mpx-camera.d.ts","sourceRoot":"","sources":["../mpx-camera.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2E,MAAM,OAAO,CAAA;AAC/F,OAAO,EAAE,MAAM,EAAuE,MAAM,4BAA4B,CAAA;AAIxH,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC5B,UAAU,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IACtC,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,CAAA;IAC7B,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAChD,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAC/D,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CAChE;AASD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI;IAEtB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAA;CAClB,CAAA;AAED,QAAA,MAAM,OAAO,qGAoIX,CAAA;AAIF,eAAe,OAAO,CAAA"}

package/lib/runtime/components/react/dist/mpx-camera.jsx

@@ -1,102 +0,0 @@
-import React, { forwardRef, useRef, useCallback, useContext, useState, useEffect } from 'react';
-import { Camera, useCameraDevice, useCodeScanner, useCameraFormat } from 'react-native-vision-camera';
-import { getCustomEvent } from './getInnerListeners';
-import { RouteContext } from './context';
-const _camera = forwardRef((props, ref) => {
-    const cameraRef = useRef(null);
-    const { mode = 'normal', resolution = 'medium', devicePosition = 'back', flash = 'auto', frameSize = 'medium', bindinitdone, bindstop, bindscancode } = props;
-    const isPhoto = mode === 'normal';
-    const device = useCameraDevice(devicePosition || 'back');
-    const { navigation } = useContext(RouteContext) || {};
-    const [zoomValue, setZoomValue] = useState(1);
-    const [hasPermission, setHasPermission] = useState(null);
-    // 先定义常量，避免在条件判断后使用
-    const maxZoom = device?.maxZoom || 1;
-    const RESOLUTION_MAPPING = {
-        low: { width: 640, height: 480 },
-        medium: { width: 1280, height: 720 },
-        high: { width: 1920, height: 1080 }
-    };
-    const FRAME_SIZE_MAPPING = {
-        small: { width: 480, height: 360 },
-        medium: { width: 720, height: 540 },
-        large: { width: 1080, height: 810 }
-    };
-    // 所有 Hooks 必须在条件判断之前调用
-    const format = useCameraFormat(device, [
-        {
-            photoResolution: RESOLUTION_MAPPING[resolution],
-            videoResolution: FRAME_SIZE_MAPPING[frameSize] || RESOLUTION_MAPPING[resolution]
-        }
-    ]);
-    const codeScanner = useCodeScanner({
-        codeTypes: ['qr', 'ean-13'],
-        onCodeScanned: (codes) => {
-            const result = codes.map(code => code.value).join(',');
-            bindscancode && bindscancode(getCustomEvent('scancode', {}, {
-                detail: {
-                    result: codes.map(code => code.value).join(',')
-                }
-            }));
-        }
-    });
-    const onInitialized = useCallback(() => {
-        bindinitdone && bindinitdone(getCustomEvent('initdone', {}, {
-            detail: {
-                maxZoom
-            }
-        }));
-    }, [bindinitdone, maxZoom]);
-    const onStopped = useCallback(() => {
-        bindstop && bindstop();
-    }, [bindstop]);
-    // 检查相机权限
-    useEffect(() => {
-        const checkCameraPermission = async () => {
-            try {
-                const cameraPermission = global?.__mpx?.config?.rnConfig?.cameraPermission;
-                if (typeof cameraPermission === 'function') {
-                    const permissionResult = await cameraPermission();
-                    setHasPermission(permissionResult === true);
-                }
-                else {
-                    setHasPermission(true);
-                }
-            }
-            catch (error) {
-                setHasPermission(false);
-            }
-        };
-        checkCameraPermission();
-    }, []);
-    const camera = {
-        setZoom: (zoom) => {
-            setZoomValue(zoom);
-        },
-        getTakePhoto: () => {
-            return cameraRef.current?.takePhoto;
-        },
-        getStartRecord: () => {
-            return cameraRef.current?.startRecording;
-        },
-        getStopRecord: () => {
-            return cameraRef.current?.stopRecording;
-        }
-    };
-    if (navigation) {
-        navigation.camera = camera;
-    }
-    // 所有 Hooks 调用完成后再进行条件判断
-    if (hasPermission === null) {
-        return null;
-    }
-    if (!hasPermission) {
-        return null;
-    }
-    if (!device) {
-        return null;
-    }
-    return (<Camera ref={cameraRef} isActive={true} photo={isPhoto} video={true} onInitialized={onInitialized} onStopped={onStopped} device={device} flash={flash} format={format} codeScanner={!isPhoto ? codeScanner : undefined} style={{ flex: 1 }} zoom={zoomValue} {...props}/>);
-});
-_camera.displayName = 'MpxCamera';
-export default _camera;

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

@@ -1,167 +0,0 @@
-import React, { forwardRef, useRef, useCallback, useContext, useState, useEffect } from 'react'
-import { Camera, useCameraDevice, useCodeScanner, useCameraFormat, useFrameProcessor } from 'react-native-vision-camera'
-import { getCustomEvent } from './getInnerListeners'
-import { RouteContext } from './context'
-
-interface CameraProps {
-  mode?: 'normal' | 'scanCode'
-  resolution?: 'low' | 'medium' | 'high'
-  devicePosition?: 'front' | 'back'
-  flash?: 'auto' | 'on' | 'off'
-  frameSize?: 'small' | 'medium' | 'large'
-  style?: Record<string, any>
-  bindstop?: () => void
-  binderror?: (error: { message: string }) => void
-  bindinitdone?: (result: { type: string, data: string }) => void
-  bindscancode?: (result: { type: string, data: string }) => void
-}
-
-interface CameraRef {
-  setZoom: (zoom: number) => void
-  getTakePhoto: () => (() => Promise<any>) | undefined
-  getStartRecord: () => ((options: any) => void) | undefined
-  getStopRecord: () => (() => void) | undefined
-}
-
-type HandlerRef<T, P> = {
-  // 根据实际的 HandlerRef 类型定义调整
-  current: T | null
-}
-
-const _camera = forwardRef<HandlerRef<Camera, CameraProps>, CameraProps>((props: CameraProps, ref): JSX.Element | null => {
-  const cameraRef = useRef<Camera>(null)
-  const {
-    mode = 'normal',
-    resolution = 'medium',
-    devicePosition = 'back',
-    flash = 'auto',
-    frameSize = 'medium',
-    bindinitdone,
-    bindstop,
-    bindscancode
-  } = props
-
-  const isPhoto = mode === 'normal'
-  const device = useCameraDevice(devicePosition || 'back')
-  const { navigation } = useContext(RouteContext) || {}
-  const [zoomValue, setZoomValue] = useState<number>(1)
-  const [hasPermission, setHasPermission] = useState<boolean | null>(null)
-
-  // 先定义常量，避免在条件判断后使用
-  const maxZoom = device?.maxZoom || 1
-  const RESOLUTION_MAPPING: Record<string, { width: number, height: number }> = {
-    low: { width: 640, height: 480 },
-    medium: { width: 1280, height: 720 },
-    high: { width: 1920, height: 1080 }
-  }
-  const FRAME_SIZE_MAPPING: Record<string, { width: number, height: number }> = {
-    small: { width: 480, height: 360 },
-    medium: { width: 720, height: 540 },
-    large: { width: 1080, height: 810 }
-  }
-
-  // 所有 Hooks 必须在条件判断之前调用
-  const format = useCameraFormat(device, [
-    {
-      photoResolution: RESOLUTION_MAPPING[resolution],
-      videoResolution: FRAME_SIZE_MAPPING[frameSize] || RESOLUTION_MAPPING[resolution]
-    }
-  ])
-
-  const codeScanner = useCodeScanner({
-    codeTypes: ['qr', 'ean-13'],
-    onCodeScanned: (codes) => {
-      const result = codes.map(code => code.value).join(',')
-      bindscancode && bindscancode(getCustomEvent('scancode', {}, {
-        detail: {
-          result: codes.map(code => code.value).join(',')
-        }
-      }))
-    }
-  })
-
-  const onInitialized = useCallback(() => {
-    bindinitdone && bindinitdone(getCustomEvent('initdone', {}, {
-      detail: {
-        maxZoom
-      }
-    }))
-  }, [bindinitdone, maxZoom])
-
-  const onStopped = useCallback(() => {
-    bindstop && bindstop()
-  }, [bindstop])
-
-  // 检查相机权限
-  useEffect(() => {
-    const checkCameraPermission = async () => {
-      try {
-        const cameraPermission = global?.__mpx?.config?.rnConfig?.cameraPermission
-        if (typeof cameraPermission === 'function') {
-          const permissionResult = await cameraPermission()
-          setHasPermission(permissionResult === true)
-        } else {
-          setHasPermission(true)
-        }
-      } catch (error) {
-        setHasPermission(false)
-      }
-    }
-
-    checkCameraPermission()
-  }, [])
-
-  const camera: CameraRef = {
-    setZoom: (zoom: number) => {
-      setZoomValue(zoom)
-    },
-    getTakePhoto: () => {
-      return cameraRef.current?.takePhoto
-    },
-    getStartRecord: () => {
-      return cameraRef.current?.startRecording
-    },
-    getStopRecord: () => {
-      return cameraRef.current?.stopRecording
-    }
-  }
-
-  if (navigation) {
-    navigation.camera = camera
-  }
-
-  // 所有 Hooks 调用完成后再进行条件判断
-  if (hasPermission === null) {
-    return null
-  }
-
-  if (!hasPermission) {
-    return null
-  }
-
-  if (!device) {
-    return null
-  }
-
-  return (
-    <Camera
-      ref={cameraRef}
-      isActive={true}
-      photo={isPhoto}
-      video={true}
-      onInitialized={onInitialized}
-      onStopped={onStopped}
-      device={device}
-      flash={flash}
-      format={format}
-      codeScanner={!isPhoto ? codeScanner : undefined}
-      style={{ flex: 1 }}
-      zoom={zoomValue}
-      {...props}
-    />
-  )
-})
-
-_camera.displayName = 'MpxCamera'
-
-export default _camera

package/lib/utils/chain-assign.js

@@ -1,47 +0,0 @@
-/**
- * 链式合并方法的工具函数
- *
- * 在多条件分支下使用 Object.assign 会导致同名方法被覆盖，
- * 这个函数通过创建组合函数来确保所有方法都能按顺序执行。
- *
- * @param {Object} target - 目标 visitor 对象
- * @param {Object} source - 要链式分配的 visitor 方法对象
- *
- * @example
- * const visitor = {}
- *
- * // 第一次合并
- * chainAssign(visitor, {
- *   CallExpression(path) {
- *     console.log('第一个处理器')
- *   }
- * })
- *
- * // 第二次合并 - 不会覆盖，而是组合执行
- * chainAssign(visitor, {
- *   CallExpression(path) {
- *     console.log('第二个处理器')
- *   }
- * })
- *
- * // 执行时会依次输出:
- * // 第一个处理器
- * // 第二个处理器
- */
-module.exports = function chainAssign (target, source) {
-  for (const [key, value] of Object.entries(source)) {
-    if (target[key]) {
-      // 如果已存在同名方法，创建组合函数依次执行
-      const originalMethod = target[key]
-      target[key] = function (path) {
-        originalMethod.call(this, path)
-        // 只有当节点没有停止遍历或被移除时才继续执行
-        if (!path.removed && !path.shouldStop) {
-          value.call(this, path)
-        }
-      }
-    } else {
-      target[key] = value
-    }
-  }
-}