更新 package.json

* update pushy reference method

* update

Example/expoUsePushy/package.json

@@ -13,7 +13,7 @@
     "expo-status-bar": "~2.0.1",
     "react": "18.3.1",
     "react-native": "0.76.9",
-    "react-native-update": "^10.28.5"
+    "react-native-update": "^10.28.7"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

Example/harmony_use_pushy/bun.lock

@@ -4,7 +4,7 @@
     "": {
       "name": "harmony_use_pushy",
       "dependencies": {
-        "@react-native-oh/react-native-harmony": "^0.72.43",
+        "@react-native-oh/react-native-harmony": "^0.72.59",
         "react": "18.2.0",
         "react-native": "0.72.5",
         "react-native-update": "^10.26.4",

Example/harmony_use_pushy/harmony/build-profile.json5

@@ -36,10 +36,6 @@
           ]
         }
       ]
-    },
-    {
-      name: 'pushy',
-      srcPath: '../node_modules/react-native-update/harmony',
     }
   ]
 }

Example/harmony_use_pushy/harmony/entry/oh-package.json5

@@ -7,7 +7,7 @@
   "license": "",
   "dependencies": {
     "@rnoh/react-native-openharmony": "0.72.38",
-    "pushy": "file:../../node_modules/react-native-update/harmony"
+    "pushy": "file:../../node_modules/react-native-update/harmony/pushy.har",
   }
 }
 

Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets

@@ -1,4 +1,4 @@
-import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
+import { PushyFileJSBundleProvider  } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
 import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
   MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
 import {
@@ -65,7 +65,7 @@ struct Index {
               // local debug mode
               new MetroJSBundleProvider(),
               // release mode
-              new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
+              new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
               new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
             ]),
             this.rnohCoreContext.logger),

Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json

@@ -1,4 +1,4 @@
 {
-    "pushy_build_time": "2025-04-12T11:12:43.423Z",
+    "pushy_build_time": "2025-04-30T02:46:33.340Z",
     "versionName": "1.0.0"
 }

Example/harmony_use_pushy/package.json

