Skip to content

Commit 9a1ac64

Browse files
committed
Merge branch 'release-next'
2 parents d90a69e + 63f0cd3 commit 9a1ac64

File tree

218 files changed

+18082
-5867
lines changed

Some content is hidden

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

218 files changed

+18082
-5867
lines changed

.eslintignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ examples/**/dist/
66
worker-configuration.d.ts
77
/playground/
88
/playground-local/
9+
integration/helpers/**/dist/
10+
integration/helpers/**/build/
11+
# Temporary until we can get prettier upgraded to support `import ... with` syntax
12+
integration/helpers/rsc-parcel/src/server.tsx
13+
playwright-report/
14+
test-results/
15+
build.utils.d.ts
16+
.wrangler/
17+
.tmp/
18+
.react-router/
19+
.react-router-parcel/
920
packages/**/dist/
1021
packages/react-router-dom/server.d.ts
1122
packages/react-router-dom/server.js

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
steps:
2020
- name: ⬇️ Checkout repo
2121
uses: actions/checkout@v4
22+
with:
23+
token: ${{ secrets.FORMAT_PAT }}
2224

2325
- name: 📦 Setup pnpm
2426
uses: pnpm/action-setup@v4
@@ -44,4 +46,4 @@ jobs:
4446
fi
4547
git commit -m "chore: deduplicate \`pnpm-lock.yaml\`"
4648
git push
47-
echo "💿 https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
49+
echo "💿 pushed dedupe changes https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"

.github/workflows/integration-full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: ./.github/workflows/shared-integration.yml
4141
with:
4242
os: "windows-latest"
43-
node_version: "[20, 22]"
43+
node_version: "[22]"
4444
browser: '["msedge"]'
4545

4646
integration-macos:

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

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

3737
integration-webkit:
3838
name: "👀 Integration Test"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ node_modules/
2727

2828
.wireit
2929
.eslintcache
30+
.parcel-cache
3031
.tmp
3132
tsup.config.bundled_*.mjs
3233
build.utils.d.ts

.nvmrc

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

0 commit comments

Comments
 (0)