RN 77 Upgrade

.eslintrc.js

@@ -1,10 +1,10 @@
 module.exports = {
   root: true,
-  extends: ['@react-native-community', 'prettier', 'prettier/@typescript-eslint', 'prettier/react'],
+  extends: ['@react-native', 'prettier', 'prettier/@typescript-eslint', 'prettier/react'],
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint'],
   env: {
     jest: true,
-    'jest/globals': true,
   },
 };
+

ReactNativeNavigation.podspec

@@ -19,23 +19,21 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |ss|
     s.source              = { :git => "https://github.com/wix/react-native-navigation.git", :tag => "#{s.version}" }
-    s.source_files    = 'lib/ios/**/*.{h,m,mm,cpp}'
+    s.source_files        = 'lib/ios/**/*.{h,m,mm,cpp}'
     s.exclude_files       = "lib/ios/ReactNativeNavigationTests/**/*.*", "lib/ios/OCMock/**/*.*"
   end
 
+  folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
+  s.pod_target_xcconfig = {
+      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+  }
+
   if fabric_enabled
     install_modules_dependencies(s)
 
-    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1 -Wno-comma -Wno-shorten-64-to-32'
-    fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
-
-    s.pod_target_xcconfig = {
-      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_CFG_NO_COROUTINES=1",
-    }
-
-    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED'
+    s.compiler_flags  = folly_compiler_flags + ' ' + '-DRCT_NEW_ARCH_ENABLED' + ' ' + '-DUSE_HERMES=1'
     s.requires_arc    = true
 
     s.dependency "React"
@@ -46,9 +44,12 @@ Pod::Spec.new do |s|
     s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
+    s.dependency "ReactCommon"
     s.dependency "React-runtimeexecutor"
     s.dependency "React-rncore"
+    s.dependency "React-RuntimeCore"
+  else
+    s.compiler_flags  = folly_compiler_flags
   end
 
   s.dependency 'React-Core'

autolink/postlink/__snapshots__/appDelegateLinker.test.js.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`appDelegateLinker should work for RN 0.68 1`] = `
-"#import \\"AppDelegate.h\\"
+"#import "AppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
 #import <React/RCTBridge.h>
@@ -40,7 +40,7 @@ exports[`appDelegateLinker should work for RN 0.68 1`] = `
 #if RCT_NEW_ARCH_ENABLED
   _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
   _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-  _contextContainer->insert(\\"ReactNativeConfig\\", _reactNativeConfig);
+  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
   _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
   bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
 #endif
@@ -55,9 +55,9 @@ exports[`appDelegateLinker should work for RN 0.68 1`] = `
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@\\"index\\"];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
-  return [[NSBundle mainBundle] URLForResource:@\\"main\\" withExtension:@\\"jsbundle\\"];
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }
 
@@ -105,7 +105,7 @@ exports[`appDelegateLinker should work for RN 0.68 1`] = `
 `;
 
 exports[`appDelegateLinker should work for RN 0.69 1`] = `
-"#import \\"AppDelegate.h\\"
+"#import "AppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
 #import <React/RCTBridge.h>
@@ -123,7 +123,7 @@ exports[`appDelegateLinker should work for RN 0.69 1`] = `
 
 #import <react/config/ReactNativeConfig.h>
 
-static NSString *const kRNConcurrentRoot = @\\"concurrentRoot\\";
+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
 @interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
   RCTTurboModuleManager *_turboModuleManager;
@@ -146,7 +146,7 @@ static NSString *const kRNConcurrentRoot = @\\"concurrentRoot\\";
 #if RCT_NEW_ARCH_ENABLED
   _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
   _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-  _contextContainer->insert(\\"ReactNativeConfig\\", _reactNativeConfig);
+  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
   _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
   bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
 #endif
@@ -183,9 +183,9 @@ static NSString *const kRNConcurrentRoot = @\\"concurrentRoot\\";
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@\\"index\\"];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
-  return [[NSBundle mainBundle] URLForResource:@\\"main\\" withExtension:@\\"jsbundle\\"];
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }
 
@@ -233,7 +233,7 @@ static NSString *const kRNConcurrentRoot = @\\"concurrentRoot\\";
 `;
 
 exports[`appDelegateLinker should work for RN 0.71 1`] = `
-"#import \\"AppDelegate.h\\"
+"#import "AppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
 #import <React/RCTBundleURLProvider.h>
@@ -249,9 +249,9 @@ exports[`appDelegateLinker should work for RN 0.71 1`] = `
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@\\"index\\"];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
-  return [[NSBundle mainBundle] URLForResource:@\\"main\\" withExtension:@\\"jsbundle\\"];
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }
 

e2e/Modals.test.js

@@ -26,9 +26,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_LIFECYCLE_BTN).tap();
     await expect(elementByLabel('didAppear')).toBeVisible();
     await elementById(TestIDs.DISMISS_MODAL_BTN).tap();
-    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
+    await waitFor(elementByLabel('componentWillUnmount')).toBeVisible().withTimeout(1000);
     await elementByLabel('OK').atIndex(0).tap();
-    await expect(elementByLabel('didDisappear')).toBeVisible();
+    await waitFor(elementByLabel('didDisappear')).toBeVisible().withTimeout(1000);
     await elementByLabel('OK').atIndex(0).tap();
   });
 
@@ -148,11 +148,9 @@ describe('modal', () => {
     await elementById(TestIDs.MODAL_COMMANDS_BTN).tap();
     await elementById(TestIDs.MODAL_BTN).tap();
 
-    await expect(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible();
-    await expect(
-      elementByLabel('modalDismissed listener called with with: UniqueStackId')
-    ).toBeVisible();
-    await expect(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible();
+    await waitFor(elementByLabel('showModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
+    await waitFor(elementByLabel('modalDismissed listener called with with: UniqueStackId')).toBeVisible().withTimeout(1000);
+    await waitFor(elementByLabel('dismissModal promise resolved with: UniqueStackId')).toBeVisible().withTimeout(1000);
   });
 
   it.e2e('should show declared modal', async () => {

e2e/Stack.test.js

@@ -134,7 +134,7 @@ describe('Stack', () => {
   it.e2e('unmount is called on pop', async () => {
     await elementById(TestIDs.PUSH_LIFECYCLE_BTN).tap();
     await elementById(TestIDs.POP_BTN).tap();
-    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
+    await waitFor(elementByLabel('componentWillUnmount')).toBeVisible().withTimeout(1000);
     await elementByLabel('OK').atIndex(0).tap();
     await expect(elementByLabel('didDisappear')).toBeVisible();
   });
@@ -179,7 +179,7 @@ describe('Stack', () => {
   it.e2e('push promise is resolved with pushed ViewController id', async () => {
     await elementById(TestIDs.STACK_COMMANDS_BTN).tap();
     await elementById(TestIDs.PUSH_BTN).tap();
-    await expect(elementByLabel('push promise resolved with: ChildId')).toBeVisible();
+    await waitFor(elementByLabel('push promise resolved with: ChildId')).toBeVisible().withTimeout(1000);
     await expect(elementByLabel('pop promise resolved with: ChildId')).toBeVisible();
   });
 

e2e/StaticLifecycleEvents.test.js

@@ -10,7 +10,6 @@ describe('static lifecycle events', () => {
     await elementById(TestIDs.SHOW_STATIC_EVENTS_SCREEN).tap();
     await elementById(TestIDs.STATIC_EVENTS_OVERLAY_BTN).tap();
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
-    await expect(elementByLabel('componentWillAppear | EventsOverlay | Component')).toBeVisible();
     await expect(elementByLabel('componentDidAppear | EventsOverlay | Component')).toBeVisible();
     await elementById(TestIDs.CLEAR_OVERLAY_EVENTS_BTN).tap();
   });

index.e2e.js

@@ -1,4 +1,5 @@
+import "setimmediate";
 import { LogBox } from 'react-native';
-LogBox.ignoreAllLogs();
 
+LogBox.ignoreAllLogs();
 require('./playground/index');

lib/android/app/build.gradle

@@ -3,6 +3,15 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: "com.facebook.react"
+
+
+react {
+    jsRootDir = file("../../src/")
+    libraryName = "rnnavigation"
+    codegenJavaPackageName = "com.reactnativenavigation.react"
+}
+
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -193,7 +202,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesCore"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.google.android.material:material:1.2.0-alpha03'
 

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.kt

@@ -1,27 +1,41 @@
 package com.reactnativenavigation.react
 
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.ReactApplication
-import com.facebook.react.ReactHost
-import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.reactnativenavigation.options.LayoutFactory
 import com.reactnativenavigation.react.modal.ModalViewManager
 
-class NavigationPackage() : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        val reactApp = reactContext.applicationContext as ReactApplication
-        return listOf(
-            NavigationModule(
-                reactContext,
-                LayoutFactory(reactApp.reactHost)
-            )
-        )
+class NavigationPackage() : BaseReactPackage() {
+
+    override fun getModule(name: String, context: ReactApplicationContext): NativeModule? {
+        val reactApp = context.applicationContext as ReactApplication
+        return when (name) {
+            NavigationTurboModule.NAME -> {
+                NavigationTurboModule(context, LayoutFactory(reactApp.reactHost))
+            }
+            else -> {
+                null
+            }
+        }
     }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
+        mapOf(NavigationTurboModule.NAME to ReactModuleInfo(
+            name = NavigationTurboModule.NAME,
+            className = NavigationTurboModule.NAME,
+            canOverrideExistingModule = false,
+            needsEagerInit = false,
+            isCxxModule = false,
+            isTurboModule = true
+        ))
+    }
 
-        return listOf(ModalViewManager(reactContext))
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return mutableListOf(ModalViewManager(reactContext))
     }
 }