chore: cherry-pick to 0.74-stable

okwasniewski · okwasniewski · commit 41a7dbf13f6f · 2024-03-20T13:54:30.000+01:00
diff --git a/packages/out-of-tree-platforms/package.json b/packages/out-of-tree-platforms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@callstack/out-of-tree-platforms",
-  "version": "0.75.0-main",
+  "version": "0.74.75",
   "description": "Utils for React Native out of tree platforms.",
   "keywords": ["out-of-tree", "react-native"],
   "homepage": "https://github.com/callstack/react-native-visionos/tree/HEAD/packages/out-of-tree-platforms#readme",
diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <UIKit/UIKit.h>
 #import <React/RCTAnimationUtils.h>
 #import <React/RCTColorAnimatedNode.h>
 #import <React/RCTObjectAnimatedNode.h>
diff --git a/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h b/packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <UIKit/UIKit.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
 
diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -45,9 +45,11 @@ typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
  */
 + (void)setInitialNotification:(UNNotification *)notification;
 
+#if !TARGET_OS_VISION
 /** DEPRECATED. Use didReceiveNotification instead. */
 + (void)didReceiveLocalNotification:(UILocalNotification *)notification RCT_DEPRECATED;
 /** 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
@@ -97,6 +97,7 @@ @implementation RCTConvert (UIBackgroundFetchResult)
 
 @implementation RCTPushNotificationManager
 
+#if !TARGET_OS_VISION
 /** DEPRECATED. UILocalNotification was deprecated in iOS 10. Please don't add new callsites. */
 static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification)
 {
@@ -116,6 +117,7 @@ @implementation RCTPushNotificationManager
   formattedLocalNotification[@"remote"] = @NO;
   return formattedLocalNotification;
 }
+#endif
 
 /** For delivered notifications */
 static NSDictionary<NSString *, id> *RCTFormatUNNotification(UNNotification *notification)
@@ -267,6 +269,7 @@ + (void)setInitialNotification:(UNNotification *)notification
   kInitialNotification = notification;
 }
 
+#if !TARGET_OS_VISION
 // Deprecated
 + (void)didReceiveLocalNotification:(UILocalNotification *)notification
 {
@@ -283,6 +286,7 @@ + (void)didReceiveRemoteNotification:(NSDictionary *)notification
                                                       object:self
                                                     userInfo:userInfo];
 }
+#endif
 
 - (void)invalidate
 {
diff --git a/packages/react-native/Libraries/WindowManager/React-RCTWindowManager.podspec b/packages/react-native/Libraries/WindowManager/React-RCTWindowManager.podspec
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi"
   s.dependency "React-Core/RCTWindowManagerHeaders"
 
-  add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"])
+  add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
 end
diff --git a/packages/react-native/Libraries/XR/React-RCTXR.podspec b/packages/react-native/Libraries/XR/React-RCTXR.podspec
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi"
   s.dependency "React-Core/RCTXRHeaders"
 
-  add_dependency(s, "ReactCodegen", :additional_framework_paths => ["build/generated/ios"])
+  add_dependency(s, "React-Codegen", :additional_framework_paths => ["build/generated/ios"])
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
 end
diff --git a/packages/react-native/sdks/hermes-engine/hermes-engine.podspec b/packages/react-native/sdks/hermes-engine/hermes-engine.podspec
@@ -13,7 +13,7 @@ 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)
+source_type = HermesEngineSourceType::BUILD_FROM_GITHUB_TAG # hermes_source_type(version, react_native_path)
 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
@@ -16,10 +16,7 @@ function get_platform_copy_destination {
     if [[ $1 == "macosx" ]]; then
       echo "macosx"
       return
-    elif [[ $1 == "xros" ]]; then
-      echo "xros"
-      return
-    elif [[ $1 == "xrsimulator" ]]; then
+    elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
       echo "xros"
       return
     fi
@@ -31,8 +28,10 @@ function get_deployment_target {
     if [[ $1 == "macosx" ]]; then
       echo ${MACOSX_DEPLOYMENT_TARGET}
       return
+    elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
+      echo ${XROS_DEPLOYMENT_TARGET}
+      return
     fi
-    
     echo ${IPHONEOS_DEPLOYMENT_TARGET}
 }
 
diff --git a/packages/react-native/template/package.json b/packages/react-native/template/package.json
@@ -15,12 +15,25 @@
     "react-native": "0.74.0-rc.4",
     "@callstack/react-native-visionos": "0.74.0-rc.4"
   },
