feat: use pnpm

2 years ago · 545d495e94
9 changed files with 9403 additions and 9394 deletions
--- a/.github/workflows/assemble_android_debug.yml
+++ b/.github/workflows/assemble_android_debug.yml
@ -43,30 +43,14 @@ jobs:
        with:
          distribution: 'zulu'
          java-version: '17'
-      - name: Cache node_modules Folder
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
        with:
-          path: ${{ github.workspace }}/node_modules
-          key: ${{ runner.os }}-node_modules
-          restore-keys: ${{ runner.os }}-node_modules
-      - name: Get Yarn Cache Directory Path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        env:
-          cache-name: yarn-cache
+          version: 8
+      - uses: actions/setup-node@v3
        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: |
-          yarn
-      # - name: Build Taro React Native Bundle
-      #   run: |
-      #     yarn build:rn --platform android
+          node-version: 20
+          cache: 'pnpm'
+      - run: pnpm install
      - name: Cache Gradle
        uses: actions/cache@v2
        env:
@ -84,6 +68,7 @@ jobs:
          bundle exec fastlane assemble
        env:
          KEYSTORE_FILE: ${{ github.workspace }}/android/app/${{ env.KEYSTORE_FILE }}
+          NODE_PATH: ${{ github.workspace }}/node_modules/.pnpm/node_modules:$NODE_PATH
      - name: Upload Android Products
        uses: actions/upload-artifact@v2
        with:
--- a/.github/workflows/assemble_android_release.yml
+++ b/.github/workflows/assemble_android_release.yml
@ -43,35 +43,14 @@ jobs:
        with:
          distribution: 'zulu'
          java-version: '17'
-      - name: Cache node_modules Folder
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
        with:
-          path: ${{ github.workspace }}/node_modules
-          key: ${{ runner.os }}-node_modules
-          restore-keys: ${{ runner.os }}-node_modules
-      - name: Get Yarn Cache Directory Path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        env:
-          cache-name: yarn-cache
+          version: 8
+      - uses: actions/setup-node@v3
        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: |
-          yarn
-      # - name: Build Taro React Native Bundle
-      #   run: |
-      #     yarn build:rn --platform android
-      # - name: Upload Taro React Native Bundle
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: taro-android-bundle
-      #     path: ${{ github.workspace }}/android/app/src/main/assets/index.android.bundle
+          node-version: 20
+          cache: 'pnpm'
+      - run: pnpm install
      - name: Cache Gradle
        uses: actions/cache@v2
        env:
@ -89,6 +68,7 @@ jobs:
          bundle exec fastlane assemble
        env:
          KEYSTORE_FILE: ${{ github.workspace }}/android/app/${{ env.KEYSTORE_FILE }}
+          NODE_PATH: ${{ github.workspace }}/node_modules/.pnpm/node_modules:$NODE_PATH
      - name: Upload Android Products
        uses: actions/upload-artifact@v2
        with:
--- a/.github/workflows/assemble_ios_debug.yml
+++ b/.github/workflows/assemble_ios_debug.yml
@ -31,37 +31,14 @@ jobs:
    steps:
      - name: Checkout Project
        uses: actions/checkout@v2
-      - name: Cache node_modules Folder
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
        with:
-          path: ${{ github.workspace }}/node_modules
-          key: ${{ runner.os }}-node_modules
-          restore-keys: ${{ runner.os }}-node_modules
-      - name: Get Yarn Cache Directory Path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        env:
-          cache-name: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Cache Pods
-        uses: actions/cache@v2
+          version: 8
+      - uses: actions/setup-node@v3
        with:
-          path: ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - name: Install Dependencies
-        run: |
-          yarn
-      # - name: Build Taro React Native Bundle
-      #   run: |
-      #     yarn build:rn --platform ios
+          node-version: 20
+          cache: 'pnpm'
+      - run: pnpm install
      - name: Install pods
        run: cd ios && pod update --no-repo-update
      - name: Import signing certificate
@ -86,6 +63,7 @@ jobs:
          FL_CODE_SIGN_IDENTITY: ${{ env.CODE_SIGN_IDENTITY }}
          FL_PROVISIONING_PROFILE_SPECIFIER: ${{ env.PROVISIONING_PROFILE_SPECIFIER }}
          FASTLANE_TEAM_ID: ${{ env.TEAM_ID }}
