Merge branch 'reactnativecn:master' into master

Author: bozaigao

Example/testHotUpdate/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         compileSdkVersion = 35
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        kotlinVersion = "1.9.25"
     }
     repositories {
         google()

Example/testHotUpdate/bun.lock

@@ -1242,7 +1242,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context (5.1.0):
+  - react-native-safe-area-context (5.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1255,8 +1255,8 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-safe-area-context/common (= 5.1.0)
-    - react-native-safe-area-context/fabric (= 5.1.0)
+    - react-native-safe-area-context/common (= 5.2.0)
+    - react-native-safe-area-context/fabric (= 5.2.0)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1265,7 +1265,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context/common (5.1.0):
+  - react-native-safe-area-context/common (5.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1286,7 +1286,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context/fabric (5.1.0):
+  - react-native-safe-area-context/fabric (5.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1308,7 +1308,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-update (10.22.0):
+  - react-native-update (10.23.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1322,8 +1322,8 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-update/HDiffPatch (= 10.22.0)
-    - react-native-update/RCTPushy (= 10.22.0)
+    - react-native-update/HDiffPatch (= 10.23.0)
+    - react-native-update/RCTPushy (= 10.23.0)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1333,7 +1333,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/HDiffPatch (10.22.0):
+  - react-native-update/HDiffPatch (10.23.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1356,7 +1356,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/RCTPushy (10.22.0):
+  - react-native-update/RCTPushy (10.23.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1646,7 +1646,50 @@ PODS:
     - React-logger (= 0.76.6)
     - React-perflogger (= 0.76.6)
     - React-utils (= 0.76.6)
-  - ReactNativeCameraKit (14.1.0):
+  - ReactNativeCameraKit (14.2.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - RNSVG (15.11.1):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RNSVG/common (= 15.11.1)
+    - Yoga
+  - RNSVG/common (15.11.1):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1760,6 +1803,7 @@ DEPENDENCIES:
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
+  - RNSVG (from `../node_modules/react-native-svg`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -1900,6 +1944,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   ReactNativeCameraKit:
     :path: "../node_modules/react-native-camera-kit"
+  RNSVG:
+    :path: "../node_modules/react-native-svg"
   RNVectorIcons:
     :path: "../node_modules/react-native-vector-icons"
   Yoga:
@@ -1941,8 +1987,8 @@ SPEC CHECKSUMS:
   React-logger: d42a53754a7252cc7a851315f0da2e46b450ea92
   React-Mapbuffer: 89885d1518433a462fe64b68bf5e097997380090
   React-microtasksnativemodule: 36341e09dcd1df535503e6ed2ddf88f10da56d52
-  react-native-safe-area-context: 0d8827b2420dfb4c8a8e27639585e61b912261be
-  react-native-update: 73336810994cf31c5085070faa1ad4ead5b76e3c
+  react-native-safe-area-context: 5e53e2b0fc3a2994ad0c89a2486e545b6566d8c4
+  react-native-update: 4a39d6a9ae4393fbb165af238dc55b1b79e1b9da
   React-nativeconfig: 539ff4de6ce3b694e8e751080568c281c84903ce
   React-NativeModulesApple: 702246817c286d057e23fe4b1302019796e62521
   React-perflogger: f260e2de95f9dbd002035251559c13bf1f0643d4
@@ -1970,7 +2016,8 @@ SPEC CHECKSUMS:
   React-utils: 1b14c41c3edf4d96db1247a78e0ad96e7ceea011
   ReactCodegen: 0a0eef9c8cd84c932ae1868832086c6441811e84
   ReactCommon: 3c1c8c6d777103c0e60e37c6c5f08e828e2a77c9
-  ReactNativeCameraKit: d4d3b606063d42d34091d53de6193ed4b330bb0c
+  ReactNativeCameraKit: 32b81683fe511833e266d428be942fafc43bea1c
+  RNSVG: c50d29abf38abbf48ebfc50b6258f81099aeabae
   RNVectorIcons: a24016b773380b1aa37fca501ec6b94a951890a0
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

Example/testHotUpdate/ios/Podfile.lock

@@ -14,15 +14,16 @@
     "dev:harmony": "react-native bundle-harmony --dev"
   },
   "dependencies": {
-    "form-data": "^4.0.1",
+    "form-data": "^4.0.2",
     "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
     "react": "18.3.1",
-    "react-native": "0.76.6",
-    "react-native-camera-kit": "^14.1.0",
+    "react-native": "0.76.7",
+    "react-native-camera-kit": "^14.2.0",
     "react-native-paper": "^5.13.1",
-    "react-native-safe-area-context": "^5.1.0",
-    "react-native-update": "^10.22.0",
+    "react-native-safe-area-context": "^5.2.0",
+    "react-native-svg": "^15.11.1",
+    "react-native-update": "^10.23.0",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
@@ -32,10 +33,10 @@
     "@react-native-community/cli": "15.0.1",
     "@react-native-community/cli-platform-android": "15.0.1",
     "@react-native-community/cli-platform-ios": "15.0.1",
-    "@react-native/babel-preset": "0.76.6",
-    "@react-native/eslint-config": "0.76.6",
-    "@react-native/metro-config": "0.76.6",
-    "@react-native/typescript-config": "0.76.6",
+    "@react-native/babel-preset": "0.76.7",
+    "@react-native/eslint-config": "0.76.7",
+    "@react-native/metro-config": "0.76.7",
+    "@react-native/typescript-config": "0.76.7",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",

Example/testHotUpdate/package.json

@@ -20,6 +20,7 @@ import {
   Portal,
 } from 'react-native-paper';
 import {Camera} from 'react-native-camera-kit';
+import {LocalSvg} from 'react-native-svg/css';
 
 import TestConsole from './TestConsole';
 
@@ -91,11 +92,21 @@ function App() {
           />
         </Modal>
       </Portal>
-      <Image
-        resizeMode={'contain'}
-        source={require('./assets/shezhi.png')}
-        style={styles.image}
-      />
+      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+        <Text>png:</Text>
+        <Image
+          resizeMode={'contain'}
+          source={require('./assets/shezhi.png')}
+          style={styles.image}
+        />
+      </View>
+      <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
+        <Text>svg:</Text>
+        <LocalSvg
+          asset={require('./assets/react-logo.svg')}
+          style={{width: 30, height: 30}}
+        />
+      </View>
       <Text style={styles.instructions}>
         这是版本一 {'\n'}
         当前原生包版本号: {packageVersion}

Example/testHotUpdate/src/assets/react-logo.svg

@@ -22,7 +22,7 @@
 ### 本地开发
 
 ```
-$ git clone [email protected]:reactnativecn/react-native-pushy.git
+$ git clone [email protected]:reactnativecn/react-native-update.git
 $ cd react-native-pushy/Example/testHotUpdate
 $ yarn
 $ yarn start
@@ -34,4 +34,4 @@ $ yarn start
 
 本组件由[React Native 中文网](https://reactnative.cn/)独家发布，如有定制需求可以[联系我们](https://reactnative.cn/about.html#content)。
 
-关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-pushy/issues)发帖提问。
+关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-update/issues)发帖提问。

Example/testHotUpdate/src/index.tsx

@@ -0,0 +1 @@
+["https://cresc-server-pthxtmvcnf.ap-southeast-1.fcapp.run"]

README.md

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.22.1",
+  "version": "10.24.1",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -26,7 +26,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/reactnativecn/react-native-pushy.git"
+    "url": "git+https://github.com/reactnativecn/react-native-update.git"
   },
   "keywords": [
     "react-native",
@@ -37,13 +37,13 @@
   "author": "reactnativecn",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/reactnativecn/react-native-pushy/issues"
+    "url": "https://github.com/reactnativecn/react-native-update/issues"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-native": ">=0.59.0"
   },
-  "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
+  "homepage": "https://github.com/reactnativecn/react-native-update#readme",
   "dependencies": {
     "nanoid": "^3.3.3",
     "react-native-url-polyfill": "^2.0.0"
@@ -74,6 +74,5 @@
     "react-native": "0.73",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3"
-  },
-  "packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }

endpoints_cresc.json

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.cocoapods_version = '>= 1.6.0'
   s.platform = :ios, "8.0"
   s.platforms = { :ios => "11.0" }
-  s.source = { :git => 'https://github.com/reactnativecn/react-native-pushy.git', :tag => '#{s.version}' }
+  s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
   s.source_files    = "ios/**/*.{h,m,mm,swift}"
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'