fix: [visionOS][0.73] adjust AppDelegate and Hermes

okwasniewski · okwasniewski · commit dfc1d06acfb7 · 2024-02-06T15:33:39.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -154,3 +154,6 @@ package-lock.json
 
 # CircleCI
 .circleci/generated_config.yml
+
+.circleci/storage/
+.yarn/cache
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h
@@ -136,7 +136,9 @@
 - (BOOL)bridgelessEnabled;
 
 /// Return the bundle URL for the main bundle.
-- (NSURL *__nullable)bundleURL;
+- (NSURL *__nullable)getBundleURL;
+
+#endif
 
 /// Don't use this method, it's going to be removed soon.
 - (UIView *)viewWithModuleName:(NSString *)moduleName
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -86,10 +86,17 @@ - (instancetype)init
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  RCTSetNewArchEnabled([self newArchEnabled]);
-  BOOL enableTM = self.turboModuleEnabled;
+  BOOL enableTM = NO;
+  BOOL enableBridgeless = NO;
+  BOOL fabricEnabled = NO;
+#if RCT_NEW_ARCH_ENABLED
+  enableTM = self.turboModuleEnabled;
+  enableBridgeless = self.bridgelessEnabled;
+  fabricEnabled = [self fabricEnabled];
+#endif
+  
+  RCTAppSetupPrepareApp(application, enableTM);
 
-  RCTAppSetupPrepareApp(application, enableTM, *_reactNativeConfig);
     
 #if TARGET_OS_VISION
   /// Bail out of UIWindow initializaiton to support multi-window scenarios in SwiftUI lifecycle.
@@ -115,48 +122,52 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
 }
 
 - (UIView *)viewWithModuleName:(NSString *)moduleName initialProperties:(NSDictionary*)initialProperties launchOptions:(NSDictionary*)launchOptions {
-    BOOL fabricEnabled = self.fabricEnabled;
-    BOOL enableBridgeless = self.bridgelessEnabled;
-
-    NSDictionary *initProps = updateInitialProps(initialProperties, fabricEnabled);
+  BOOL enableTM = NO;
+  BOOL enableBridgeless = NO;
+  BOOL fabricEnabled = NO;
+#if RCT_NEW_ARCH_ENABLED
+  enableTM = self.turboModuleEnabled;
+  enableBridgeless = self.bridgelessEnabled;
+  fabricEnabled = [self fabricEnabled];
+#endif
+  UIView *rootView;
+  
+  if (enableBridgeless) {
+#if RCT_NEW_ARCH_ENABLED
+    // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
+    RCTSetUseNativeViewConfigsInBridgelessMode(fabricEnabled);
     
-    UIView *rootView;
-    if (enableBridgeless) {
-      // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-      RCTSetUseNativeViewConfigsInBridgelessMode(self.fabricEnabled);
-
-      // Enable TurboModule interop by default in Bridgeless mode
-      RCTEnableTurboModuleInterop(YES);
-      RCTEnableTurboModuleInteropBridgeProxy(YES);
-
-      [self createReactHost];
-      [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-      RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
-
-      RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
-          initWithSurface:surface
-          sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
-
-      rootView = (RCTRootView *)surfaceHostingProxyRootView;
-    } else {
-      if (!self.bridge) {
-        self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
-      }
-      if ([self newArchEnabled]) {
-        if (!self.bridgeAdapter) {
-          self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
-                                                                       contextContainer:_contextContainer];
-          self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
-
-          [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-        }
-      }
-      rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
+    // Enable TurboModule interop by default in Bridgeless mode
+    RCTEnableTurboModuleInterop(YES);
+    RCTEnableTurboModuleInteropBridgeProxy(YES);
+    
+    [self createReactHost];
+    [self unstable_registerLegacyComponents];
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+    RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:moduleName initialProperties:initialProperties];
+    
+    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
+                                                                   initWithSurface:surface
+                                                                   sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
+    
+    rootView = (RCTRootView *)surfaceHostingProxyRootView;
+#endif
+  } else {
+    if (!self.bridge) {
+      self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
     }
-
-    [self customizeRootView:(RCTRootView *)rootView];
+#if RCT_NEW_ARCH_ENABLED
+    self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
+                                                                 contextContainer:_contextContainer];
+    self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
     
-    return rootView;
+    [self unstable_registerLegacyComponents];
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+#endif
+    
+    rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initialProperties];
+  }
+  return rootView;
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -219,20 +230,19 @@ - (void)windowScene:(UIWindowScene *)windowScene
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
   _runtimeScheduler = std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-  if ([self newArchEnabled]) {
-    std::shared_ptr<facebook::react::CallInvoker> callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    RCTTurboModuleManager *turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                                                     delegate:self
-                                                                                    jsInvoker:callInvoker];
-    _contextContainer->erase("RuntimeScheduler");
-    _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
-  } else {
-    return RCTAppSetupJsExecutorFactoryForOldArch(bridge, _runtimeScheduler);
-  }
+#if RCT_NEW_ARCH_ENABLED
+  std::shared_ptr<facebook::react::CallInvoker> callInvoker =
+      std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
+  RCTTurboModuleManager *turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                                                   delegate:self
+                                                                                  jsInvoker:callInvoker];
+  _contextContainer->erase("RuntimeScheduler");
+  _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
+#else
+  return RCTAppSetupJsExecutorFactoryForOldArch(bridge, _runtimeScheduler);
+#endif
 }