+          NODE_PATH: ${{ github.workspace }}/node_modules/.pnpm/node_modules:$NODE_PATH
        run: |
          cd ios
          bundle update
--- a/.github/workflows/assemble_ios_release.yml
+++ b/.github/workflows/assemble_ios_release.yml
@ -37,42 +37,14 @@ jobs:
        run: echo "::set-output name=timestamp::$(date +'%s')"
      - name: Checkout Project
        uses: actions/checkout@v2
-      - name: Cache node_modules Folder
-        uses: actions/cache@v2
+      - uses: pnpm/action-setup@v2
        with:
-          path: ${{ github.workspace }}/node_modules
-          key: ${{ runner.os }}-node_modules
-          restore-keys: ${{ runner.os }}-node_modules
-      - name: Get Yarn Cache Directory Path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache Yarn
-        uses: actions/cache@v2
-        env:
-          cache-name: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Cache Pods
-        uses: actions/cache@v2
+          version: 8
+      - uses: actions/setup-node@v3
        with:
-          path: ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - name: Install Dependencies
-        run: |
-          yarn
-      # - name: Build Taro React Native Bundle
-      #   run: |
-      #     yarn build:rn --platform ios
-      # - name: Upload Taro React Native Bundle
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: taro-ios-bundle
-      #     path: ${{ github.workspace }}/ios/main.jsbundle
+          node-version: 20
+          cache: 'pnpm'
+      - run: pnpm install
      - name: Install pods
        run: cd ios && pod update --no-repo-update
      - name: Import signing certificate
@ -97,6 +69,7 @@ jobs:
          FL_CODE_SIGN_IDENTITY: ${{ env.CODE_SIGN_IDENTITY }}
          FL_PROVISIONING_PROFILE_SPECIFIER: ${{ env.PROVISIONING_PROFILE_SPECIFIER }}
          FASTLANE_TEAM_ID: ${{ env.TEAM_ID }}
+          NODE_PATH: ${{ github.workspace }}/node_modules/.pnpm/node_modules:$NODE_PATH
        run: |
          cd ios
          bundle update
