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

Author: ArekChr

.eslintrc.js

@@ -64,9 +64,10 @@ module.exports = {
       },
     },
     {
-      files: ['flow-typed/**/*.js'],
+      files: ['flow-typed/**/*.js', 'packages/react-native/flow/**/*'],
       rules: {
         'lint/valid-flow-typed-signature': 2,
+        'no-shadow': 0,
         'no-unused-vars': 0,
         quotes: 0,
       },
@@ -136,7 +137,7 @@ module.exports = {
       },
     },
     {
-      files: ['**/*-itest{.fb,}.js'],
+      files: ['**/__tests__/**'],
       rules: {
         'lint/no-react-native-imports': 'off',
       },

.flowconfig

@@ -44,7 +44,6 @@
 flow-typed/
 packages/react-native/interface.js
 packages/react-native/flow/
-packages/react-native/src/types/
 
 [options]
 enums=true
@@ -101,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.269.1
+^0.272.1

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

@@ -86,27 +86,13 @@ runs:
       if: ${{ always() }}
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: rntester-hermes-debug
+        name: rntester-debug
         path: packages/rn-tester/android/app/build/outputs/apk/hermes/debug/
         compression-level: 0
     - name: Upload RNTester APK - hermes-release
       if: ${{ always() }}
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: rntester-hermes-release
+        name: rntester-release
         path: packages/rn-tester/android/app/build/outputs/apk/hermes/release/
         compression-level: 0
-    - name: Upload RNTester APK - jsc-debug
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v4.3.4
-      with:
-        name: rntester-jsc-debug
-        path: packages/rn-tester/android/app/build/outputs/apk/jsc/debug/
-        compression-level: 0
-    - name: Upload RNTester APK - jsc-release
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v4.3.4
-      with:
-        name: rntester-jsc-release
-        path: packages/rn-tester/android/app/build/outputs/apk/jsc/release/
-        compression-level: 0

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

@@ -7,9 +7,6 @@ inputs:
   app-id:
     required: true
     description: The id of the app to test
-  jsengine:
-    required: true
-    description: The js engine we are using
   maestro-flow:
     required: true
     description: the folder that contains the maestro tests
@@ -79,13 +76,13 @@ runs:
       uses: actions/upload-artifact@v4.3.4
       if: always()
       with:
-        name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.jsengine }}_${{ inputs.flavor }}_${{ inputs.architecture }}
+        name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.architecture }}
         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.jsengine }}-${{ inputs.flavor }}-${{ inputs.architecture }}
+        name: maestro-logs-android-${{ steps.normalize-app-id.outputs.app-id }}-${{ inputs.flavor }}-${{ inputs.architecture }}
         path: /tmp/MaestroLogs

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

@@ -7,9 +7,6 @@ inputs:
   app-id:
     required: true
     description: The id of the app to test
-  jsengine:
-    required: true
-    description: The js engine we are using
   maestro-flow:
     required: true
     description: the folder that contains the maestro tests
@@ -66,24 +63,24 @@ runs:
           "${{ inputs.app-path }}" \
           "${{ inputs.app-id }}" \
           "${{ inputs.maestro-flow }}" \
-          "${{ inputs.jsengine }}" \
+          "Hermes" \
           "${{ inputs.flavor }}" \
           "${{ inputs.working-directory }}"
     - name: Store video record
       if: always()
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.jsengine }}_${{ inputs.flavor }}_${{ inputs.architecture }}
+        name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.architecture }}
         path: |
-          video_record_${{ inputs.jsengine }}_1.mov
-          video_record_${{ inputs.jsengine }}_2.mov
-          video_record_${{ inputs.jsengine }}_3.mov
-          video_record_${{ inputs.jsengine }}_4.mov
-          video_record_${{ inputs.jsengine }}_5.mov
+          video_record_1.mov
+          video_record_2.mov
+          video_record_3.mov
+          video_record_4.mov
+          video_record_5.mov
           report.xml
     - name: Store Logs
       if: failure() && steps.run-tests.outcome == 'failure'
       uses: actions/upload-artifact@v4.3.4
       with:
-        name: maestro-logs-${{ inputs.app-id }}-${{ inputs.jsengine }}-${{ inputs.flavor }}-${{ inputs.architecture }}
+        name: maestro-logs-${{ inputs.app-id }}-${{ inputs.flavor }}-${{ inputs.architecture }}
         path: /tmp/MaestroLogs

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

@@ -4,9 +4,6 @@ inputs:
   hermes-version:
     description: The version of hermes
     required: true
-  jsengine:
-    dscription: The js engine in use
-    default: Hermes
   flavor:
     description: The flavor that is going to be built
     default: Debug
@@ -30,9 +27,9 @@ runs:
       uses: actions/cache@v4
       with:
         path: packages/rn-tester/Podfile.lock
-        key: v13-podfilelock-${{ github.job }}-${{ inputs.architecture }}-${{ inputs.jsengine }}-${{ inputs.flavor }}-${{ inputs.use-frameworks }}-${{ inputs.ruby-version }}-${{ hashfiles('packages/rn-tester/Podfile') }}-${{ inputs.hermes-version }}
+        key: v13-podfilelock-${{ github.job }}-${{ inputs.architecture }}-${{ 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.jsengine }}-${{ 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 }}-${{ inputs.architecture }}-${{ 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

@@ -1,9 +1,6 @@
 name: test-ios-helloworld
 description: Test iOS Hello World
 inputs:
-  jsengine:
-    description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
-    default: Hermes
   use-frameworks:
     description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
     default: StaticLibraries
@@ -54,7 +51,7 @@ 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 }}; JS Engine ${{ inputs.jsengine }}
+    - name: Install iOS dependencies - Configuration ${{ inputs.flavor }}; New Architecture ${{ inputs.architecture }}
       shell: bash
       run: |
         cd packages/helloworld
