Simplify verbose [macOS] comments

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Saadnajmi

packages/react-native/Package.swift

@@ -246,15 +246,12 @@ let reactJsErrorHandler = RNTarget(
 let reactGraphicsApple = RNTarget(
   name: .reactGraphicsApple,
   path: "ReactCommon/react/renderer/graphics/platform/ios",
-  linkedFrameworks: ["CoreGraphics"], // [macOS] UIKit removed; linked conditionally via platformLinkerSettings below
-  // [macOS: UIKit on iOS/visionOS, AppKit on macOS
-  // Note: #if os(macOS) doesn't work here because Package.swift runs on the host,
-  // not the target. Use .when(platforms:) for cross-compilation support.
+  linkedFrameworks: ["CoreGraphics"],
+  // [macOS] UIKit/AppKit linked conditionally for cross-compilation
   platformLinkerSettings: [
     .linkedFramework("UIKit", .when(platforms: [.iOS, .visionOS])),
     .linkedFramework("AppKit", .when(platforms: [.macOS])),
   ],
-  // macOS]
   dependencies: [.reactDebug, .jsi, .reactUtils, .reactNativeDependencies]
 )
 
@@ -368,13 +365,13 @@ let reactCore = RNTarget(
     "ReactCommon/react/runtime/platform/ios", // explicit header search path to break circular dependency. RCTHost imports `RCTDefines.h` in ReactCore, ReacCore needs to import RCTHost
   ],
   linkedFrameworks: ["CoreServices"],
-  excludedPaths: ["Fabric", "Tests", "Resources", "Runtime/RCTJscInstanceFactory.mm", "I18n/strings", "CxxBridge/JSCExecutorFactory.mm", "CoreModules", "RCTUIKit"], // [macOS] added RCTUIKit exclusion (separate target)
-  dependencies: [.reactNativeDependencies, .reactCxxReact, .reactPerfLogger, .jsi, .reactJsiExecutor, .reactUtils, .reactFeatureFlags, .reactRuntimeScheduler, .yoga, .reactJsInspector, .reactJsiTooling, .rctDeprecation, .reactCoreRCTWebsocket, .reactRCTImage, .reactTurboModuleCore, .reactRCTText, .reactRCTBlob, .reactRCTAnimation, .reactRCTNetwork, .reactFabric, .hermesPrebuilt, .reactRCTUIKit], // [macOS] added .reactRCTUIKit
+  excludedPaths: ["Fabric", "Tests", "Resources", "Runtime/RCTJscInstanceFactory.mm", "I18n/strings", "CxxBridge/JSCExecutorFactory.mm", "CoreModules", "RCTUIKit"], // [macOS]
+  dependencies: [.reactNativeDependencies, .reactCxxReact, .reactPerfLogger, .jsi, .reactJsiExecutor, .reactUtils, .reactFeatureFlags, .reactRuntimeScheduler, .yoga, .reactJsInspector, .reactJsiTooling, .rctDeprecation, .reactCoreRCTWebsocket, .reactRCTImage, .reactTurboModuleCore, .reactRCTText, .reactRCTBlob, .reactRCTAnimation, .reactRCTNetwork, .reactFabric, .hermesPrebuilt, .reactRCTUIKit], // [macOS]
   sources: [".", "Runtime/RCTHermesInstanceFactory.mm"]
 )
 
 /// React-Fabric.podspec
-// [macOS: on macOS, use platform/macos view sources instead of platform/cxx
+// [macOS
 #if os(macOS)
 let reactFabricViewPlatformSources = ["components/view/platform/macos"]
 let reactFabricViewPlatformExcludes = ["components/view/platform/cxx"]
@@ -393,7 +390,7 @@ let reactFabric = RNTarget(
     "components/view/tests",
     "components/view/platform/android",
     "components/view/platform/windows",
-    // "components/view/platform/macos", // [macOS] moved to reactFabricViewPlatformExcludes for conditional exclusion
+    // "components/view/platform/macos", // [macOS]
     "components/scrollview/tests",
     "components/scrollview/platform/android",
     "mounting/tests",
@@ -437,16 +434,16 @@ let reactFabricComponents = RNTarget(
     "components/modal/platform/cxx",
     "components/view/platform/android",
     "components/view/platform/windows",
-    // "components/view/platform/macos", // [macOS] not needed here — sources don't include components/view
+    // "components/view/platform/macos", // [macOS]
     "components/textinput/platform/android",
-    // "components/textinput/platform/macos", // [macOS] removed — directory does not exist
+    // "components/textinput/platform/macos", // [macOS]
     "components/text/platform/android",
     "components/text/tests",
     "textlayoutmanager/tests",
     "textlayoutmanager/platform/android",
     "textlayoutmanager/platform/cxx",
     "textlayoutmanager/platform/windows",
-    // "textlayoutmanager/platform/macos", // [macOS] removed — directory does not exist
+    // "textlayoutmanager/platform/macos", // [macOS]
     "conponents/rncore", // this was the old folder where RN Core Components were generated. If you ran codegen in the past, you might have some files in it that might make the build fail.
   ],
   dependencies: [.reactNativeDependencies, .reactCore, .reactJsiExecutor, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .yoga, .reactRendererDebug, .reactGraphics, .reactFabric, .reactTurboModuleBridging],
@@ -662,7 +659,7 @@ class BinaryTarget: BaseTarget {
 
 class RNTarget: BaseTarget {
   let linkedFrameworks: [String]
-  let platformLinkerSettings: [LinkerSetting] // [macOS] Platform-conditional framework linking (e.g. UIKit vs AppKit)
+  let platformLinkerSettings: [LinkerSetting] // [macOS]
   let excludedPaths: [String]
   let dependencies: [String]
   let sources: [String]?

packages/react-native/scripts/ios-prebuild/hermes.js

@@ -62,8 +62,6 @@ async function prepareHermesArtifactsAsync(
     let resolvedVersion = process.env.HERMES_VERSION ?? version;
 
     // [macOS] Map macOS version to upstream RN version for artifact lookup.
-    // If no mapped version is found (main branch / 1000.0.0), allowBuildFromSource
-    // enables the fallback to hermesCommitAtMergeBase() when no prebuilt artifacts exist.
     let allowBuildFromSource = false;
     if (!process.env.HERMES_VERSION) {
       const packageJsonPath = path.resolve(
@@ -279,8 +277,7 @@ async function hermesSourceType(
     return HermesEngineSourceTypes.DOWNLOAD_PREBUILT_NIGHTLY_TARBALL;
   }
 
-  // [macOS] When on the macOS main branch (no mapped version, no explicit HERMES_VERSION),
-  // fall back to resolving the Hermes commit at the merge base with facebook/react-native.
+  // [macOS] Fall back to building Hermes from the merge-base commit.
   if (allowBuildFromSource) {
     hermesLog(
       'No prebuilt Hermes artifact found. Will attempt to resolve from merge base with facebook/react-native.',
@@ -486,7 +483,10 @@ async function buildFromHermesCommit(
     const tarballName = `hermes-ios-${buildType.toLowerCase()}.tar.gz`;
     const tarballPath = path.join(artifactsPath, tarballName);
     hermesLog('Creating Hermes tarball from build output...');
-    execSync(`tar -czf "${tarballPath}" -C "${hermesDir}" destroot`, inheritStdio);
+    execSync(
+      `tar -czf "${tarballPath}" -C "${hermesDir}" destroot`,
+      inheritStdio,
+    );
 
     hermesLog(`Hermes built from source and packaged at ${tarballPath}`);
     return tarballPath;

packages/react-native/scripts/ios-prebuild/macosVersionResolver.js

@@ -4,9 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * [macOS] This file is specific to react-native-macos and has no upstream equivalent.
- * It handles version resolution for macOS fork branches where the package version
- * differs from upstream react-native.
+ * [macOS] Handles version resolution for macOS fork branches.
  *
  * @flow
  * @format

packages/react-native/scripts/ios-prebuild/reactNativeDependencies.js

@@ -50,8 +50,6 @@ async function prepareReactNativeDependenciesArtifactsAsync(
   let resolvedVersion = process.env.RN_DEP_VERSION ?? version;
 
   // [macOS] Map macOS version to upstream RN version for artifact lookup.
-  // For stable branches, peerDependencies maps to the upstream version.
-  // For the main branch (1000.0.0), fall back to the latest stable RN release.
   if (!process.env.RN_DEP_VERSION) {
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
     const mappedVersion = findMatchingHermesVersion(packageJsonPath);

packages/react-native/sdks/hermes-engine/utils/build-apple-framework.sh

@@ -12,7 +12,7 @@ CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
 BUILD_TYPE=${BUILD_TYPE:-Debug}
 
-# [macOS] Allow HERMES_PATH override for building from a standalone Hermes checkout
+# [macOS]
 HERMES_PATH=${HERMES_PATH:-"$CURR_SCRIPT_DIR/.."}
 REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$CURR_SCRIPT_DIR/../../..}
 

packages/react-native/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -20,7 +20,7 @@ function get_architecture {
       echo "arm64"
     elif [[ $1 == "appletvsimulator" ]]; then
       echo "x86_64;arm64"
-    elif [[ $1 == "catalyst" || $1 == "macosx" ]]; then # [macOS] added macosx
+    elif [[ $1 == "catalyst" || $1 == "macosx" ]]; then # [macOS]
       echo "x86_64;arm64"
     else
       echo "Error: unknown architecture passed $1"
@@ -57,7 +57,7 @@ function build_framework {
 # group the frameworks together to create a universal framework
 function build_universal_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        create_universal_framework "macosx" "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator" # [macOS] added macosx
+        create_universal_framework "macosx" "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator" # [macOS]
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi