fix(ios-prebuild): address review on the deps-headers sidecar

Review feedback on ReactNativeDependenciesHeaders + pure-RN ReactNativeHeaders:

- prebuild-ios-dependencies.yml: the sidecar cache key now hashes the two
  cross-package files it is actually generated from — ios-prebuild/
  headers-xcframework.js (emitter) + headers-spec.js (DEPS_NAMESPACES) — in
  BOTH occurrences, and bumps v4->v5. A DEPS_NAMESPACES/emitter edit can no
  longer serve a stale cached sidecar on main.
- prebuild-ios-core.yml: bump the core xcframework cache key v2->v3 to reflect
  the added ReactNativeHeaders tarball in the artifact set (was relying only on
  the hashFiles component).
- headers-xcframework.js: wrap both staging temp dirs (.stub-work-* /
  .deps-headers-stage-*) in try/finally so an xcrun/xcodebuild failure can't
  leave them behind in outDir (= third-party/).
- verifyArtifactsAreOnMaven.js: clarify the comment — the 8 primary xcframework
  classifier tarballs are HEAD-checked; the 4 dSYM classifiers are intentionally
  excluded.
- test-ios-rntester/action.yml: harden the use-prebuilds resolution — only
  true/false enable/disable; an unexpected value warns instead of silently
  disabling.
- reactNativeDependencies.js: comment reconciling the two sidecar sources (the
  full-slice tarball copy vs the ensureHeadersLayout DEFAULT_STUB_SLICES
  fallback) — they agree on the iOS slices SPM needs; headers are slice-uniform.
- Tests: stubSlicesFromXcframework known-slice mapping + unknown-slice throw
  (mocked plutil JSON).

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

Author: chrfalch

.github/actions/test-ios-rntester/action.yml

@@ -61,8 +61,14 @@ runs:
           else
             echo "enabled=true" >> "$GITHUB_OUTPUT"
           fi
+        elif [[ "${{ inputs.use-prebuilds }}" == "true" ]]; then
+          echo "enabled=true" >> "$GITHUB_OUTPUT"
+        elif [[ "${{ inputs.use-prebuilds }}" == "false" ]]; then
+          echo "enabled=false" >> "$GITHUB_OUTPUT"
         else
-          echo "enabled=${{ inputs.use-prebuilds }}" >> "$GITHUB_OUTPUT"
+          # Don't silently treat a typo as 'disabled' — surface it.
+          echo "::warning::Unexpected use-prebuilds value '${{ inputs.use-prebuilds }}' (expected auto/true/false); treating as disabled."
+          echo "enabled=false" >> "$GITHUB_OUTPUT"
         fi
     - name: Download ReactNativeDependencies
       if: ${{ steps.prebuilds.outputs.enabled == 'true' }}

.github/workflow-scripts/verifyArtifactsAreOnMaven.js

@@ -16,9 +16,12 @@ const ARTIFACT_URL =
   'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/';
 const ARTIFACT_NAME = 'react-native-artifacts-';
 
