Merge branch 'facebook:main' into daksh/add-aria-labelledBy-prop

.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh

@@ -33,7 +33,7 @@ node cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/a
 
 # build test APK
 # shellcheck disable=SC1091
-source ./scripts/android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
+source ./scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
 
 # run installed apk with tests
 node ./.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js "$*"

.circleci/config.yml

@@ -26,6 +26,8 @@ references:
 
   hermes_workspace_root: &hermes_workspace_root
     /tmp/hermes
+  hermes_tarball_artifacts_dir: &hermes_tarball_artifacts_dir
+    /tmp/hermes/hermes-runtime-darwin
   attach_hermes_workspace: &attach_hermes_workspace
     attach_workspace:
       at: *hermes_workspace_root
@@ -66,7 +68,7 @@ references:
       - ~/react-native/sdks/hermes/build_macosx
       - ~/react-native/sdks/hermes/destroot
     hermes_tarball_cache_paths: &hermes_tarball_cache_paths
-      - /tmp/hermes/hermes-runtime-darwin/
+      - *hermes_tarball_artifacts_dir
 
   # -------------------------
   #        Filters
@@ -133,12 +135,12 @@ commands:
     steps:
       - restore_cache:
             keys:
-              - << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }}
-              - << parameters.checkout_base_cache_key >>-{{ .Branch }}-
-              - << parameters.checkout_base_cache_key >>
+              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
+              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-
+              - << parameters.checkout_base_cache_key >>-{{ arch }}-
       - checkout
       - save_cache:
-          key: << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }}
+          key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
           paths:
             - ".git"
 
@@ -269,6 +271,9 @@ commands:
       flavor:
         type: string
         default: "Debug"
+      hermes_tarball_artifacts_dir:
+        type: string
+        default: *hermes_tarball_artifacts_dir
     steps:
       - when:
           condition:
@@ -288,26 +293,27 @@ commands:
           condition: << parameters.set_tarball_path >>
           steps:
             - run:
-                name: Set HERMES_ENGINE_TARBALL_PATH if present
+                name: Set HERMES_ENGINE_TARBALL_PATH envvar if Hermes tarball is present
                 command: |
-                  BASE_PATH=/tmp/hermes/hermes-runtime-darwin/
-                  if [ ! -d $BASE_PATH ]; then
-                    echo "Hermes tarball base path not present ($BASE_PATH). Build it from source."
+                  HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
+                  if [ ! -d $HERMES_TARBALL_ARTIFACTS_DIR ]; then
+                    echo "Hermes tarball artifacts dir not present ($HERMES_TARBALL_ARTIFACTS_DIR). Build Hermes from source."
                     exit 0
                   fi
-                  if [[ << parameters.flavor >> == "Debug" ]]; then
-                    TARBALL_FILENAME=hermes-runtime-darwin-debug-*.tar.gz
-                  elif [[ << parameters.flavor >> == "Release" ]]; then
-                    TARBALL_FILENAME=hermes-runtime-darwin-release-*.tar.gz
-                  else
-                    echo "Unsupported build type << parameters.flavor >>."
+
+                  if [ ! -d ~/react-native ]; then
+                    echo "No React Native checkout found. Run `checkout` first."
                     exit 0
                   fi
-                  # /tmp/hermes/hermes-runtime-darwin/hermes-runtime-darwin-release-v0.70.0.tar.gz
-                  # /tmp/hermes/hermes-runtime-darwin/hermes-runtime-darwin-debug-v0.70.0.tar.gz
-                  TARBALL_PATH=$(ls $BASE_PATH$TARBALL_FILENAME)
+
+                  TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>" --releaseVersion "*")
+                  TARBALL_PATH=$(ls $HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME)
+
+                  echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
+                  echo "$TARBALL_PATH"
+
                   if [ ! -f $TARBALL_PATH ]; then
-                    echo "Hermes tarball not present ($TARBALL_PATH). Build it from source."
+                    echo "Hermes tarball not present ($TARBALL_PATH). Build Hermes from source."
                     exit 0
                   fi
 
@@ -617,7 +623,7 @@ jobs:
             if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then
               echo "JavaScript bundle missing, cannot run instrumentation tests. Verify Build JavaScript Bundle step completed successfully."; exit 1;
             fi
-            source scripts/android-setup.sh && NO_BUCKD=1 retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
+            source scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 timeout 300 buck build ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
 
       - run:
           name: Collect Test Results
@@ -826,6 +832,10 @@ jobs:
   # -------------------------
   test_ios_rntester:
     executor: reactnativeios