--- a/README.md
+++ b/README.md
@ -7,8 +7,8 @@ Taro 原生 React Native 壳工程，和 React Native init 的工程的区别如

 0. 集成了 [expo](https://docs.expo.dev/bare/installing-expo-modules/)
 1. 集成了 Taro 依赖的所有原生库
-2. debug 方式变更: 在 JS 工程中 `yarn dev:rn` 启动 metro server
-3. release 方式变更: 在 JS 工程中 `yarn buid:rn` 打包 jsbundle 并通过配置 `rn.output` 输出到壳工程
+2. debug 方式变更: 在 JS 工程中 `pnpm dev:rn` 启动 metro server
+3. release 方式变更: 在 JS 工程中 `pnpm buid:rn` 打包 jsbundle 并通过配置 `rn.output` 输出到壳工程

 ## 该仓库如何生成

@ -39,8 +39,8 @@ npx install-expo-modules@latest
 4. 更新 Taro 需要的依赖（如果还没正式发布，则使用对应的 alpha 或 beta 版本）

 ```
-yarn
-yarn upgradePeerdeps
+pnpm
+pnpm upgradePeerdeps
 ```

 5. 添加打包脚本，此部分可以直接 cherry-pick
@ -58,5 +58,5 @@ https://react-native-community.github.io/upgrade-helper/

 > 使用 Taro 最新版，或者修改 `upgradePeerdeps` 指定 Taro 版本，再执行：
 ```
-yarn upgradePeerdeps
+pnpm upgradePeerdeps
 ```
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -2,38 +2,38 @@ PODS:
  - boost (1.83.0)
  - CocoaAsyncSocket (7.6.5)
  - DoubleConversion (1.1.6)
-  - EXAV (13.10.0):
+  - EXAV (13.10.1):
    - ExpoModulesCore
    - ReactCommon/turbomodule/core
-  - EXBarCodeScanner (12.9.0):
+  - EXBarCodeScanner (12.9.2):
    - EXImageLoader
    - ExpoModulesCore
    - ZXingObjC/OneD
    - ZXingObjC/PDF417
-  - EXConstants (15.4.1):
+  - EXConstants (15.4.2):
    - ExpoModulesCore
-  - EXFont (11.10.0):
+  - EXFont (11.10.2):
    - ExpoModulesCore
  - EXImageLoader (4.6.0):
    - ExpoModulesCore
    - React-Core
-  - EXLocation (16.5.0):
+  - EXLocation (16.5.1):
    - ExpoModulesCore
-  - Expo (50.0.0-preview.4):
+  - Expo (50.0.2):
    - ExpoModulesCore
  - ExpoBrightness (11.8.0):
    - ExpoModulesCore
-  - ExpoCamera (14.0.0):
+  - ExpoCamera (14.0.1):
    - ExpoModulesCore
    - ZXingObjC/OneD
    - ZXingObjC/PDF417
-  - ExpoFileSystem (16.0.1):
+  - ExpoFileSystem (16.0.2):
    - ExpoModulesCore
-  - ExpoImagePicker (14.7.0):
+  - ExpoImagePicker (14.7.1):
    - ExpoModulesCore
  - ExpoKeepAwake (12.8.0):
    - ExpoModulesCore
-  - ExpoModulesCore (1.11.2):
+  - ExpoModulesCore (1.11.7):
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
@ -984,7 +984,7 @@ PODS:
  - React-Mapbuffer (0.73.1):
    - glog
    - React-debug
-  - react-native-cameraroll (7.2.1):
+  - react-native-cameraroll (7.2.2):
    - React-Core
  - react-native-geolocation (3.1.0):
    - React-Core
@ -996,13 +996,15 @@ PODS:
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - react-native-safe-area-context (4.8.1):
+  - react-native-safe-area-context (4.8.2):
    - React-Core
  - react-native-slider (4.4.4):
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - react-native-webview (13.6.3):
+  - react-native-webview (13.6.4):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
    - React-Core
  - React-nativeconfig (0.73.1)
  - React-NativeModulesApple (0.73.1):
@ -1173,7 +1175,7 @@ PODS:
    - React-perflogger (= 0.73.1)
  - RNCAsyncStorage (1.21.0):
    - React-Core
-  - RNCClipboard (1.13.0):
+  - RNCClipboard (1.13.2):
    - React-Core
  - RNCMaskedView (0.3.1):
    - React-Core
@ -1202,20 +1204,20 @@ PODS:
 DEPENDENCIES:
  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - EXAV (from `../node_modules/expo-av/ios`)
-  - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`)
-  - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXFont (from `../node_modules/expo-font/ios`)
-  - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
-  - EXLocation (from `../node_modules/expo-location/ios`)
-  - Expo (from `../node_modules/expo`)
-  - ExpoBrightness (from `../node_modules/expo-brightness/ios`)
-  - ExpoCamera (from `../node_modules/expo-camera/ios`)
-  - ExpoFileSystem (from `../node_modules/expo-file-system/ios`)
-  - ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
-  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
-  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
-  - ExpoSensors (from `../node_modules/expo-sensors/ios`)
+  - "EXAV (from `../node_modules/.pnpm/expo-av@13.10.1_expo@50.0.2/node_modules/expo-av/ios`)"
+  - "EXBarCodeScanner (from `../node_modules/.pnpm/expo-barcode-scanner@12.9.2_expo@50.0.2/node_modules/expo-barcode-scanner/ios`)"
+  - "EXConstants (from `../node_modules/.pnpm/expo-constants@15.4.2_expo@50.0.2/node_modules/expo-constants/ios`)"
+  - "EXFont (from `../node_modules/.pnpm/expo-font@11.10.2_expo@50.0.2/node_modules/expo-font/ios`)"
+  - "EXImageLoader (from `../node_modules/.pnpm/expo-image-loader@4.6.0_expo@50.0.2/node_modules/expo-image-loader/ios`)"
+  - "EXLocation (from `../node_modules/.pnpm/expo-location@16.5.1_expo@50.0.2/node_modules/expo-location/ios`)"
+  - "Expo (from `../node_modules/.pnpm/expo@50.0.2_@babel+core@7.23.7_@react-native+babel-preset@0.73.18/node_modules/expo`)"
+  - "ExpoBrightness (from `../node_modules/.pnpm/expo-brightness@11.8.0_expo@50.0.2/node_modules/expo-brightness/ios`)"
+  - "ExpoCamera (from `../node_modules/.pnpm/expo-camera@14.0.1_expo@50.0.2/node_modules/expo-camera/ios`)"
+  - "ExpoFileSystem (from `../node_modules/.pnpm/expo-file-system@16.0.2_expo@50.0.2/node_modules/expo-file-system/ios`)"
+  - "ExpoImagePicker (from `../node_modules/.pnpm/expo-image-picker@14.7.1_expo@50.0.2/node_modules/expo-image-picker/ios`)"
+  - "ExpoKeepAwake (from `../node_modules/.pnpm/expo-keep-awake@12.8.0_expo@50.0.2/node_modules/expo-keep-awake/ios`)"
+  - "ExpoModulesCore (from `../node_modules/.pnpm/expo-modules-core@1.11.7/node_modules/expo-modules-core`)"
+  - "ExpoSensors (from `../node_modules/.pnpm/expo-sensors@12.9.0_expo@50.0.2/node_modules/expo-sensors/ios`)"
  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
  - Flipper (= 0.201.0)
@ -1327,33 +1329,33 @@ EXTERNAL SOURCES:
  DoubleConversion:
    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
  EXAV:
-    :path: "../node_modules/expo-av/ios"
+    :path: "../node_modules/.pnpm/expo-av@13.10.1_expo@50.0.2/node_modules/expo-av/ios"
  EXBarCodeScanner:
-    :path: "../node_modules/expo-barcode-scanner/ios"
+    :path: "../node_modules/.pnpm/expo-barcode-scanner@12.9.2_expo@50.0.2/node_modules/expo-barcode-scanner/ios"
  EXConstants:
-    :path: "../node_modules/expo-constants/ios"
+    :path: "../node_modules/.pnpm/expo-constants@15.4.2_expo@50.0.2/node_modules/expo-constants/ios"
  EXFont:
-    :path: "../node_modules/expo-font/ios"
+    :path: "../node_modules/.pnpm/expo-font@11.10.2_expo@50.0.2/node_modules/expo-font/ios"
  EXImageLoader:
-    :path: "../node_modules/expo-image-loader/ios"
+    :path: "../node_modules/.pnpm/expo-image-loader@4.6.0_expo@50.0.2/node_modules/expo-image-loader/ios"
  EXLocation:
-    :path: "../node_modules/expo-location/ios"
+    :path: "../node_modules/.pnpm/expo-location@16.5.1_expo@50.0.2/node_modules/expo-location/ios"
  Expo:
-    :path: "../node_modules/expo"
+    :path: "../node_modules/.pnpm/expo@50.0.2_@babel+core@7.23.7_@react-native+babel-preset@0.73.18/node_modules/expo"
  ExpoBrightness:
-    :path: "../node_modules/expo-brightness/ios"
+    :path: "../node_modules/.pnpm/expo-brightness@11.8.0_expo@50.0.2/node_modules/expo-brightness/ios"
  ExpoCamera:
-    :path: "../node_modules/expo-camera/ios"
+    :path: "../node_modules/.pnpm/expo-camera@14.0.1_expo@50.0.2/node_modules/expo-camera/ios"
  ExpoFileSystem:
-    :path: "../node_modules/expo-file-system/ios"
+    :path: "../node_modules/.pnpm/expo-file-system@16.0.2_expo@50.0.2/node_modules/expo-file-system/ios"
  ExpoImagePicker:
-    :path: "../node_modules/expo-image-picker/ios"
+    :path: "../node_modules/.pnpm/expo-image-picker@14.7.1_expo@50.0.2/node_modules/expo-image-picker/ios"
  ExpoKeepAwake:
-    :path: "../node_modules/expo-keep-awake/ios"
+    :path: "../node_modules/.pnpm/expo-keep-awake@12.8.0_expo@50.0.2/node_modules/expo-keep-awake/ios"
  ExpoModulesCore:
-    :path: "../node_modules/expo-modules-core"
+    :path: "../node_modules/.pnpm/expo-modules-core@1.11.7/node_modules/expo-modules-core"
  ExpoSensors:
-    :path: "../node_modules/expo-sensors/ios"
+    :path: "../node_modules/.pnpm/expo-sensors@12.9.0_expo@50.0.2/node_modules/expo-sensors/ios"
  FBLazyVector:
    :path: "../node_modules/react-native/Libraries/FBLazyVector"
  FBReactNativeSpec:
@ -1484,22 +1486,22 @@ SPEC CHECKSUMS:
  boost: 26fad476bfa736552bbfa698a06cc530475c1505
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
-  EXAV: 69adaa7433e7123a7dc9df9841fd80e954916d2d
-  EXBarCodeScanner: 2c2fee40a33902612792b2f0de4e9da40f080613
-  EXConstants: 86bbc9fedbb67770c0c6bb37f22f81970ef45dc8
-  EXFont: 9ae7e8e2e4825cef04a45dca74512a3f711e2fe9
+  EXAV: 4f5b0cf437b5c9dfde3c29089760047daacd50b7
+  EXBarCodeScanner: 9cf7039d99448ed1ea506401eba5ad4abd4e4871
+  EXConstants: e77cccf9afb245a6fb2ea917fe5f45f0e1d8b841
+  EXFont: 21b9c760abd593ce8f0d5386b558ced76018506f
  EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
-  EXLocation: 4cdbc108ff5bd944d981b7d0c0cf98630104a84a
-  Expo: 00eaae3d5de1f2e9af393abf1b2c9efb57b3b599
+  EXLocation: d85e362b70c7545629905d487aafb9503b076555
+  Expo: 6c6526e76864e140363431722b22d0fa3cdeafd2
  ExpoBrightness: 6d160de5877289d11674aea61aacdb37422774cf
-  ExpoCamera: a3f3681963815533c24f698a22c239e68724fb99
-  ExpoFileSystem: ebbbe77366bff2e66876e3b3bf09e61d3bb72c70
-  ExpoImagePicker: 247fc7d2c13426a835525b67d5fb221864b79612
+  ExpoCamera: 64f16dee3c712c41046dc6a3c22518461c0ceae7
+  ExpoFileSystem: fb4c94cc5ec5c50cb2663d2f6d503a1960b95a1d
+  ExpoImagePicker: 66970181d1c838f444e5e1f81b804ab2d5ff49bd
  ExpoKeepAwake: ed71bfe0e6ecd38e337586ba6e1ba27a56eb373b
-  ExpoModulesCore: 94238d9653114ff9786634541688e1fdb7ed95e3
+  ExpoModulesCore: f103ff1346136b2926e1654f32b3f45ab0b74830
  ExpoSensors: 773adb32167d5d3c28280697ceee342b88f606ab
  FBLazyVector: 2296bacb2fa157a43991048b0a9d71c1c8b65083
-  FBReactNativeSpec: df0ebe69acd14ce0be0269cf75b6e338a727259b
+  FBReactNativeSpec: 00c9b95ce75c53d6dfc543d9ba8f69572cd2054e
  Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@ -1534,14 +1536,14 @@ SPEC CHECKSUMS:
  React-jsinspector: 369048694e39942063c5d08e9580b43e2edd379a
  React-logger: e0c1e918d9588a9f39c9bc62d9d6bfe9ca238d9d
  React-Mapbuffer: 9731a0a63ebaf8976014623c4d637744d7353a7c
-  react-native-cameraroll: a793da5ec61a654c5b9eb040cde4e81155976810
+  react-native-cameraroll: 8acc1cf2c31d38992222fd08c7041691fc98dce3
  react-native-geolocation: ef66fb798d96284c6043f0b16c15d9d1d4955db4
  react-native-image-resizer: 681f7607418b97c084ba2d0999b153b103040d8a
  react-native-netinfo: 8a7fd3f7130ef4ad2fb4276d5c9f8d3f28d2df3d
  react-native-pager-view: d81ab2060b9caf57ca8c3a0d57467ff407cdb825
-  react-native-safe-area-context: cd1169d797a2ef722a00bfc5af10748d5b6c94f9
+  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
  react-native-slider: 2ae4b4aa6f5ed9a25d546e590e83c0fc9ccfd58c
-  react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
+  react-native-webview: f95eb7d4d6a7ca45d04d861d99f628241b2aff83
  React-nativeconfig: 37aecd26d64b79327c3f10e43b2e9a6c425e0a60
  React-NativeModulesApple: 9ca6d2eaa1dd5606588262195b46d0774bdec83a
  React-perflogger: 5ffc4d6ccb74eaac7b8b2867e58a447232483d6d
@ -1557,13 +1559,13 @@ SPEC CHECKSUMS:
  React-RCTText: 08dd5d7173ed279d3468b333217afb22bb7948c3
  React-RCTVibration: 2f906cd58dfd44ff5e4ca4fc0edd8740dceda6be
  React-rendererdebug: e3db5db14234d9ee46d2e58fff3b8652ee7da6bc
-  React-rncore: d1aa3c2f01b22a53bc10ff2775e6ddcd43fc71a2
+  React-rncore: 8b52cc253dcb365241989590ce097464810db205
  React-runtimeexecutor: d87e84455640dc5685e87563c2eaef90e5df8752
  React-runtimescheduler: 93a4c84e46a85c3fc9678abd4f6923b785226ea7
  React-utils: debda2c206770ee2785bdebb7f16d8db9f18838a
  ReactCommon: ddb128564dcbfa0287d3d1a2d10f8c7457c971f6
  RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
-  RNCClipboard: 204b94473a99932e314b730a81363e0bf795a60d
+  RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
  RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
  RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
  RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
--- a/package.json
+++ b/package.json
@ -8,37 +8,39 @@
    "lint": "eslint .",
    "start": "react-native start",
    "test": "jest",
-    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn -o -Y && install-peerdeps @tarojs/components-rn -o -Y && install-peerdeps @tarojs/router-rn -o -Y && pod-install"
+    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn -o -P && install-peerdeps @tarojs/components-rn -o -P && install-peerdeps @tarojs/router-rn -o -P && pod-install"
  },
  "dependencies": {
-    "@bam.tech/react-native-image-resizer": "~3.0.5",
+    "@bam.tech/react-native-image-resizer": "~3.0.7",
    "@react-native-async-storage/async-storage": "~1.21.0",
-    "@react-native-camera-roll/camera-roll": "~7.2.0",
-    "@react-native-clipboard/clipboard": "~1.13.0",
+    "@react-native-camera-roll/camera-roll": "~7.2.2",
+    "@react-native-clipboard/clipboard": "~1.13.2",
+    "@react-native-community/cli-platform-android": "^13.2.0",
    "@react-native-community/geolocation": "~3.1.0",
-    "@react-native-community/netinfo": "~11.2.0",
-    "@react-native-community/slider": "~4.4.2",
+    "@react-native-community/netinfo": "~11.2.1",
+    "@react-native-community/slider": "~4.4.4",
    "@react-native-masked-view/masked-view": "~0.3.1",
    "@react-native-picker/picker": "~2.6.1",
-    "expo": "~50.0.0-preview.4",
-    "expo-av": "~13.10.0",
-    "expo-barcode-scanner": "~12.9.0",
+    "@react-native/gradle-plugin": "^0.73.4",
+    "expo": "~50.0.2",
+    "expo-av": "~13.10.1",
+    "expo-barcode-scanner": "~12.9.2",
    "expo-brightness": "~11.8.0",
-    "expo-camera": "~14.0.0",
-    "expo-file-system": "~16.0.0",
-    "expo-image-picker": "~14.7.0",
+    "expo-camera": "~14.0.1",
+    "expo-file-system": "~16.0.2",
+    "expo-image-picker": "~14.7.1",
    "expo-keep-awake": "~12.8.0",
-    "expo-location": "~16.5.0",
+    "expo-location": "~16.5.1",
    "expo-sensors": "~12.9.0",
    "react": "18.2.0",
    "react-native": "0.73.1",
    "react-native-device-info": "~10.12.0",
    "react-native-gesture-handler": "~2.14.0",
-    "react-native-pager-view": "~6.2.0",
-    "react-native-safe-area-context": "~4.8.0",
+    "react-native-pager-view": "~6.2.3",
+    "react-native-safe-area-context": "~4.8.2",
    "react-native-screens": "^3.29.0",
    "react-native-svg": "~14.1.0",
-    "react-native-webview": "~13.6.3"
+    "react-native-webview": "~13.6.4"
  },
  "devDependencies": {
    "@babel/core": "^7.20.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/yarn.lock
+++ b/yarn.lock