Skip to content

Commit 3154535

Browse files
authored
Merge branch 'facebook:main' into main
2 parents d505f54 + f5bb54d commit 3154535

1,377 files changed

Lines changed: 212856 additions & 24266 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.

.github/workflows/pre-merge.yml

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,74 @@ on:
55
branches:
66
- main
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
lint:
1013
runs-on: ubuntu-latest
1114
steps:
1215
- name: Checkout repository
13-
uses: actions/checkout@v4
14-
15-
- name: Enable Corepack
16-
run: corepack enable
16+
uses: actions/checkout@v6
1717

1818
- name: Set up Node.js
19-
uses: actions/setup-node@v4
19+
uses: actions/setup-node@v6
2020
with:
2121
node-version: "22"
2222
cache: yarn
2323

2424
- name: Check lock for duplications
25-
run: yarn dedupe --check
25+
run: yarn update-lock --fail
2626

2727
- name: Install dependencies
2828
run: yarn install --immutable
2929

3030
- name: Check dependencies alignment
3131
run: yarn check-dependencies
3232

33-
- name: Run Workspace Lint
34-
run: yarn lint
33+
- name: Run packages lint
34+
run: yarn lint:packages
35+
36+
- name: Run plugins lint
37+
run: yarn lint:plugins
38+
39+
check-vercel-redirects:
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: Checkout repository
43+
uses: actions/checkout@v6
44+
45+
- name: Set up Node.js
46+
uses: actions/setup-node@v6
47+
with:
48+
node-version: "22"
49+
cache: yarn
50+
51+
- name: Install dependencies
52+
run: yarn install --immutable
53+
54+
- name: Check Vercel redirects are in sync
55+
run: |
56+
yarn sync-redirects:vercel
57+
if ! git diff --exit-code vercel.json; then
58+
echo "::error::vercel.json redirects are out of sync with _redirects. Run 'yarn sync-redirects:vercel' and commit."
59+
exit 1
60+
fi
61+
62+
lint-website:
63+
runs-on: ubuntu-latest
64+
steps:
65+
- name: Checkout repository
66+
uses: actions/checkout@v6
67+
68+
- name: Set up Node.js
69+
uses: actions/setup-node@v6
70+
with:
71+
node-version: "22"
72+
cache: yarn
73+
74+
- name: Install dependencies
75+
run: yarn install --immutable
3576

3677
- name: Run Website Specific Lints
3778
working-directory: website
@@ -41,13 +82,10 @@ jobs:
4182
runs-on: ubuntu-latest
4283
steps:
4384
- name: Checkout repository
44-
uses: actions/checkout@v4
45-
46-
- name: Enable Corepack
47-
run: corepack enable
85+
uses: actions/checkout@v6
4886

4987
- name: Set up Node.js
50-
uses: actions/setup-node@v4
88+
uses: actions/setup-node@v6
5189
with:
5290
node-version: "22"
5391
cache: yarn

.github/workflows/stale-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
issues: write
1010
pull-requests: write
1111
steps:
12-
- uses: actions/stale@v4
12+
- uses: actions/stale@v10
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
days-before-issue-stale: 90

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ website/build/
3333
!.yarn/releases
3434
!.yarn/sdks
3535
!.yarn/versions
36+
.vercel
37+
.env*.local

.yarnrc.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,13 @@ This repo contains the website configuration and documentation powering the [Rea
1818

1919
1. [Git](https://git-scm.com/downloads).
2020
1. [Node](https://nodejs.org/en/download/) _(version 22 or greater)_.
21-
1. [Yarn](https://yarnpkg.com/getting-started/install) _(version 4)_.
21+
1. [Yarn Classic](https://classic.yarnpkg.com/en/docs/install) _(version 1)_.
2222
1. A fork and clone of the `react-native-website` repo _(for any contributions)_.
2323

2424
### Installation
2525

2626
1. `cd react-native-website` to go into the project root.
27-
1. Run `corepack enable` to enable Corepack.
28-
29-
> If the command above fails, run `npm install -g corepack@latest` to install the latest version of [Corepack](https://yarnpkg.com/corepack#installation).
30-
3127
1. Run `yarn` to install the website's workspace dependencies.
32-
> If you want to retain the globally installed `yarn` classic, you can use `corepack yarn` instead.
3328

3429
### Running locally
3530

docs/_canary-channel-api-warning.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:::tip Canary 🧪
1+
:::tip[Canary 🧪]
22

33
**This API is currently only available in React Native’s Canary and Experimental channels.**
44

docs/_experimental-api-warning.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:::important Experimental 🧪
1+
:::important[Experimental 🧪]
22

33
**This API is experimental.** Experimental APIs may contain bugs and are likely to change in a future version of React Native. Don't use them in production.
44

docs/_experimental-channel-api-warning.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:::tip Experimental Feature 🧪
1+
:::important[Experimental Feature 🧪]
22

33
**This API is currently only available in React Native’s Experimental channels.**
44

docs/_getting-started-linux-android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ While you can use any editor of your choice to develop your app, you will need t
66

77
<h3>Node</h3>
88

9-
Follow the [installation instructions for your Linux distribution](https://nodejs.org/en/download/package-manager/) to install Node 20.19.4 or newer.
9+
Follow the [installation instructions for your Linux distribution](https://nodejs.org/en/download/package-manager/) to install Node 22.11.0 or newer.
1010

1111
<h3>Java Development Kit</h3>
1212

@@ -47,7 +47,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
4747
- `Android SDK Platform 35`
4848
- `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
4949

50-
Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
50+
Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
5151

5252
Finally, click "Apply" to download and install the Android SDK and related build tools.
5353

docs/_getting-started-macos-android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ brew install node
1313
brew install watchman
1414
```
1515

16-
If you have already installed Node on your system, make sure it is Node 20.19.4 or newer.
16+
If you have already installed Node on your system, make sure it is Node 22.11.0 or newer.
1717

1818
[Watchman](https://facebook.github.io/watchman) is a tool by Facebook for watching changes in the filesystem. It is highly recommended you install it for better performance.
1919

@@ -88,7 +88,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
8888
- `Android SDK Platform 35`
8989
- `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
9090

91-
Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
91+
Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
9292

9393
Finally, click "Apply" to download and install the Android SDK and related build tools.
9494

0 commit comments

Comments
 (0)