Skip to content

Commit 8b1f51f

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/android-text-descender-clipping
2 parents 357f29d + 549e4e2 commit 8b1f51f

78 files changed

Lines changed: 613 additions & 849 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flowconfig

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,8 @@ packages/react-native/interface.js
4343
packages/react-native/flow/
4444

4545
[options]
46-
enums=true
47-
experimental.pattern_matching=true
48-
experimental.allow_variance_keywords=true
49-
casting_syntax=both
50-
component_syntax=true
51-
5246
emoji=true
5347

54-
exact_by_default=true
55-
5648
format.bracket_spacing=false
5749

5850
module.file_ext=.js
@@ -73,6 +65,9 @@ module.system.haste.module_ref_prefix=m#
7365

7466
react.runtime=automatic
7567

68+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
69+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
70+
experimental.deprecated_utilities.excludes=<PROJECT_ROOT>/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js
7671
ban_spread_key_props=true
7772

7873
[lints]
@@ -96,4 +91,4 @@ untyped-import
9691
untyped-type-import
9792

9893
[version]
99-
^0.317.0
94+
^0.318.0

.github/actions/build-npm-package/action.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ inputs:
44
release-type:
55
required: true
66
description: The type of release we are building. It could be nightly, release or dry-run
7-
gha-npm-token:
8-
required: false
9-
description: The GHA npm token, required only to publish to npm
10-
default: ''
117
gradle-cache-encryption-key:
128
description: The encryption key needed to store the Gradle Configuration cache
139
skip-apple-prebuilts:
@@ -45,6 +41,8 @@ runs:
4541
cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
4642
- name: Setup node.js
4743
uses: ./.github/actions/setup-node
44+
with:
45+
registry-url: 'https://registry.npmjs.org'
4846
- name: Install dependencies
4947
uses: ./.github/actions/yarn-install
5048
- name: Build packages
@@ -53,12 +51,9 @@ runs:
5351
- name: Build types
5452
shell: bash
5553
run: yarn build-types --skip-snapshot
56-
# Continue with publish steps
57-
- name: Set npm credentials
58-
if: ${{ inputs.release-type == 'release' ||
59-
inputs.release-type == 'nightly' }}
60-
shell: bash
61-
run: echo "//registry.npmjs.org/:_authToken=${{ inputs.gha-npm-token }}" > ~/.npmrc
54+
# `npm publish` below authenticates via npm Trusted Publishing (OIDC).
55+
# The caller (the reusable `publish-npm.yml` workflow) MUST grant
56+
# `id-token: write`; this composite action runs inside that job.
6257
- name: Publish NPM
6358
shell: bash
6459
run: |

.github/actions/setup-node/action.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ inputs:
55
description: 'The node.js version to use'
66
required: false
77
default: '22.14.0'
8+
registry-url:
9+
description: |
10+
Optional npm registry URL passed through to actions/setup-node. Set on
11+
jobs that publish to npm so setup-node writes a `.npmrc` configured to
12+
pick up the OIDC-minted token from npm Trusted Publishing.
13+
required: false
14+
default: ''
815
runs:
916
using: "composite"
1017
steps:
@@ -13,3 +20,4 @@ runs:
1320
with:
1421
node-version: ${{ inputs.node-version }}
1522
cache: yarn
23+
registry-url: ${{ inputs.registry-url }}

.github/workflows/analyze-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
analyze_pr:
1313
runs-on: ubuntu-latest
14-
if: github.repository == 'facebook/react-native'
14+
if: github.repository == 'react/react-native'
1515
steps:
1616
- name: Check out main branch
1717
uses: actions/checkout@v6

.github/workflows/api-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
api_changes:
1212
runs-on: ubuntu-latest
13-
if: github.repository == 'facebook/react-native'
13+
if: github.repository == 'react/react-native'
1414
steps:
1515
- name: Check out main branch
1616
uses: actions/checkout@v6

.github/workflows/cache-reaper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
cache-cleaner:
11-
if: github.repository == 'facebook/react-native'
11+
if: github.repository == 'react/react-native'
1212
runs-on: ubuntu-latest
1313
env:
1414
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-for-reproducer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-for-reproducer:
99
runs-on: ubuntu-latest
1010
if: |
11-
github.repository == 'facebook/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
11+
github.repository == 'react/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
1212
steps:
1313
- uses: actions/checkout@v6
1414
- uses: actions/github-script@v8

.github/workflows/close-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
comment-and-label:
1111
runs-on: ubuntu-latest
12-
if: github.repository == 'facebook/react-native'
12+
if: github.repository == 'react/react-native'
1313
steps:
1414
- uses: actions/github-script@v8
1515
with:

.github/workflows/create-release.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
create_release:
22-
if: github.repository == 'facebook/react-native'
22+
if: github.repository == 'react/react-native'
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout
@@ -28,21 +28,6 @@ jobs:
2828
token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
2929
fetch-depth: 0
3030
fetch-tags: 'true'
31-
- name: Verify NPM token
32-
run: |
33-
if [[ -z "$GHA_NPM_TOKEN" ]]; then
34-
echo "⚠️ No NPM token found. Skipping validation."
35-
exit 0
36-
fi
37-
echo "//registry.npmjs.org/:_authToken=$GHA_NPM_TOKEN" > ~/.npmrc
38-
if ! npm whoami > /dev/null 2>&1; then
39-
echo "❌ NPM token is invalid or expired. Aborting release."
40-
exit 1
41-
fi
42-
echo "✅ NPM token is valid ($(npm whoami))"
43-
rm -f ~/.npmrc
44-
env:
45-
GHA_NPM_TOKEN: ${{ secrets.GHA_NPM_TOKEN }}
4631
- name: Check if on stable branch
4732
id: check_stable_branch
4833
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
echo "Feed maven local to gradle.properties"
6868
cd /tmp/RNTestProject
69-
echo "\nreact.internal.mavenLocalRepo=$MAVEN_LOCAL" >> android/gradle.properties
69+
echo -e "\nreact.internal.mavenLocalRepo=$MAVEN_LOCAL" >> android/gradle.properties
7070
7171
# Build
7272
cd android

0 commit comments

Comments
 (0)