+    parameters:
+      architecture:
+        type: string
+        default: "OldArch"
     steps:
       - checkout_code_with_cache
       - run_yarn
@@ -854,9 +864,14 @@ jobs:
           set_tarball_path: True
           steps:
             - run:
-                name: Install CocoaPods dependencies
+                name: Install CocoaPods dependencies - Architecture << parameters.architecture >>
                 command: |
                   rm -rf packages/rn-tester/Pods
+
+                  if [[ << parameters.architecture >> == "NewArch" ]]; then
+                    export RCT_NEW_ARCH_ENABLED=1
+                  fi
+
                   cd packages/rn-tester && bundle exec pod install
 
       - run:
@@ -1084,8 +1099,10 @@ jobs:
     executor: reactnativeios
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
+      - HERMES_TARBALL_ARTIFACTS_DIR: *hermes_tarball_artifacts_dir
     steps:
       - checkout_code_with_cache
+      - run_yarn
       - *attach_hermes_workspace
       - when:
           condition:
@@ -1126,35 +1143,42 @@ jobs:
             - run:
                 name: Package the Hermes Apple frameworks
                 command: |
-                  echo "Packaging Hermes Apple frameworks for << parameters.flavor >> build type"
+                  BUILD_TYPE="<< parameters.flavor >>"
+                  echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"
+
+                  TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)
 
+                  # get_release_version() is defined in build-apple-framework.sh
                   cd ~/react-native/sdks/hermes
-                  BUILD_TYPE="<< parameters.flavor >>" source ./utils/build-apple-framework.sh
-
-                  mkdir -p /tmp/cocoapods-package-root/destroot
-                  mkdir -p /tmp/hermes/output
-                  cp -R ./destroot /tmp/cocoapods-package-root
-                  cp LICENSE /tmp/cocoapods-package-root
-
-                  if [[ << parameters.flavor >> == "Debug" ]]; then
-                    TARBALL_FILENAME=hermes-runtime-darwin-debug-v$(get_release_version).tar.gz
-                  elif [[ << parameters.flavor >> == "Release" ]]; then
-                    TARBALL_FILENAME=hermes-runtime-darwin-release-v$(get_release_version).tar.gz
-                  else
-                    echo "Unsupported build type << parameters.flavor >>."
-                    exit 0
-                  fi
+                  BUILD_TYPE=$BUILD_TYPE source ./utils/build-apple-framework.sh
+                  RELEASE_VERSION=$(get_release_version)
+
+                  cd ~/react-native
+
+                  TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE" --releaseVersion "$RELEASE_VERSION")
 
-                  tar -C /tmp/cocoapods-package-root/ -czvf /tmp/hermes/output/$TARBALL_FILENAME .
+                  echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"
 
-                  mkdir -p /tmp/hermes/hermes-runtime-darwin
-                  cp /tmp/hermes/output/$TARBALL_FILENAME /tmp/hermes/hermes-runtime-darwin/.
+                  TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
+                    --inputDir ~/react-native/sdks/hermes \
+                    --buildType "$BUILD_TYPE" \
+                    --releaseVersion "$RELEASE_VERSION" \
+                    --outputDir "$TARBALL_OUTPUT_DIR")
 
-                  # TODO: Remove this once the client side is aware of -release and -debug tarballs
-                  if [[ << parameters.flavor >> == "Debug" ]]; then
-                    cp /tmp/hermes/hermes-runtime-darwin/hermes-runtime-darwin-debug-v$(get_release_version).tar.gz /tmp/hermes/hermes-runtime-darwin/hermes-runtime-darwin-v$(get_release_version).tar.gz
+                  echo "Hermes tarball saved to $TARBALL_OUTPUT_PATH"
+
+                  mkdir -p "$HERMES_TARBALL_ARTIFACTS_DIR"
+                  cp "$TARBALL_OUTPUT_PATH" "$HERMES_TARBALL_ARTIFACTS_DIR/."
+
+                  # Make a copy of the debug tarball and use the old filename.
+                  # This is necessary to support patch releases in versions of
+                  # React Native that expect a single tarball.
+                  # TODO: Remove once 0.70.x and 0.69.x are no longer being patched.
+                  if [[ $BUILD_TYPE == "Debug" ]]; then
+                    OLD_TARBALL_FILENAME="hermes-runtime-darwin-v$RELEASE_VERSION.tar.gz"
+                    cp "$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME" "$HERMES_TARBALL_ARTIFACTS_DIR/$OLD_TARBALL_FILENAME"
+                    echo "$OLD_TARBALL_FILENAME is a copy of $TARBALL_FILENAME, provided for backward compatibility." >> "$HERMES_TARBALL_ARTIFACTS_DIR/README.txt"
                   fi
