Skip to content

Commit 1f1f92b

Browse files
authored
Merge branch 'main' into patch-1
2 parents ef83f13 + bcbb56e commit 1f1f92b

File tree

297 files changed

+19751
-6090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+19751
-6090
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules/
33
pnpm-lock.yaml
44
/docs/api
55
examples/**/dist/
6+
worker-configuration.d.ts
67
/playground/
78
/playground-local/
89
packages/**/dist/

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@ body:
88
value: |
99
Thank you for helping to improve React Router!
1010
11+
- **All** bugs must have a **minimal** reproduction
12+
- Minimal means that it is not just pointing to a deployed site or a branch in your existing application
13+
- The preferred method is StackBlitz via [https://reactrouter.com/new](https://reactrouter.com/new)
14+
- If Stackblitz is not an option, a GitHub repo based on a fresh `create-react-router` app is acceptable
15+
- Only in extraordinary circumstances will code snippets or maximal reproductions be accepted
16+
- Issue Review
17+
- Issues not meeting the above criteria will be closed and pointed to this document
18+
- Non-issues (feature requests, usage questions) will also be closed with a link to this document
19+
- The SC will triage issues regularly
20+
- Fixing Issues
21+
- The SC will mark good community issues with an `Accepting PRs` label
22+
- These issues will generally be ones that are likely to have a small surface area fix
23+
- However, anyone can work on any issue but there's no guarantee the PR will be accepted if the surface area is too large for expedient review by a core team member
24+
1125
## Option 1: Submit a PR with a failing test
1226
1327
🏆 The most helpful reproduction is to use our _bug report integration test_ template:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ contact_links:
55
about: If you've got an idea for a new feature in React Router, please open a new Discussion with the `Proposals` label
66
- name: 🤔 Usage Question (Github Discussions)
77
url: https://github.com/remix-run/remix/discussions/new?category=q-a
8-
about: Open a Discussion in GitHub wih the `Q&A` label
8+
about: Open a Discussion in GitHub with the `Q&A` label
99
- name: 💬 Remix Discord Channel
1010
url: https://rmx.as/discord
1111
about: Interact with other people using React Router and Remix 📀

.github/workflows/integration-full.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
name: Branch
22

3-
# main/dev/release-* branches will get the full run across
3+
# main/dev branches will get the full run across
44
# all OS/browsers for multiple node versions
55

66
on:
77
push:
88
branches:
99
- main
1010
- dev
11-
- release-*
12-
tags:
13-
- "v0.0.0-nightly-*"
1411
paths-ignore:
1512
- ".changeset/**"
1613
- "decisions/**"

.github/workflows/integration-pr-windows-macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
os: "windows-latest"
3333
node_version: "[22]"
3434
browser: '["msedge"]'
35+
timeout: 60
3536

3637
integration-webkit:
3738
name: "👀 Integration Test"

.github/workflows/release-comments.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ jobs:
1919
with:
2020
DIRECTORY_TO_CHECK: "./packages"
2121
PACKAGE_NAME: "react-router"
22+
ISSUE_LABELS_TO_REMOVE: "awaiting release"

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ jobs:
5151
# publish to npm.
5252
- name: 🚀 PR / Publish
5353
id: changesets
54-
uses: changesets/action@v1
54+
# PLEASE KEEP THIS PINNED TO 1.4.10 to avoid a regression in 1.5.*
55+
# See https://github.com/changesets/action/issues/465
56+
uses: changesets/[email protected]
5557
with:
5658
version: pnpm run changeset:version
5759
commit: "chore: Update version for release"

.github/workflows/shared-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
node-version-file: ".nvmrc"
2323
cache: "pnpm"
2424

25-
- uses: google/wireit@setup-github-actions-caching/v2
25+
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
26+
# - uses: google/wireit@setup-github-actions-caching/v2
2627

2728
- name: Disable GitHub Actions Annotations
2829
run: |

.github/workflows/shared-integration.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
# but we want to pass an array (browser: "['chromium', 'firefox']"),
1919
# so we'll need to manually stringify it for now
2020
type: string
21+
timeout:
22+
required: false
23+
type: number
24+
default: 30
2125

2226
env:
2327
CI: true
@@ -45,7 +49,8 @@ jobs:
4549
node-version: ${{ matrix.node }}
4650
cache: "pnpm"
4751

48-
- uses: google/wireit@setup-github-actions-caching/v2
52+
# TODO: Track and renable once this has been fixed: https://github.com/google/wireit/issues/1297
53+
# - uses: google/wireit@setup-github-actions-caching/v2
4954

5055
- name: Disable GitHub Actions Annotations
5156
run: |
@@ -61,4 +66,4 @@ jobs:
6166

6267
- name: 👀 Run Integration Tests ${{ matrix.browser }}
6368
run: "pnpm test:integration --project=${{ matrix.browser }}"
64-
timeout-minutes: 40
69+
timeout-minutes: ${{inputs.timeout}}

.github/workflows/support.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
action:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: dessant/support-requests@v3
14+
- uses: dessant/support-requests@v4
1515
with:
1616
issue-comment: >
1717
:wave: @{issue-author}, we use the issue tracker exclusively for bug reports

0 commit comments

Comments
 (0)