feat: taro 4

wuba · Dec 26, 2023 · d1edc0b · d1edc0b
1 parent 8c1cea6
commit d1edc0b
Show file tree

Hide file tree

Showing 11 changed files with 844 additions and 839 deletions.
diff --git a/.github/workflows/assemble_android_debug.yml b/.github/workflows/assemble_android_debug.yml
@@ -38,6 +38,10 @@ jobs:
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
       - name: Cache node_modules Folder
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/assemble_android_release.yml b/.github/workflows/assemble_android_release.yml
@@ -38,6 +38,10 @@ jobs:
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
       - name: Cache node_modules Folder
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/assemble_ios_debug.yml b/.github/workflows/assemble_ios_debug.yml
@@ -26,7 +26,7 @@ env:
 
 jobs:
   assemble:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2

diff --git a/.github/workflows/assemble_ios_release.yml b/.github/workflows/assemble_ios_release.yml
@@ -29,7 +29,7 @@ env:
 
 jobs:
   assemble:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Get current date
         id: date

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -4,15 +4,15 @@ PODS:
     - React-Core
   - 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):
     - ExpoModulesCore
@@ -25,16 +25,16 @@ PODS:
     - 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
   - ExpoGL (13.6.0):
     - ExpoModulesCore
     - ReactCommon/turbomodule/core
-  - ExpoImagePicker (14.7.0):
+  - ExpoImagePicker (14.7.1):
     - ExpoModulesCore
   - ExpoKeepAwake (12.8.0):
     - ExpoModulesCore
@@ -47,6 +47,9 @@ PODS:
     - ReactCommon/turbomodule/core
   - ExpoSensors (12.9.0):
     - ExpoModulesCore
+  - EXTaskManager (11.7.0):
+    - ExpoModulesCore
+    - UMAppLoader
   - FBLazyVector (0.73.1)
   - FBReactNativeSpec (0.73.1):
     - RCT-Folly (= 2022.05.16.00)
@@ -117,9 +120,9 @@ PODS:
     - hermes-engine/Pre-built (= 0.73.0)
   - hermes-engine/Pre-built (0.73.0)
   - libevent (2.1.12)
-  - lottie-ios (3.4.0)
-  - lottie-react-native (5.1.6):
-    - lottie-ios (~> 3.4.0)
+  - lottie-ios (4.3.4)
+  - lottie-react-native (6.4.1):
+    - lottie-ios (~> 4.3.3)
     - React-Core
   - OpenSSL-Universal (1.1.1100)
   - RCT-Folly (2022.05.16.00):
@@ -993,7 +996,7 @@ PODS:
   - React-Mapbuffer (0.73.1):
     - glog
     - React-debug
-  - react-native-cameraroll (7.2.0):
+  - react-native-cameraroll (7.2.2):
     - React-Core
   - react-native-geolocation (3.1.0):
     - React-Core
@@ -1005,9 +1008,9 @@ 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-skia (0.1.228):
+  - react-native-skia (0.1.222):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React
@@ -1190,7 +1193,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
@@ -1216,6 +1219,7 @@ PODS:
   - RNSVG (14.1.0):
     - React-Core
   - SocketRocket (0.6.1)
+  - UMAppLoader (4.5.0)
   - Yoga (1.14.0)
   - ZXingObjC/Core (3.6.9)
   - ZXingObjC/OneD (3.6.9):
@@ -1242,6 +1246,7 @@ DEPENDENCIES:
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - ExpoSensors (from `../node_modules/expo-sensors/ios`)
+  - EXTaskManager (from `../node_modules/expo-task-manager/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - Flipper (= 0.201.0)
@@ -1334,6 +1339,7 @@ DEPENDENCIES:
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSVG (from `../node_modules/react-native-svg`)
+  - UMAppLoader (from `../node_modules/unimodules-app-loader/ios`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -1390,6 +1396,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-modules-core"
   ExpoSensors:
     :path: "../node_modules/expo-sensors/ios"
+  EXTaskManager:
+    :path: "../node_modules/expo-task-manager/ios"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
@@ -1525,6 +1533,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-screens"
   RNSVG:
     :path: "../node_modules/react-native-svg"
+  UMAppLoader:
+    :path: "../node_modules/unimodules-app-loader/ios"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -1533,21 +1543,22 @@ SPEC CHECKSUMS:
   BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
-  EXAV: 69adaa7433e7123a7dc9df9841fd80e954916d2d
-  EXBarCodeScanner: 2c2fee40a33902612792b2f0de4e9da40f080613
-  EXConstants: 86bbc9fedbb67770c0c6bb37f22f81970ef45dc8
+  EXAV: 4f5b0cf437b5c9dfde3c29089760047daacd50b7
+  EXBarCodeScanner: 9cf7039d99448ed1ea506401eba5ad4abd4e4871
+  EXConstants: e77cccf9afb245a6fb2ea917fe5f45f0e1d8b841
   EXFont: 9ae7e8e2e4825cef04a45dca74512a3f711e2fe9
   EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
   EXLocation: d85e362b70c7545629905d487aafb9503b076555
   Expo: cd2dc043dd1cc3d9e8e4e035fb9a41b421e8f13f
   ExpoBrightness: 6d160de5877289d11674aea61aacdb37422774cf
-  ExpoCamera: a3f3681963815533c24f698a22c239e68724fb99
-  ExpoFileSystem: ebbbe77366bff2e66876e3b3bf09e61d3bb72c70
+  ExpoCamera: 64f16dee3c712c41046dc6a3c22518461c0ceae7
+  ExpoFileSystem: fb4c94cc5ec5c50cb2663d2f6d503a1960b95a1d
   ExpoGL: 085542f97b13f2428ac2edb077c9a90f4566944d
-  ExpoImagePicker: 247fc7d2c13426a835525b67d5fb221864b79612
+  ExpoImagePicker: 66970181d1c838f444e5e1f81b804ab2d5ff49bd
   ExpoKeepAwake: ed71bfe0e6ecd38e337586ba6e1ba27a56eb373b
   ExpoModulesCore: 01c0abfa6cd9c41c4bd76d8a1a079e6b591db10f
   ExpoSensors: 773adb32167d5d3c28280697ceee342b88f606ab
+  EXTaskManager: 81b2dfaaba6d9f9a4bc3e3e2a786a98004eb9e98
   FBLazyVector: 2296bacb2fa157a43991048b0a9d71c1c8b65083
   FBReactNativeSpec: df0ebe69acd14ce0be0269cf75b6e338a727259b
   Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
@@ -1562,8 +1573,8 @@ SPEC CHECKSUMS:
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 34304f8c6e8fa68f63a5fe29af82f227d817d7a7
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  lottie-ios: 69495122151a378fdc7d1bb4c5930347e37baf1f
-  lottie-react-native: 8f9d4be452e23f6e5ca0fdc11669dc99ab52be81
+  lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e
+  lottie-react-native: a2ae9c27c273b060b2affff2957bc0ff7fdca353
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
   RCTRequired: 6dda55e483f75d2b43781d8ad5bd7df276a50981
@@ -1586,13 +1597,13 @@ SPEC CHECKSUMS:
   React-jsinspector: 369048694e39942063c5d08e9580b43e2edd379a
   React-logger: e0c1e918d9588a9f39c9bc62d9d6bfe9ca238d9d
   React-Mapbuffer: 9731a0a63ebaf8976014623c4d637744d7353a7c
-  react-native-cameraroll: 2a198b0eb86c7ccf3303fb57702b2465cc292c94
+  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-skia: d0f00846bcb36cdf1fb6d8cdbc4ca755348894fa
+  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
+  react-native-skia: 4b2ef340e599c4d3ec13001a7158f79d873d4a5c
   react-native-slider: 2ae4b4aa6f5ed9a25d546e590e83c0fc9ccfd58c
   react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
   react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
@@ -1617,7 +1628,7 @@ SPEC CHECKSUMS:
   React-utils: debda2c206770ee2785bdebb7f16d8db9f18838a
   ReactCommon: ddb128564dcbfa0287d3d1a2d10f8c7457c971f6
   RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
-  RNCClipboard: 204b94473a99932e314b730a81363e0bf795a60d
+  RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
   RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
   RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
   RNDeviceInfo: db5c64a060e66e5db3102d041ebe3ef307a85120
@@ -1627,6 +1638,7 @@ SPEC CHECKSUMS:
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
+  UMAppLoader: 5df85360d65cabaef544be5424ac64672e648482
   Yoga: 4f53dc50008d626fa679c7a1cb4bed898f8c0bde
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 

diff --git a/ios/taroDemo.xcodeproj/project.pbxproj b/ios/taroDemo.xcodeproj/project.pbxproj
@@ -597,9 +597,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2ULWQK4QBS;
+				DEVELOPMENT_TEAM = UVRDSF5DKW;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = taroDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
@@ -615,7 +616,7 @@
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = taroDemo;
-				PROVISIONING_PROFILE_SPECIFIER = taro_demo_dev_profile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -628,9 +629,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 2ULWQK4QBS;
+				DEVELOPMENT_TEAM = UVRDSF5DKW;
 				INFOPLIST_FILE = taroDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -645,7 +647,7 @@
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = taroDemo;
-				PROVISIONING_PROFILE_SPECIFIER = taro_demo_dev_profile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};

diff --git a/ios/taroDemo/Info.plist b/ios/taroDemo/Info.plist
@@ -56,6 +56,8 @@
 	<string>Taro Playground 使用您的地理位置信息，用于展示获取位置信息 API。</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Taro Playground 使用您的麦克风，用于展示相机组件的录像功能。</string>
+	<key>NSMotionUsageDescription</key>
+	<string>Taro Playground 使用您的运动与健康数据，用于展示运动传感器相关 API。</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>Taro Playground 使用您的照片，用于展示照片相关 API。</string>
 	<key>NSPhotoLibraryUsageDescription</key>

diff --git a/package.json b/package.json
@@ -30,11 +30,11 @@
     "dev:quickapp": "npm run build:quickapp -- --watch",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "start": "react-native start",
+    "start": "react-native start --custom-log-reporter-path @tarojs/rn-supporter/TerminalReporter.js",
     "link": "react-native link",
     "update-version": "sh ./bin/update_version.sh",
     "podInstall": "pod-install",
-    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@3.7.0-canary.6 -o -Y && install-peerdeps @tarojs/components-rn@3.7.0-canary.6 -o -Y && install-peerdeps @tarojs/router-rn@3.7.0-canary.6 -o -Y && pod-install"
+    "upgradePeerdeps": "install-peerdeps @tarojs/taro-rn@4.0.0-canary.1 -o -Y && install-peerdeps @tarojs/components-rn@4.0.0-canary.1 -o -Y && install-peerdeps @tarojs/router-rn@4.0.0-canary.1 -o -Y && pod-install"
   },
   "browserslist": [
     "last 3 versions",
@@ -54,24 +54,24 @@
     "@react-native-masked-view/masked-view": "~0.3.1",
     "@react-native-picker/picker": "~2.6.1",
     "@shopify/flash-list": "^1.3.1",
-    "@shopify/react-native-skia": "^0.1.156",
-    "@tarojs/components": "3.7.0-canary.6",
-    "@tarojs/components-rn": "3.7.0-canary.6",
-    "@tarojs/helper": "3.7.0-canary.6",
-    "@tarojs/plugin-framework-react": "3.7.0-canary.6",
-    "@tarojs/plugin-html": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-alipay": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-h5": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-jd": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-qq": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-swan": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-tt": "3.7.0-canary.6",
-    "@tarojs/plugin-platform-weapp": "3.7.0-canary.6",
-    "@tarojs/react": "3.7.0-canary.6",
-    "@tarojs/runtime": "3.7.0-canary.6",
-    "@tarojs/shared": "3.7.0-canary.6",
-    "@tarojs/taro": "3.7.0-canary.6",
-    "@tarojs/taro-rn": "3.7.0-canary.6",
+    "@shopify/react-native-skia": "0.1.222",
+    "@tarojs/components": "4.0.0-canary.1",
+    "@tarojs/components-rn": "4.0.0-canary.1",
+    "@tarojs/helper": "4.0.0-canary.1",
+    "@tarojs/plugin-framework-react": "4.0.0-canary.1",
+    "@tarojs/plugin-html": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-alipay": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-h5": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-jd": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-qq": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-swan": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-tt": "4.0.0-canary.1",
+    "@tarojs/plugin-platform-weapp": "4.0.0-canary.1",
+    "@tarojs/react": "4.0.0-canary.1",
+    "@tarojs/runtime": "4.0.0-canary.1",
+    "@tarojs/shared": "4.0.0-canary.1",
+    "@tarojs/taro": "4.0.0-canary.1",
+    "@tarojs/taro-rn": "4.0.0-canary.1",
     "@wuba/react-native-echarts": "1.2.5",
     "d3-hierarchy": "^3.1.2",
     "echarts": "^5.4.1",
@@ -89,8 +89,8 @@
     "expo-sensors": "~12.9.0",
     "expo-task-manager": "~11.7.0",
     "linear-gradient-taro": "^1.0.1",
-    "lottie-ios": "3.4.0",
-    "lottie-react-native": "^5.1.6",
+    "lottie-ios": "^4.3.4",
+    "lottie-react-native": "^6.4.1",
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
     "react": "^18.2.0",
@@ -116,18 +116,18 @@
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
     "@react-native/metro-config": "^0.73.2",
     "@react-native/typescript-config": "^0.73.1",
-    "@tarojs/cli": "3.7.0-canary.6",
-    "@tarojs/plugin-mini-ci": "3.7.0-canary.6",
-    "@tarojs/rn-runner": "3.7.0-canary.6",
-    "@tarojs/webpack5-runner": "3.7.0-canary.6",
+    "@tarojs/cli": "4.0.0-canary.1",
+    "@tarojs/plugin-mini-ci": "4.0.0-canary.1",
+    "@tarojs/rn-runner": "4.0.0-canary.1",
+    "@tarojs/webpack5-runner": "4.0.0-canary.1",
     "@types/jest": "^29.2.1",
     "@types/react": "^18.0.24",
     "@types/webpack-env": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
-    "babel-preset-taro": "3.7.0-canary.6",
+    "babel-preset-taro": "4.0.0-canary.1",
     "eslint": "^8.12.0",
-    "eslint-config-taro": "3.7.0-canary.6",
+    "eslint-config-taro": "4.0.0-canary.1",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",