Skip to content

Commit 1f06982

Browse files
merging all conflicts
2 parents 4e68bad + b011783 commit 1f06982

110 files changed

Lines changed: 12707 additions & 7854 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.

‎.claude/skills/docs-writer-blog/SKILL.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ See [How to Upgrade to React X.Y](/blog/YYYY/MM/DD/react-xy-upgrade-guide) for s
159159

160160
### React {/*react*/}
161161

162-
* Add `useNewHook` for [purpose]. ([#12345](https://github.com/facebook/react/pull/12345) by [@contributor](https://github.com/contributor))
162+
* Add `useNewHook` for [purpose]. ([#12345](https://github.com/react/react/pull/12345) by [@contributor](https://github.com/contributor))
163163

164164
---
165165

@@ -603,7 +603,7 @@ npm install react@latest react-dom@latest
603603

604604
| Type | Pattern |
605605
|------|---------|
606-
| GitHub PR | `[#12345](https://github.com/facebook/react/pull/12345)` |
606+
| GitHub PR | `[#12345](https://github.com/react/react/pull/12345)` |
607607
| GitHub user | `[@username](https://github.com/username)` |
608608
| Twitter/X | `[@username](https://x.com/username)` |
609609
| Bluesky | `[Name](https://bsky.app/profile/handle)` |
@@ -623,8 +623,8 @@ For more information, see the docs for [`useActionState`](/reference/react/useAc
623623
### Bullet Pattern
624624

625625
```markdown
626-
* Add `useTransition` for concurrent rendering. ([#10426](https://github.com/facebook/react/pull/10426) by [@acdlite](https://github.com/acdlite))
627-
* Fix `useReducer` observing incorrect props. ([#22445](https://github.com/facebook/react/pull/22445) by [@josephsavona](https://github.com/josephsavona))
626+
* Add `useTransition` for concurrent rendering. ([#10426](https://github.com/react/react/pull/10426) by [@acdlite](https://github.com/acdlite))
627+
* Fix `useReducer` observing incorrect props. ([#22445](https://github.com/react/react/pull/22445) by [@josephsavona](https://github.com/josephsavona))
628628
```
629629

630630
**Structure:** `Verb` + backticked API + description + `([#PR](url) by [@user](url))`

‎.claude/skills/react-expert/SKILL.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This skill produces exhaustive documentation research on any React API or concep
3232
2. **React Source Code** - Warnings, errors, implementation details
3333
3. **Git History** - Commit messages with context
3434
4. **GitHub PRs & Comments** - Design rationale (via `gh` CLI)
35-
5. **GitHub Issues** - Confusion/questions (facebook/react + reactjs/react.dev)
35+
5. **GitHub Issues** - Confusion/questions (react/react + reactjs/react.dev)
3636
6. **React Working Group** - Design discussions for newer APIs
3737
7. **Flow Types** - Source of truth for type signatures
3838
8. **TypeScript Types** - Note discrepancies with Flow
@@ -51,7 +51,7 @@ First, ensure the React repo is available locally:
5151
if [ -d ".claude/react" ]; then
5252
cd .claude/react && git pull origin main
5353
else
54-
git clone --depth=100 https://github.com/facebook/react.git .claude/react
54+
git clone --depth=100 https://github.com/react/react.git .claude/react
5555
fi
5656
```
5757

@@ -71,8 +71,8 @@ Spawn these agents IN PARALLEL using the Task tool. Each agent receives the skep
7171
| test-explorer | Explore | Test files for usage patterns | Search `.claude/react/packages/*/src/__tests__/` for test files mentioning the topic. Extract actual usage examples WITH file paths and line numbers. |
7272
| source-explorer | Explore | Warnings/errors in source | Search `.claude/react/packages/*/src/` for console.error, console.warn, and error messages mentioning the topic. Document trigger conditions. |
7373
| git-historian | Explore | Commit messages | Run `git log --all --grep="<topic>" --oneline -50` in `.claude/react`. Read full commit messages for context. |
74-
| pr-researcher | Explore | PRs introducing/modifying API | Run `gh pr list -R facebook/react --search "<topic>" --state all --limit 20`. Read key PR descriptions and comments. |
75-
| issue-hunter | Explore | Issues showing confusion | Search issues in both `facebook/react` and `reactjs/react.dev` repos. Look for common questions and misunderstandings. |
74+
| pr-researcher | Explore | PRs introducing/modifying API | Run `gh pr list -R react/react --search "<topic>" --state all --limit 20`. Read key PR descriptions and comments. |
75+
| issue-hunter | Explore | Issues showing confusion | Search issues in both `react/react` and `reactjs/react.dev` repos. Look for common questions and misunderstandings. |
7676
| types-inspector | Explore | Flow + TypeScript signatures | Find Flow types in `.claude/react/packages/*/src/*.js` (look for `@flow` annotations). Find TS types in `.claude/react/packages/*/index.d.ts`. Note discrepancies. |
7777

7878
### Step 3: Agent Prompts
@@ -164,8 +164,8 @@ CRITICAL: Do NOT rely on your prior knowledge. Only report what you find in PRs.
164164

165165
Your task: Find PRs that introduced or modified <TOPIC>.
166166

167-
1. Run: gh pr list -R facebook/react --search "<topic>" --state all --limit 20 --json number,title,url
168-
2. For promising PRs, read details: gh pr view <number> -R facebook/react
167+
1. Run: gh pr list -R react/react --search "<topic>" --state all --limit 20 --json number,title,url
168+
2. For promising PRs, read details: gh pr view <number> -R react/react
169169
3. Look for:
170170
- The original RFC/motivation
171171
- Design discussions in comments
@@ -189,7 +189,7 @@ CRITICAL: Do NOT rely on your prior knowledge. Only report what you find in issu
189189

190190
Your task: Find issues that reveal common confusion about <TOPIC>.
191191

192-
1. Search facebook/react: gh issue list -R facebook/react --search "<topic>" --state all --limit 20 --json number,title,url
192+
1. Search react/react: gh issue list -R react/react --search "<topic>" --state all --limit 20 --json number,title,url
193193
2. Search reactjs/react.dev: gh issue list -R reactjs/react.dev --search "<topic>" --state all --limit 20 --json number,title,url
194194
3. For each issue, identify:
195195
- What the user was confused about
@@ -199,7 +199,7 @@ Your task: Find issues that reveal common confusion about <TOPIC>.
199199
Format your output as:
200200
## Common Confusion
201201
### Issue #<number>: <title>
202-
**Repo:** <facebook/react or reactjs/react.dev>
202+
**Repo:** <react/react or reactjs/react.dev>
203203
**Confusion:** <what they misunderstood>
204204
**Resolution:** <correct understanding>
205205
**Gotcha:** <if applicable>

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
contact_links:
22
- name: 📃 Bugs in React
3-
url: https://github.com/facebook/react/issues/new/choose
3+
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
66
url: https://reactjs.org/community/support.html

‎.github/workflows/discord_notify.yml‎

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

99
jobs:
1010
check_maintainer:
11-
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
11+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
1212
permissions:
1313
# Used by check_maintainer
1414
contents: read

‎.github/workflows/label_core_team_prs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
jobs:
1414
check_maintainer:
15-
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
15+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
1616
permissions:
1717
# Used by check_maintainer
1818
contents: read

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ public/rss.xml
4646

4747
# worktrees
4848
.worktrees/
49+
50+
# Generated OG images (scripts/generateOgImages.mjs)
51+
public/images/og/
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)