Skip to content

Commit be22b52

Browse files
committed
Merge branch 'facebook-main' into production
# Conflicts: # package.json # yarn.lock
2 parents eaf2bfe + baf5eb6 commit be22b52

File tree

415 files changed

+51244
-3549
lines changed

Some content is hidden

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

415 files changed

+51244
-3549
lines changed

.alexignore

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

.alexrc.cjs

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

.github/workflows/pre-merge.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414

1515
- name: Enable Corepack
1616
run: corepack enable
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
@@ -30,20 +30,24 @@ jobs:
3030
- name: Check dependencies alignment
3131
run: yarn check-dependencies
3232

33-
- name: Run Lint
33+
- name: Run Workspace Lint
34+
run: yarn lint
35+
36+
- name: Run Website Specific Lints
37+
working-directory: website
3438
run: yarn ci:lint
3539

3640
build:
3741
runs-on: ubuntu-latest
3842
steps:
3943
- name: Checkout repository
40-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4145

4246
- name: Enable Corepack
4347
run: corepack enable
4448

4549
- name: Set up Node.js
46-
uses: actions/setup-node@v4
50+
uses: actions/setup-node@v6
4751
with:
4852
node-version: "22"
4953
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

.prettierrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"plugins": [
3+
"@prettier/plugin-oxc"
4+
],
25
"overrides": [
36
{
47
"files": ["*.js", "*.mjs", "*.cjs", "*.jsx", "*.ts", "*.tsx"],
@@ -26,7 +29,7 @@
2629
}
2730
},
2831
{
29-
"files": ["*.scss", "*.css"],
32+
"files": ["*.scss", "*.css", "*.yml"],
3033
"options": {
3134
"printWidth": 80,
3235
"endOfLine": "auto"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ If possible, test any visual changes in all latest versions of the following bro
181181

182182
### Push it
183183

184-
1. Run `yarn prettier` and `yarn language:lint` in `./website` directory to ensure your changes are consistent with other files in the repo.
184+
1. Run `yarn lint` and `yarn prettier` in `./website` directory to ensure your changes are consistent with other files in the repo.
185185
1. Run `yarn update-lock` to [deduplicate dependencies](https://yarnpkg.com/cli/dedupe).
186186
1. `git add -A && git commit -m "My message"` to stage and commit your changes.
187187
> replace `My message` with a commit message, such as `Fixed header logo on Android`

STYLEGUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ When writing step-by-step instructions (e.g. how to install something), try to f
137137

138138
## Resources
139139

140-
- [React JS’s contibuting guidelines](https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md#guidelines-for-text), especially the [code examples guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-code-examples)
140+
- [React JS’s contributing guidelines](https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md#guidelines-for-text), especially the [code examples guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-code-examples)

docs/_getting-started-windows-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Open an Administrator Command Prompt (right click Command Prompt and select "Run
1818
choco install -y nodejs-lts microsoft-openjdk17
1919
```
2020

21-
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.
21+
If you have already installed Node on your system, make sure it is Node 20.19.4 or newer. If you already have a JDK on your system, we recommend JDK17. You may encounter problems using higher JDK versions.
2222

2323
:::note
2424
You can find additional installation options on [Node's Downloads page](https://nodejs.org/en/download/).

docs/_integration-with-existing-apps-ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ We now need to add some native code in order to start the React Native runtime a
237237

238238
### Requirements
239239

240-
React Native intialization is now unbound to any specific part of an iOS app.
240+
React Native initialization is now unbound to any specific part of an iOS app.
241241

242242
React Native can be initialized using a class called `RCTReactNativeFactory`, that takes care of handling the React Native lifecycle for you.
243243

docs/boxshadowvalue.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ The offset on the y-axis. This can be positive or negative. A positive value ind
3838

3939
### `blurRadius`
4040

41-
Represents the radius used in the [Guassian blur](https://en.wikipedia.org/wiki/Gaussian_blur) algorithm. The larger the value the blurrier the shadow is. Only non-negative values are valid. The default is 0.
41+
Represents the radius used in the [Gaussian blur](https://en.wikipedia.org/wiki/Gaussian_blur) algorithm. The larger the value the blurrier the shadow is. Only non-negative values are valid. The default is 0.
4242

43-
| Type | Optional |
44-
| --------------- | -------- |
45-
| numer \| string | Yes |
43+
| Type | Optional |
44+
| ---------------- | -------- |
45+
| number \| string | Yes |
4646

4747
### `spreadDistance`
4848

4949
How much larger or smaller the shadow grows or shrinks. A positive value will grow the shadow, a negative value will shrink the shadow.
5050

51-
| Type | Optional |
52-
| --------------- | -------- |
53-
| numer \| string | Yes |
51+
| Type | Optional |
52+
| ---------------- | -------- |
53+
| number \| string | Yes |
5454

5555
### `color`
5656

0 commit comments

Comments
 (0)