Skip to content

Commit 15ad8d5

Browse files
committed
Merge branch 'release-next' into dev
2 parents 8cb1a38 + 74979cb commit 15ad8d5

37 files changed

+1095
-716
lines changed

.changeset/eight-tomatoes-breathe.md

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

.changeset/great-owls-juggle.md

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

.changeset/happy-ladybugs-occur.md

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

.changeset/lazy-needles-shout.md

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

.changeset/light-phones-impress.md

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

.changeset/slow-trees-notice.md

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

.changeset/violet-timers-type.md

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

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 🐛 Bug Report
2-
description: Something is wrong with React Router.
2+
description: Something is wrong with React Router
33
title: "[Bug]: "
44
labels:
55
- bug
@@ -11,18 +11,20 @@ body:
1111
1212
Do you need some help?
1313
======================
14-
The issue tracker is meant for feature requests and bug reports only. This isn't the best place for
15-
support or usage questions. Questions here don't have as much visibility as they do elsewhere. Before
16-
you ask a question, here are some resources to get help first:
14+
The issue tracker is meant for bug reports only. This isn't the best place for support
15+
or usage questions. Questions here don't have as much visibility as they do elsewhere.
16+
Before you ask a question, here are some resources to get help first:
1717
1818
- Read the docs: https://reactrouter.com
1919
- Check out the list of frequently asked questions: https://reactrouter.com/start/faq
2020
- Explore examples: https://reactrouter.com/start/examples
21+
- Ask in chat: https://rmx.as/discord
2122
- Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/tagged/react-router
22-
- Ask in chat: https://discord.gg/6RyV8n8yyM
2323
24-
### Test Case Starter:
25-
https://stackblitz.com/github/remix-run/react-router/tree/main/examples/basic?file=src/App.tsx
24+
### Test Case Starters:
25+
26+
* [Using `<RouterProvider>`](https://stackblitz.com/github/remix-run/react-router/tree/main/examples/data-router?file=src/App.tsx)
27+
* [Using `<BrowserRouter>`](https://stackblitz.com/github/remix-run/react-router/tree/main/examples/basic?file=src/App.tsx)
2628
- type: input
2729
attributes:
2830
label: What version of React Router are you using?

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: 🤔 Support/Usage Question
4-
url: https://stackoverflow.com/questions/tagged/react-router
5-
about: This is a bug tracker, not a support system. For usage questions, please use Stack Overflow where there are a lot more people ready to help you out. Thanks!
3+
- name: 💡 Feature Request
4+
url: https://github.com/remix-run/react-router/discussions/new?category=proposals
5+
about: If you've got an idea for a new feature in React Router, please open a new Discussion with the `Proposals` label
6+
- name: 🤔 Usage Question (Github Discussions)
7+
url: https://github.com/remix-run/remix/discussions/new?category=q-a
8+
about: Open a Discussion in GitHub wih the `Q&A` label
9+
- name: 💬 Remix Discord Channel
10+
url: https://rmx.as/discord
11+
about: Interact with other people using React Router and Remix 📀
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 📚 Documentation Issue
2+
description: Something is wrong with the React Router docs
3+
title: "[Docs]: "
4+
labels:
5+
- docs
6+
body:
7+
- type: markdown
8+
attributes:
9+
value: |
10+
Thank you for contributing!
11+
12+
For documentation updates - we would happily accept PRs, so feel free to update and
13+
open a PR to the `main` branch. Otherwise let us know in this issue what you felt
14+
was missing or incorrect.
15+
16+
- type: textarea
17+
attributes:
18+
label: Describe what's incorrect/missing in the documentation
19+
description: A concise description of what you expected to see in the docs
20+
validations:
21+
required: true

.github/ISSUE_TEMPLATE/feature_request.yml

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[npm-badge]: https://img.shields.io/npm/v/react-router-dom.svg?style=flat-square
44
[npm]: https://www.npmjs.org/package/react-router-dom
5-
[build-badge]: https://img.shields.io/github/workflow/status/remix-run/react-router/test/dev?style=flat-square
5+
[build-badge]: https://img.shields.io/github/actions/workflow/status/remix-run/react-router/test.yml?branch=dev&style=square
66
[build]: https://github.com/remix-run/react-router/actions/workflows/test.yml
77

88
React Router is a lightweight, fully-featured routing library for the [React](https://reactjs.org) JavaScript library. React Router runs everywhere that React runs; on the web, on the server (using node.js), and on React Native.

contributors.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- adil62
66
- afzalsayed96
77
- Ajayff4
8+
- akamfoad
89
- alany411
910
- alexlbr
1011
- AmRo045
@@ -33,6 +34,7 @@
3334
- codeape2
3435
- coryhouse
3536
- cvbuelow
37+
- damianstasik
3638
- danielberndt
3739
- dauletbaev
3840
- david-crespo
@@ -94,6 +96,7 @@
9496
- latin-1
9597
- lequangdongg
9698
- liuhanqu
99+
- lkwr
97100
- lopezac
98101
- lordofthecactus
99102
- loun4

docs/components/await.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ function Book() {
140140
>
141141
<Reviews />
142142
</Await>
143-
/>
144143
</React.Suspense>
145144
</div>
146145
);

docs/route/error-element.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Here's a "not found" case in a [loader][loader]:
6464
if (res.status === 404) {
6565
throw new Response("Not Found", { status: 404 });
6666
}
67-
const home = res.json();
67+
const home = await res.json();
6868
const descriptionHtml = parseMarkdown(
6969
data.descriptionMarkdown
7070
);

0 commit comments

Comments
 (0)