Merge branch 'main' into feat/scene-delegate

Author: artus9033

.eslintrc.js

@@ -61,12 +61,6 @@ module.exports = {
       files: ['package.json'],
       parser: 'jsonc-eslint-parser',
     },
-    {
-      files: ['package.json'],
-      rules: {
-        '@react-native/monorepo/react-native-manifest': 'error',
-      },
-    },
     {
       files: ['flow-typed/**/*.js', 'packages/react-native/flow/**/*'],
       rules: {

.flowconfig

@@ -56,6 +56,8 @@ experimental.multi_platform.extensions=.android
 munge_underscores=true
 
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
+module.name_mapper='^react-native/react-private-interface$' -> '<PROJECT_ROOT>/packages/react-native/src/react-private-interface.js'
+module.name_mapper='^react-native/setup-env$' -> '<PROJECT_ROOT>/packages/react-native/src/setup-env.js'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native/\1'
 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\|ktx\|heic\|heif\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
@@ -64,11 +66,6 @@ module.system.haste.module_ref_prefix=m#
 
 react.runtime=automatic
 
-experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
-experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
-experimental.deprecated_colon_extends.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
-experimental.deprecated_variance_sigils.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
-
 ban_spread_key_props=true
 
 [lints]

.github/workflow-scripts/lint_files.sh

@@ -60,9 +60,10 @@ async function executeFlowInFolder(flowFolder) {
     const filePath = `${flowFolder}/${file}`;
     if (fs.lstatSync(filePath).isDirectory()) {
       await executeFlowInFolder(filePath);
-    } else {
+    } else if (file.endsWith('.yml') || file.endsWith('.yaml')) {
       await executeFlowWithRetries(filePath, 0);
     }
+    // Skip non-flow files (e.g. screenshot baselines under screenshots/).
   }
 }
 

.github/workflow-scripts/maestro-android.js

@@ -16,7 +16,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: 4-core-ubuntu
     outputs:
       status: ${{ steps.report-status.outputs.status }}
     strategy:

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

@@ -16,7 +16,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: 4-core-ubuntu
     outputs:
       status: ${{ steps.report-status.outputs.status }}
     strategy:

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

@@ -16,7 +16,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: 8-core-ubuntu
     outputs:
       status: ${{ steps.report-status.outputs.status }}
     container:

.github/workflows/fantom-tests.yml

@@ -201,7 +201,15 @@ jobs:
   post_publish:
     runs-on: ubuntu-latest
     needs: [determine_mode, publish_react_native]
-    if: needs.determine_mode.outputs.mode == 'release'
+    # Use always() so this job still runs in release mode even though some
+    # upstream jobs (e.g. build_android) are skipped and would otherwise
+    # poison the implicit success() gate. The explicit result checks below
+    # handle the real gating: only run for a successful release publish.
+    if: |
+      always() &&
+      needs.determine_mode.result == 'success' &&
+      needs.publish_react_native.result == 'success' &&
+      needs.determine_mode.outputs.mode == 'release'
     env:
       REACT_NATIVE_BOT_GITHUB_TOKEN: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
     steps:
@@ -256,19 +264,38 @@ jobs:
   # ─── Release-only: changelog, podfile bump, draft release ────────
   generate_changelog:
     needs: [determine_mode, publish_react_native]
-    if: needs.determine_mode.outputs.mode == 'release'
+    # always() + explicit result checks: run for a successful release publish
+    # even when skipped upstream jobs would trip the implicit success() gate.
+    if: |
+      always() &&
+      needs.determine_mode.result == 'success' &&
+      needs.publish_react_native.result == 'success' &&
+      needs.determine_mode.outputs.mode == 'release'
     uses: ./.github/workflows/generate-changelog.yml
     secrets: inherit
 
   bump_podfile_lock:
     needs: [determine_mode, publish_react_native]
-    if: needs.determine_mode.outputs.mode == 'release'
+    # always() + explicit result checks: run for a successful release publish
+    # even when skipped upstream jobs would trip the implicit success() gate.
+    if: |
+      always() &&
+      needs.determine_mode.result == 'success' &&
+      needs.publish_react_native.result == 'success' &&
+      needs.determine_mode.outputs.mode == 'release'
     uses: ./.github/workflows/bump-podfile-lock.yml
     secrets: inherit
 
   create_draft_release:
     needs: [determine_mode, generate_changelog, set_hermes_version]
-    if: needs.determine_mode.outputs.mode == 'release'
+    # always() + explicit result checks: run for a successful release even when
+    # skipped upstream jobs would trip the implicit success() gate.
+    if: |
+      always() &&
+      needs.determine_mode.result == 'success' &&
+      needs.generate_changelog.result == 'success' &&
+      needs.set_hermes_version.result == 'success' &&
+      needs.determine_mode.outputs.mode == 'release'
     uses: ./.github/workflows/create-draft-release.yml
     secrets: inherit
     with:

.github/workflows/publish-npm.yml

@@ -218,7 +218,7 @@ jobs:
     secrets: inherit
 
   build_fantom_runner:
-    runs-on: ubuntu-latest
+    runs-on: 8-core-ubuntu
     needs: [set_release_type, check_code_changes, lint]
     if: needs.check_code_changes.outputs.any_code_change == 'true'
     container:
@@ -261,7 +261,7 @@ jobs:
     secrets: inherit
 
   build_android:
-    runs-on: ubuntu-latest
+    runs-on: 8-core-ubuntu
     needs: [set_release_type, check_code_changes]
     if: |
       needs.check_code_changes.outputs.any_code_change == 'true' &&
@@ -307,7 +307,7 @@ jobs:
     secrets: inherit
 
   build_npm_package:
-    runs-on: ubuntu-latest
+    runs-on: 8-core-ubuntu
     needs:
       [
         set_release_type,
@@ -340,7 +340,7 @@ jobs:
           skip-apple-prebuilts: ${{ needs.check_code_changes.outputs.should_test_ios == 'false' }}
 
   test_android_helloworld:
-    runs-on: ubuntu-latest
+    runs-on: 4-core-ubuntu
     needs: [build_npm_package, build_android]
     if: ${{ always() && needs.build_android.result == 'success' && needs.build_npm_package.result == 'success' }}
     container:
@@ -453,9 +453,6 @@ jobs:
         uses: ./.github/actions/setup-node
       - name: Install dependencies
         uses: ./.github/actions/yarn-install
-      - name: Lint file structure
-        shell: bash
-        run: ./.github/workflow-scripts/lint_files.sh
       - name: Run shellcheck
         shell: bash
         run: ./.github/workflow-scripts/analyze_scripts.sh
@@ -471,9 +468,9 @@ jobs:
       - name: Flow
         shell: bash
         run: yarn flow-check
-      - name: TypeScript
+      - name: TypeScript (legacy deep imports / manual types)
         shell: bash
-        run: yarn test-typescript
+        run: yarn test-typescript-legacy
 
   test_js:
     runs-on: ubuntu-latest
@@ -510,7 +507,7 @@ jobs:
         run: yarn test-generated-typescript
 
   build_debugger_shell:
-    runs-on: ubuntu-latest
+    runs-on: macos-26
     needs: check_code_changes
     if: needs.check_code_changes.outputs.debugger_shell == 'true'
     steps: