Merge branch 'main' into improve-lineheight-calc-ios

Author: ArekChr

.eslintrc.js

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @noflow
  * @format
  */
 
@@ -27,6 +28,9 @@ module.exports = {
       files: ['*.js', '*.js.flow', '*.jsx'],
       parser: 'hermes-eslint',
       rules: {
+        'ft-flow/require-valid-file-annotation': [2, 'always'],
+        'no-extra-boolean-cast': 0,
+        'no-void': 0,
         // These rules are not required with hermes-eslint
         'ft-flow/define-flow-type': 0,
         'ft-flow/use-flow-type': 0,
@@ -66,6 +70,7 @@ module.exports = {
     {
       files: ['flow-typed/**/*.js', 'packages/react-native/flow/**/*'],
       rules: {
+        'ft-flow/require-valid-file-annotation': 0,
         'lint/valid-flow-typed-signature': 2,
         'no-shadow': 0,
         'no-unused-vars': 0,

.flowconfig

@@ -69,6 +69,8 @@ module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-nat
 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\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
 
+module.system.haste.module_ref_prefix=m#
+
 react.runtime=automatic
 
 suppress_type=$FlowIssue
@@ -100,4 +102,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.272.1
+^0.272.2

.github/actions/build-hermesc-windows/action.yml

@@ -25,7 +25,7 @@ runs:
     - name: Windows cache
       uses: actions/cache@v4
       with:
-        key: v2-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }}
+        key: v3-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }}
         path: |
           D:\tmp\hermes\win64-bin\
           D:\tmp\hermes\hermes\icu\
@@ -63,7 +63,7 @@ runs:
           $Env:PATH += ";$Env:CMAKE_DIR;$Env:MSBUILD_DIR"
           $Env:ICU_ROOT = "$Env:HERMES_WS_DIR\icu"
 
-          cmake -S hermes -B build_release -G 'Visual Studio 16 2019' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
+          cmake -S hermes -B build_release -G 'Visual Studio 17 2022' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
           if (-not $?) { throw "Failed to configure Hermes" }
           echo "Running windows build..."
           cd build_release

.github/actions/maestro-android/action.yml

@@ -22,10 +22,6 @@ inputs:
     required: false
     default: "."
     description: The directory from which metro should be started
-  architecture:
-    required: false
-    default: "NewArch"
-    description: The react native architecture to test
 
 runs:
   using: composite
@@ -76,13 +72,13 @@ runs:
       uses: actions/upload-artifact@v4.3.4
       if: always()
       with:
-        name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.architecture }}
+        name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.flavor }}_NewArch
         path: |
           report.xml
           screen.mp4
     - name: Store Logs
       if: steps.run-tests.outcome == 'failure'
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: maestro-logs-android-${{ steps.normalize-app-id.outputs.app-id }}-${{ inputs.flavor }}-${{ inputs.architecture }}
+        name: maestro-logs-android-${{ steps.normalize-app-id.outputs.app-id }}-${{ inputs.flavor }}-NewArch
         path: /tmp/MaestroLogs

.github/actions/maestro-ios/action.yml

@@ -18,10 +18,6 @@ inputs:
     required: false
     default: "."
     description: The directory from which metro should be started
-  architecture:
-    required: false
-    default: "NewArch"
-    description: The react native architecture to test
 
 runs:
   using: composite
@@ -70,7 +66,7 @@ runs:
       if: always()
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.architecture }}
+        name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.flavor }}_NewArch
         path: |
           video_record_1.mov
           video_record_2.mov
@@ -82,5 +78,5 @@ runs:
       if: failure() && steps.run-tests.outcome == 'failure'
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: maestro-logs-${{ inputs.app-id }}-${{ inputs.flavor }}-${{ inputs.architecture }}
+        name: maestro-logs-${{ inputs.app-id }}-${{ inputs.flavor }}-NewArch
         path: /tmp/MaestroLogs

.github/actions/setup-xcode-build-cache/action.yml

@@ -7,9 +7,6 @@ inputs:
   flavor:
     description: The flavor that is going to be built
     default: Debug
