@bravemobile/react-native-code-push 12.4.0 → 13.0.0

package/cli/dist/functions/runHermesEmitBinaryCommand.js

@@ -4,6 +4,7 @@
 import childProcess from "child_process";
 import fs from "fs";
 import path from "path";
+import { createRequire } from "node:module";
 import shell from "shelljs";
 /**
  * Run Hermes compile CLI command
@@ -12,9 +13,10 @@ import shell from "shelljs";
  * @param outputPath {string} Path to output .hbc file
  * @param sourcemapOutput {string} Path to output sourcemap file (Warning: if sourcemapOutput points to the outputPath, the sourcemap will be included in the CodePush bundle and increase the deployment size)
  * @param extraHermesFlags {string[]} Additional options to pass to `hermesc` command
+ * @param projectRoot {string} Root directory of the target app project used to resolve the app's React Native module and locate the matching Hermes compiler. Defaults to the current working directory.
  * @return {Promise<void>}
  */
-export async function runHermesEmitBinaryCommand(bundleName, outputPath, sourcemapOutput, extraHermesFlags = []) {
+export async function runHermesEmitBinaryCommand(bundleName, outputPath, sourcemapOutput, extraHermesFlags = [], projectRoot = process.cwd()) {
     const hermesArgs = [
         '-emit-binary',
         '-out',
@@ -28,7 +30,7 @@ export async function runHermesEmitBinaryCommand(bundleName, outputPath, sourcem
     console.log('Converting JS bundle to byte code via Hermes, running command:\n');
     return new Promise((resolve, reject) => {
         try {
-            const hermesCommand = getHermesCommand();
+            const hermesCommand = getHermesCommand(projectRoot);
             const disableAllWarningsArg = '-w';
             shell.exec(`${hermesCommand} ${hermesArgs.join(' ')} ${disableAllWarningsArg}`);
             // Copy HBC bundle to overwrite JS bundle
@@ -47,7 +49,7 @@ export async function runHermesEmitBinaryCommand(bundleName, outputPath, sourcem
             return;
         }
         // compose-source-maps.js file path
-        const composeSourceMapsPath = getComposeSourceMapsPath();
+        const composeSourceMapsPath = getComposeSourceMapsPath(projectRoot);
         if (composeSourceMapsPath === null) {
             throw new Error('react-native compose-source-maps.js scripts is not found');
         }
@@ -87,7 +89,7 @@ export async function runHermesEmitBinaryCommand(bundleName, outputPath, sourcem
         });
     });
 }
-function getHermesCommand() {
+function getHermesCommand(projectRoot) {
     const fileExists = (file) => {
         try {
             return fs.statSync(file).isFile();
@@ -96,7 +98,7 @@ function getHermesCommand() {
             return false;
         }
     };
-    const hermescExecutable = path.join(getHermesCompilerPath(), getHermesOSBin(), getHermesOSExe());
+    const hermescExecutable = path.join(getHermesCompilerPath(projectRoot), getHermesOSBin(), getHermesOSExe());
     if (fileExists(hermescExecutable)) {
         return hermescExecutable;
     }
@@ -124,45 +126,67 @@ function getHermesOSExe() {
             return hermesExecutableName;
     }
 }
-function getComposeSourceMapsPath() {
+function getComposeSourceMapsPath(projectRoot) {
     // detect if compose-source-maps.js script exists
-    const composeSourceMaps = path.join(getReactNativePackagePath(), 'scripts', 'compose-source-maps.js');
+    const composeSourceMaps = path.join(getReactNativePackagePath(projectRoot), 'scripts', 'compose-source-maps.js');
     if (fs.existsSync(composeSourceMaps)) {
         return composeSourceMaps;
     }
     return null;
 }
-function getReactNativePackagePath() {
-    const result = childProcess.spawnSync('node', [
-        '--print',
-        "require.resolve('react-native/package.json')",
-    ]);
-    const packagePath = path.dirname(result.stdout.toString());
-    if (result.status === 0 && directoryExistsSync(packagePath)) {
+function getReactNativePackagePath(projectRoot) {
+    const packagePath = resolvePackageRoot(projectRoot, 'react-native');
+    if (packagePath !== null) {
         return packagePath;
     }
-    return path.join('node_modules', 'react-native');
+    return path.join(projectRoot, 'node_modules', 'react-native');
 }
-function getHermescDirPathInHermesCompilerPackage() {
-    const result = childProcess.spawnSync('node', [
-        '--print',
-        "require.resolve('hermes-compiler/package.json')",
-    ]);
-    const packagePath = path.dirname(result.stdout.toString());
-    const hermescDirPath = path.join(packagePath, 'hermesc');
-    if (result.status === 0 && directoryExistsSync(hermescDirPath)) {
+function getHermescDirPathInHermesCompilerPackage(projectRoot) {
+    const reactNativePackagePath = getReactNativePackagePath(projectRoot);
+    const hermescDirPath = path.join(path.dirname(reactNativePackagePath), 'hermes-compiler', 'hermesc');
+    if (directoryExistsSync(hermescDirPath)) {
         return hermescDirPath;
     }
     return null;
 }
-function getHermesCompilerPath() {
-    const hermescDirPath = getHermescDirPathInHermesCompilerPackage();
+function getHermesCompilerPath(projectRoot) {
+    const hermescDirPath = getHermescDirPathInHermesCompilerPackage(projectRoot);
     if (hermescDirPath) {
         // Since react-native 0.83, Hermes compiler executables are in 'hermes-compiler' package
         return hermescDirPath;
     }
     else {
-        return path.join(getReactNativePackagePath(), 'sdks', 'hermesc');
+        return path.join(getReactNativePackagePath(projectRoot), 'sdks', 'hermesc');
+    }
+}
+function resolvePackageRoot(projectRoot, packageName) {
+    try {
+        const projectRequire = createRequire(path.join(projectRoot, 'package.json'));
+        const resolvedPath = projectRequire.resolve(packageName);
+        return findPackageRoot(packageName, resolvedPath);
+    }
+    catch {
+        return null;
+    }
+}
+function findPackageRoot(packageName, resolvedPath) {
+    let currentPath = path.dirname(resolvedPath);
+    while (true) {
+        const packageJsonPath = path.join(currentPath, 'package.json');
+        try {
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            if (packageJson.name === packageName) {
+                return currentPath;
+            }
+        }
+        catch {
+            // Continue traversing upward until the package root is found.
+        }
+        const parentPath = path.dirname(currentPath);
+        if (parentPath === currentPath) {
+            return null;
+        }
+        currentPath = parentPath;
     }
 }
 function directoryExistsSync(dirname) {

package/cli/functions/runHermesEmitBinaryCommand.ts

@@ -5,6 +5,7 @@
 import childProcess from "child_process";
 import fs from "fs";
 import path from "path";
+import { createRequire } from "node:module";
 import shell from "shelljs";
 
 /**
@@ -14,6 +15,7 @@ import shell from "shelljs";
  * @param outputPath {string} Path to output .hbc file
  * @param sourcemapOutput {string} Path to output sourcemap file (Warning: if sourcemapOutput points to the outputPath, the sourcemap will be included in the CodePush bundle and increase the deployment size)
  * @param extraHermesFlags {string[]} Additional options to pass to `hermesc` command
+ * @param projectRoot {string} Root directory of the target app project used to resolve the app's React Native module and locate the matching Hermes compiler. Defaults to the current working directory.
  * @return {Promise<void>}
  */
 export async function runHermesEmitBinaryCommand(
@@ -21,6 +23,7 @@ export async function runHermesEmitBinaryCommand(
     outputPath: string,
     sourcemapOutput: string,
     extraHermesFlags: string[] = [],
+    projectRoot: string = process.cwd(),
 ): Promise<void> {
     const hermesArgs: string[] = [
         '-emit-binary',
@@ -37,7 +40,7 @@ export async function runHermesEmitBinaryCommand(
 
     return new Promise<void>((resolve, reject) => {
         try {
-            const hermesCommand = getHermesCommand();
+            const hermesCommand = getHermesCommand(projectRoot);
 
             const disableAllWarningsArg = '-w';
             shell.exec(`${hermesCommand} ${hermesArgs.join(' ')} ${disableAllWarningsArg}`);
@@ -58,7 +61,7 @@ export async function runHermesEmitBinaryCommand(
         }
 
         // compose-source-maps.js file path
-        const composeSourceMapsPath = getComposeSourceMapsPath();
+        const composeSourceMapsPath = getComposeSourceMapsPath(projectRoot);
         if (composeSourceMapsPath === null) {
             throw new Error('react-native compose-source-maps.js scripts is not found');
         }
@@ -106,7 +109,7 @@ export async function runHermesEmitBinaryCommand(
     });
 }
 
-function getHermesCommand(): string {
+function getHermesCommand(projectRoot: string): string {
     const fileExists = (file: string): boolean => {
         try {
             return fs.statSync(file).isFile();
@@ -115,7 +118,7 @@ function getHermesCommand(): string {
         }
     };
 
-    const hermescExecutable = path.join(getHermesCompilerPath(), getHermesOSBin(), getHermesOSExe());
+    const hermescExecutable = path.join(getHermesCompilerPath(projectRoot), getHermesOSBin(), getHermesOSExe());
     if (fileExists(hermescExecutable)) {
         return hermescExecutable;
     }
@@ -146,48 +149,75 @@ function getHermesOSExe(): string {
     }
 }
 
-function getComposeSourceMapsPath(): string | null {
+function getComposeSourceMapsPath(projectRoot: string): string | null {
     // detect if compose-source-maps.js script exists
-    const composeSourceMaps = path.join(getReactNativePackagePath(), 'scripts', 'compose-source-maps.js');
+    const composeSourceMaps = path.join(getReactNativePackagePath(projectRoot), 'scripts', 'compose-source-maps.js');
     if (fs.existsSync(composeSourceMaps)) {
         return composeSourceMaps;
     }
     return null;
 }
 
-function getReactNativePackagePath(): string {
-    const result = childProcess.spawnSync('node', [
-        '--print',
-        "require.resolve('react-native/package.json')",
-    ]);
-    const packagePath = path.dirname(result.stdout.toString());
-    if (result.status === 0 && directoryExistsSync(packagePath)) {
+function getReactNativePackagePath(projectRoot: string): string {
+    const packagePath = resolvePackageRoot(projectRoot, 'react-native');
+    if (packagePath !== null) {
         return packagePath;
     }
 
-    return path.join('node_modules', 'react-native');
+    return path.join(projectRoot, 'node_modules', 'react-native');
 }
 
-function getHermescDirPathInHermesCompilerPackage() {
-    const result = childProcess.spawnSync('node', [
-        '--print',
-        "require.resolve('hermes-compiler/package.json')",
-    ]);
-    const packagePath = path.dirname(result.stdout.toString());
-    const hermescDirPath = path.join(packagePath, 'hermesc');
-    if (result.status === 0 && directoryExistsSync(hermescDirPath)) {
+function getHermescDirPathInHermesCompilerPackage(projectRoot: string) {
+    const reactNativePackagePath = getReactNativePackagePath(projectRoot);
+    const hermescDirPath = path.join(path.dirname(reactNativePackagePath), 'hermes-compiler', 'hermesc');
+
+    if (directoryExistsSync(hermescDirPath)) {
         return hermescDirPath;
     }
+
     return null;
 }
 
-function getHermesCompilerPath() {
-    const hermescDirPath = getHermescDirPathInHermesCompilerPackage();
+function getHermesCompilerPath(projectRoot: string) {
+    const hermescDirPath = getHermescDirPathInHermesCompilerPackage(projectRoot);
     if (hermescDirPath) {
         // Since react-native 0.83, Hermes compiler executables are in 'hermes-compiler' package
         return hermescDirPath
     } else {
-        return path.join(getReactNativePackagePath(), 'sdks', 'hermesc');
+        return path.join(getReactNativePackagePath(projectRoot), 'sdks', 'hermesc');
+    }
+}
+
+function resolvePackageRoot(projectRoot: string, packageName: string): string | null {
+    try {
+        const projectRequire = createRequire(path.join(projectRoot, 'package.json'));
+        const resolvedPath = projectRequire.resolve(packageName);
+        return findPackageRoot(packageName, resolvedPath);
+    } catch {
+        return null;
+    }
+}
+
+function findPackageRoot(packageName: string, resolvedPath: string): string | null {
+    let currentPath = path.dirname(resolvedPath);
+
+    while (true) {
+        const packageJsonPath = path.join(currentPath, 'package.json');
+
+        try {
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) as { name?: string };
+            if (packageJson.name === packageName) {
+                return currentPath;
+            }
+        } catch {
+            // Continue traversing upward until the package root is found.
+        }
+
+        const parentPath = path.dirname(currentPath);
+        if (parentPath === currentPath) {
+            return null;
+        }
+        currentPath = parentPath;
     }
 }
 

package/ios/CodePush/CodePush.h

@@ -1,14 +1,40 @@
-#if __has_include(<React/RCTEventEmitter.h>)
-#import <React/RCTEventEmitter.h>
-#elif __has_include("RCTEventEmitter.h")
-#import "RCTEventEmitter.h"
+#import <Foundation/Foundation.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  #if defined(__cplusplus)
+    #if __has_include(<RNCodePushSpec/RNCodePushSpec.h>)
+      #import <RNCodePushSpec/RNCodePushSpec.h>
+    #elif __has_include("RNCodePushSpec.h")
+      #import "RNCodePushSpec.h"
+    #endif
+  #else
+    #if __has_include(<React/RCTBridgeModule.h>)
+      #import <React/RCTBridgeModule.h>
+    #elif __has_include("RCTBridgeModule.h")
+      #import "RCTBridgeModule.h"
+    #else
+      #import "React/RCTBridgeModule.h"
+    #endif
+  #endif
 #else
-#import "React/RCTEventEmitter.h"   // Required when used as a Pod in a Swift project
+  #if __has_include(<React/RCTEventEmitter.h>)
+    #import <React/RCTEventEmitter.h>
+  #elif __has_include("RCTEventEmitter.h")
+    #import "RCTEventEmitter.h"
+  #else
+    #import "React/RCTEventEmitter.h"   // Required when used as a Pod in a Swift project
+  #endif
 #endif
 
-#import <Foundation/Foundation.h>
-
+#ifdef RCT_NEW_ARCH_ENABLED
+  #if defined(__cplusplus)
+@interface CodePush : NativeCodePushSpecBase
+  #else
+@interface CodePush : NSObject <RCTBridgeModule>
+  #endif
+#else
 @interface CodePush : RCTEventEmitter
+#endif
 
 + (NSURL *)binaryBundleURL;
 /*
@@ -68,7 +94,7 @@
  * This information will be used to decide whether the application
  * should ignore the update or not.
  */
-+ (NSDictionary*)getRollbackInfo;
++ (NSDictionary*)getLatestRollbackInfo;
 /*
  * This method is used to save information about the latest rollback.
  * This information will be used to decide whether the application
@@ -203,7 +229,13 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 @end
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 void CPLog(NSString *formatString, ...);
+#if defined(__cplusplus)
+}
+#endif
 
 typedef NS_ENUM(NSInteger, CodePushInstallMode) {
     CodePushInstallModeImmediate,

package/ios/CodePush/{CodePush.m → CodePush.mm}

@@ -8,7 +8,11 @@
 
 #import "CodePush.h"
 
-@interface CodePush () <RCTBridgeModule, RCTFrameUpdateObserver>
+@interface CodePush () <RCTFrameUpdateObserver
+#ifdef RCT_NEW_ARCH_ENABLED
+, NativeCodePushSpec
+#endif
+>
 @end
 
 @implementation CodePush {
@@ -62,6 +66,7 @@ static NSString *const PackageIsPendingKey = @"isPending";
 static BOOL isRunningBinaryVersion = NO;
 static BOOL needToReportRollback = NO;
 static BOOL testConfigurationFlag = NO;
+static BOOL hasInitializedUpdateAfterRestartForCurrentLoad = NO;
 
 // These values are used to save the NS bundle, name, extension and subdirectory
 // for the JS bundle in the binary.
@@ -246,6 +251,9 @@ static NSString *const LatestRollbackCountKey = @"count";
 
 #pragma mark - Private API methods
 
+#ifdef RCT_NEW_ARCH_ENABLED
+@synthesize bridge = _bridge;
+#endif
 @synthesize methodQueue = _methodQueue;
 @synthesize pauseCallback = _pauseCallback;
 @synthesize paused = _paused;
@@ -269,7 +277,7 @@ static NSString *const LatestRollbackCountKey = @"count";
 - (void)clearDebugUpdates
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        if ([super.bridge.bundleURL.scheme hasPrefix:@"http"]) {
+        if ([self.bridge.bundleURL.scheme hasPrefix:@"http"]) {
             NSError *error;
             NSString *binaryAppVersion = [[CodePushConfig current] appVersion];
             NSDictionary *currentPackageMetadata = [CodePushPackage getCurrentPackage:&error];
@@ -283,28 +291,6 @@ static NSString *const LatestRollbackCountKey = @"count";
     });
 }
 
-/*
- * This method is used by the React Native bridge to allow
- * our plugin to expose constants to the JS-side. In our case
- * we're simply exporting enum values so that the JS and Native
- * sides of the plugin can be in sync.
- */
-- (NSDictionary *)constantsToExport
-{
-    // Export the values of the CodePushInstallMode and CodePushUpdateState
-    // enums so that the script-side can easily stay in sync
-    return @{
-             @"codePushInstallModeOnNextRestart":@(CodePushInstallModeOnNextRestart),
-             @"codePushInstallModeImmediate": @(CodePushInstallModeImmediate),
-             @"codePushInstallModeOnNextResume": @(CodePushInstallModeOnNextResume),
-             @"codePushInstallModeOnNextSuspend": @(CodePushInstallModeOnNextSuspend),
-
-             @"codePushUpdateStateRunning": @(CodePushUpdateStateRunning),
-             @"codePushUpdateStatePending": @(CodePushUpdateStatePending),
-             @"codePushUpdateStateLatest": @(CodePushUpdateStateLatest)
-            };
-};
-
 + (BOOL)requiresMainQueueSetup
 {
     return YES;
@@ -319,13 +305,16 @@ static NSString *const LatestRollbackCountKey = @"count";
 
 - (void)dispatchDownloadProgressEvent {
   // Notify the script-side about the progress
-  [self sendEventWithName:DownloadProgressEvent
-                     body:@{
-                       @"totalBytes" : [NSNumber
-                           numberWithLongLong:_latestExpectedContentLength],
-                       @"receivedBytes" : [NSNumber
-                           numberWithLongLong:_latestReceivedConentLength]
-                     }];
+  NSDictionary *progress = @{
+    @"totalBytes" : [NSNumber numberWithLongLong:_latestExpectedContentLength],
+    @"receivedBytes" : [NSNumber numberWithLongLong:_latestReceivedConentLength]
+  };
+
+#ifndef RCT_NEW_ARCH_ENABLED
+  [self sendEventWithName:DownloadProgressEvent body:progress];
+#else
+  [self emitOnDownloadProgress:progress];
+#endif
 }
 
 - (void)dispatchThrottledDownloadProgressEventWithForce:(BOOL)force
@@ -385,7 +374,12 @@ static NSString *const LatestRollbackCountKey = @"count";
 
     self = [super init];
     if (self) {
-        [self initializeUpdateAfterRestart];
+        @synchronized([CodePush class]) {
+            if (!hasInitializedUpdateAfterRestartForCurrentLoad) {
+                hasInitializedUpdateAfterRestartForCurrentLoad = YES;
+                [self initializeUpdateAfterRestart];
+            }
+        }
     }
 
     return self;
@@ -535,6 +529,10 @@ static NSString *const LatestRollbackCountKey = @"count";
  */
 - (void)loadBundle
 {
+    @synchronized([CodePush class]) {
+        hasInitializedUpdateAfterRestartForCurrentLoad = NO;
+    }
+
     // This needs to be async dispatched because the bridge is not set on init
     // when the app first starts, therefore rollbacks will not take effect.
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -542,8 +540,8 @@ static NSString *const LatestRollbackCountKey = @"count";
         // is debugging and therefore, shouldn't be redirected to a local
         // file (since Chrome wouldn't support it). Otherwise, update
         // the current bundle URL to point at the latest update
-        if ([CodePush isUsingTestConfiguration] || ![super.bridge.bundleURL.scheme hasPrefix:@"http"]) {
-            [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
+        if ([CodePush isUsingTestConfiguration] || ![self.bridge.bundleURL.scheme hasPrefix:@"http"]) {
+            [self.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
         }
 
         RCTTriggerReloadCommandListeners(@"CodePush reload");
@@ -713,8 +711,8 @@ static NSString *const LatestRollbackCountKey = @"count";
  */
 RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
                   notifyProgress:(BOOL)notifyProgress
-                        resolver:(RCTPromiseResolveBlock)resolve
-                        rejecter:(RCTPromiseRejectBlock)reject)
+                         resolve:(RCTPromiseResolveBlock)resolve
+                          reject:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary *mutableUpdatePackage = [updatePackage mutableCopy];
     NSURL *binaryBundleURL = [CodePush binaryBundleURL];
@@ -813,7 +811,7 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
  * app version, as well as the deployment key that was configured in the Info.plist file.
  */
 RCT_EXPORT_METHOD(getConfiguration:(RCTPromiseResolveBlock)resolve
-                          rejecter:(RCTPromiseRejectBlock)reject)
+                            reject:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary *configuration = [[CodePushConfig current] configuration];
     NSError *error;
@@ -846,10 +844,11 @@ RCT_EXPORT_METHOD(getConfiguration:(RCTPromiseResolveBlock)resolve
 /*
  * This method is the native side of the CodePush.getUpdateMetadata method.
  */
-RCT_EXPORT_METHOD(getUpdateMetadata:(CodePushUpdateState)updateState
-                           resolver:(RCTPromiseResolveBlock)resolve
-                           rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(getUpdateMetadata:(double)updateStateValue
+                            resolve:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject)
 {
+    CodePushUpdateState updateState = (CodePushUpdateState)updateStateValue;
     NSError *error;
     NSMutableDictionary *package = [[CodePushPackage getCurrentPackage:&error] mutableCopy];
 
@@ -895,11 +894,13 @@ RCT_EXPORT_METHOD(getUpdateMetadata:(CodePushUpdateState)updateState
  * This method is the native side of the LocalPackage.install method.
  */
 RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
-                    installMode:(CodePushInstallMode)installMode
-      minimumBackgroundDuration:(int)minimumBackgroundDuration
-                       resolver:(RCTPromiseResolveBlock)resolve
-                       rejecter:(RCTPromiseRejectBlock)reject)
+                    installMode:(double)installModeValue
+      minimumBackgroundDuration:(double)minimumBackgroundDurationValue
+                         resolve:(RCTPromiseResolveBlock)resolve
+                          reject:(RCTPromiseRejectBlock)reject)
 {
+    CodePushInstallMode installMode = (CodePushInstallMode)installModeValue;
+    int minimumBackgroundDuration = (int)minimumBackgroundDurationValue;
     NSError *error;
     [CodePushPackage installPackage:updatePackage
                 removePendingUpdate:[[self class] isPendingUpdate:nil]
@@ -965,7 +966,7 @@ RCT_EXPORT_METHOD(setLatestRollbackInfo:(NSString *)packageHash
 
 
 RCT_EXPORT_METHOD(getLatestRollbackInfo:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                            reject:(RCTPromiseRejectBlock)reject)
 {
     NSDictionary *latestRollbackInfo = [[self class] getLatestRollbackInfo];
     resolve(latestRollbackInfo);
@@ -977,7 +978,7 @@ RCT_EXPORT_METHOD(getLatestRollbackInfo:(RCTPromiseResolveBlock)resolve
  */
 RCT_EXPORT_METHOD(isFirstRun:(NSString *)packageHash
                      resolve:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
+                      reject:(RCTPromiseRejectBlock)reject)
 {
     NSError *error;
     BOOL isFirstRun = _isFirstRunAfterUpdate
@@ -992,14 +993,13 @@ RCT_EXPORT_METHOD(isFirstRun:(NSString *)packageHash
  * This method is the native side of the CodePush.notifyApplicationReady() method.
  */
 RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve
-                                rejecter:(RCTPromiseRejectBlock)reject)
+                                  reject:(RCTPromiseRejectBlock)reject)
 {
     [CodePush removePendingUpdate];
     resolve(nil);
 }
 
-RCT_EXPORT_METHOD(allow:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(allow)
 {
     CPLog(@"Re-allowing restarts.");
     _allowed = YES;
@@ -1010,34 +1010,25 @@ RCT_EXPORT_METHOD(allow:(RCTPromiseResolveBlock)resolve
         [_restartQueue removeObjectAtIndex:0];
         [self restartAppInternal:buf];
     }
-
-    resolve(nil);
 }
 
-RCT_EXPORT_METHOD(clearPendingRestart:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(clearPendingRestart)
 {
     [_restartQueue removeAllObjects];
-    resolve(nil);
 }
 
-RCT_EXPORT_METHOD(disallow:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(disallow)
 {
     CPLog(@"Disallowing restarts.");
     _allowed = NO;
-    resolve(nil);
 }
 
 /*
  * This method is the native side of the CodePush.restartApp() method.
  */
-RCT_EXPORT_METHOD(restartApp:(BOOL)onlyIfUpdateIsPending
-                     resolve:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(restartApp:(BOOL)onlyIfUpdateIsPending)
 {
     [self restartAppInternal:onlyIfUpdateIsPending];
-    resolve(nil);
 }
 
 /*
@@ -1071,7 +1062,7 @@ RCT_EXPORT_METHOD(downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl)
  * or an update failed) and return its details (version label, status).
  */
 RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve
-                            rejecter:(RCTPromiseRejectBlock)reject)
+                              reject:(RCTPromiseRejectBlock)reject)
 {
     if (needToReportRollback) {
         needToReportRollback = NO;
@@ -1128,4 +1119,12 @@ RCT_EXPORT_METHOD(saveStatusReportForRetry:(NSDictionary *)statusReport)
     _didUpdateProgress = NO;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeCodePushSpecJSI>(params);
+}
+#endif
+
 @end