Skip to content

Commit 4c61aa9

Browse files
authored
Merge branch 'dev' into patch-1
2 parents 1f1f92b + f248c51 commit 4c61aa9

File tree

70 files changed

+2046
-1911
lines changed

Some content is hidden

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

70 files changed

+2046
-1911
lines changed

.changeset/bright-cougars-buy.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Handle `InvalidCharacterError` when validating cookie signature

.changeset/dull-pianos-matter.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Add Vite 7 support

.changeset/eight-cherries-lick.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Support invalid `Date` in `turbo-stream` v2 fork

.changeset/large-points-arrive.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Skip `package.json` resolution checks when a custom `entry.server.(j|t)sx` file is provided.

.changeset/silent-boxes-sell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/cloudflare": patch
3+
---
4+
5+
Remove `tsup` from `peerDependencies`

.changeset/sour-hotels-explain.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/node": patch
3+
---
4+
5+
Remove old "install" package exports

.changeset/tasty-peas-retire.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@react-router/remix-routes-option-adapter": patch
3+
"@react-router/fs-routes": patch
4+
---
5+
6+
Use `replaceAll` for normalising windows file system slashes.

.changeset/tender-snails-attack.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Add validation for a route's id not being 'root'

.changeset/weak-turkeys-pretend.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Do not serialize types for `useRouteLoaderData<typeof clientLoader>`
6+
7+
For types to distinguish a `clientLoader` from a `serverLoader`, you MUST annotate `clientLoader` args:
8+
9+
```ts
10+
// 👇 annotation required to skip serializing types
11+
export function clientLoader({}: Route.ClientLoaderArgs) {
12+
return { fn: () => "earth" };
13+
}
14+
15+
function SomeComponent() {
16+
const data = useRouteLoaderData<typeof clientLoader>("routes/this-route");
17+
const planet = data?.fn() ?? "world";
18+
return <h1>Hello, {planet}!</h1>;
19+
}
20+
```

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ on:
55
branches:
66
- dev
77
paths:
8-
- ./pnpm-lock.yaml
8+
- pnpm-lock.yaml
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212
cancel-in-progress: true
1313

1414
jobs:
15-
format:
15+
dedupe:
1616
if: github.repository == 'remix-run/react-router'
1717
runs-on: ubuntu-latest
1818

@@ -34,13 +34,14 @@ jobs:
3434

3535
- name: 💪 Commit
3636
run: |
37-
git config --local user.email "github-actions[bot]@users.noreply.github.com"
38-
git config --local user.name "github-actions[bot]"
37+
git config --local user.email "[email protected]"
38+
git config --local user.name "Remix Run Bot"
39+
3940
git add .
4041
if [ -z "$(git status --porcelain)" ]; then
4142
echo "💿 no deduplication needed"
4243
exit 0
4344
fi
44-
git commit -m "chore: deduplicate `pnpm-lock.yaml`"
45+
git commit -m "chore: deduplicate \`pnpm-lock.yaml\`"
4546
git push
4647
echo "💿 https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"

0 commit comments

Comments
 (0)