refactor: address PR review comments (diff tags, code cleanup)

- Add missing [macOS] diff tags across Package.swift, hermes.js, and
  shell build scripts per the diff tag guide
- Move macosx case to bottom of get_deployment_target elif chain to
  minimize upstream diff in build-ios-framework.sh
- Remove hermes.js re-exports; import directly from macosVersionResolver
- Extract {stdio: 'inherit'} to const in buildFromHermesCommit
- Add HERMES_PATH override comment in build-apple-framework.sh
- Increase CI artifact retention-days from 1 to 30
- Add commented-out lines for removed upstream excludes in Package.swift

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

Author: Saadnajmi

.github/workflows/microsoft-build-spm.yml

@@ -34,7 +34,7 @@ jobs:
         id: resolve
         working-directory: packages/react-native
         run: |
-          COMMIT=$(node -e "const {hermesCommitAtMergeBase} = require('./scripts/ios-prebuild/hermes'); console.log(hermesCommitAtMergeBase().commit);" 2>&1 | grep -E '^[0-9a-f]{40}$')
+          COMMIT=$(node -e "const {hermesCommitAtMergeBase} = require('./scripts/ios-prebuild/macosVersionResolver'); console.log(hermesCommitAtMergeBase().commit);" 2>&1 | grep -E '^[0-9a-f]{40}$')
           echo "hermes-commit=$COMMIT" >> "$GITHUB_OUTPUT"
           echo "Resolved Hermes commit: $COMMIT"
 
@@ -51,7 +51,7 @@ jobs:
         with:
           name: hermes-artifacts
           path: hermes-destroot
-          retention-days: 1
+          retention-days: 30
 
   build-hermesc:
     name: "Build hermesc"
@@ -89,7 +89,7 @@ jobs:
         with:
           name: hermesc
           path: hermes/build_host_hermesc
-          retention-days: 1
+          retention-days: 30
 
   build-hermes-slice:
     name: "Hermes ${{ matrix.slice }}"
@@ -151,7 +151,7 @@ jobs:
         with:
           name: hermes-slice-${{ matrix.slice }}
           path: hermes/destroot
-          retention-days: 1
+          retention-days: 30
 
   assemble-hermes:
     name: "Assemble Hermes xcframework"
@@ -207,7 +207,7 @@ jobs:
         with:
           name: hermes-artifacts
           path: hermes/destroot
-          retention-days: 1
+          retention-days: 30
 
   build-spm:
     name: "SPM ${{ matrix.platform }}"

packages/react-native/Package.swift

@@ -246,7 +246,7 @@ let reactJsErrorHandler = RNTarget(
 let reactGraphicsApple = RNTarget(
   name: .reactGraphicsApple,
   path: "ReactCommon/react/renderer/graphics/platform/ios",
-  linkedFrameworks: ["CoreGraphics"],
+  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.
@@ -368,8 +368,8 @@ 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"],
-  dependencies: [.reactNativeDependencies, .reactCxxReact, .reactPerfLogger, .jsi, .reactJsiExecutor, .reactUtils, .reactFeatureFlags, .reactRuntimeScheduler, .yoga, .reactJsInspector, .reactJsiTooling, .rctDeprecation, .reactCoreRCTWebsocket, .reactRCTImage, .reactTurboModuleCore, .reactRCTText, .reactRCTBlob, .reactRCTAnimation, .reactRCTNetwork, .reactFabric, .hermesPrebuilt, .reactRCTUIKit],
+  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
   sources: [".", "Runtime/RCTHermesInstanceFactory.mm"]
 )
 
@@ -393,8 +393,7 @@ let reactFabric = RNTarget(
     "components/view/tests",
     "components/view/platform/android",
     "components/view/platform/windows",
-    // "components/view/platform/cxx", // [macOS] excluded on macOS, included on iOS/visionOS (see reactFabricViewPlatformExcludes)
-    // "components/view/platform/macos", // [macOS] excluded on iOS/visionOS, included on macOS (see reactFabricViewPlatformExcludes)
+    // "components/view/platform/macos", // [macOS] moved to reactFabricViewPlatformExcludes for conditional exclusion
     "components/scrollview/tests",
     "components/scrollview/platform/android",
     "mounting/tests",
@@ -440,12 +439,14 @@ let reactFabricComponents = RNTarget(
     "components/view/platform/windows",
     // "components/view/platform/macos", // [macOS] not needed here — sources don't include components/view
     "components/textinput/platform/android",
+    // "components/textinput/platform/macos", // [macOS] removed — directory does not exist
     "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
     "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],

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

@@ -105,7 +105,7 @@ async function prepareHermesArtifactsAsync(
     const sourceType = await hermesSourceType(
       resolvedVersion,
       buildType,
-      allowBuildFromSource,
+      allowBuildFromSource, // [macOS]
     );
     localPath = await resolveSourceFromSourceType(
       sourceType,
@@ -156,7 +156,7 @@ type HermesEngineSourceType =
   | 'local_prebuilt_tarball'
   | 'download_prebuild_tarball'
   | 'download_prebuilt_nightly_tarball'
-  | 'build_from_hermes_commit'
+  | 'build_from_hermes_commit' // [macOS]
 */
 
 const HermesEngineSourceTypes = {
@@ -255,16 +255,11 @@ async function hermesArtifactExists(
 
 /**
  * Determines the source type for Hermes based on availability
- *
- * @param version - The resolved version string
- * @param buildType - Debug or Release
- * @param allowBuildFromSource - If true (macOS main branch), fall back to BUILD_FROM_HERMES_COMMIT
- *   when no prebuilt artifacts exist. If false, fall back to nightly download (original behavior).
  */
 async function hermesSourceType(
   version /*: string */,
   buildType /*: BuildFlavor */,
-  allowBuildFromSource /*: boolean */ = false,
+  allowBuildFromSource /*: boolean */ = false, // [macOS]
 ) /*: Promise<HermesEngineSourceType> */ {
   if (hermesEngineTarballEnvvarDefined()) {
     hermesLog('Using local prebuild tarball');
@@ -440,20 +435,22 @@ async function buildFromHermesCommit(
   const HERMES_GITHUB_URL = 'https://github.com/facebook/hermes.git';
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'hermes-build-'));
   const hermesDir = path.join(tmpDir, 'hermes');
+  const inheritStdio = {stdio: 'inherit'};
 
   try {
     // Clone Hermes at the identified commit using the most efficient
     // single-fetch pattern (see https://github.com/actions/checkout)
     hermesLog(`Cloning Hermes at commit ${commit}...`);
-    execSync(`git init "${hermesDir}"`, {stdio: 'inherit'});
-    execSync(`git -C "${hermesDir}" remote add origin ${HERMES_GITHUB_URL}`, {
-      stdio: 'inherit',
-    });
+    execSync(`git init "${hermesDir}"`, inheritStdio);
+    execSync(
+      `git -C "${hermesDir}" remote add origin ${HERMES_GITHUB_URL}`,
+      inheritStdio,
+    );
     execSync(
       `git -C "${hermesDir}" fetch --no-tags --depth 1 origin +${commit}:refs/remotes/origin/main`,
-      {stdio: 'inherit', timeout: 300000},
+      {...inheritStdio, timeout: 300000},
     );
-    execSync(`git -C "${hermesDir}" checkout main`, {stdio: 'inherit'});
+    execSync(`git -C "${hermesDir}" checkout main`, inheritStdio);
 
     const reactNativeRoot = path.resolve(__dirname, '..', '..');
     const buildScript = path.join(
@@ -479,8 +476,8 @@ async function buildFromHermesCommit(
 
     hermesLog(`Building Hermes frameworks (${buildType})...`);
     execSync(`bash "${buildScript}"`, {
+      ...inheritStdio,
       cwd: hermesDir,
-      stdio: 'inherit',
       timeout: 3600000, // 60 minutes
       env: buildEnv,
     });
@@ -489,9 +486,7 @@ 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`, {
-      stdio: 'inherit',
-    });
+    execSync(`tar -czf "${tarballPath}" -C "${hermesDir}" destroot`, inheritStdio);
 
     hermesLog(`Hermes built from source and packaged at ${tarballPath}`);
     return tarballPath;
@@ -535,6 +530,4 @@ function abort(message /*: string */) {
 
 module.exports = {
   prepareHermesArtifactsAsync,
-  findMatchingHermesVersion, // [macOS] re-exported from macosVersionResolver.js
-  hermesCommitAtMergeBase, // [macOS] re-exported from macosVersionResolver.js
 };

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

@@ -12,6 +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
 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
+    elif [[ $1 == "catalyst" || $1 == "macosx" ]]; then # [macOS] added macosx
       echo "x86_64;arm64"
     else
       echo "Error: unknown architecture passed $1"
@@ -29,10 +29,12 @@ function get_architecture {
 }
 
 function get_deployment_target {
-    if [[ $1 == "macosx" ]]; then
-      echo "$(get_mac_deployment_target)"
-    elif [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
+    if [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
       echo "$(get_visionos_deployment_target)"
+    # [macOS
+    elif [[ $1 == "macosx" ]]; then
+      echo "$(get_mac_deployment_target)"
+    # macOS]
     else # tvOS and iOS use the same deployment target
       echo "$(get_ios_deployment_target)"
     fi
@@ -55,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"
+        create_universal_framework "macosx" "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator" # [macOS] added macosx
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,7 +67,7 @@ function build_universal_framework {
 # this is used to preserve backward compatibility
 function create_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        build_framework "macosx"
+        build_framework "macosx" # [macOS]
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"