-// The classifier-suffixed tarballs attached to the react-native-artifacts
-// publication (external-artifacts/build.gradle.kts). The POM check alone
-// would pass even when a classifier artifact never made it to Maven.
+// The primary xcframework classifier tarballs attached to the
+// react-native-artifacts publication (external-artifacts/build.gradle.kts).
+// The 4 dSYM classifiers (core/deps dSYM debug+release) are intentionally
+// excluded — they are debug-symbol sidecars, not consumed at install time.
+// The POM check alone would pass even when a classifier artifact never made
+// it to Maven.
 const ARTIFACT_CLASSIFIERS = [
   'reactnative-core-debug',
   'reactnative-core-release',

.github/workflows/prebuild-ios-core.yml

@@ -133,7 +133,7 @@ jobs:
         uses: actions/cache/restore@v5
         with:
           path: packages/react-native/.build/output/xcframeworks
-          key: v2-ios-core-xcframework-${{ matrix.flavor }}-${{ hashFiles('packages/react-native/Package.swift', 'packages/react-native/scripts/ios-prebuild/*.js', 'packages/react-native/scripts/ios-prebuild.js', 'packages/react-native/React/**/*', 'packages/react-native/ReactCommon/**/*', 'packages/react-native/Libraries/**/*') }}
+          key: v3-ios-core-xcframework-${{ matrix.flavor }}-${{ hashFiles('packages/react-native/Package.swift', 'packages/react-native/scripts/ios-prebuild/*.js', 'packages/react-native/scripts/ios-prebuild.js', 'packages/react-native/React/**/*', 'packages/react-native/ReactCommon/**/*', 'packages/react-native/Libraries/**/*') }}
       - name: Setup node.js
         if: steps.restore-ios-xcframework.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-node
@@ -246,4 +246,4 @@ jobs:
             packages/react-native/.build/output/xcframeworks/ReactCore${{matrix.flavor}}.xcframework.tar.gz
             packages/react-native/.build/output/xcframeworks/ReactCore${{matrix.flavor}}.framework.dSYM.tar.gz
             packages/react-native/.build/output/xcframeworks/ReactNativeHeaders${{matrix.flavor}}.xcframework.tar.gz
-          key: v2-ios-core-xcframework-${{ matrix.flavor }}-${{ hashFiles('packages/react-native/Package.swift', 'packages/react-native/scripts/ios-prebuild/*.js', 'packages/react-native/scripts/ios-prebuild.js', 'packages/react-native/React/**/*', 'packages/react-native/ReactCommon/**/*', 'packages/react-native/Libraries/**/*') }}
+          key: v3-ios-core-xcframework-${{ matrix.flavor }}-${{ hashFiles('packages/react-native/Package.swift', 'packages/react-native/scripts/ios-prebuild/*.js', 'packages/react-native/scripts/ios-prebuild.js', 'packages/react-native/React/**/*', 'packages/react-native/ReactCommon/**/*', 'packages/react-native/Libraries/**/*') }}

.github/workflows/prebuild-ios-dependencies.yml

@@ -130,7 +130,7 @@ jobs:
         with:
           path: |
             packages/react-native/third-party/
-          key: v4-ios-dependencies-xcframework-${{ matrix.flavor }}-${{ hashfiles('scripts/releases/ios-prebuild/configuration.js', 'scripts/releases/ios-prebuild/compose-framework.js') }}
+          key: v5-ios-dependencies-xcframework-${{ matrix.flavor }}-${{ hashfiles('scripts/releases/ios-prebuild/configuration.js', 'scripts/releases/ios-prebuild/compose-framework.js', 'packages/react-native/scripts/ios-prebuild/headers-xcframework.js', 'packages/react-native/scripts/ios-prebuild/headers-spec.js') }}
       # If cache hit, we already have our binary. We don't need to do anything.
       - name: Yarn Install
         if: steps.restore-xcframework.outputs.cache-hit != 'true'
@@ -204,4 +204,4 @@ jobs:
             packages/react-native/third-party/ReactNativeDependencies${{ matrix.flavor }}.xcframework.tar.gz
             packages/react-native/third-party/ReactNativeDependenciesHeaders${{ matrix.flavor }}.xcframework.tar.gz
             packages/react-native/third-party/ReactNativeDependencies${{ matrix.flavor }}.framework.dSYM.tar.gz
-          key: v4-ios-dependencies-xcframework-${{ matrix.flavor }}-${{ hashfiles('scripts/releases/ios-prebuild/configuration.js', 'scripts/releases/ios-prebuild/compose-framework.js') }}
+          key: v5-ios-dependencies-xcframework-${{ matrix.flavor }}-${{ hashfiles('scripts/releases/ios-prebuild/configuration.js', 'scripts/releases/ios-prebuild/compose-framework.js', 'packages/react-native/scripts/ios-prebuild/headers-xcframework.js', 'packages/react-native/scripts/ios-prebuild/headers-spec.js') }}

packages/react-native/scripts/ios-prebuild/__tests__/headers-xcframework-test.js

@@ -10,7 +10,11 @@
 
 'use strict';
 
-const {buildDepsHeadersXcframework} = require('../headers-xcframework');
+const {
+  buildDepsHeadersXcframework,
+  stubSlicesFromXcframework,
+} = require('../headers-xcframework');
+const childProcess = require('child_process');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -57,3 +61,53 @@ describe('buildDepsHeadersXcframework set-equality gate', () => {
     ).toThrow(/missing from .*Headers: glog/); // throws for glog, not stray.h
   });
 });
