feat: use pnpm

NervJS · Jan 5, 2024 · a76addc · a76addc
1 parent 436d069
commit a76addc
Show file tree

Hide file tree

Showing 9 changed files with 9,674 additions and 9,389 deletions.
diff --git 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:

diff --git 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:

diff --git 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

diff --git 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

diff --git 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
 ```