Merge branch 'main' into set-log-box-max-font-size

Author: pchalupa

.eslintrc.js

@@ -50,7 +50,7 @@ module.exports = {
       files: [
         './packages/react-native/Libraries/**/*.{js,flow}',
         './packages/react-native/src/**/*.{js,flow}',
-        './packages/assets/registry.js',
+        './packages/assets-registry/registry.js',
       ],
       parser: 'hermes-eslint',
       rules: {

.flowconfig

@@ -45,6 +45,7 @@ packages/react-native/flow/
 [options]
 enums=true
 experimental.pattern_matching=true
+experimental.allow_variance_keywords=true
 casting_syntax=both
 component_syntax=true
 

.github/actions/diff-js-api-changes/action.yml

@@ -7,30 +7,51 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Fetch PR and main, compute merge base
-      id: merge_base
-      shell: bash
-      env:
-        PR_SHA: ${{ github.event.pull_request.head.sha }}
-      run: |
-        git fetch origin main
-        git fetch origin "$PR_SHA" --depth=500
-        echo "merge_base=$(git merge-base "$PR_SHA" origin/main)" >> $GITHUB_OUTPUT
+    - name: Resolve API diff inputs
+      id: api_diff
+      uses: actions/github-script@v8
+      with:
+        script: |
+          // Check if we are targeting main or a stable branch
+          const baseRef = context.payload.pull_request.base.ref;
+          if (baseRef !== 'main' && !baseRef.endsWith('-stable')) {
+            core.setOutput('changed', false);
+            return;
+          }
+
+          // Check if the diff touches ReactNativeApi.d.ts
+          const files = await github.paginate(github.rest.pulls.listFiles, {
+            ...context.repo,
+            pull_number: context.payload.pull_request.number,
+          });
+          const changed = files.some(f => f.filename === 'packages/react-native/ReactNativeApi.d.ts');
+          core.setOutput('changed', changed);
+          if (!changed) return;
+
+          // Calculate merge base
+          const {data} = await github.rest.repos.compareCommits({
+            ...context.repo,
+            base: context.payload.pull_request.base.ref,
+            head: context.payload.pull_request.head.sha,
+          });
+          core.setOutput('merge_base', data.merge_base_commit.sha);
 
-    - name: Extract before and after API snapshots
+    - name: Fetch commits and extract API snapshots
+      if: steps.api_diff.outputs.changed == 'true'
       shell: bash
       env:
         SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-changes
-        MERGE_BASE: ${{ steps.merge_base.outputs.merge_base }}
-        PR_SHA: ${{ github.event.pull_request.head.sha }}
       run: |
         mkdir -p $SCRATCH_DIR
-        git show "$MERGE_BASE":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-before.d.ts \
+        git fetch origin "${{ steps.api_diff.outputs.merge_base }}" --depth=1
+        git fetch origin "${{ github.event.pull_request.head.sha }}" --depth=1
+        git show "${{ steps.api_diff.outputs.merge_base }}":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-before.d.ts \
           || echo "" > $SCRATCH_DIR/ReactNativeApi-before.d.ts
-        git show "$PR_SHA":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-after.d.ts \
+        git show "${{ github.event.pull_request.head.sha }}":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-after.d.ts \
           || echo "" > $SCRATCH_DIR/ReactNativeApi-after.d.ts
 
     - name: Run breaking change detection
+      if: steps.api_diff.outputs.changed == 'true'
       shell: bash
       env:
         SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-changes

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v0.86.0-rc.2
+
+### Added
+
+#### Android specific
+
+- **Pressable**: `android_ripple` now accepts `PlatformColor` ([60d8b282ea](https://github.com/facebook/react-native/commit/60d8b282eaf5bd2803fdaa838520f6ff41cc6737) by [@adrcotfas](https://github.com/adrcotfas))
+
+### Changed
+
+#### iOS specific
+
+- **Build**: Cache prebuilt iOS binaries ([9a0b05b8d0](https://github.com/facebook/react-native/commit/9a0b05b8d07f3468a08077119189406d56a230ba) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Fixed
+
+#### iOS specific
+
+- **Build**: Fixed escaping local file URIs for unicode paths in ruby scripts ([9563cb5b5a](https://github.com/facebook/react-native/commit/9563cb5b5a546d6daf09abc9d5594850129a4ae3) by [@chrfalch](https://github.com/chrfalch))
+- **CocoaPods**: Fix Pod install checksum drifting ([814ebb12b6](https://github.com/facebook/react-native/commit/814ebb12b64cee51b91ada9fa0d90970feac9a9f) by [@chrfalch](https://github.com/chrfalch))
+- **CocoaPods**: Load `RCTDefines.h` first in the prebuilt React umbrella and drop the `module *` submodule wildcard so RCT_* macros propagate to consumer pods under `use_frameworks!`. ([90c303fafb](https://github.com/facebook/react-native/commit/90c303fafb941155dbe379e6b3e74390a139872a) by [@wneel](https://github.com/wneel))
+
 ## v0.86.0-rc.1
 
 ### Fixed

packages/assets/README.md packages/assets-registry/README.mdpackages/assets/README.md renamed to packages/assets-registry/README.md

@@ -18,4 +18,4 @@ yarn add --dev @react-native/assets-registry
 To run the tests in this package, run the following commands from the React Native root folder:
 
 1. `yarn` to install the dependencies. You just need to run this once
-2. `yarn jest packages/assets`.
+2. `yarn jest packages/assets-registry`.

…es/assets/__tests__/path-support-test.js …-registry/__tests__/path-support-test.jspackages/assets/__tests__/path-support-test.js renamed to packages/assets-registry/__tests__/path-support-test.js packages/assets/__tests__/path-support-test.js renamed to packages/assets-registry/__tests__/path-support-test.js

@@ -6,9 +6,9 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/facebook/react-native.git",
-    "directory": "packages/assets"
+    "directory": "packages/assets-registry"
   },
-  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/assets#readme",
+  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/assets-registry#readme",
   "keywords": [
     "assets",
     "registry",

packages/assets/package.json packages/assets-registry/package.jsonpackages/assets/package.json renamed to packages/assets-registry/package.json

@@ -14,16 +14,16 @@
 export type AssetDestPathResolver = 'android' | 'generic';
 
 export type PackagerAsset = {
-  +__packager_asset: boolean,
-  +fileSystemLocation: string,
-  +httpServerLocation: string,
-  +width: ?number,
-  +height: ?number,
-  +scales: Array<number>,
-  +hash: string,
-  +name: string,
-  +type: string,
-  +resolver?: AssetDestPathResolver,
+  readonly __packager_asset: boolean,
+  readonly fileSystemLocation: string,
+  readonly httpServerLocation: string,
+  readonly width: ?number,
+  readonly height: ?number,
+  readonly scales: Array<number>,
+  readonly hash: string,
+  readonly name: string,
+  readonly type: string,
+  readonly resolver?: AssetDestPathResolver,
   ...
 };
 */