Skip to content

Commit ee1bac9

Browse files
merging all conflicts
2 parents e2b8dba + 46a54e0 commit ee1bac9

92 files changed

Lines changed: 11565 additions & 7715 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/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ contact_links:
33
url: https://github.com/react/react/issues/new/choose
44
about: This issue tracker is not for bugs in React. Please file React issues here.
55
- name: 🤔 Questions and Help
6-
url: https://reactjs.org/community/support.html
6+
url: https://react.dev/community
77
about: This issue tracker is not for support questions. Please refer to the React community's help and discussion forums.

‎.github/workflows/analyze.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
- name: Set up node
1919
uses: actions/setup-node@v4
2020
with:
21-
node-version: '20.x'
21+
node-version: '24.x'
2222
cache: yarn
2323
cache-dependency-path: yarn.lock
2424

2525
- name: Restore cached node_modules
2626
uses: actions/cache@v4
2727
with:
2828
path: '**/node_modules'
29-
key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
29+
key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
3030

3131
- name: Install deps
3232
run: yarn install --frozen-lockfile

‎.github/workflows/site_lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ jobs:
1313
lint:
1414
runs-on: ubuntu-latest
1515

16-
name: Lint on node 20.x and ubuntu-latest
16+
name: Lint on node 24.x and ubuntu-latest
1717

1818
steps:
1919
- uses: actions/checkout@v4
20-
- name: Use Node.js 20.x
20+
- name: Use Node.js 24.x
2121
uses: actions/setup-node@v4
2222
with:
23-
node-version: 20.x
23+
node-version: 24.x
2424
cache: yarn
2525
cache-dependency-path: yarn.lock
2626

2727
- name: Restore cached node_modules
2828
uses: actions/cache@v4
2929
with:
3030
path: '**/node_modules'
31-
key: node_modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
31+
key: node_modules-24-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
3232

3333
- name: Install deps
3434
run: yarn install --frozen-lockfile

‎CLAUDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code when working with this repository.
44

55
## Project Overview
66

7-
This is the React documentation website (react.dev), built with Next.js 15.1.11 and React 19. Documentation is written in MDX format.
7+
This is the React documentation website (react.dev), built with Next.js 15.1.12 and React 19. Documentation is written in MDX format.
88

99
## Development Commands
1010

@@ -47,6 +47,6 @@ When editing files in `src/content/`, the appropriate skill will be auto-suggest
4747
For MDX components (DeepDive, Pitfall, Note, etc.), invoke `/docs-components`.
4848
For Sandpack code examples, invoke `/docs-sandpack`.
4949

50-
See `.claude/docs/react-docs-patterns.md` for comprehensive style guidelines.
50+
See `.claude/skills/` for comprehensive style guidelines.
5151

5252
Prettier is used for formatting (config in `.prettierrc`).

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,41 +38,9 @@ Ignore this if you're specifically describing `createElement`.
3838

3939
Ignore this if you're specifically writing about ES5.
4040

41-
#### Don't use ES6 features when equivalent ES5 features have no downsides.
41+
#### Prefer readable syntax.
4242

43-
Remember that ES6 is still new to a lot of people. While we use it in many places (`const` / `let`, classes, arrow functions), if the equivalent ES5 code is just as straightforward and readable, consider using it.
44-
45-
In particular, you should prefer named `function` declarations over `const myFunction = () => ...` arrows for top-level functions. However, you *should* use arrow functions where they provide a tangible improvement (such as preserving `this` context inside a component). Consider both sides of the tradeoff when deciding whether to use a new feature.
46-
47-
#### Don't use features that aren't standardized yet.
48-
49-
For example, **don't** write this:
50-
51-
```js
52-
class MyComponent extends React.Component {
53-
state = {value: ''};
54-
handleChange = (e) => {
55-
this.setState({value: e.target.value});
56-
};
57-
}
58-
```
59-
60-
Instead, **do** write this:
61-
62-
```js
63-
class MyComponent extends React.Component {
64-
constructor(props) {
65-
super(props);
66-
this.handleChange = this.handleChange.bind(this);
67-
this.state = {value: ''};
68-
}
69-
handleChange(e) {
70-
this.setState({value: e.target.value});
71-
}
72-
}
73-
```
74-
75-
Ignore this rule if you're specifically describing an experimental proposal. Make sure to mention its experimental nature in the code and in the surrounding text.
43+
Choose syntax that makes each example easier to follow. Prefer named `function` declarations over `const myFunction = () => ...` arrows for top-level functions. Use arrow functions when they make callbacks easier to read. In class components, arrow functions can also preserve the component's `this` value.
7644

7745
### Style
7846

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ This repo contains the source code and documentation powering [react.dev](https:
77
### Prerequisites
88

99
1. Git
10-
1. Node: any version starting with v16.8.0 or greater
11-
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
10+
1. Node: v24 or greater
11+
1. Yarn Classic: See [Yarn website for installation instructions](https://classic.yarnpkg.com/en/docs/install/)
1212
1. A fork of the repo (for any contributions)
1313
1. A clone of the [react.dev repo](https://github.com/reactjs/react.dev) on your local machine
1414

1515
### Installation
1616

1717
1. `cd react.dev` to go into the project root
18+
2. `git remote add my-fork-name https://github.com/YOUR_USERNAME/react.dev.git` to add your fork as a remote. Replace `YOUR_USERNAME` with your GitHub username. You only need to do this once.
1819
3. `yarn` to install the website's npm dependencies
1920

2021
### Running locally
@@ -39,8 +40,8 @@ The documentation is divided into several sections with a different tone and pur
3940
1. Follow the ["Running locally"](#running-locally) instructions
4041
1. Save the files and check in the browser
4142
1. Changes to React components in `src` will hot-reload
42-
1. Changes to markdown files in `content` will hot-reload
43-
1. If working with plugins, you may need to remove the `.cache` directory and restart the server
43+
1. Changes to markdown files in `src/content` will hot-reload
44+
1. If working with plugins, you may need to remove the `node_modules/.cache/react-docs-mdx` directory and restart the server
4445

4546
### Test the change
4647

@@ -57,7 +58,7 @@ The documentation is divided into several sections with a different tone and pur
5758

5859
## Translation
5960

60-
If you are interested in translating `react.dev`, please see the current translation efforts [here](https://github.com/reactjs/react.dev/issues/4135).
61+
If you are interested in translating `react.dev`, please see the current translation efforts [here](https://react.dev/community/translations).
6162

6263
## License
6364
Content submitted to [react.dev](https://react.dev/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/reactjs/react.dev/blob/main/LICENSE-DOCS.md) file.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```js [[1, 1, "submitAction"]]
2+
function UpdateName() {}
3+
```
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```js [[1, 3, "submitAction"]]
2+
function submitAction() {}
3+
```
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```js [[1, 1, "submitAction"]]
2+
function submitAction() {}
3+
```
4+
5+
```js [[1, 1, "\\"hidden\\""]]
6+
const mode = "hidden";
7+
```

‎eslint-local-rules/__tests__/lint-markdown-code-blocks.test.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,37 @@ async function run() {
123123
),
124124
'expected malformed metadata to be replaced with canonical form'
125125
);
126+
127+
const validHighlightResult = await lintFixture('valid-highlight.md');
128+
assert.strictEqual(
129+
validHighlightResult.messages.length,
130+
0,
131+
'expected a valid inline highlight to pass'
132+
);
133+
134+
const missingHighlightResult = await lintFixture('missing-highlight.md');
135+
assert.strictEqual(
136+
missingHighlightResult.messages.length,
137+
1,
138+
'expected a highlight with text missing from its line to fail'
139+
);
140+
assert.strictEqual(
141+
missingHighlightResult.messages[0].message,
142+
"Could not find 'submitAction' on highlighted line 1"
143+
);
144+
145+
const outOfBoundsHighlightResult = await lintFixture(
146+
'out-of-bounds-highlight.md'
147+
);
148+
assert.strictEqual(
149+
outOfBoundsHighlightResult.messages.length,
150+
1,
151+
'expected an out-of-bounds highlight line to fail'
152+
);
153+
assert.strictEqual(
154+
outOfBoundsHighlightResult.messages[0].message,
155+
'Code highlight line 3 is outside this code block'
156+
);
126157
}
127158

128159
run().catch(error => {

0 commit comments

Comments
 (0)