Skip to content

Commit

Permalink
Merge branch 'dev' into release-next
Browse files Browse the repository at this point in the history
  • Loading branch information
mjackson committed Nov 19, 2024
2 parents 3f8f46d + 6c13442 commit fd76ac8
Show file tree
Hide file tree
Showing 174 changed files with 5,247 additions and 3,701 deletions.
5 changes: 5 additions & 0 deletions .changeset/empty-glasses-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/dev": patch
---

chore: warn instead of error for min node version in CLI
5 changes: 5 additions & 0 deletions .changeset/five-cheetahs-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/node": patch
---

Add createRequestListener to @react-router/node
7 changes: 7 additions & 0 deletions .changeset/four-needles-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"integration": patch
"@react-router/dev": patch
"react-router": patch
---

chore: re-enable development warnings through a `development` exports condition.
6 changes: 6 additions & 0 deletions .changeset/nine-peas-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@react-router/node": patch
"react-router": patch
---

Remove unneeded dependency on @web3-storage/multipart-parser
24 changes: 11 additions & 13 deletions .changeset/prerendering.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@
- `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.

```ts
export default defineConfig({
plugins: [
reactRouter({
async prerender() {
let slugs = await fakeGetSlugsFromCms();
// Prerender these paths into `.html` files at build time, and `.data`
// files if they have loaders
return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
},
}),
tsconfigPaths(),
],
});
// react-router.config.ts
import type { Config } from "@react-router/dev/config";

export default {
async prerender() {
let slugs = await fakeGetSlugsFromCms();
// Prerender these paths into `.html` files at build time, and `.data`
// files if they have loaders
return ["/", "/about", ...slugs.map((slug) => `/product/${slug}`)];
},
} satisfies Config;

async function fakeGetSlugsFromCms() {
await new Promise((r) => setTimeout(r, 1000));
Expand Down
25 changes: 11 additions & 14 deletions .changeset/remove-manifest-option.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,18 @@ The `manifest` option been superseded by the more powerful `buildEnd` hook since

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

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

export default {
plugins: [
reactRouter({
async buildEnd({ buildManifest }) {
await writeFile(
"build/manifest.json",
JSON.stringify(buildManifest, null, 2),
"utf-8"
);
},
}),
],
};
async buildEnd({ buildManifest }) {
await writeFile(
"build/manifest.json",
JSON.stringify(buildManifest, null, 2),
"utf-8"
);
},
} satisfies Config;
```
5 changes: 5 additions & 0 deletions .changeset/serious-ravens-appear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/dev": patch
---

if we are in SAP mode, always render the `index.html` for hydration
7 changes: 7 additions & 0 deletions .changeset/shiny-cameras-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"integration": patch
"@react-router/dev": patch
"react-router": patch
---

fix(react-router): (v7) fix static prerender of non-ascii characters
5 changes: 5 additions & 0 deletions .changeset/twelve-bees-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-router": patch
---

Remove unneeded dependency on source-map
2 changes: 1 addition & 1 deletion .github/workflows/deduplicate-lock-file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
token: ${{ secrets.FORMAT_PAT }}

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🥺 Handle Ghosting
uses: actions/stale@v8
uses: actions/stale@v9
with:
days-before-close: 10
close-issue-message: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetch-depth: 0

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fetch-depth: 0

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node ${{ matrix.node }}
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4

- name: ⎔ Setup node
uses: actions/setup-node@v4
Expand Down
Loading

0 comments on commit fd76ac8

Please sign in to comment.