react-native-update 9.0.0-beta.2 → 9.0.0-beta.3

package/ios/RCTPushy/RCTPushy.mm

@@ -53,6 +53,7 @@ typedef NS_ENUM(NSInteger, PushyType) {
 };
 
 static BOOL ignoreRollback = false;
+static BOOL isUsingBundleUrl = false;
 
 @implementation RCTPushy {
     RCTPushyManager *_fileManager;
@@ -65,6 +66,7 @@ RCT_EXPORT_MODULE(RCTPushy);
 
 + (NSURL *)bundleURL
 {
+    isUsingBundleUrl = true;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
@@ -161,6 +163,7 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];
+    ret[@"isUsingBundleUrl"] = @(isUsingBundleUrl);
     
     // clear isFirstTimemarked
     if (ret[@"isFirstTime"]) {

package/lib/{NativeUpdate.js → NativeUpdate.ts}

@@ -1,51 +1,45 @@
-/**
- * @format
- * @flow strict-local
- */
-'use strict';
-
 import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
   getConstants: () => {
-    downloadRootDir: string,
-    packageVersion: string,
-    currentVersion: string,
-    isFirstTime: boolean,
-    rolledBackVersion: string,
-    buildTime: string,
-    blockUpdate: Object,
-    uuid: string,
-    isUsingBundleUrl: boolean,
+    downloadRootDir: string;
+    packageVersion: string;
+    currentVersion: string;
+    isFirstTime: boolean;
+    rolledBackVersion: string;
+    buildTime: string;
+    blockUpdate: Object;
+    uuid: string;
+    isUsingBundleUrl: boolean;
   };
   setLocalHashInfo(hash: string, info: string): Promise<void>;
   getLocalHashInfo(hash: string): Promise<string>;
   setUuid(uuid: string): Promise<void>;
-  setBlockUpdate(options: { reason: string, until: number }): Promise<void>;
+  setBlockUpdate(options: { reason: string; until: number }): Promise<void>;
   reloadUpdate(options: { hash: string }): Promise<void>;
   setNeedUpdate(options: { hash: string }): Promise<void>;
   markSuccess(): Promise<void>;
   downloadPatchFromPpk(options: {
-    updateUrl: string,
-    hash: string,
-    originHash: string,
+    updateUrl: string;
+    hash: string;
+    originHash: string;
   }): Promise<void>;
   downloadPatchFromPackage(options: {
-    updateUrl: string,
-    hash: string,
+    updateUrl: string;
+    hash: string;
   }): Promise<void>;
   downloadFullUpdate(options: {
-    updateUrl: string,
-    hash: string,
+    updateUrl: string;
+    hash: string;
   }): Promise<void>;
   downloadAndInstallApk(options: {
-    url: string,
-    target: string,
-    hash: string,
+    url: string;
+    target: string;
+    hash: string;
   }): Promise<void>;
   addListener(eventName: string): void;
   removeListeners(count: number): void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('Pushy'): ?Spec);
+export default TurboModuleRegistry.get<Spec>('Pushy') as Spec | null;

package/lib/main.ts

@@ -44,7 +44,7 @@ export const buildTime = PushyConstants.buildTime;
 let blockUpdate = PushyConstants.blockUpdate;
 let uuid = PushyConstants.uuid;
 
-if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
+if (!PushyConstants.isUsingBundleUrl) {
   throw new Error(
     'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
   );
@@ -125,7 +125,6 @@ export const cInfo = {
 };
 
 function assertRelease() {
-  // @ts-expect-error
   if (__DEV__) {
     throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
   }

package/lib/simpleUpdate.tsx

@@ -1,5 +1,11 @@
-import React, { PureComponent } from 'react';
-import { Platform, Alert, Linking, AppState } from 'react-native';
+import React, { PureComponent, ComponentType } from 'react';
+import {
+  Platform,
+  Alert,
+  Linking,
+  AppState,
+  NativeEventSubscription,
+} from 'react-native';
 
 import {
   isFirstTime,
@@ -15,7 +21,7 @@ import {
 import { UpdateEventsListener } from './type';
 
 export function simpleUpdate(
-  WrappedComponent: JSX.Element,
+  WrappedComponent: ComponentType,
   options: { appKey?: string; onEvents?: UpdateEventsListener } = {},
 ) {
   const { appKey, onEvents: eventListeners } = options;
@@ -25,10 +31,10 @@ export function simpleUpdate(
   if (typeof eventListeners === 'function') {
     onEvents(eventListeners);
   }
-  // @ts-expect-error
   return __DEV__
     ? WrappedComponent
     : class AppUpdate extends PureComponent {
+        stateListener: NativeEventSubscription;
         componentDidMount() {
           if (isRolledBack) {
             Alert.alert('抱歉', '刚刚更新遭遇错误，已为您恢复到更新前版本');
@@ -79,7 +85,7 @@ export function simpleUpdate(
         checkUpdate = async () => {
           let info;
           try {
-            info = await checkUpdate(appKey);
+            info = await checkUpdate(appKey!);
           } catch (err) {
             Alert.alert('更新检查失败', err.message);
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "9.0.0-beta.2",
+  "version": "9.0.0-beta.3",
   "description": "react-native hot update",
   "main": "lib/index.ts",
   "scripts": {

package/react-native-update.podspec

@@ -2,7 +2,6 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 Pod::Spec.new do |s|
   s.name         = package['name']
   s.version      = package['version']
@@ -41,18 +40,5 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.private_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
-if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-  s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-  s.pod_target_xcconfig    = {
-      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-  }
-
-  s.dependency "React-Codegen"
-  s.dependency "RCT-Folly"
-  s.dependency "RCTRequired"
-  s.dependency "RCTTypeSafety"
-  s.dependency "ReactCommon/turbomodule/core"
-end
+  install_modules_dependencies(s)
 end