+
+describe('stubSlicesFromXcframework', () => {
+  // The plist shape is a pure function of plutil's JSON; mock it so the
+  // SupportedPlatform/Variant -> key mapping and the unknown-slice guard can be
+  // tested without a real xcframework or macOS tooling.
+  const mockPlist = (obj /*: mixed */) =>
+    jest
+      .spyOn(childProcess, 'execSync')
+      .mockReturnValue(Buffer.from(JSON.stringify(obj)));
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  test('maps ios / ios-simulator slices to their stub recipes', () => {
+    mockPlist({
+      AvailableLibraries: [
+        {SupportedPlatform: 'ios', SupportedArchitectures: ['arm64']},
+        {
+          SupportedPlatform: 'ios',
+          SupportedPlatformVariant: 'simulator',
+          SupportedArchitectures: ['arm64', 'x86_64'],
+        },
+      ],
+    });
+    const slices = stubSlicesFromXcframework('/fake.xcframework');
+    expect(slices).toEqual([
+      {name: 'ios', sdk: 'iphoneos', targets: ['arm64-apple-ios15.0']},
+      {
+        name: 'ios-simulator',
+        sdk: 'iphonesimulator',
+        targets: [
+          'arm64-apple-ios15.0-simulator',
+          'x86_64-apple-ios15.0-simulator',
+        ],
+      },
+    ]);
+  });
+
+  test('throws for an unknown slice, pointing at PLATFORM_STUB_RECIPES', () => {
+    mockPlist({
+      AvailableLibraries: [
+        {SupportedPlatform: 'watchos', SupportedArchitectures: ['arm64']},
+      ],
+    });
+    expect(() => stubSlicesFromXcframework('/fake.xcframework')).toThrow(
+      /no stub recipe for slice 'watchos'[\s\S]*PLATFORM_STUB_RECIPES/,
+    );
+  });
+});

packages/react-native/scripts/ios-prebuild/headers-xcframework.js

@@ -129,45 +129,50 @@ function composeHeadersOnlyXcframework(
   slices /*: Array<StubSlice> */,
 ) /*: string */ {
   const work = fs.mkdtempSync(path.join(outDir, '.stub-work-'));
-  fs.writeFileSync(
-    path.join(work, 'stub.c'),
-    `// ${name} is headers-only; this stub satisfies xcframework tooling.\n` +
-      `static int ${name}Stub __attribute__((unused)) = 0;\n`,
-  );
-  const libs = slices.map(slice => {
-    const sdkPath = execSync(`xcrun --sdk ${slice.sdk} --show-sdk-path`)
-      .toString()
-      .trim();
-    const thins = slice.targets.map((t, i) => {
-      const obj = path.join(work, `stub-${slice.name}-${i}.o`);
-      execSync(
-        `xcrun clang -c -target ${t} -isysroot "${sdkPath}" "${path.join(work, 'stub.c')}" -o "${obj}"`,
-      );
-      const lib = path.join(work, `stub-${slice.name}-${i}.a`);
-      execSync(`xcrun libtool -static -o "${lib}" "${obj}" 2>/dev/null`);
-      return lib;
+  // try/finally so an xcrun/xcodebuild failure mid-compose doesn't leave the
+  // .stub-work-* staging dir behind in outDir.
+  try {
+    fs.writeFileSync(
+      path.join(work, 'stub.c'),
+      `// ${name} is headers-only; this stub satisfies xcframework tooling.\n` +
+        `static int ${name}Stub __attribute__((unused)) = 0;\n`,
+    );
+    const libs = slices.map(slice => {
+      const sdkPath = execSync(`xcrun --sdk ${slice.sdk} --show-sdk-path`)
+        .toString()
+        .trim();
+      const thins = slice.targets.map((t, i) => {
+        const obj = path.join(work, `stub-${slice.name}-${i}.o`);
+        execSync(
+          `xcrun clang -c -target ${t} -isysroot "${sdkPath}" "${path.join(work, 'stub.c')}" -o "${obj}"`,
+        );
+        const lib = path.join(work, `stub-${slice.name}-${i}.a`);
+        execSync(`xcrun libtool -static -o "${lib}" "${obj}" 2>/dev/null`);
+        return lib;
+      });
+      const outLib = path.join(work, `lib${name}-${slice.name}.a`);
+      if (thins.length === 1) {
+        fs.copyFileSync(thins[0], outLib);
+      } else {
+        execSync(
+          `xcrun lipo -create ${thins.map(l => `"${l}"`).join(' ')} -output "${outLib}"`,
+        );
+      }
+      return outLib;
     });
-    const outLib = path.join(work, `lib${name}-${slice.name}.a`);
-    if (thins.length === 1) {
-      fs.copyFileSync(thins[0], outLib);
-    } else {
-      execSync(
-        `xcrun lipo -create ${thins.map(l => `"${l}"`).join(' ')} -output "${outLib}"`,
-      );
-    }
-    return outLib;
-  });
 
-  const outXcfw = path.join(outDir, `${name}.xcframework`);
-  fs.rmSync(outXcfw, {recursive: true, force: true});
-  execSync(
-    `xcodebuild -create-xcframework ` +
-      libs.map(l => `-library "${l}" -headers "${stage}"`).join(' ') +
-      ` -output "${outXcfw}"`,
-    {stdio: 'pipe'},
-  );
-  fs.rmSync(work, {recursive: true, force: true});
-  return outXcfw;
+    const outXcfw = path.join(outDir, `${name}.xcframework`);
+    fs.rmSync(outXcfw, {recursive: true, force: true});
+    execSync(
+      `xcodebuild -create-xcframework ` +
+        libs.map(l => `-library "${l}" -headers "${stage}"`).join(' ') +
+        ` -output "${outXcfw}"`,
+      {stdio: 'pipe'},
+    );
+    return outXcfw;
+  } finally {
+    fs.rmSync(work, {recursive: true, force: true});
+  }
 }
 
 const DEPS_HEADERS_XCFRAMEWORK_NAME = 'ReactNativeDependenciesHeaders';
@@ -211,18 +216,24 @@ function buildDepsHeadersXcframework(
   }
 
   const stage = fs.mkdtempSync(path.join(outDir, '.deps-headers-stage-'));
-  for (const ns of namespaces) {
-    execSync(
-      `/bin/cp -Rc "${path.join(depsHeaders, ns)}" "${path.join(stage, ns)}"`,
+  // try/finally so a cp/compose failure doesn't leave the .deps-headers-stage-*
+  // dir behind in outDir (= third-party/ for the deps path).
+  let outXcfw;
+  try {
+    for (const ns of namespaces) {
+      execSync(
+        `/bin/cp -Rc "${path.join(depsHeaders, ns)}" "${path.join(stage, ns)}"`,
+      );
+    }
+    outXcfw = composeHeadersOnlyXcframework(
+      outDir,
+      DEPS_HEADERS_XCFRAMEWORK_NAME,
+      stage,
+      slices,
     );
+  } finally {
+    fs.rmSync(stage, {recursive: true, force: true});
   }
-  const outXcfw = composeHeadersOnlyXcframework(
-    outDir,
-    DEPS_HEADERS_XCFRAMEWORK_NAME,
-    stage,
-    slices,
-  );
-  fs.rmSync(stage, {recursive: true, force: true});
   console.log(
     `headers-xcframework: ${DEPS_HEADERS_XCFRAMEWORK_NAME}.xcframework ` +
       `(${slices.map(s => s.name).join(', ')}) -> ${outXcfw} ` +

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

@@ -98,6 +98,14 @@ async function prepareReactNativeDependenciesArtifactsAsync(
   // invisible to binaryTargets). Absent only in pre-sidecar tarballs (pinned
   // RN_DEP_VERSION): CocoaPods still works (the pod flattens the binary's
   // root Headers/), SwiftPM consumers regain it via ensureHeadersLayout.
+  //
+  // Slice coverage: this tarball sidecar carries ALL slices the deps prebuild
+  // produced. The ensureHeadersLayout fallback (headers-compose.js) rebuilds it
+  // from DEFAULT_STUB_SLICES (ios + ios-simulator only) — sufficient for a
+  // SwiftPM iOS build, which is the only supported SPM target today. The two
+  // paths therefore agree on the iOS slices; the fallback simply omits the
+  // extra slices (catalyst/tvos/...) that no SPM consumer needs yet. Headers
+  // are slice-uniform, so a consumer never sees divergent content per slice.
   const headersSidecarSource = path.join(
     path.dirname(xcframeworkSource),
     'ReactNativeDependenciesHeaders.xcframework',