Merge upstream main into fix/ios-refresh-control-appearance

Author: Cameron Chisholm

.eslintrc.js

@@ -51,7 +51,6 @@ module.exports = {
       files: [
         './packages/react-native/Libraries/**/*.{js,flow}',
         './packages/react-native/src/**/*.{js,flow}',
-        './packages/assets-registry/registry.js',
       ],
       parser: 'flow-eslint',
       rules: {

.flowconfig

@@ -16,6 +16,7 @@ packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeEnumTurboModul
 **/*.windows.js
 
 **/node_modules/resolve/test/resolver/malformed_package_json/package.json
+**/node_modules/invariant/**
 
 ; Checked-in build output
 packages/debugger-frontend/dist/**
@@ -52,6 +53,9 @@ experimental.multi_platform=true
 experimental.multi_platform.extensions=.ios
 experimental.multi_platform.extensions=.android
 
+experimental.assertion_functions=true
+experimental.disable_invariant_special_casing=true
+
 munge_underscores=true
 
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
@@ -96,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.333.0
+^0.335.0

.github/actions/download-artifact/action.yml

@@ -0,0 +1,59 @@
+name: Download artifact with retries
+description: Downloads an artifact, retrying transient failures up to two times
+
+inputs:
+  name:
+    description: Artifact name
+    required: true
+  path:
+    description: Destination path
+    required: true
+
+outputs:
+  download-path:
+    description: Absolute path where the artifact was downloaded
+    value: ${{ steps.download-3.outputs.download-path || steps.download-2.outputs.download-path || steps.download-1.outputs.download-path }}
+
+runs:
+  using: composite
+  steps:
+    - name: Download artifact (attempt 1 of 3)
+      id: download-1
+      if: ${{ always() }}
+      continue-on-error: true
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+      with:
+        name: ${{ inputs.name }}
+        path: ${{ inputs.path }}
+
+    - name: Wait before attempt 2
+      if: ${{ always() && steps.download-1.outcome == 'failure' }}
+      shell: bash
+      run: |
+        echo "::warning::Artifact download failed; retrying in 10 seconds"
+        sleep 10
+
+    - name: Download artifact (attempt 2 of 3)
+      id: download-2
+      if: ${{ always() && steps.download-1.outcome == 'failure' }}
+      continue-on-error: true
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+      with:
+        name: ${{ inputs.name }}
+        path: ${{ inputs.path }}
+
+    - name: Wait before attempt 3
+      if: ${{ always() && steps.download-2.outcome == 'failure' }}
+      shell: bash
+      run: |
+        echo "::warning::Artifact download failed again; retrying in 20 seconds"
+        sleep 20
+
+    - name: Download artifact (attempt 3 of 3)
+      id: download-3
+      if: ${{ always() && steps.download-2.outcome == 'failure' }}
+      # Deliberately do not continue on error: the last failure must fail the caller.
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+      with:
+        name: ${{ inputs.name }}
+        path: ${{ inputs.path }}

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

@@ -2,8 +2,8 @@ name: test-ios-helloworld
 description: Test iOS Hello World
 inputs:
   use-frameworks:
-    description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
-    default: StaticLibraries
+    description: Whether to build with dynamic frameworks.
+    default: false
   ruby-version:
     description: The version of ruby that must be used
     default: 2.6.10
@@ -51,7 +51,7 @@ runs:
         cd private/helloworld
         args=()
 
-        if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
+        if [[ "${{ inputs.use-frameworks }}" == "true" ]]; then
           args+=(--frameworks dynamic)
         fi
 

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

@@ -41,6 +41,27 @@ runs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ inputs.ruby-version }}
+        bundler: none
+    - name: Install Bundler
+      shell: bash
+      run: |
+        BUNDLER_VERSION="$(awk '/BUNDLED WITH/{getline; print $1}' Gemfile.lock)"
+        if [ -z "$BUNDLER_VERSION" ]; then
+          echo "Could not determine Bundler version from Gemfile.lock." >&2
+          exit 1
+        fi
+        for attempt in 1 2 3; do
+          echo "Attempt $attempt of 3"
+          if gem install bundler --version "$BUNDLER_VERSION" --no-document; then
+            exit 0
+          fi
+          if [ "$attempt" -lt 3 ]; then
+            echo "Attempt $attempt failed. Retrying..."
+            sleep "$((attempt * 10))"
+          fi
+        done
+        echo "All 3 attempts failed."
+        exit 1
     - name: Set Hermes prebuilt version
       shell: bash
       run: |

.github/workflows/e2e-ios-rntester.yml

@@ -60,7 +60,8 @@ jobs:
     steps:
       - id: check
         run: |
-          if [[ "${{ needs.test.outputs.status }}" == "failure" ]]; then
+          if [[ "${{ needs.test.result }}" != "success" ||
+                "${{ needs.test.outputs.status }}" == "failure" ]]; then
             echo "status=failure" >> $GITHUB_OUTPUT
           else
             echo "status=success" >> $GITHUB_OUTPUT

.github/workflows/e2e-ios-templateapp.yml

@@ -33,22 +33,22 @@ jobs:
         with:
           ruby-version: 2.6.10
       - name: Download React Native Package
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: react-native-package
           path: /tmp/react-native-tmp
       - name: Print /tmp folder
         run: ls -lR /tmp/react-native-tmp
       - name: Download ReactNativeDependencies
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactNativeDependencies${{ matrix.flavor }}.xcframework.tar.gz
           path: /tmp/third-party
       - name: Print third-party folder
         shell: bash
         run: ls -lR /tmp/third-party
       - name: Download React Native Prebuilds
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactCore${{ matrix.flavor }}.xcframework.tar.gz
           path: /tmp/ReactCore
@@ -114,15 +114,15 @@ jobs:
       - name: Run yarn
         uses: ./.github/actions/yarn-install
       - name: Download app
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: RNTestProject-${{ matrix.flavor }}
           path: /tmp/RNTestProjectBuild/RNTestProject.app
       - name: Check downloaded folder content
         run: ls -l /tmp/RNTestProjectBuild/RNTestProject.app
       - name: Download React Native Package
         if: ${{ matrix.flavor == 'Debug' }}
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: react-native-package
           path: /tmp/react-native-tmp
@@ -163,15 +163,17 @@ jobs:
         run: echo "status=failure" >> $GITHUB_OUTPUT
 
   report:
-    needs: test
+    needs: [build, test]
     if: always()
     runs-on: ubuntu-latest
     outputs:
       status: ${{ steps.check.outputs.status }}
     steps:
       - id: check
         run: |
-          if [[ "${{ needs.test.outputs.status }}" == "failure" ]]; then
+          if [[ "${{ needs.build.result }}" != "success" ||
+                "${{ needs.test.result }}" != "success" ||
+                "${{ needs.test.outputs.status }}" == "failure" ]]; then
             echo "status=failure" >> $GITHUB_OUTPUT
           else
             echo "status=success" >> $GITHUB_OUTPUT

.github/workflows/test-all.yml

@@ -534,7 +534,7 @@ jobs:
         exclude:
           # This config is tested with Ruby 3.2.0. Let's not double test it.
           - flavor: Debug
-            use_frameworks: StaticLibraries
+            use_frameworks: false
     env:
       PROJECT_NAME: iOSTemplateProject
       YARN_ENABLE_IMMUTABLE_INSTALLS: false

.github/workflows/test-ios-spm-newapp.yml

@@ -40,27 +40,27 @@ jobs:
       # release/ artifact slots together (and `--download skip` refuses an
       # incomplete slot). Please don't "optimise" this down to one flavor.
       - name: Download ReactCore (Debug)
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactCoreDebug.xcframework.tar.gz
           path: /tmp/rc-debug
       - name: Download ReactCore (Release)
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactCoreRelease.xcframework.tar.gz
           path: /tmp/rc-release
       - name: Download ReactNativeDependencies (Debug)
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactNativeDependenciesDebug.xcframework.tar.gz
           path: /tmp/deps-debug
       - name: Download ReactNativeDependencies (Release)
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: ReactNativeDependenciesRelease.xcframework.tar.gz
           path: /tmp/deps-release
       - name: Download React Native package
-        uses: actions/download-artifact@v7
+        uses: ./.github/actions/download-artifact
         with:
           name: react-native-package
           path: /tmp/react-native-tmp

.prettierrc.js

@@ -23,7 +23,7 @@ module.exports = {
       },
     },
     {
-      files: ['*.js', '*.js.flow'],
+      files: ['*.js', '*.js.flow', '*.json.flow'],
       options: {
         parser: 'flow',
       },