Skip to content

Commit 7037428

Browse files
mjacksonmjackson
committed
Merge branch 'release-next'
2 parents 79241a8 + e8e3b00 commit 7037428

File tree

797 files changed

+90544
-39235
lines changed

Some content is hidden

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

797 files changed

+90544
-39235
lines changed

‎.changeset/config.json‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,26 @@
77
"commit": false,
88
"fixed": [
99
[
10+
"create-react-router",
1011
"react-router",
1112
"react-router-dom",
12-
"react-router-dom-v5-compat",
13-
"react-router-native"
13+
"@react-router/architect",
14+
"@react-router/cloudflare",
15+
"@react-router/dev",
16+
"@react-router/fs-routes",
17+
"@react-router/express",
18+
"@react-router/node",
19+
"@react-router/remix-routes-option-adapter",
20+
"@react-router/serve"
1421
]
1522
],
1623
"linked": [],
1724
"access": "public",
1825
"baseBranch": "dev",
1926
"updateInternalDependencies": "patch",
2027
"bumpVersionsWithWorkspaceProtocolOnly": true,
21-
"ignore": []
28+
"ignore": ["integration", "integration-*", "@playground/*"],
29+
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
30+
"onlyUpdatePeerDependentsWhenOutOfRange": true
31+
}
2232
}

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ node_modules/
33
pnpm-lock.yaml
44
/docs/api
55
examples/**/dist/
6+
/playground/
7+
/playground-local/
68
packages/**/dist/
79
packages/react-router-dom/server.d.ts
810
packages/react-router-dom/server.js

‎.eslintrc‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
"files": ["**/__tests__/**"],
1010
"plugins": ["jest"],
1111
"extends": ["plugin:jest/recommended"]
12+
},
13+
{
14+
"files": ["integration/**/*.*"],
15+
"rules": {
16+
"react-hooks/rules-of-hooks": "off"
17+
},
18+
"env": {
19+
"jest/globals": false
20+
}
1221
}
13-
]
22+
],
23+
"reportUnusedDisableDirectives": true
1424
}

‎.github/workflows/deduplicate-lock-file.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: 📦 Setup pnpm
24-
uses: pnpm/action-setup@v3.0.0
24+
uses: pnpm/action-setup@v4
2525

2626
- name: ⎔ Setup node
2727
uses: actions/setup-node@v4

‎.github/workflows/format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
token: ${{ secrets.FORMAT_PAT }}
2323

2424
- name: 📦 Setup pnpm
25-
uses: pnpm/action-setup@v3.0.0
25+
uses: pnpm/action-setup@v4
2626

2727
- name: ⎔ Setup node
2828
uses: actions/setup-node@v4
2929
with:
30-
cache: pnpm
3130
node-version-file: ".nvmrc"
31+
cache: pnpm
3232

3333
- name: 📥 Install deps
3434
run: pnpm install --frozen-lockfile

‎.github/workflows/integration-full.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Branch
2+
3+
# main/dev/release-* branches will get the full run across
4+
# all OS/browsers for multiple node versions
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
- dev
11+
- release-*
12+
tags:
13+
- "v0.0.0-nightly-*"
14+
paths-ignore:
15+
- ".changeset/**"
16+
- "decisions/**"
17+
- "docs/**"
18+
- "examples/**"
19+
- "jest/**"
20+
- "scripts/**"
21+
- "tutorial/**"
22+
- "contributors.yml"
23+
- "**/*.md"
24+
25+
jobs:
26+
build:
27+
name: "⚙️ Build"
28+
if: github.repository == 'remix-run/react-router'
29+
uses: ./.github/workflows/shared-build.yml
30+
31+
integration-ubuntu:
32+
name: "👀 Integration Test"
33+
if: github.repository == 'remix-run/react-router'
34+
uses: ./.github/workflows/shared-integration.yml
35+
with:
36+
os: "ubuntu-latest"
37+
node_version: "[20, 22]"
38+
browser: '["chromium", "firefox"]'
39+
40+
integration-windows:
41+
name: "👀 Integration Test"
42+
if: github.repository == 'remix-run/react-router'
43+
uses: ./.github/workflows/shared-integration.yml
44+
with:
45+
os: "windows-latest"
46+
node_version: "[20, 22]"
47+
browser: '["msedge"]'
48+
49+
integration-macos:
50+
name: "👀 Integration Test"
51+
if: github.repository == 'remix-run/react-router'
52+
uses: ./.github/workflows/shared-integration.yml
53+
with:
54+
os: "macos-latest"
55+
node_version: "[20, 22]"
56+
browser: '["webkit"]'

‎.github/workflows/integration-pr-ubuntu.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: PR (Base)
2+
3+
# All PRs touching code will run tests on ubuntu/node/chromium
4+
5+
on:
6+
pull_request:
7+
paths-ignore:
8+
- ".changeset/**"
9+
- "decisions/**"
10+
- "docs/**"
11+
- "examples/**"
12+
- "jest/**"
13+
- "scripts/**"
14+
- "tutorial/**"
15+
- "contributors.yml"
16+
- "**/*.md"
17+
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
build:
24+
name: "⚙️ Build"
25+
if: github.repository == 'remix-run/react-router'
26+
uses: ./.github/workflows/shared-build.yml
27+
28+
integration-chromium:
29+
name: "👀 Integration Test"
30+
if: github.repository == 'remix-run/react-router'
31+
uses: ./.github/workflows/shared-integration.yml
32+
with:
33+
os: "ubuntu-latest"
34+
node_version: "[22]"
35+
browser: '["chromium"]'

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PR (Full)
2+
3+
# PRs touching react-router-dev will also run on Windows and OSX
4+
5+
on:
6+
pull_request:
7+
paths:
8+
- "pnpm-lock.yaml"
9+
- "integration/**"
10+
- "packages/react-router-dev/**"
11+
- "!**/*.md"
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
integration-firefox:
19+
name: "👀 Integration Test"
20+
if: github.repository == 'remix-run/react-router'
21+
uses: ./.github/workflows/shared-integration.yml
22+
with:
23+
os: "ubuntu-latest"
24+
node_version: "[22]"
25+
browser: '["firefox"]'
26+
27+
integration-msedge:
28+
name: "👀 Integration Test"
29+
if: github.repository == 'remix-run/react-router'
30+
uses: ./.github/workflows/shared-integration.yml
31+
with:
32+
os: "windows-latest"
33+
node_version: "[22]"
34+
browser: '["msedge"]'
35+
36+
integration-webkit:
37+
name: "👀 Integration Test"
38+
if: github.repository == 'remix-run/react-router'
39+
uses: ./.github/workflows/shared-integration.yml
40+
with:
41+
os: "macos-latest"
42+
node_version: "[22]"
43+
browser: '["webkit"]'

‎.github/workflows/no-response.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 🥺 Handle Ghosting
18-
uses: actions/stale@v8
18+
uses: actions/stale@v9
1919
with:
2020
days-before-close: 10
2121
close-issue-message: >

‎.github/workflows/release-experimental.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: 📦 Setup pnpm
29-
uses: pnpm/action-setup@v3.0.0
29+
uses: pnpm/action-setup@v4
3030

3131
- name: ⎔ Setup node
3232
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)