react-native-tvos 0.74.0-0rc2 → 0.74.0-0rc3

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 74,
   patch: 0,
-  prerelease: '0rc2',
+  prerelease: '0rc3',
 };
 
 module.exports = {version};

package/Libraries/React-Native

@@ -0,0 +1,214 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall react_native
+ */
+
+import type {
+  ReactDevToolsAgent,
+  ReactDevToolsGlobalHook,
+} from '../Types/ReactDevToolsTypes';
+import type {Props} from './AppContainer';
+
+import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
+import View from '../Components/View/View';
+import Platform from '../Utilities/Platform';
+// import DebuggingOverlay from '../Debugging/DebuggingOverlay';
+// import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
+import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
+import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
+import StyleSheet from '../StyleSheet/StyleSheet';
+import {RootTagContext, createRootTag} from './RootTag';
+import * as React from 'react';
+
+const {useEffect, useState, useCallback} = React;
+
+const reactDevToolsHook: ReactDevToolsGlobalHook =
+  window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+
+// Required for React DevTools to view / edit React Native styles in Flipper.
+// Flipper doesn't inject these values when initializing DevTools.
+if (reactDevToolsHook) {
+  reactDevToolsHook.resolveRNStyle = require('../StyleSheet/flattenStyle');
+  reactDevToolsHook.nativeStyleEditorValidAttributes = Object.keys(
+    ReactNativeStyleAttributes,
+  );
+}
+
+type InspectorDeferredProps = {
+  inspectedViewRef: InspectedViewRef,
+  onInspectedViewRerenderRequest: () => void,
+  reactDevToolsAgent?: ReactDevToolsAgent,
+};
+
+const InspectorDeferred = ({
+  inspectedViewRef,
+  onInspectedViewRerenderRequest,
+  reactDevToolsAgent,
+}: InspectorDeferredProps) => {
+  // D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
+  // We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
+  const Inspector = require('../Inspector/Inspector');
+
+  return (
+    <Inspector
+      inspectedViewRef={inspectedViewRef}
+      onRequestRerenderApp={onInspectedViewRerenderRequest}
+      reactDevToolsAgent={reactDevToolsAgent}
+    />
+  );
+};
+
+type ReactDevToolsOverlayDeferredProps = {
+  inspectedViewRef: InspectedViewRef,
+  reactDevToolsAgent: ReactDevToolsAgent,
+};
+
+const ReactDevToolsOverlayDeferred = ({
+  inspectedViewRef,
+  reactDevToolsAgent,
+}: ReactDevToolsOverlayDeferredProps) => {
+  const ReactDevToolsOverlay =
+    require('../Inspector/ReactDevToolsOverlay').default;
+
+  return (
+    <ReactDevToolsOverlay
+      inspectedViewRef={inspectedViewRef}
+      reactDevToolsAgent={reactDevToolsAgent}
+    />
+  );
+};
+
+const AppContainer = ({
+  children,
+  fabric,
+  initialProps,
+  internal_excludeInspector = false,
+  internal_excludeLogBox = false,
+  rootTag,
+  showArchitectureIndicator,
+  WrapperComponent,
+}: Props): React.Node => {
+  const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
+  const innerViewRef: InspectedViewRef = React.useRef(null);
+  const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null);
+
+/*
+  useSubscribeToDebuggingOverlayRegistry(
+    appContainerRootViewRef,
+    debuggingOverlayRef,
+  );
+ */
+
+  const [key, setKey] = useState(0);
+  const [shouldRenderInspector, setShouldRenderInspector] = useState(false);
+  const [reactDevToolsAgent, setReactDevToolsAgent] =
+    useState<ReactDevToolsAgent | void>(reactDevToolsHook?.reactDevtoolsAgent);
+
+  useEffect(() => {
+    let inspectorSubscription = null;
+    if (!internal_excludeInspector) {
+      inspectorSubscription = RCTDeviceEventEmitter.addListener(
+        'toggleElementInspector',
+        () => setShouldRenderInspector(value => !value),
+      );
+    }
+
+    let reactDevToolsAgentListener = null;
+    // If this is first render, subscribe to the event from React DevTools hook
+    if (reactDevToolsHook != null && reactDevToolsAgent == null) {
+      reactDevToolsAgentListener = setReactDevToolsAgent;
+      reactDevToolsHook.on?.('react-devtools', reactDevToolsAgentListener);
+    }
+
+    return () => {
+      inspectorSubscription?.remove();
+
+      if (
+        reactDevToolsHook?.off != null &&
+        reactDevToolsAgentListener != null
+      ) {
+        reactDevToolsHook.off('react-devtools', reactDevToolsAgentListener);
+      }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  let innerView: React.Node = (
+    <View
+      collapsable={reactDevToolsAgent == null && !shouldRenderInspector}
+      pointerEvents="box-none"
+      key={key}
+      style={styles.container}
+      ref={innerViewRef}>
+      {children}
+    </View>
+  );
+
+  if (WrapperComponent != null) {
+    innerView = (
+      <WrapperComponent
+        initialProps={initialProps}
+        fabric={fabric === true}
+        showArchitectureIndicator={showArchitectureIndicator === true}>
+        {innerView}
+      </WrapperComponent>
+    );
+  }
+
+  const onInspectedViewRerenderRequest = useCallback(
+    () => setKey(k => k + 1),
+    [],
+  );
+
+  return (
+    <RootTagContext.Provider value={createRootTag(rootTag)}>
+      <View
+        ref={appContainerRootViewRef}
+        style={styles.container}
+        pointerEvents="box-none">
+        {innerView}
+
+        {/* <DebuggingOverlay ref={debuggingOverlayRef} /> */}
+
+        {reactDevToolsAgent != null && (
+          <ReactDevToolsOverlayDeferred
+            inspectedViewRef={innerViewRef}
+            reactDevToolsAgent={reactDevToolsAgent}
+          />
+        )}
+
+        {shouldRenderInspector && (
+          <InspectorDeferred
+            inspectedViewRef={innerViewRef}
+            onInspectedViewRerenderRequest={onInspectedViewRerenderRequest}
+            reactDevToolsAgent={reactDevToolsAgent}
+          />
+        )}
+
+        {!internal_excludeLogBox && <LogBoxNotificationContainer />}
+      </View>
+    </RootTagContext.Provider>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {flex: 1},
+});
+
+export type AppContainerRootViewRef = React.RefObject<React.ElementRef<
+  typeof View,
+> | null>;
+export type InspectedViewRef = React.RefObject<React.ElementRef<
+  typeof View,
+> | null>;
+export type DebuggingOverlayRef = React.RefObject<React.ElementRef<
+  typeof DebuggingOverlay,
+> | null>;
+
+export default AppContainer;

package/Libraries/ReactNative/AppContainer-dev.js

@@ -18,8 +18,11 @@ import type {Props} from './AppContainer';
 import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
 import View from '../Components/View/View';
 import Platform from '../Utilities/Platform';
+/*
+// Stub out DebuggingOverlay from TV for now
 import DebuggingOverlay from '../Debugging/DebuggingOverlay';
 import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
+ */
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
 import StyleSheet from '../StyleSheet/StyleSheet';
@@ -96,12 +99,14 @@ const AppContainer = ({
 }: Props): React.Node => {
   const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
   const innerViewRef: InspectedViewRef = React.useRef(null);
+/*
   const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null);
 
   useSubscribeToDebuggingOverlayRegistry(
     appContainerRootViewRef,
     debuggingOverlayRef,
   );
+ */
 
   const [key, setKey] = useState(0);
   const [shouldRenderInspector, setShouldRenderInspector] = useState(false);
@@ -172,7 +177,7 @@ const AppContainer = ({
         pointerEvents="box-none">
         {innerView}
 
-        {!Platform.isTV ? <DebuggingOverlay ref={debuggingOverlayRef} /> : null}
+        {/* <DebuggingOverlay ref={debuggingOverlayRef} /> */}
 
         {reactDevToolsAgent != null && (
           <ReactDevToolsOverlayDeferred

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(74),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc2",
+                  RCTVersionPrerelease: @"0rc3",
                   };
   });
   return __rnVersion;

package/React/CoreModules/RCTDevMenu.mm

@@ -396,7 +396,7 @@ RCT_EXPORT_METHOD(show)
       ? UIAlertControllerStyleActionSheet
       : UIAlertControllerStyleAlert;
 
-  NSString *devMenuType = self.bridge ? @"Bridge" : @"Bridgeless";
+  NSString *devMenuType = [self.bridge isKindOfClass:RCTBridge.class] ? @"Bridge" : @"Bridgeless";
   NSString *devMenuTitle = [NSString stringWithFormat:@"React Native Dev Menu (%@)", devMenuType];
 
   _actionSheet = [UIAlertController alertControllerWithTitle:devMenuTitle message:description preferredStyle:style];

package/React/CoreModules/RCTDevSettings.mm

@@ -158,6 +158,11 @@ RCT_EXPORT_MODULE()
   return NO;
 }
 
+- (BOOL)_isBridgeMode
+{
+  return [self.bridge isKindOfClass:[RCTBridge class]];
+}
+
 - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource
 {
   if (self = [super init]) {
@@ -178,7 +183,7 @@ RCT_EXPORT_MODULE()
 - (void)initialize
 {
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  if (self.bridge) {
+  if ([self _isBridgeMode]) {
     RCTBridge *__weak weakBridge = self.bridge;
     _bridgeExecutorOverrideToken = [[RCTPackagerConnection sharedPackagerConnection]
         addNotificationHandler:^(id params) {
@@ -209,7 +214,7 @@ RCT_EXPORT_MODULE()
 #endif
 
 #if RCT_ENABLE_INSPECTOR
-  if (self.bridge) {
+  if ([self _isBridgeMode]) {
     // We need this dispatch to the main thread because the bridge is not yet
     // finished with its initialisation. By the time it relinquishes control of
     // the main thread, this operation can be performed.
@@ -250,7 +255,7 @@ RCT_EXPORT_MODULE()
 {
   [super invalidate];
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  if (self.bridge) {
+  if ([self _isBridgeMode]) {
     [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_bridgeExecutorOverrideToken];
   }
 
@@ -281,7 +286,7 @@ RCT_EXPORT_MODULE()
 - (BOOL)isDeviceDebuggingAvailable
 {
 #if RCT_ENABLE_INSPECTOR
-  if (self.bridge) {
+  if ([self _isBridgeMode]) {
     return self.bridge.isInspectable;
   } else {
     return self.isInspectable;

package/React/CoreModules/RCTTVNavigationEventEmitter.mm

@@ -6,7 +6,9 @@
  */
 
 #import "RCTTVNavigationEventEmitter.h"
+#if TARGET_OS_TV
 #import "RCTTVNavigationEventNotificationConstants.h"
+#endif
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import "CoreModulesPlugins.h"
@@ -28,10 +30,12 @@ RCT_EXPORT_MODULE()
 - (instancetype)init
 {
   if (self = [super init]) {
+#if TARGET_OS_TV
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleTVNavigationEventNotification:)
                                                  name:RCTTVNavigationEventNotificationName
                                                object:nil];
+#endif
   }
   return self;
 }

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h

@@ -9,6 +9,10 @@
 
 @protocol RCTFabricModalHostViewControllerDelegate <NSObject>
 - (void)boundsDidChange:(CGRect)newBounds;
+#if TARGET_OS_TV
+- (void)enableEventHandlers;
+- (void)disableEventHandlers;
+#endif
 @end
 
 @interface RCTFabricModalHostViewController : UIViewController

package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

@@ -42,18 +42,28 @@
   [_touchHandler attachToView:self.view];
 }
 
-#if !TARGET_OS_TV
-- (UIStatusBarStyle)preferredStatusBarStyle
-{
-  return [RCTUIStatusBarManager() statusBarStyle];
-}
-
 - (void)viewDidDisappear:(BOOL)animated
 {
   [super viewDidDisappear:animated];
   _lastViewBounds = CGRectZero;
 }
 
+#if TARGET_OS_TV
+- (void)viewDidAppear:(BOOL)animated
+{
+  [self.delegate enableEventHandlers];
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [self.delegate disableEventHandlers];
+}
+#else
+- (UIStatusBarStyle)preferredStatusBarStyle
+{
+  return [RCTUIStatusBarManager() statusBarStyle];
+}
+
 - (BOOL)prefersStatusBarHidden
 {
   return [RCTUIStatusBarManager() isStatusBarHidden];

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -19,6 +19,10 @@
 
 #import "RCTFabricModalHostViewController.h"
 
+#if TARGET_OS_TV
+#import <React/RCTTVRemoteHandler.h>
+#endif
+
 using namespace facebook::react;
 
 #if !TARGET_OS_TV
@@ -115,6 +119,10 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   BOOL _shouldPresent;
   BOOL _isPresented;
   UIView *_modalContentsSnapshot;
+#if TARGET_OS_TV
+  UITapGestureRecognizer *_menuButtonGestureRecognizer;
+  RCTTVRemoteHandler *_tvRemoteHandler;
+#endif
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -122,6 +130,11 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   if (self = [super initWithFrame:frame]) {
     _props = ModalHostViewShadowNode::defaultSharedProps();
     _shouldAnimatePresentation = YES;
+#if TARGET_OS_TV
+    _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                           action:@selector(menuButtonPressed)];
+    _menuButtonGestureRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
+#endif
 
     _isPresented = NO;
   }
@@ -129,6 +142,38 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
   return self;
 }
 
+#if TARGET_OS_TV
+- (void)menuButtonPressed {
+  UIView *snapshot = _modalContentsSnapshot;
+  [self.viewController.view addSubview:snapshot];
+  [self dismissViewController:self.viewController
+                     animated:_shouldAnimatePresentation
+                   completion:^{
+                     [snapshot removeFromSuperview];
+                     auto eventEmitter = [self modalEventEmitter];
+                     if (eventEmitter) {
+                       eventEmitter->onDismiss(ModalHostViewEventEmitter::OnDismiss{});
+                       eventEmitter->onRequestClose(ModalHostViewEventEmitter::OnRequestClose{});
+                     }
+                   }];
+}
+
+- (void)enableEventHandlers
+{
+  _tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:_viewController.view];
+  [_tvRemoteHandler disableTVMenuKey];
+
+  [_viewController.view addGestureRecognizer:_menuButtonGestureRecognizer];
+}
+
+- (void)disableEventHandlers
+{
+  _tvRemoteHandler = nil;
+  [_viewController.view removeGestureRecognizer:_menuButtonGestureRecognizer];
+}
+
+#endif
+
 - (RCTFabricModalHostViewController *)viewController
 {
   if (!_viewController) {

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -11,7 +11,6 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConstants.h>
 #import <React/RCTScrollEvent.h>
-#import <React/RCTTVNavigationEventNotification.h>
 
 #import <react/renderer/components/scrollview/RCTComponentViewHelpers.h>
 #import <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
@@ -26,7 +25,8 @@
 #import "RCTFabricComponentsPlugins.h"
 
 #if TARGET_OS_TV
-#import "RCTTVRemoteHandler.h"
+#import <React/RCTTVRemoteHandler.h>
+#import <React/RCTTVNavigationEventNotification.h>
 #endif
 
 using namespace facebook::react;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -19,7 +19,9 @@
 #import <React/RCTLog.h>
 
 #import <React/RCTSurfaceHostingProxyRootView.h>
+#if TARGET_OS_TV
 #import <React/RCTTVNavigationEventNotification.h>
+#endif
 
 #import <react/renderer/components/view/ViewComponentDescriptor.h>
 #import <react/renderer/components/view/ViewEventEmitter.h>

package/React/Views/RCTModalHostViewController.m

@@ -34,6 +34,32 @@
   return self;
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  [self.modalHostView enableEventHandlers];
+#endif
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  [self.modalHostView disableEventHandlers];
+  if (self.modalHostView.onRequestClose) {
+    self.modalHostView.onRequestClose(nil);
+  }
+#endif
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+#if TARGET_OS_TV
+  if (self.modalHostView.onDismiss) {
+    self.modalHostView.onDismiss(nil);
+  }
+#endif
+}
+
 - (void)viewDidLayoutSubviews
 {
   [super viewDidLayoutSubviews];

package/React/Views/ScrollView/RCTScrollView.m

@@ -12,7 +12,6 @@
 #import "RCTConvert.h"
 #import "RCTLog.h"
 #import "RCTScrollEvent.h"
-#import "RCTTVNavigationEventNotification.h"
 #import "RCTUIManager.h"
 #import "RCTUIManagerObserverCoordinator.h"
 #import "RCTUIManagerUtils.h"
@@ -23,6 +22,7 @@
 
 #if TARGET_OS_TV
 #import "RCTTVRemoteHandler.h"
+#import "RCTTVNavigationEventNotification.h"
 #endif
 
 #if !TARGET_OS_TV

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.74.0-0rc2
+VERSION_NAME=0.74.0-0rc3
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group
 react.internal.publishingGroup=io.github.react-native-tvos

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 74,
       "patch", 0,
-      "prerelease", "0rc2");
+      "prerelease", "0rc3");
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -145,12 +145,12 @@ public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) :
   }
 
   @Deprecated(message = "This API is unsupported in the New Architecture.")
-  override fun getJavaScriptContextHolder(): JavaScriptContextHolder {
-    throw UnsupportedOperationException("Unimplemented method 'getJavaScriptContextHolder'")
+  override fun getJavaScriptContextHolder(): JavaScriptContextHolder? {
+    return reactHost.getJavaScriptContextHolder()
   }
 
-  override fun getRuntimeExecutor(): RuntimeExecutor {
-    throw UnsupportedOperationException("Unimplemented method 'getRuntimeExecutor'")
+  override fun getRuntimeExecutor(): RuntimeExecutor? {
+    return reactHost.getRuntimeExecutor()
   }
 
   override fun getRuntimeScheduler(): RuntimeScheduler {

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 74;
   int32_t Patch = 0;
-  std::string_view Prerelease = "0rc2";
+  std::string_view Prerelease = "0rc3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.74.0-0rc2",
+  "version": "0.74.0-0rc3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -111,13 +111,13 @@
     "@react-native-community/cli": "13.6.4",
     "@react-native-community/cli-platform-android": "13.6.4",
     "@react-native-community/cli-platform-ios": "13.6.4",
-    "@react-native/assets-registry": "0.74.79",
-    "@react-native/codegen": "0.74.79",
-    "@react-native/community-cli-plugin": "0.74.79",
-    "@react-native/gradle-plugin": "0.74.79",
-    "@react-native/js-polyfills": "0.74.79",
-    "@react-native/normalize-colors": "0.74.79",
-    "@react-native-tvos/virtualized-lists": "0.74.0-0rc2",
+    "@react-native/assets-registry": "0.74.80",
+    "@react-native/codegen": "0.74.80",
+    "@react-native/community-cli-plugin": "0.74.80",
+    "@react-native/gradle-plugin": "0.74.80",
+    "@react-native/js-polyfills": "0.74.80",
+    "@react-native/normalize-colors": "0.74.80",
+    "@react-native-tvos/virtualized-lists": "0.74.0-0rc3",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -166,4 +166,4 @@
   "devDependencies": {
     "react-native-core": "npm:react-native@0.74.0-rc.8"
   }
-}
+}

package/scripts/cocoapods/utils.rb

@@ -98,11 +98,12 @@ class ReactNativePodsUtils
             Pod::UI.puts("#{message_prefix}: Ccache found at #{ccache_path}")
         end
 
+        # Using scripts wrapping the ccache executable, to allow injection of configurations
+        ccache_clang_sh = File.join("$(REACT_NATIVE_PATH)", 'scripts', 'xcode', 'ccache-clang.sh')
+        ccache_clangpp_sh = File.join("$(REACT_NATIVE_PATH)", 'scripts', 'xcode', 'ccache-clang++.sh')
+
         if ccache_available and ccache_enabled
             Pod::UI.puts("#{message_prefix}: Setting CC, LD, CXX & LDPLUSPLUS build settings")
-            # Using scripts wrapping the ccache executable, to allow injection of configurations
-            ccache_clang_sh = File.join("$(REACT_NATIVE_PATH)", 'scripts', 'xcode', 'ccache-clang.sh')
-            ccache_clangpp_sh = File.join("$(REACT_NATIVE_PATH)", 'scripts', 'xcode', 'ccache-clang++.sh')
 
             projects.each do |project|
                 project.build_configurations.each do |config|
@@ -119,6 +120,20 @@ class ReactNativePodsUtils
             Pod::UI.puts("#{message_prefix}: Pass ':ccache_enabled => true' to 'react_native_post_install' in your Podfile or set environment variable 'USE_CCACHE=1' to increase the speed of subsequent builds")
         elsif !ccache_available and ccache_enabled
             Pod::UI.warn("#{message_prefix}: Install ccache or ensure your neither passing ':ccache_enabled => true' nor setting environment variable 'USE_CCACHE=1'")
+        else
+            Pod::UI.puts("#{message_prefix}: Removing Ccache from CC, LD, CXX & LDPLUSPLUS build settings")
+
+            projects.each do |project|
+                project.build_configurations.each do |config|
+                    # Using the un-qualified names means you can swap in different implementations, for example ccache
+                    config.build_settings["CC"] = config.build_settings["CC"] ? config.build_settings["CC"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, '') : ""
+                    config.build_settings["LD"] = config.build_settings["LD"] ? config.build_settings["LD"].gsub(/#{Regexp.escape(ccache_clang_sh)}/, "") : ""
+                    config.build_settings["CXX"] = config.build_settings["CXX"] ? config.build_settings["CXX"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : ""
+                    config.build_settings["LDPLUSPLUS"] = config.build_settings["LDPLUSPLUS"] ? config.build_settings["LDPLUSPLUS"].gsub(/#{Regexp.escape(ccache_clangpp_sh)}/, "") : ""
+                end
+
+                project.save()
+            end
         end
     end
 
@@ -580,6 +595,44 @@ class ReactNativePodsUtils
         ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "React-ImageManager", header_search_paths)
     end
 
+    def self.get_privacy_manifest_paths_from(user_project)
+        privacy_manifests = user_project
+            .files
+            .select { |p|
+                p.path&.end_with?('PrivacyInfo.xcprivacy')
+            }
+        return privacy_manifests
+    end
+
+    def self.add_privacy_manifest_if_needed(installer)
+        user_project = installer.aggregate_targets
+                    .map{ |t| t.user_project }
+                    .first
+        privacy_manifest = self.get_privacy_manifest_paths_from(user_project).first
+        if privacy_manifest.nil?
+            file_timestamp_reason = {
+                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryFileTimestamp",
+                "NSPrivacyAccessedAPITypeReasons" => ["C617.1"],
+            }
+            user_defaults_reason = {
+                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategoryUserDefaults",
+                "NSPrivacyAccessedAPITypeReasons" => ["CA92.1"],
+            }
+            boot_time_reason = {
+                "NSPrivacyAccessedAPIType" => "NSPrivacyAccessedAPICategorySystemBootTime",
+                "NSPrivacyAccessedAPITypeReasons" => ["35F9.1"],
+            }
+            privacy_manifest = {
+                "NSPrivacyCollectedDataTypes" => [],
+                "NSPrivacyTracking" => false,
+                "NSPrivacyAccessedAPITypes" => [file_timestamp_reason, user_defaults_reason, boot_time_reason]
+            }
+            path = File.join(user_project.path.parent, "PrivacyInfo.xcprivacy")
+            Xcodeproj::Plist.write_to_path(privacy_manifest, path)
+            Pod::UI.puts "Your app does not have a privacy manifest! A template has been generated containing Required Reasons API usage in the core React Native library. Please add the PrivacyInfo.xcprivacy file to your project and complete data use, tracking and any additional required reasons your app is using according to Apple's guidance: https://developer.apple.com/.../privacy_manifest_files. Then, you will need to manually add this file to your project in Xcode.".red
+        end
+    end
+
     def self.react_native_pods
         return [
             "DoubleConversion",

package/scripts/react_native_pods.rb

@@ -297,6 +297,7 @@ def react_native_post_install(
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
   ReactNativePodsUtils.set_dynamic_frameworks_flags(installer)
   ReactNativePodsUtils.add_ndebug_flag_to_pods_in_release(installer)
+  ReactNativePodsUtils.add_privacy_manifest_if_needed(installer)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, NewArchitectureHelper.new_arch_enabled)

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-03-06-RNv0.74.0-eb237ab61163fe3d064abad22d27902852b52afd
+hermes-2024-04-19-RNv0.74.0-165ff0ee4154834c995b80227ecd67e94a031035

package/template/package.json

@@ -13,16 +13,16 @@
   "dependencies": {
     "expo": "^50.0.11",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.74.0-0rc2"
+    "react-native": "npm:react-native-tvos@0.74.0-0rc3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "0.74.79",
-    "@react-native/eslint-config": "0.74.79",
-    "@react-native/metro-config": "0.74.79",
-    "@react-native/typescript-config": "0.74.79",
+    "@react-native/babel-preset": "0.74.80",
+    "@react-native/eslint-config": "0.74.80",
+    "@react-native/metro-config": "0.74.80",
+    "@react-native/typescript-config": "0.74.80",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",