Skip to content

Commit fd76ac8

Browse files
committed
Merge branch 'dev' into release-next
2 parents 3f8f46d + 6c13442 commit fd76ac8

File tree

174 files changed

+5247
-3701
lines changed

Some content is hidden

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

174 files changed

+5247
-3701
lines changed

.changeset/empty-glasses-dream.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+
chore: warn instead of error for min node version in CLI

.changeset/five-cheetahs-press.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+
Add createRequestListener to @react-router/node

.changeset/four-needles-search.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"integration": patch
3+
"@react-router/dev": patch
4+
"react-router": patch
5+
---
6+
7+
chore: re-enable development warnings through a `development` exports condition.

.changeset/nine-peas-change.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@react-router/node": patch
3+
"react-router": patch
4+
---
5+
6+
Remove unneeded dependency on @web3-storage/multipart-parser

.changeset/prerendering.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
- `prerender` can either be an array of string paths, or a function (sync or async) that returns an array of strings so that you can dynamically generate the paths by talking to your CMS, etc.
88

99
```ts
10-
export default defineConfig({
11-
plugins: [
12-
reactRouter({
13-
async prerender() {
14-
let slugs = await fakeGetSlugsFromCms();
15-
// Prerender these paths into `.html` files at build time, and `.data`
16-
// files if they have loaders
17-
return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
18-
},
19-
}),
20-
tsconfigPaths(),
21-
],
22-
});
10+
// react-router.config.ts
11+
import type { Config } from "@react-router/dev/config";
12+
13+
export default {
14+
async prerender() {
15+
let slugs = await fakeGetSlugsFromCms();
16+
// Prerender these paths into `.html` files at build time, and `.data`
17+
// files if they have loaders
18+
return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
19+
},
20+
} satisfies Config;
2321

2422
async function fakeGetSlugsFromCms() {
2523
await new Promise((r) => setTimeout(r, 1000));

.changeset/remove-manifest-option.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,18 @@ The `manifest` option been superseded by the more powerful `buildEnd` hook since
88

99
If you were using the `manifest` option, you can replace it with a `buildEnd` hook that writes the manifest to disk like this:
1010

11-
```js
12-
import { reactRouter } from "@react-router/dev/vite";
11+
```ts
12+
// react-router.config.ts
13+
import type { Config } from "@react-router/dev/config";
1314
import { writeFile } from "node:fs/promises";
1415

1516
export default {
16-
plugins: [
17-
reactRouter({
18-
async buildEnd({ buildManifest }) {
19-
await writeFile(
20-
"build/manifest.json",
21-
JSON.stringify(buildManifest, null, 2),
22-
"utf-8"
23-
);
24-
},
25-
}),
26-
],
27-
};
17+
async buildEnd({ buildManifest }) {
18+
await writeFile(
19+
"build/manifest.json",
20+
JSON.stringify(buildManifest, null, 2),
21+
"utf-8"
22+
);
23+
},
24+
} satisfies Config;
2825
```

.changeset/serious-ravens-appear.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+
if we are in SAP mode, always render the `index.html` for hydration

.changeset/shiny-cameras-try.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"integration": patch
3+
"@react-router/dev": patch
4+
"react-router": patch
5+
---
6+
7+
fix(react-router): (v7) fix static prerender of non-ascii characters

.changeset/twelve-bees-sin.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+
Remove unneeded dependency on source-map

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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

.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

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
fetch-depth: 0
3838

3939
- name: 📦 Setup pnpm
40-
uses: pnpm/action-setup@v3.0.0
40+
uses: pnpm/action-setup@v4
4141

4242
- name: ⎔ Setup node
4343
uses: actions/setup-node@v4

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 0
2929

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

3333
- name: ⎔ Setup node
3434
uses: actions/setup-node@v4
@@ -74,7 +74,7 @@ jobs:
7474
uses: actions/checkout@v4
7575

7676
- name: 📦 Setup pnpm
77-
uses: pnpm/action-setup@v3.0.0
77+
uses: pnpm/action-setup@v4
7878

7979
- name: ⎔ Setup node
8080
uses: actions/setup-node@v4

.github/workflows/shared-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: 📦 Setup pnpm
17-
uses: pnpm/action-setup@v3.0.0
17+
uses: pnpm/action-setup@v4
1818

1919
- name: ⎔ Setup node
2020
uses: actions/setup-node@v4

.github/workflows/shared-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/checkout@v4
3838

3939
- name: 📦 Setup pnpm
40-
uses: pnpm/action-setup@v3.0.0
40+
uses: pnpm/action-setup@v4
4141

4242
- name: ⎔ Setup node ${{ matrix.node }}
4343
uses: actions/setup-node@v4

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@v4
3737

3838
- name: 📦 Setup pnpm
39-
uses: pnpm/action-setup@v3.0.0
39+
uses: pnpm/action-setup@v4
4040

4141
- name: ⎔ Setup node
4242
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)