Skip to content

Commit 71e9a87

Browse files
wyattjohwyattjoh
authored
Merge branch 'main' into fix/fully-static-ppr-fallback
2 parents dfa41f6 + 2a59669 commit 71e9a87

Some content is hidden

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

43 files changed

+297
-413
lines changed

‎.changeset/forty-apricots-build.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"vercel": patch
3+
---
4+
5+
[cli] update handleError to use output utilities

‎.changeset/kind-knives-shave.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@vercel/static-build': patch
3+
'@vercel/build-utils': patch
4+
'@vercel/hydrogen': patch
5+
'@vercel/redwood': patch
6+
'@vercel/remix-builder': patch
7+
'@vercel/next': patch
8+
---
9+
10+
Revert build utils refactor

‎.changeset/next-15-1-3.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
---
3+

‎.changeset/pink-beers-jump.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/six-bugs-run.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/vercel-remix-run-dev-2-15-2.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@vercel/remix-builder': patch
3+
---
4+
5+
Update `@remix-run/dev` fork to v2.15.2

‎.github/workflows/test-lint.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ jobs:
5050
- run: pnpm run prettier-check
5151
- run: pnpm run build
5252
- run: pnpm run type-check
53+
- name: Ensure clean git workspace
54+
run: git diff --name-only --exit-code
5355

5456
summary:
5557
name: Summary (lint)

‎examples/nextjs/package-lock.json‎

Lines changed: 176 additions & 184 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/nextjs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"react": "^19.0.0",
1313
"react-dom": "^19.0.0",
14-
"next": "15.1.2"
14+
"next": "15.1.3"
1515
},
1616
"devDependencies": {
1717
"typescript": "^5",
@@ -21,7 +21,7 @@
2121
"postcss": "^8",
2222
"tailwindcss": "^3.4.1",
2323
"eslint": "^9",
24-
"eslint-config-next": "15.1.2",
24+
"eslint-config-next": "15.1.3",
2525
"@eslint/eslintrc": "^3"
2626
}
2727
}

‎internals/types/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### Patch Changes
66

7-
- Updated dependencies [[`7adf5367054bdd86e7ecb9791290fffeb756fcfb`](https://github.com/vercel/vercel/commit/7adf5367054bdd86e7ecb9791290fffeb756fcfb), [`7adf5367054bdd86e7ecb9791290fffeb756fcfb`](https://github.com/vercel/vercel/commit/7adf5367054bdd86e7ecb9791290fffeb756fcfb), [`c31d0813fc9668859c81ec0002e502aa200eec95`](https://github.com/vercel/vercel/commit/c31d0813fc9668859c81ec0002e502aa200eec95)]:
7+
- Updated dependencies [[`e6b0343585cc3cdf02467fd3264b1f57b2ffb0da`](https://github.com/vercel/vercel/commit/e6b0343585cc3cdf02467fd3264b1f57b2ffb0da), [`e6b0343585cc3cdf02467fd3264b1f57b2ffb0da`](https://github.com/vercel/vercel/commit/e6b0343585cc3cdf02467fd3264b1f57b2ffb0da), [`e6b0343585cc3cdf02467fd3264b1f57b2ffb0da`](https://github.com/vercel/vercel/commit/e6b0343585cc3cdf02467fd3264b1f57b2ffb0da)]:
88
- @vercel/build-utils@9.0.0
99

1010
## 3.0.2

0 commit comments

Comments
 (0)