-
 #pragma mark - New Arch Enabled settings
 
 - (BOOL)newArchEnabled
@@ -259,6 +269,15 @@ - (BOOL)bridgelessEnabled
   return NO;
 }
 
+#pragma mark - New Arch Utilities
+
+- (void)unstable_registerLegacyComponents
+{
+  for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
+    [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
+  }
+}
+
 #pragma mark - RCTComponentViewFactoryComponentProvider
 
 - (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -13,16 +13,15 @@ extern NSString *const RCTRemoteNotificationReceived;
 
 typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 
-#if !TARGET_OS_UIKITFORMAC
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification
               fetchCompletionHandler:(RCTRemoteNotificationCallback)completionHandler;
 #if !TARGET_OS_VISION
 /** DEPRECATED. Use didReceiveNotification instead. */
 + (void)didReceiveLocalNotification:(UILocalNotification *)notification RCT_DEPRECATED;
-#endif
 /** DEPRECATED. Use didReceiveNotification instead. */
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification RCT_DEPRECATED;
+#endif
 
 @end
diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -176,7 +176,6 @@ @implementation RCTPushNotificationManager
   return [formatter stringFromDate:date];
 }
 
-#endif // TARGET_OS_UIKITFORMAC
 
 RCT_EXPORT_MODULE()
 
@@ -268,14 +267,6 @@ + (void)didReceiveLocalNotification:(UILocalNotification *)notification
 }
 #endif
 
-// Deprecated
-+ (void)didReceiveRemoteNotification:(NSDictionary *)notification
-{
-  NSDictionary *userInfo = @{@"notification" : notification};
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived
-                                                      object:self
-                                                    userInfo:userInfo];
-}
 
 - (void)handleLocalNotificationReceived:(NSNotification *)notification
 {
diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.mm b/packages/react-native/Libraries/Text/Text/RCTTextView.mm
@@ -256,11 +256,12 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
   }
 
     [menuController showMenuFromView:self rect:self.bounds];
+    
+    [menuController setTargetRect:self.bounds inView:self];
+    [menuController setMenuVisible:YES animated:YES];
 #endif
   }
 
-  [menuController setTargetRect:self.bounds inView:self];
-  [menuController setMenuVisible:YES animated:YES];
 #endif
 }
 
diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -253,11 +253,11 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
   }
 
     [menuController showMenuFromView:self rect:self.bounds];
+    [menuController setTargetRect:self.bounds inView:self];
+    [menuController setMenuVisible:YES animated:YES];
 #endif
   }
 
