Merge main and preserve scoped Android disabled-state resets

Author: Marve10s

.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: {

.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

package.json

@@ -95,11 +95,11 @@
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
     "fb-dotslash": "0.5.8",
-    "flow-api-translator": "0.331.0",
+    "flow-api-translator": "0.333.0",
     "flow-bin": "^0.333.0",
-    "flow-eslint": "0.331.0",
-    "flow-parser": "0.331.0",
-    "flow-transform": "0.331.0",
+    "flow-eslint": "0.333.0",
+    "flow-parser": "0.333.0",
+    "flow-transform": "0.333.0",
     "google-java-format": "1.4.0",
     "ini": "^5.0.0",
     "inquirer": "^7.1.0",
@@ -140,7 +140,7 @@
     "@xmldom/xmldom": "^0.8.13",
     "fast-xml-parser": "^4.5.6",
     "yaml": "^2.8.3",
-    "fast-uri": "^3.1.2",
+    "fast-uri": "^3.1.6",
     "shell-quote": "1.9.0"
   }
 }