-  "codegenConfig": {
-    "name": "AppSpecs",
-    "type": "all",
-    "jsSrcsDir": ".",
-    "android": {
-      "javaPackageName": "com.facebook.fbreact.specs"
-    }
+  "devDependencies": {
+    "@babel/core": "^7.20.0",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@callstack/out-of-tree-platforms": "0.74.0-rc.4",
+    "@react-native/babel-preset": "0.74.75",
+    "@react-native/eslint-config": "0.74.75",
+    "@react-native/metro-config": "0.74.75",
+    "@react-native/typescript-config": "0.74.75",
+    "@types/react": "^18.2.6",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
+    "eslint": "^8.19.0",
+    "jest": "^29.6.3",
+    "prettier": "2.8.8",
+    "react-test-renderer": "18.2.0",
+    "typescript": "5.0.4"
+  },
+  "engines": {
+    "node": ">=18"
   }
 }
diff --git a/packages/react-native/template/visionos/HelloWorld/AppDelegate.swift b/packages/react-native/template/visionos/HelloWorld/AppDelegate.swift
@@ -9,7 +9,7 @@ class AppDelegate: RCTAppDelegate {
   
   override func bundleURL() -> URL? {
 #if DEBUG
-    RCTBundleURLProvider.sharedSettings()?.jsBundleURL(forBundleRoot: "index")
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
 #else
     Bundle.main.url(forResource: "main", withExtension: "jsbundle")
 #endif
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@callstack/out-of-tree-platforms",`
`3`		`- "version": "0.75.0-main",`
	`3`	`+ "version": "0.74.75",`
`4`	`4`	`"description": "Utils for React Native out of tree platforms.",`
`5`	`5`	`"keywords": ["out-of-tree", "react-native"],`
`6`	`6`	`"homepage": "https://github.com/callstack/react-native-visionos/tree/HEAD/packages/out-of-tree-platforms#readme",`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ @implementation RCTConvert (UIBackgroundFetchResult)`
`97`	`97`
`98`	`98`	`@implementation RCTPushNotificationManager`
`99`	`99`
	`100`	`+#if !TARGET_OS_VISION`
`100`	`101`	`/** DEPRECATED. UILocalNotification was deprecated in iOS 10. Please don't add new callsites. */`
`101`	`102`	`static NSDictionary RCTFormatLocalNotification(UILocalNotification notification)`
`102`	`103`	`{`
`@@ -116,6 +117,7 @@ @implementation RCTPushNotificationManager`
`116`	`117`	`formattedLocalNotification[@"remote"] = @NO;`
`117`	`118`	`return formattedLocalNotification;`
`118`	`119`	`}`
	`120`	`+#endif`
`119`	`121`
`120`	`122`	`/** For delivered notifications */`
`121`	`123`	`static NSDictionary<NSString , id> RCTFormatUNNotification(UNNotification *notification)`
`@@ -267,6 +269,7 @@ + (void)setInitialNotification:(UNNotification *)notification`
`267`	`269`	`kInitialNotification = notification;`
`268`	`270`	`}`
`269`	`271`
	`272`	`+#if !TARGET_OS_VISION`
`270`	`273`	`// Deprecated`
`271`	`274`	`+ (void)didReceiveLocalNotification:(UILocalNotification *)notification`
`272`	`275`	`{`
`@@ -283,6 +286,7 @@ + (void)didReceiveRemoteNotification:(NSDictionary *)notification`
`283`	`286`	`object:self`
`284`	`287`	`userInfo:userInfo];`
`285`	`288`	`}`
	`289`	`+#endif`
`286`	`290`
`287`	`291`	`- (void)invalidate`
`288`	`292`	`{`