Skip to content

Commit 4b35306

Browse files
merging all conflicts
2 parents af13cea + b011783 commit 4b35306

121 files changed

Lines changed: 15158 additions & 7742 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

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

Lines changed: 8 additions & 8 deletions

‎.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
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
check_maintainer:
9-
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
9+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
1010
permissions:
1111
# Used by check_maintainer
1212
contents: read

‎.github/workflows/label_core_team_prs.yml‎

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

1515
jobs:
1616
check_maintainer:
17-
uses: facebook/react/.github/workflows/shared_check_maintainer.yml@main
17+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
1818
permissions:
1919
# Used by check_maintainer
2020
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
Lines changed: 3 additions & 0 deletions
Lines changed: 7 additions & 0 deletions

‎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)