@@ -15,10 +15,10 @@
     "hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
   },
   "dependencies": {
-    "@react-native-oh/react-native-harmony": "^0.72.43",
+    "@react-native-oh/react-native-harmony": "^0.72.59",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "^10.26.4"
+    "react-native-update": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

android/build.gradle

@@ -78,7 +78,7 @@ if (expoProject) {
     def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
     apply from: expoModulesCorePlugin
     applyKotlinExpoModulesCorePlugin()
-    useExpoPublishing()
+    // useExpoPublishing()
     useCoreDependencies()
 } else {
     group = 'cn.reactnative.modules.update'
@@ -148,7 +148,6 @@ repositories {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
-    implementation 'com.jakewharton:process-phoenix:3.0.0'
 }
 if (isNewArchitectureEnabled()) {
     react {

android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

@@ -20,7 +20,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.jakewharton.processphoenix.ProcessPhoenix;
 
 import java.io.File;
 import java.lang.reflect.Field;

harmony/oh_modules/@rnoh/react-native-openharmony

@@ -1 +0,0 @@
-../../../../../harmony/oh_modules/.ohpm/@rnoh+react-native-openharmony@0.72.38/oh_modules/@rnoh/react-native-openharmony

harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets

@@ -3,7 +3,7 @@ import fileIo from '@ohos.file.fs';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
 
-export class FileJSBundleProvider extends JSBundleProvider {
+export class PushyFileJSBundleProvider extends JSBundleProvider {
   private updateContext: UpdateContext;
   private filePath: string = ''
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.28.7",
+  "version": "10.28.11",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -57,24 +57,20 @@
   "devDependencies": {
     "@babel/core": "^7.25.8",
     "@react-native/babel-preset": "^0.73.21",
-    "@react-native/eslint-config": "^0.73.2",
+    "@react-native/eslint-config": "0.79.1",
-    "@react-native/typescript-config": "^0.74.0",
+    "@react-native/typescript-config": "0.79.1",
-    "@types/fs-extra": "^11.0.4",
+    "@types/jest": "^29.5.14",
-    "@types/jest": "^29.5.13",
+    "@types/node": "^22.15.2",
-    "@types/node": "^22.7.6",
     "@types/react": "^18.3.11",
-    "detox": "^20.27.3",
+    "detox": "^20.37.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-ft-flow": "^3.0.7",
     "firebase-tools": "^13.22.1",
-    "fs-extra": "^11.2.0",
     "jest": "^29.7.0",
-    "pod-install": "^0.2.2",
+    "pod-install": "^0.3.7",
     "prettier": "^2",
     "react": "18.2.0",
     "react-native": "0.73",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
-  },
+  }
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

react-native-update.podspec

@@ -9,7 +9,6 @@ podspec_dir = File.dirname(__FILE__)
 Pod::Spec.new do |s|
 
   is_expo_in_podfile = false
-  is_version_sufficient = false
   begin
     # Check Podfile for use_expo_modules!
     podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
@@ -17,24 +16,67 @@ Pod::Spec.new do |s|
       podfile_content = File.read(podfile_path)
       is_expo_in_podfile = podfile_content.include?('use_expo_modules!')
     end
-    # Check root package.json for Expo version >= 50
+  rescue => e
-    root_package_json_path = File.join(podspec_dir, '..', '..', 'package.json')
+     # Silently ignore errors during check
-    if File.exist?(root_package_json_path)
+  end
-        pkg_json = JSON.parse(File.read(root_package_json_path))
+
-        expo_version_string = pkg_json['dependencies']&.[]('expo') || pkg_json['devDependencies']&.[]('expo')
+  # Determine final validity by checking Podfile presence AND Expo version
-        if expo_version_string
+  valid_expo_project = false # Default
-          match = expo_version_string.match(/\d+/)
+  if is_expo_in_podfile
+    # Only check expo version if use_expo_modules! is present
+    is_version_sufficient = false
+    begin
+        expo_version_str = `node --print \"require('expo/package.json').version\"`.strip
+        if expo_version_str && !expo_version_str.empty?
+          match = expo_version_str.match(/^\d+/)
           if match
             major_version = match[0].to_i
             is_version_sufficient = major_version >= 50
           end
         end
+    rescue
+        # Node command failed, version remains insufficient
+    end
+    
+    # Final check
+    valid_expo_project = is_version_sufficient
+  end
+
+  # Set platform based on whether it's a valid Expo project and if we can parse its target
+  final_ios_deployment_target = '11.0' # Default target
+
+  if valid_expo_project
+    # --- Try to find and parse ExpoModulesCore.podspec only if it's an Expo project ---
+    parsed_expo_ios_target = nil
+    expo_modules_core_podspec_path = begin
+        package_json_path = `node -p "require.resolve('expo-modules-core/package.json')"`.strip
+        File.join(File.dirname(package_json_path), 'ExpoModulesCore.podspec') if $?.success? && package_json_path && !package_json_path.empty?
+    rescue
+        nil
+    end
+
+    if expo_modules_core_podspec_path && File.exist?(expo_modules_core_podspec_path)
+      begin
+        content = File.read(expo_modules_core_podspec_path)
+        match = content.match(/s\.platforms\s*=\s*\{[\s\S]*?:ios\s*=>\s*'([^\']+)'/) # Match within s.platforms hash
+        if match && match[1]
+          parsed_expo_ios_target = match[1]
+        else
+          match = content.match(/s\.platform\s*=\s*:ios,\s*'([^\']+)'/) # Fallback to s.platform = :ios, 'version'
+          if match && match[1]
+            parsed_expo_ios_target = match[1]
+          end
         end
       rescue => e
-     # Silently ignore errors during check
+        # Pod::UI.warn "Failed to read or parse ExpoModulesCore.podspec content: #{e.message}"
       end
-  # Determine final validity
+    end
-  valid_expo_project = is_expo_in_podfile && is_version_sufficient
+    if parsed_expo_ios_target
+        final_ios_deployment_target = parsed_expo_ios_target
+    end
+  end
+
+  s.platforms = { :ios => final_ios_deployment_target }
 
   s.name         = package['name']
   s.version      = package['version']
@@ -45,8 +87,7 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
 
   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-update.git', :tag => '#{s.version}' }
 
   # Conditionally set source files
@@ -92,21 +133,27 @@ Pod::Spec.new do |s|
   # Conditionally add Expo subspec and check ExpoModulesCore version
   if valid_expo_project
     supports_bundle_url_final = false # Default
+
+    # 1. Try executing node to get the version string
+    expo_modules_core_version_str = begin
+      # Use node to directly require expo-modules-core/package.json and get its version
+      `node --print \"require('expo-modules-core/package.json').version\"` # Execute, keep raw output
+    rescue
+      # Node command failed (e.g., node not found, package not found). Return empty string.
+      ''
+    end
+
+    # 2. Process the obtained version string (if not empty)
+    if expo_modules_core_version_str && !expo_modules_core_version_str.empty?
         begin
-      # Check installed ExpoModulesCore version for bundle URL support
+            # Compare versions using Gem::Version (handles trailing newline)
-      expo_core_package_json_path = File.join(podspec_dir, '..', 'expo-modules-core', 'package.json')
+            installed_version = Gem::Version.new(expo_modules_core_version_str)
-      if File.exist?(expo_core_package_json_path)
-          core_package_json = JSON.parse(File.read(expo_core_package_json_path))
-          installed_version_str = core_package_json['version']
-          if installed_version_str
-            installed_version = Gem::Version.new(installed_version_str)
             target_version = Gem::Version.new('1.12.0')
             supports_bundle_url_final = installed_version >= target_version
+        rescue ArgumentError
+            # If Gem::Version fails parsing, supports_bundle_url_final remains false.
         end
     end
-    rescue JSON::ParserError, Errno::ENOENT, ArgumentError, StandardError => e
-      # Pod::UI.warn "Could not check ExpoModulesCore version: #{e.message}"
-    end
 
     s.subspec 'Expo' do |ss|
       ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'