fix: ci error

wuba · Jan 4, 2024 · 02c0153 · 02c0153
1 parent 1c0f8de
commit 02c0153
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 149 deletions.
diff --git a/.github/workflows/assemble_android_debug.yml b/.github/workflows/assemble_android_debug.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2

diff --git a/.github/workflows/assemble_android_release.yml b/.github/workflows/assemble_android_release.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2

diff --git a/.github/workflows/assemble_ios_debug.yml b/.github/workflows/assemble_ios_debug.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2

diff --git a/.github/workflows/assemble_ios_release.yml b/.github/workflows/assemble_ios_release.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - name: Get current date
         id: date

diff --git a/.github/workflows/assemble_weapp_release.yml b/.github/workflows/assemble_weapp_release.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2

diff --git a/.github/workflows/assemble_web_release.yml b/.github/workflows/assemble_web_release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [18]
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2

diff --git a/config/index.js b/config/index.js
@@ -92,7 +92,12 @@ const config = {
       }
     }
   },
-  harmony: require('./harmony.json'),
+  harmony: {
+    compiler: "vite",
+    projectPath: process.env.HARMONY_PROJECT_PATH || 'dist',
+    hapName: "entry",
+    name: "default"
+  },
   rn: {
     appName: 'taroDemo',
     output: {

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1241,7 +1241,7 @@ DEPENDENCIES:
   - "EXFont (from `../node_modules/.pnpm/expo-font@11.10.0_expo@50.0.0-preview.7/node_modules/expo-font/ios`)"
   - "EXImageLoader (from `../node_modules/.pnpm/expo-image-loader@4.6.0_expo@50.0.0-preview.7/node_modules/expo-image-loader/ios`)"
   - "EXLocation (from `../node_modules/.pnpm/expo-location@16.5.1_expo@50.0.0-preview.7/node_modules/expo-location/ios`)"
-  - "Expo (from `../node_modules/.pnpm/expo@50.0.0-preview.7_@babel+core@7.23.7/node_modules/expo`)"
+  - "Expo (from `../node_modules/.pnpm/expo@50.0.0-preview.7_@babel+core@7.23.7_@react-native+babel-preset@0.74.0/node_modules/expo`)"
   - "ExpoBrightness (from `../node_modules/.pnpm/expo-brightness@11.8.0_expo@50.0.0-preview.7/node_modules/expo-brightness/ios`)"
   - "ExpoCamera (from `../node_modules/.pnpm/expo-camera@14.0.1_expo@50.0.0-preview.7/node_modules/expo-camera/ios`)"
   - "ExpoFileSystem (from `../node_modules/.pnpm/expo-file-system@16.0.2_expo@50.0.0-preview.7/node_modules/expo-file-system/ios`)"
@@ -1383,7 +1383,7 @@ EXTERNAL SOURCES:
   EXLocation:
     :path: "../node_modules/.pnpm/expo-location@16.5.1_expo@50.0.0-preview.7/node_modules/expo-location/ios"
   Expo:
-    :path: "../node_modules/.pnpm/expo@50.0.0-preview.7_@babel+core@7.23.7/node_modules/expo"
+    :path: "../node_modules/.pnpm/expo@50.0.0-preview.7_@babel+core@7.23.7_@react-native+babel-preset@0.74.0/node_modules/expo"
   ExpoBrightness:
     :path: "../node_modules/.pnpm/expo-brightness@11.8.0_expo@50.0.0-preview.7/node_modules/expo-brightness/ios"
   ExpoCamera:
@@ -1638,7 +1638,7 @@ SPEC CHECKSUMS:
   RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
   RNFlashList: 4b4b6b093afc0df60ae08f9cbf6ccd4c836c667a
   RNGestureHandler: 61bfdfc05db9b79dd61f894dcd29d3dcc6db3c02
-  RNReanimated: 7486a1f346bfb4c6b171e1e2673d281abec31ae3
+  RNReanimated: 189d2bcd1e8c0bfc306eacac83455edccf67c5da
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

diff --git a/package.json b/package.json
@@ -49,14 +49,17 @@
     "@react-native-async-storage/async-storage": "~1.21.0",
     "@react-native-camera-roll/camera-roll": "~7.2.2",
     "@react-native-clipboard/clipboard": "~1.13.2",
+    "@react-native-community/cli-platform-android": "^12.3.0",
     "@react-native-community/geolocation": "~3.1.0",
     "@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",
+    "@react-native/gradle-plugin": "^0.73.0",
     "@shopify/flash-list": "^1.3.1",
     "@shopify/react-native-skia": "0.1.222",
     "@tarojs/components": "4.0.0-canary.6",
+    "@tarojs/components-advanced": "4.0.0-canary.6",
     "@tarojs/components-rn": "4.0.0-canary.6",
     "@tarojs/helper": "4.0.0-canary.6",
     "@tarojs/plugin-framework-react": "4.0.0-canary.6",
@@ -115,7 +118,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
-    "@babel/preset-env": "^7.20.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
     "@react-native/metro-config": "^0.73.2",
     "@react-native/typescript-config": "^0.73.1",