Merge remote-tracking branch 'upstream/main' into assets-catalog

# Conflicts:
#	packages/react-native/package.json

Author: janicduplessis

.eslintrc.js

@@ -15,7 +15,7 @@ module.exports = {
 
   extends: ['@react-native'],
 
-  plugins: ['@react-native/monorepo', '@react-native/specs'],
+  plugins: ['@react-native/monorepo', '@react-native/specs', 'import'],
 
   overrides: [
     // overriding the JS config from @react-native/eslint-config to ensure
@@ -44,6 +44,7 @@ module.exports = {
       files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
       rules: {
         '@react-native/no-deep-imports': 'off',
+        'import/enforce-node-protocol-usage': ['warn', 'always'],
       },
     },
     {
@@ -61,17 +62,14 @@ module.exports = {
       files: ['package.json'],
       parser: 'jsonc-eslint-parser',
     },
-    {
-      files: ['package.json'],
-      rules: {
-        '@react-native/monorepo/react-native-manifest': 'error',
-      },
-    },
     {
       files: ['flow-typed/**/*.js', 'packages/react-native/flow/**/*'],
       rules: {
         '@react-native/monorepo/valid-flow-typed-signature': 'error',
         'ft-flow/require-valid-file-annotation': 'off',
+        // These libdefs are kept byte-identical across projects (see
+        // flow-typed-sync-test), so they must not be migrated independently.
+        'import/enforce-node-protocol-usage': 'off',
         'no-shadow': 'off',
         'no-unused-vars': 'off',
         quotes: 'off',

.flowconfig

@@ -56,6 +56,8 @@ experimental.multi_platform.extensions=.android
 munge_underscores=true
 
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
+module.name_mapper='^react-native/react-private-interface$' -> '<PROJECT_ROOT>/packages/react-native/src/react-private-interface.js'
+module.name_mapper='^react-native/setup-env$' -> '<PROJECT_ROOT>/packages/react-native/src/setup-env.js'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native/\1'
 module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
 module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\|xml\|ktx\|heic\|heif\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
@@ -87,4 +89,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.319.0
+^0.322.0

.github/actions/build-npm-package/action.yml

@@ -31,6 +31,15 @@ runs:
         pattern: ReactCore*
         path: ./packages/react-native/ReactAndroid/external-artifacts/artifacts
         merge-multiple: true
+    # ReactNativeDependenciesHeaders* is already covered by the
+    # ReactNativeDependencies* pattern above; ReactNativeHeaders* needs its own.
+    - name: Download ReactNativeHeaders artifacts
+      if: ${{ inputs.skip-apple-prebuilts != 'true' }}
+      uses: actions/download-artifact@v7
+      with:
+        pattern: ReactNativeHeaders*
+        path: ./packages/react-native/ReactAndroid/external-artifacts/artifacts
+        merge-multiple: true
     - name: Print Artifacts Directory
       if: ${{ inputs.skip-apple-prebuilts != 'true' }}
       shell: bash

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

@@ -15,9 +15,18 @@ inputs:
     required: false
     default: false
   use-frameworks:
-    description: Whether we have to build with Dynamic Frameworks. If this is set to true, it builds from source
+    description: Whether we have to build with Dynamic Frameworks.
     required: false
     default: false
+  use-prebuilds:
+    description: >-
+      Whether to consume the prebuilt ReactCore/ReactNativeDependencies
+      artifacts. 'auto' (default) keeps the historical coupling: prebuilds for
+      static, source for dynamic frameworks. Pass 'true' with
+      use-frameworks:true for the prebuilt + dynamic-frameworks lane (the
+      config of the 2026-07-03 SocketRocket dual-copy regression).
+    required: false
+    default: auto
 
 runs:
   using: composite
@@ -41,33 +50,53 @@ runs:
     - name: Prepare IOS Tests
       if: ${{ inputs.run-unit-tests == 'true' }}
       uses: ./.github/actions/prepare-ios-tests
+    - name: Resolve prebuilds mode
+      id: prebuilds
+      shell: bash
+      run: |
+        if [[ "${{ inputs.use-prebuilds }}" == "auto" ]]; then
+          # Historical coupling: prebuilds for static, source for dynamic frameworks.
+          if [[ "${{ inputs.use-frameworks }}" == "true" ]]; then
+            echo "enabled=false" >> "$GITHUB_OUTPUT"
+          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
+          # 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: ${{ inputs.use-frameworks == 'false' }}
+      if: ${{ steps.prebuilds.outputs.enabled == 'true' }}
       uses: actions/download-artifact@v7
       with:
         name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/third-party/
     - name: Print third-party folder
-      if: ${{ inputs.use-frameworks == 'false' }}
+      if: ${{ steps.prebuilds.outputs.enabled == 'true' }}
       shell: bash
       run: ls -lR /tmp/third-party
     - name: Download React Native Prebuilds
-      if: ${{ inputs.use-frameworks == 'false' }}
+      if: ${{ steps.prebuilds.outputs.enabled == 'true' }}
       uses: actions/download-artifact@v7
       with:
         name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/ReactCore
     - name: Print ReactCore folder
-      if: ${{ inputs.use-frameworks == 'false' }}
+      if: ${{ steps.prebuilds.outputs.enabled == 'true' }}
       shell: bash
       run: ls -lR /tmp/ReactCore
     - name: Install CocoaPods dependencies
       shell: bash
       run: |
         if [[ ${{ inputs.use-frameworks }} == "true" ]]; then
           export USE_FRAMEWORKS=dynamic
-        else
-          # If use-frameworks is false, let's use prebuilds
+        fi
+        if [[ "${{ steps.prebuilds.outputs.enabled }}" == "true" ]]; then
           export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
           export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
         fi

.github/workflow-scripts/__tests__/verifyArtifactsAreOnMaven-test.js

@@ -22,24 +22,47 @@ jest.mock('../utils.js', () => ({
 process.exit = mockExit;
 global.fetch = mockFetch;
 
+const BASE_URL =
+  'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts';
+
+// The verifier HEAD-checks the POM plus every classifier tarball attached to
+// the react-native-artifacts publication (external-artifacts/build.gradle.kts).
+const expectedUrls = version => [
+  `${BASE_URL}/${version}/react-native-artifacts-${version}.pom`,
+  ...[
+    'reactnative-core-debug',
+    'reactnative-core-release',
+    'reactnative-dependencies-debug',
+    'reactnative-dependencies-release',
+    'reactnative-headers-debug',
+    'reactnative-headers-release',
+    'reactnative-dependencies-headers-debug',
+    'reactnative-dependencies-headers-release',
+  ].map(
+    classifier =>
+      `${BASE_URL}/${version}/react-native-artifacts-${version}-${classifier}.tar.gz`,
+  ),
+];
+
 describe('#verifyArtifactsAreOnMaven', () => {
   beforeEach(jest.clearAllMocks);
 
   it('waits for the packages to be published on maven when version has no v', async () => {
     mockSleep.mockReturnValueOnce(Promise.resolve()).mockImplementation(() => {
       throw new Error('Should not be called again!');
     });
+    // First attempt: the POM is not there yet. Second attempt: every URL is.
     mockFetch
       .mockReturnValueOnce(Promise.resolve({status: 404}))
-      .mockReturnValueOnce(Promise.resolve({status: 200}));
+      .mockReturnValue(Promise.resolve({status: 200}));
 
     const version = '0.78.1';
     await verifyArtifactsAreOnMaven(version);
 
     expect(mockSleep).toHaveBeenCalledTimes(1);
-    expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
-    );
+    for (const url of expectedUrls('0.78.1')) {
+      expect(mockFetch).toHaveBeenCalledWith(url, {method: 'HEAD'});
+    }
   });
 
   it('waits for the packages to be published on maven, when version starts with v', async () => {
@@ -48,27 +71,46 @@ describe('#verifyArtifactsAreOnMaven', () => {
     });
     mockFetch
       .mockReturnValueOnce(Promise.resolve({status: 404}))
-      .mockReturnValueOnce(Promise.resolve({status: 200}));
+      .mockReturnValue(Promise.resolve({status: 200}));
 
     const version = 'v0.78.1';
     await verifyArtifactsAreOnMaven(version);
 
     expect(mockSleep).toHaveBeenCalledTimes(1);
-    expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
-    );
+    for (const url of expectedUrls('0.78.1')) {
+      expect(mockFetch).toHaveBeenCalledWith(url, {method: 'HEAD'});
+    }
   });
 
   it('passes immediately if packages are already on Maven', async () => {
-    mockFetch.mockReturnValueOnce(Promise.resolve({status: 200}));
+    mockFetch.mockReturnValue(Promise.resolve({status: 200}));
 
     const version = '0.78.1';
     await verifyArtifactsAreOnMaven(version);
 
     expect(mockSleep).toHaveBeenCalledTimes(0);
-    expect(mockFetch).toHaveBeenCalledWith(
-      'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
-    );
+    // All nine URLs (POM + 8 classifier tarballs) are verified in one pass.
+    expect(mockFetch).toHaveBeenCalledTimes(9);
+    for (const url of expectedUrls('0.78.1')) {
+      expect(mockFetch).toHaveBeenCalledWith(url, {method: 'HEAD'});
+    }
+  });
+
+  it('waits when a classifier artifact is missing even though the POM exists', async () => {
+    mockSleep.mockReturnValueOnce(Promise.resolve()).mockImplementation(() => {
+      throw new Error('Should not be called again!');
+    });
+    // First attempt: POM ok, first classifier missing. Second attempt: all ok.
+    mockFetch
+      .mockReturnValueOnce(Promise.resolve({status: 200}))
+      .mockReturnValueOnce(Promise.resolve({status: 404}))
+      .mockReturnValue(Promise.resolve({status: 200}));
+
+    const version = '0.78.1';
+    await verifyArtifactsAreOnMaven(version);
+
+    expect(mockSleep).toHaveBeenCalledTimes(1);
+    expect(mockExit).not.toHaveBeenCalled();
   });
 
   it('tries 90 times and then exits', async () => {
@@ -82,6 +124,7 @@ describe('#verifyArtifactsAreOnMaven', () => {
     expect(mockExit).toHaveBeenCalledWith(1);
     expect(mockFetch).toHaveBeenCalledWith(
       'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.78.1/react-native-artifacts-0.78.1.pom',
+      {method: 'HEAD'},
     );
   });
 });

.github/workflow-scripts/lint_files.sh

@@ -7,6 +7,7 @@
  * @format
  */
 
+// @flow
 const {log, sleep} = require('./utils');
 
 const SLEEP_S = 60; // 1 minute
@@ -15,23 +16,64 @@ const ARTIFACT_URL =
   'https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/';
 const ARTIFACT_NAME = 'react-native-artifacts-';
 
-async function verifyArtifactsAreOnMaven(version, retries = MAX_RETRIES) {
+// 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',
+  'reactnative-dependencies-debug',
+  'reactnative-dependencies-release',
+  'reactnative-headers-debug',
+  'reactnative-headers-release',
+  'reactnative-dependencies-headers-debug',
+  'reactnative-dependencies-headers-release',
+];
+
+async function verifyArtifactsAreOnMaven(
+  version /*: string */,
+  retries /*: number */ = MAX_RETRIES,
+) /*: Promise<void> */ {
   if (version.startsWith('v')) {
     version = version.substring(1);
   }
 
-  const artifactUrl = `${ARTIFACT_URL}${version}/${ARTIFACT_NAME}${version}.pom`;
+  const urls = [
+    `${ARTIFACT_URL}${version}/${ARTIFACT_NAME}${version}.pom`,
+    ...ARTIFACT_CLASSIFIERS.map(
+      classifier =>
+        `${ARTIFACT_URL}${version}/${ARTIFACT_NAME}${version}-${classifier}.tar.gz`,
+    ),
+  ];
   for (let currentAttempt = 1; currentAttempt <= retries; currentAttempt++) {
-    const response = await fetch(artifactUrl);
-
-    if (response.status !== 200) {
-      log(
-        `${currentAttempt}) Artifact's for version ${version} are not on maven yet.\nURL: ${artifactUrl}\nLet's wait a minute and try again.\n`,
-      );
-      await sleep(SLEEP_S);
-    } else {
+    let missingUrl = null;
+    for (const url of urls) {
+      try {
+        const response = await fetch(url, {method: 'HEAD'});
+        if (response.status === 200) {
+          continue;
+        }
+        log(`Got status ${response.status} while checking ${url}`);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        log(`Network error while checking ${url}: ${message}`);
+        missingUrl = url;
+        break;
+      }
+      missingUrl = url;
+      break;
+    }
+
+    if (missingUrl == null) {
       return;
     }
+    log(
+      `${currentAttempt}) Artifact's for version ${version} are not on maven yet.\nURL: ${missingUrl}\nLet's wait a minute and try again.\n`,
+    );
+    await sleep(SLEEP_S);
   }
 
   log(

.github/workflow-scripts/verifyArtifactsAreOnMaven.js

@@ -5,7 +5,7 @@ on:
 
 jobs:
   bump-podfile-lock:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v6