-  architecture:
-    description: The architecture that is going to be built
-    default: NewArch
   use-frameworks:
     description: Whether we are bulding with DynamicFrameworks or StaticLibraries
     default: StaticLibraries
@@ -27,9 +24,9 @@ runs:
       uses: actions/cache@v4
       with:
         path: packages/rn-tester/Podfile.lock
-        key: v13-podfilelock-${{ github.job }}-${{ inputs.architecture }}-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-${{ inputs.ruby-version }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version }}
+        key: v13-podfilelock-${{ github.job }}-NewArch-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-${{ inputs.ruby-version }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version }}
     - name: Cache cocoapods
       uses: actions/cache@v4
       with:
         path: packages/rn-tester/Pods
-        key: v15-cocoapods-${{ github.job }}-${{ inputs.architecture }}-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-${{ inputs.ruby-version }}-${{ hashfiles('packages/rn-tester/Podfile.lock') }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version}}
+        key: v15-cocoapods-${{ github.job }}-NewArch-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-${{ inputs.ruby-version }}-${{ hashfiles('packages/rn-tester/Podfile.lock') }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version}}

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

@@ -4,9 +4,6 @@ inputs:
   use-frameworks:
     description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
     default: StaticLibraries
-  architecture:
-    description: The React Native architecture to Test. RNTester has always Fabric enabled, but we want to run integration test with the old arch setup. Must be one of "OldArch" or "NewArch"
-    default: OldArch
   ruby-version:
     description: The version of ruby that must be used
     default: 2.6.10
@@ -51,16 +48,12 @@ runs:
     - name: Print third-party folder
       shell: bash
       run: ls -lR /tmp/third-party
-    - name: Install iOS dependencies - Configuration ${{ inputs.flavor }}; New Architecture ${{ inputs.architecture }}
+    - name: Install iOS dependencies - Configuration ${{ inputs.flavor }};
       shell: bash
       run: |
         cd packages/helloworld
         args=()
 
-        if [[ ${{ inputs.architecture }} == "OldArch" ]]; then
-          args+=(--arch old)
-        fi
-
         if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
           args+=(--frameworks dynamic)
         fi

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

@@ -4,9 +4,6 @@ inputs:
   use-frameworks:
     description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
     default: StaticLibraries
-  architecture:
-    description: The React Native architecture to Test. RNTester has always Fabric enabled, but we want to run integration test with the old arch setup
-    default: NewArch
   ruby-version:
     description: The version of ruby that must be used
     default: 2.6.10
@@ -101,7 +98,6 @@ runs:
       uses: ./.github/actions/setup-xcode-build-cache
       with:
         hermes-version: ${{ inputs.hermes-version }}
-        architecture: ${{ inputs.architecture }}
         use-frameworks: ${{ inputs.use-frameworks }}
         flavor: ${{ inputs.flavor }}
         ruby-version: ${{ inputs.ruby-version }}
@@ -114,10 +110,6 @@ runs:
           export USE_FRAMEWORKS=dynamic
         fi
 
-        if [[ ${{ inputs.architecture }} == "OldArch" ]]; then
-          export RCT_NEW_ARCH_ENABLED=0
-        fi
-
         export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
         cd packages/rn-tester
 
@@ -162,7 +154,7 @@ runs:
       if: ${{ inputs.use-frameworks == 'StaticLibraries' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: RNTesterApp-${{ inputs.architecture }}-${{ inputs.flavor }}
+        name: RNTesterApp-NewArch-${{ inputs.flavor }}
         path: ${{ env.app-path }}
     - name: Store test results
       if: ${{ inputs.run-unit-tests == 'true' }}

.github/workflows/nightly.yml

@@ -120,7 +120,7 @@ jobs:
           react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
   build_hermesc_windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
     needs: prepare_hermes_workspace
     env:
       HERMES_WS_DIR: 'D:\tmp\hermes'

.github/workflows/publish-release.yml

@@ -116,7 +116,7 @@ jobs:
           react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
   build_hermesc_windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
     needs: prepare_hermes_workspace
     env:
       HERMES_WS_DIR: 'D:\tmp\hermes'