Skip to content

Commit dd68670

Browse files
merging all conflicts
2 parents dabd21b + 6be2b02 commit dd68670

92 files changed

Lines changed: 3716 additions & 277 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
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Discord Notify
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, ready_for_review]
6+
7+
permissions: {}
8+
9+
jobs:
10+
check_maintainer:
11+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
12+
permissions:
13+
# Used by check_maintainer
14+
contents: read
15+
with:
16+
actor: ${{ github.event.pull_request.user.login }}
17+
18+
notify:
19+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
20+
needs: check_maintainer
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Discord Webhook Action
24+
uses: tsickert/discord-webhook@v6.0.0
25+
with:
26+
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
27+
embed-author-name: ${{ github.event.pull_request.user.login }}
28+
embed-author-url: ${{ github.event.pull_request.user.html_url }}
29+
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
30+
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
31+
embed-description: ${{ github.event.pull_request.body }}
32+
embed-url: ${{ github.event.pull_request.html_url }}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Label Core Team PRs
2+
3+
on:
4+
pull_request_target:
5+
6+
permissions: {}
7+
8+
env:
9+
TZ: /usr/share/zoneinfo/America/Los_Angeles
10+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
11+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
12+
13+
jobs:
14+
check_maintainer:
15+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
16+
permissions:
17+
# Used by check_maintainer
18+
contents: read
19+
with:
20+
actor: ${{ github.event.pull_request.user.login }}
21+
22+
label:
23+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
24+
runs-on: ubuntu-latest
25+
needs: check_maintainer
26+
permissions:
27+
# Used to add labels on issues
28+
issues: write
29+
# Used to add labels on PRs
30+
pull-requests: write
31+
steps:
32+
- name: Label PR as React Core Team
33+
uses: actions/github-script@v7
34+
with:
35+
script: |
36+
github.rest.issues.addLabels({
37+
owner: context.repo.owner,
38+
repo: context.repo.repo,
39+
issue_number: ${{ github.event.number }},
40+
labels: ['React Core Team']
41+
});

.gitignore

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

5252
# worktrees
5353
.worktrees/
54+
55+
# Generated OG images (scripts/generateOgImages.mjs)
56+
public/images/og/

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
"analyze": "ANALYZE=true next build",
66
"dev": "next-remote-watch ./src/content",
77
"prebuild:rsc": "node scripts/buildRscWorker.mjs",
8+
<<<<<<< HEAD
89
"build": "yarn cache-reset && node scripts/buildRscWorker.mjs && next build && node --experimental-modules ./scripts/downloadFonts.mjs",
10+
=======
11+
"build": "node scripts/buildRscWorker.mjs && next build && node --experimental-modules ./scripts/downloadFonts.mjs && node ./scripts/generateOgImages.mjs",
12+
>>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
913
"lint": "next lint && eslint \"src/content/**/*.md\"",
1014
"lint:fix": "next lint --fix && eslint \"src/content/**/*.md\" --fix",
1115
"format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
@@ -54,6 +58,7 @@
5458
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
5559
"@babel/preset-react": "^7.18.6",
5660
"@mdx-js/mdx": "^2.1.3",
61+
"@resvg/resvg-js": "^2.6.2",
5762
"@types/body-scroll-lock": "^2.6.1",
5863
"@types/classnames": "^2.2.10",
5964
"@types/debounce": "^1.2.1",
@@ -108,6 +113,7 @@
108113
"retext": "^7.0.1",
109114
"retext-smartypants": "^4.0.0",
110115
"rss": "^1.2.2",
116+
"satori": "^0.26.0",
111117
"tailwindcss": "^3.4.1",
112118
"textlint": "^14.0.4",
113119
"textlint-filter-rule-comments": "^1.2.2",
59.4 KB
Binary file not shown.
59.6 KB
Binary file not shown.
16.6 KB
Loading

0 commit comments

Comments
 (0)