@@ -68,29 +65,31 @@ runs:
           args+=(--frameworks dynamic)
         fi
 
-        if [[ ${{ inputs.jsengine }} == "JSC" ]]; then
-          args+=(--jsvm jsc)
-          yarn bootstrap ios "${args[@]}" | cat
-        else
-          # Tarball is restored with capital flavors suffix, but somehow the tarball name from JS at line 96 returns as lowercased.
-          # Let's ensure that the tarballs have the right names
+        # Tarball is restored with capital flavors suffix, but somehow the tarball name from JS at line 96 returns as lowercased.
+        # Let's ensure that the tarballs have the right names
 
-          if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" ]]; then
-            mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz"
-          fi
+        if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" ]]; then
+          mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Debug.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz"
+        fi
+
+        if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" ]]; then
+          mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz"
+        fi
 
-          if [[ -f "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" ]]; then
-            mv "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-Release.tar.gz" "$HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz"
-          fi
+        BUILD_TYPE="${{ inputs.flavor }}"
+        TARBALL_FILENAME=$(node ../react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
+        export HERMES_ENGINE_TARBALL_PATH="$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME"
+        export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
 
-          BUILD_TYPE="${{ inputs.flavor }}"
-          TARBALL_FILENAME=$(node ../react-native/scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
-          export HERMES_ENGINE_TARBALL_PATH="$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME"
-          export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
+        yarn bootstrap ios "${args[@]}" | cat
 
-          yarn bootstrap ios "${args[@]}" | cat
-        fi
-    - name: Build HelloWorld  project
+    - name: Run Helloworld tests
+      shell: bash
+      run: |
+        cd packages/helloworld
+        yarn test
+
+    - name: Build HelloWorld project
       shell: bash
       run: |
         cd packages/helloworld

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

@@ -1,9 +1,6 @@
 name: test-ios-rntester
 description: Test iOS RNTester
 inputs:
-  jsengine:
-    description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
-    default: Hermes
   use-frameworks:
     description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
     default: StaticLibraries
@@ -104,19 +101,14 @@ runs:
       uses: ./.github/actions/setup-xcode-build-cache
       with:
         hermes-version: ${{ inputs.hermes-version }}
-        jsengine: ${{ inputs.jsengine }}
         architecture: ${{ inputs.architecture }}
         use-frameworks: ${{ inputs.use-frameworks }}
         flavor: ${{ inputs.flavor }}
         ruby-version: ${{ inputs.ruby-version }}
     - name: Install CocoaPods dependencies
       shell: bash
       run: |
-        if [[ ${{ inputs.jsengine }} == "JSC" ]]; then
-          export USE_HERMES=0
-        else
-          export HERMES_ENGINE_TARBALL_PATH=$HERMES_ENGINE_TARBALL_PATH
-        fi
+        export HERMES_ENGINE_TARBALL_PATH=$HERMES_ENGINE_TARBALL_PATH
 
         if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
           export USE_FRAMEWORKS=dynamic
@@ -170,7 +162,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.jsengine }}-${{ inputs.flavor }}
+        name: RNTesterApp-${{ inputs.architecture }}-${{ inputs.flavor }}
         path: ${{ env.app-path }}
     - name: Store test results
       if: ${{ inputs.run-unit-tests == 'true' }}

.github/workflow-scripts/actOnLabel.js

@@ -95,12 +95,6 @@ module.exports = async (github, context, labelWithContext) => {
       );
       await requestAuthorFeedback();
       return;
-    case 'Newer Patch Available':
-      await addComment(
-        `> [!TIP]\n` +
-          `> **Newer version available**: You are on a supported minor version, but it looks like there's a newer patch available - ${labelWithContext.newestPatch}. Please [upgrade](https://reactnative.dev/docs/upgrading) to the highest patch for your minor or latest and verify if the issue persists (alternatively, create a new project and repro the issue in it). If it does not repro, please let us know so we can close out this issue. This helps us ensure we are looking at issues that still exist in the most recent releases.`,
-      );
-      return;
     case 'Needs: Version Info':
       await addComment(
         `> [!WARNING]\n` +

.github/workflow-scripts/verifyVersion.js

@@ -45,18 +45,6 @@ module.exports = async (github, context) => {
   if (!isVersionSupported(issueVersion, latestVersion)) {
     return {label: 'Type: Unsupported Version'};
   }
-
-  // We want to encourage users to repro the issue on the highest available patch for the given minor.
-  const latestPatchForVersion = getLatestPatchForVersion(
-    issueVersion,
-    recentReleases,
-  );
-  if (latestPatchForVersion > issueVersion.patch) {
-    return {
-      label: 'Newer Patch Available',
-      newestPatch: `${issueVersion.major}.${issueVersion.minor}.${latestPatchForVersion}`,
-    };
-  }
 };
 
 /**
@@ -87,22 +75,6 @@ function isVersionTooOld(actualVersion, latestVersion) {
   );
 }
 
-// Assumes that releases are sorted in the order of recency (i.e. most recent releases are earlier in the list)
-// This enables us to stop looking as soon as we find the first release with a matching major/minor version, since
-// we know it's the most recent release, therefore the highest patch available.
-function getLatestPatchForVersion(version, releases) {
-  for (releaseName of releases) {
-    const release = parseVersionFromString(releaseName);
-    if (
-      release &&
-      release.major == version.major &&
-      release.minor == version.minor
-    ) {
-      return release.patch;
-    }
-  }
-}
-
 function getReactNativeVersionFromIssueBodyIfExists(issue) {
   if (!issue || !issue.body) return;
   const rnVersionRegex = /React Native Version[\r\n]+(?<version>.+)[\r\n]*/;