-  [menuController setTargetRect:self.bounds inView:self];
-  [menuController setMenuVisible:YES animated:YES];
 #endif
 }
 
diff --git a/packages/react-native/scripts/cocoapods/__tests__/jsengine-test.rb b/packages/react-native/scripts/cocoapods/__tests__/jsengine-test.rb
@@ -73,7 +73,7 @@ def test_setupHermes_installsPods
         assert_equal(hermes_engine_pod_invocation[:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
         assert_equal(hermes_engine_pod_invocation[:tag], "")
         assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
-        assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
+        assert_equal($podInvocation["libevent"][:version], "~> 2.1.12.1")
     end
 
 end
diff --git a/packages/react-native/scripts/cocoapods/jsengine.rb b/packages/react-native/scripts/cocoapods/jsengine.rb
@@ -30,5 +30,5 @@ def setup_hermes!(react_native_path: "../node_modules/react-native")
     hermestag = File.exist?(hermestag_file) ? File.read(hermestag_file).strip : ''
     pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec", :tag => hermestag
     pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes"
-    pod 'libevent', '~> 2.1.12'
+    pod 'libevent', :podspec => "#{react_native_path}/third-party-podspecs/libevent.podspec"
 end
diff --git a/packages/react-native/scripts/codegen/generate-artifacts-executor.js b/packages/react-native/scripts/codegen/generate-artifacts-executor.js
@@ -32,7 +32,7 @@ const REACT_NATIVE_PACKAGE_ROOT_FOLDER = path.join(__dirname, '..', '..');
 
 const CODEGEN_DEPENDENCY_NAME = '@react-native/codegen';
 const CODEGEN_REPO_PATH = `${REACT_NATIVE_REPOSITORY_ROOT}/packages/react-native-codegen`;
-const CODEGEN_NPM_PATH = `${REACT_NATIVE_PACKAGE_ROOT_FOLDER}/../${CODEGEN_DEPENDENCY_NAME}`;
+const CODEGEN_NPM_PATH = `${REACT_NATIVE_PACKAGE_ROOT_FOLDER}/../../${CODEGEN_DEPENDENCY_NAME}`;
 const CORE_LIBRARIES_WITH_OUTPUT_FOLDER = {
   rncore: path.join(REACT_NATIVE_PACKAGE_ROOT_FOLDER, 'ReactCommon'),
   FBReactNativeSpec: null,
diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb
@@ -160,10 +160,10 @@ def use_react_native! (
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
   pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
-  pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
   pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec", :modular_headers => true
   pod 'SocketRocket', :podspec => "#{prefix}/third-party-podspecs/SocketRocket.podspec", :modular_headers => true
+  pod 'libevent', :podspec => "#{prefix}/third-party-podspecs/libevent.podspec" 
 
 
   run_codegen!(
diff --git a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec
@@ -12,8 +12,9 @@ react_native_path = File.join(__dir__, "..", "..")
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
 version = package['version']
 
-# Temporaily build from source until visionOS supports prebuilt binaries
-source_type = HermesEngineSourceType::BUILD_FROM_GITHUB_MAIN # hermes_source_type(version, react_native_path)
+# Build hermes from given commit
+source_type = HermesEngineSourceType::BUILD_FROM_GITHUB_COMMIT # hermes_source_type(version, react_native_path)
+ENV['HERMES_COMMIT'] = "4249e05bdc3897a4f00aa06de67156b39707781f"
 source = podspec_source(source_type, version, react_native_path)
 
 Pod::Spec.new do |spec|
diff --git a/packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh b/packages/react-native/sdks/hermes-engine/utils/build-hermes-xcode.sh
@@ -50,10 +50,7 @@ else
   cmake_build_type="MinSizeRel"
 fi
 
-deployment_target=${IPHONEOS_DEPLOYMENT_TARGET}
-if [ -z "$deployment_target" ]; then
-  deployment_target=${MACOSX_DEPLOYMENT_TARGET}
-fi
+deployment_target=$(get_deployment_target $PLATFORM_NAME)
 
 xcode_15_flags=""
 xcode_major_version=$(xcodebuild -version | grep -oE '[0-9]*' | head -n 1)
@@ -80,6 +77,7 @@ echo "Configure Apple framework"
   -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
   -DHERMES_ENABLE_BITCODE:BOOLEAN=false \
   -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
+  -DHERMES_BUILD_SHARED_JSI:BOOLEAN=false \
   -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
   -DIMPORT_HERMESC:PATH="${hermesc_path}" \
   -DJSI_DIR="$jsi_path" \
@@ -95,6 +93,8 @@ echo "Build Apple framework"
 
 echo "Copy Apple framework to destroot/Library/Frameworks"
 
+platform_copy_destination=$(get_platform_copy_destination $PLATFORM_NAME)
+
 cp -pfR \
   "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}/API/hermes/hermes.framework" \
-  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/ios"
+  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${platform_copy_destination}"
diff --git a/packages/react-native/template/visionos/HelloWorld/AppDelegate.swift b/packages/react-native/template/visionos/HelloWorld/AppDelegate.swift
@@ -7,7 +7,7 @@ class AppDelegate: RCTAppDelegate {
     self.bundleURL()
   }
   
-  override func bundleURL() -> URL? {
+  func bundleURL() -> URL? {
 #if DEBUG
     RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index")
 #else
diff --git a/packages/react-native/third-party-podspecs/libevent.podspec b/packages/react-native/third-party-podspecs/libevent.podspec
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
diff --git a/packages/rn-tester/RNTester-visionOS/AppDelegate.swift b/packages/rn-tester/RNTester-visionOS/AppDelegate.swift
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
diff --git a/scripts/oot-release.js b/scripts/oot-release.js

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@ @implementation RCTPushNotificationManager`
`176`	`176`	`return [formatter stringFromDate:date];`
`177`	`177`	`}`
`178`	`178`
`179`		`-#endif // TARGET_OS_UIKITFORMAC`
`180`	`179`
`181`	`180`	`RCT_EXPORT_MODULE()`
`182`	`181`
`@@ -268,14 +267,6 @@ + (void)didReceiveLocalNotification:(UILocalNotification *)notification`
`268`	`267`	`}`
`269`	`268`	`#endif`
`270`	`269`
`271`		`-// Deprecated`
`272`		`-+ (void)didReceiveRemoteNotification:(NSDictionary *)notification`
`273`		`-{`
`274`		`- NSDictionary *userInfo = @{@"notification" : notification};`
`275`		`- [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived`
`276`		`- object:self`
`277`		`- userInfo:userInfo];`
`278`		`-}`
`279`	`270`
`280`	`271`	`- (void)handleLocalNotificationReceived:(NSNotification *)notification`
`281`	`272`	`{`
Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,12 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`[menuController showMenuFromView:self rect:self.bounds];`
	`259`	`+`
	`260`	`+ [menuController setTargetRect:self.bounds inView:self];`
	`261`	`+ [menuController setMenuVisible:YES animated:YES];`
`259`	`262`	`#endif`
`260`	`263`	`}`
`261`	`264`
`262`		`- [menuController setTargetRect:self.bounds inView:self];`
`263`		`- [menuController setMenuVisible:YES animated:YES];`
`264`	`265`	`#endif`
`265`	`266`	`}`
`266`	`267`
Original file line number	Diff line number	Diff line change
`@@ -253,11 +253,11 @@ - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`[menuController showMenuFromView:self rect:self.bounds];`
	`256`	`+ [menuController setTargetRect:self.bounds inView:self];`
	`257`	`+ [menuController setMenuVisible:YES animated:YES];`
`256`	`258`	`#endif`
`257`	`259`	`}`
`258`	`260`
`259`		`- [menuController setTargetRect:self.bounds inView:self];`
`260`		`- [menuController setMenuVisible:YES animated:YES];`
`261`	`261`	`#endif`
`262`	`262`	`}`
`263`	`263`