-                  ls /tmp/hermes/hermes-runtime-darwin/
             - when:
                 condition:
                   equal: [ << parameters.flavor >>, "Debug"]
@@ -1170,7 +1194,7 @@ jobs:
                       key: *hermes_workspace_release_cache_key
                       paths: *hermes_workspace_macos_cache_paths
             - store_artifacts:
-                path: /tmp/hermes/hermes-runtime-darwin/
+                path: *hermes_tarball_artifacts_dir
             - store_artifacts:
                 path: /tmp/hermes/osx-bin/
             - persist_to_workspace:
@@ -1466,6 +1490,9 @@ workflows:
       - test_ios_rntester:
           requires:
             - build_hermes_macos
+          matrix:
+            parameters:
+              architecture: ["NewArch", "OldArch"]
       - test_ios:
           run_unit_tests: true
           requires:

.eslintignore

@@ -2,9 +2,9 @@
 **/staticBundle.js
 docs/generatedComponentApiDocs.js
 flow/
-flow-typed/
 Libraries/Renderer/*
 Libraries/vendor/**/*
 node_modules/
 packages/*/node_modules
 packages/react-native-codegen/lib
+tools/eslint/rules/sort-imports.js

.eslintrc.js

@@ -43,11 +43,14 @@ module.exports = {
         'lint/no-haste-imports': 2,
         'lint/no-react-native-imports': 2,
         'lint/require-extends-error': 2,
+        'lint/sort-imports': 1,
       },
     },
     {
       files: ['flow-typed/**/*.js'],
       rules: {
+        'lint/valid-flow-typed-signature': 2,
+        'no-unused-vars': 0,
         quotes: 0,
       },
     },

.flowconfig

@@ -74,4 +74,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.187.1
+^0.188.1

.flowconfig.android

@@ -74,4 +74,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.187.1
+^0.188.1

.github/workflows/autorebase.yml

@@ -10,7 +10,7 @@ jobs:
       contents: write  # for cirrus-actions/rebase to push code to rebase
       pull-requests: read  # for cirrus-actions/rebase to get info about PR
     name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v0.70.2
+
+### Added
+
+#### iOS specific
+
+- Add support for "Prefer Cross-Fade Transitions" into AccessibilityInfo ([be7c50fefd](https://github.com/facebook/react-native/commit/be7c50fefd7f13201fb538ded93d91b374341173) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### Changed
+
+- Bump CLI to 9.1.3 and Metro to 0.72.3 ([f164556037](https://github.com/facebook/react-native/commit/f1645560376b734a87f0eba1fef69f6cba312cc1) by [@kelset](https://github.com/kelset))
+
+### Fixed
+
+- Inform ScrollView of Keyboard Events Before Mount ([26d148029c](https://github.com/facebook/react-native/commit/26d148029c7fde117f33b0d6c8b34286c45a0ef2) by [@NickGerleman](https://github.com/NickGerleman))
+
+#### Android specific
+
+- Fix port as -1 if dev server without specifying port on Android ([3d7e1380b4](https://github.com/facebook/react-native/commit/3d7e1380b4e609f5340ee80c19d566b17e620427) by [@Kudo](https://github.com/Kudo))
+
 ## v0.70.1
 
 ### Added

Gemfile.lock

@@ -3,14 +3,14 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.5)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -45,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -63,29 +63,29 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.15.0)
+    json (2.6.2)
+    minitest (5.16.3)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rexml (3.2.5)
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -97,4 +97,4 @@ RUBY VERSION
    ruby 2.7.5p203
 
 BUNDLED WITH
-   2.3.10
+   2.3.22

Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -8,12 +8,13 @@
  * @format
  */
 
+import type {ProcessedColorValue} from '../StyleSheet/processColor';
+import type {ColorValue} from '../StyleSheet/StyleSheet';
+
 import RCTActionSheetManager from './NativeActionSheetManager';
 
-const invariant = require('invariant');
 const processColor = require('../StyleSheet/processColor');
-import type {ColorValue} from '../StyleSheet/StyleSheet';
-import type {ProcessedColorValue} from '../StyleSheet/processColor';
+const invariant = require('invariant');
 
 /**
  * Display action sheets and share sheets on iOS.

Libraries/ActionSheetIOS/NativeActionSheetManager.js

@@ -9,6 +9,7 @@
  */
 
 import type {TurboModule} from '../TurboModule/RCTExport';
+
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {