Skip to content

Commit 1c74aea

Browse files
committed
Merge branch 'facebook-main' into production
# Conflicts: # .gitignore # package.json
2 parents 054699b + 371c3bb commit 1c74aea

File tree

369 files changed

+3691
-4395
lines changed

Some content is hidden

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

369 files changed

+3691
-4395
lines changed
File renamed without changes.

.eslintrc.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/pre-merge.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-node@v4
2020
with:
2121
node-version: "20"
22-
cache: "yarn"
22+
cache: yarn
2323

2424
- name: Check lock for duplications
2525
run: yarn dedupe --check
@@ -32,7 +32,6 @@ jobs:
3232

3333
- name: Run Lint
3434
run: yarn ci:lint
35-
working-directory: website
3635

3736
build:
3837
runs-on: ubuntu-latest
@@ -47,7 +46,7 @@ jobs:
4746
uses: actions/setup-node@v4
4847
with:
4948
node-version: "20"
50-
cache: "yarn"
49+
cache: yarn
5150

5251
- name: Install dependencies
5352
run: yarn install --immutable
@@ -56,4 +55,4 @@ jobs:
5655
run: yarn build
5756
working-directory: website
5857
env:
59-
NODE_OPTIONS: "--max_old_space_size=8192"
58+
NODE_OPTIONS: --max_old_space_size=8192

.gitignore

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

2020
*.tsbuildinfo
2121

22-
scripts/lint-examples/out/
23-
24-
.nvmrc
25-
website/scripts/sync-api-docs/generatedComponentApiDocs.js
26-
website/scripts/sync-api-docs/extracted.json
27-
28-
cnwebsite/translated_docs
29-
cnwebsite/build/
30-
cnwebsite/community-repos.json
31-
cnwebsite/node_modules
32-
33-
cnwebsite/scripts/sync-api-docs/generatedComponentApiDocs.js
34-
cnwebsite/scripts/sync-api-docs/extracted.json
35-
sync-api-docs/generatedComponentApiDocs.js
36-
sync-api-docs/extracted.json
22+
packages/lint-examples/out/
3723

3824
website/.docusaurus
3925
website/.cache-loader
@@ -50,7 +36,3 @@ cnwebsite/build/
5036
!.yarn/releases
5137
!.yarn/sdks
5238
!.yarn/versions
53-
54-
55-
# Generated file(s) for llms
56-
llms.txt

.prettierrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"overrides": [
33
{
4-
"files": ["*.js", "*.jsx", "*.ts", "*.tsx"],
4+
"files": ["*.js", "*.mjs", "*.cjs", "*.jsx", "*.ts", "*.tsx"],
55
"options": {
66
"arrowParens": "avoid",
77
"bracketSpacing": false,
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
{
16-
"files": "*.md",
16+
"files": ["*.md", "*.mdx"],
1717
"options": {
1818
"arrowParens": "avoid",
1919
"bracketSpacing": false,

docs/_experimental-api-warning.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
:::important Experimental 🧪
2+
3+
**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.
4+
5+
:::

docs/_getting-started-linux-android.md

Lines changed: 20 additions & 8 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 18.18 or newer.
9+
Follow the [installation instructions for your Linux distribution](https://nodejs.org/en/download/package-manager/) to install Node 20.19.4 or newer.
1010

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

@@ -18,15 +18,17 @@ Setting up your development environment can be somewhat tedious if you're new to
1818

1919
<h4 id="android-studio">1. Install Android Studio</h4>
2020

21-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
21+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
2222

2323
- `Android SDK`
2424
- `Android SDK Platform`
2525
- `Android Virtual Device`
2626

2727
Then, click "Next" to install all of these components.
2828

29-
> If the checkboxes are grayed out, you will have a chance to install these components later on.
29+
:::note
30+
If the checkboxes are grayed out, you will have a chance to install these components later on.
31+
:::
3032

3133
Once setup has finalized and you're presented with the Welcome screen, proceed to the next step.
3234

@@ -36,7 +38,9 @@ Android Studio installs the latest Android SDK by default. Building a React Nati
3638

3739
To do that, open Android Studio, click on "Configure" button and select "SDK Manager".
3840

39-
> The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
41+
:::tip
42+
The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
43+
:::
4044

4145
Select the "SDK Platforms" tab from within the SDK Manager, then check the box next to "Show Package Details" in the bottom right corner. Look for and expand the `Android 15 (VanillaIceCream)` entry, then make sure the following items are checked:
4246

@@ -59,17 +63,23 @@ export PATH=$PATH:$ANDROID_HOME/emulator
5963
export PATH=$PATH:$ANDROID_HOME/platform-tools
6064
```
6165

62-
> `.bash_profile` is specific to `bash`. If you're using another shell, you will need to edit the appropriate shell-specific config file.
66+
:::note
67+
`.bash_profile` is specific to `bash`. If you're using another shell, you will need to edit the appropriate shell-specific config file.
68+
:::
6369

6470
Type `source $HOME/.bash_profile` for `bash` or `source $HOME/.zprofile` to load the config into your current shell. Verify that ANDROID_HOME has been set by running `echo $ANDROID_HOME` and the appropriate directories have been added to your path by running `echo $PATH`.
6571

66-
> Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
72+
:::note
73+
Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
74+
:::
6775

6876
<h3>Watchman</h3>
6977

7078
Follow the [Watchman installation guide](https://facebook.github.io/watchman/docs/install#buildinstall) to compile and install Watchman from source.
7179

72-
> [Watchman](https://facebook.github.io/watchman/docs/install) is a tool by Facebook for watching changes in the filesystem. It is highly recommended you install it for better performance and increased compatibility in certain edge cases (translation: you may be able to get by without installing this, but your mileage may vary; installing this now may save you from a headache later).
80+
:::info
81+
[Watchman](https://facebook.github.io/watchman/docs/install) is a tool by Facebook for watching changes in the filesystem. It is highly recommended you install it for better performance and increased compatibility in certain edge cases (translation: you may be able to get by without installing this, but your mileage may vary; installing this now may save you from a headache later).
82+
:::
7383

7484
<h2>Preparing the Android device</h2>
7585

@@ -89,7 +99,9 @@ If you use Android Studio to open `./AwesomeProject/android`, you can see the li
8999

90100
If you have recently installed Android Studio, you will likely need to [create a new AVD](https://developer.android.com/studio/run/managing-avds.html). Select "Create Virtual Device...", then pick any Phone from the list and click "Next", then select the **VanillaIceCream** API Level 35 image.
91101

92-
> We recommend configuring [VM acceleration](https://developer.android.com/studio/run/emulator-acceleration.html#vm-linux) on your system to improve performance. Once you've followed those instructions, go back to the AVD Manager.
102+
:::tip
103+
We recommend configuring [VM acceleration](https://developer.android.com/studio/run/emulator-acceleration.html#vm-linux) on your system to improve performance. Once you've followed those instructions, go back to the AVD Manager.
104+
:::
93105

94106
Click "Next" then "Finish" to create your AVD. At this point you should be able to click on the green triangle button next to your AVD to launch it.
95107

docs/_getting-started-macos-android.md

Lines changed: 11 additions & 5 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 18.18 or newer.
16+
If you have already installed Node on your system, make sure it is Node 20.19.4 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

@@ -57,15 +57,17 @@ Setting up your development environment can be somewhat tedious if you're new to
5757

5858
<h4 id="android-studio">1. Install Android Studio</h4>
5959

60-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
60+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
6161

6262
- `Android SDK`
6363
- `Android SDK Platform`
6464
- `Android Virtual Device`
6565

6666
Then, click "Next" to install all of these components.
6767

68-
> If the checkboxes are grayed out, you will have a chance to install these components later on.
68+
:::note
69+
If the checkboxes are grayed out, you will have a chance to install these components later on.
70+
:::
6971

7072
Once setup has finalized and you're presented with the Welcome screen, proceed to the next step.
7173

@@ -77,7 +79,9 @@ To do that, open Android Studio, click on "More Actions" button and select "SDK
7779

7880
![Android Studio Welcome](/docs/assets/GettingStartedAndroidStudioWelcomeMacOS.png)
7981

80-
> The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
82+
:::tip
83+
The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
84+
:::
8185

8286
Select the "SDK Platforms" tab from within the SDK Manager, then check the box next to "Show Package Details" in the bottom right corner. Look for and expand the `Android 15 (VanillaIceCream)` entry, then make sure the following items are checked:
8387

@@ -102,7 +106,9 @@ export PATH=$PATH:$ANDROID_HOME/platform-tools
102106

103107
Run `source ~/.zprofile` (or `source ~/.bash_profile` for `bash`) to load the config into your current shell. Verify that ANDROID_HOME has been set by running `echo $ANDROID_HOME` and the appropriate directories have been added to your path by running `echo $PATH`.
104108

105-
> Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
109+
:::note
110+
Please make sure you use the correct Android SDK path. You can find the actual location of the SDK in the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
111+
:::
106112

107113
<h2>Preparing the Android device</h2>
108114

docs/_getting-started-macos-ios.md

Lines changed: 1 addition & 1 deletion
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 18.18 or newer.
16+
If you have already installed Node on your system, make sure it is Node 20.19.4 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

docs/_getting-started-windows-android.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,21 @@ choco install -y nodejs-lts microsoft-openjdk17
2020

2121
If you have already installed Node on your system, make sure it is Node 18 or newer. If you already have a JDK on your system, we recommend JDK17. You may encounter problems using higher JDK versions.
2222

23-
> You can find additional installation options on [Node's Downloads page](https://nodejs.org/en/download/).
23+
:::note
24+
You can find additional installation options on [Node's Downloads page](https://nodejs.org/en/download/).
25+
:::
2426

25-
> If you're using the latest version of Java Development Kit, you'll need to change the Gradle version of your project so it can recognize the JDK. You can do that by going to `{project root folder}\android\gradle\wrapper\gradle-wrapper.properties` and changing the `distributionUrl` value to upgrade the Gradle version. You can check out [here the latest releases of Gradle](https://gradle.org/releases/).
27+
:::info
28+
If you're using the latest version of Java Development Kit, you'll need to change the Gradle version of your project so it can recognize the JDK. You can do that by going to `{project root folder}\android\gradle\wrapper\gradle-wrapper.properties` and changing the `distributionUrl` value to upgrade the Gradle version. You can check out [here the latest releases of Gradle](https://gradle.org/releases/).
29+
:::
2630

2731
<h3>Android development environment</h3>
2832

2933
Setting up your development environment can be somewhat tedious if you're new to Android development. If you're already familiar with Android development, there are a few things you may need to configure. In either case, please make sure to carefully follow the next few steps.
3034

3135
<h4 id="android-studio">1. Install Android Studio</h4>
3236

33-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
37+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
3438

3539
- `Android SDK`
3640
- `Android SDK Platform`
@@ -39,7 +43,9 @@ Setting up your development environment can be somewhat tedious if you're new to
3943

4044
Then, click "Next" to install all of these components.
4145

42-
> If the checkboxes are grayed out, you will have a chance to install these components later on.
46+
:::note
47+
If the checkboxes are grayed out, you will have a chance to install these components later on.
48+
:::
4349

4450
Once setup has finalized and you're presented with the Welcome screen, proceed to the next step.
4551

@@ -51,7 +57,9 @@ To do that, open Android Studio, click on "More Actions" button and select "SDK
5157

5258
![Android Studio Welcome](/docs/assets/GettingStartedAndroidStudioWelcomeWindows.png)
5359

54-
> The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
60+
:::tip
61+
The SDK Manager can also be found within the Android Studio "Settings" dialog, under **Languages & Frameworks****Android SDK**.
62+
:::
5563

5664
Select the "SDK Platforms" tab from within the SDK Manager, then check the box next to "Show Package Details" in the bottom right corner. Look for and expand the `Android 15 (VanillaIceCream)` entry, then make sure the following items are checked:
5765

@@ -120,7 +128,9 @@ If you use Android Studio to open `./AwesomeProject/android`, you can see the li
120128

121129
If you have recently installed Android Studio, you will likely need to [create a new AVD](https://developer.android.com/studio/run/managing-avds.html). Select "Create Virtual Device...", then pick any Phone from the list and click "Next", then select the **VanillaIceCream** API Level 35 image.
122130

123-
> If you don't have HAXM installed, click on "Install HAXM" or follow [these instructions](https://github.com/intel/haxm/wiki/Installation-Instructions-on-Windows) to set it up, then go back to the AVD Manager.
131+
:::note
132+
If you don't have HAXM installed, click on "Install HAXM" or follow [these instructions](https://github.com/intel/haxm/wiki/Installation-Instructions-on-Windows) to set it up, then go back to the AVD Manager.
133+
:::
124134

125135
Click "Next" then "Finish" to create your AVD. At this point you should be able to click on the green triangle button next to your AVD to launch it.
126136

0 commit comments

Comments
 (0)