Skip to content

Commit

Permalink
Merge branch 'main' into migrate_build_argument_parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] committed Apr 30, 2024
2 parents fd4b0db + 52e435a commit a76afc0
Show file tree
Hide file tree
Showing 121 changed files with 5,714 additions and 5,369 deletions.
2 changes: 0 additions & 2 deletions .changeset/chilly-dryers-joke.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/clean-buttons-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@vercel/next": patch
---

Fix missing .rsc outputs for pages prerenders
5 changes: 0 additions & 5 deletions .changeset/eleven-dodos-call.md

This file was deleted.

2 changes: 0 additions & 2 deletions .changeset/strong-spoons-sniff.md

This file was deleted.

29 changes: 28 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ updates:
update-types:
- 'minor'

- directory: /packages/static-build/test/fixtures/ionic-angular-v7
- directory: /packages/static-build/test/fixtures/ionic-angular-v8
schedule:
interval: 'daily'
open-pull-requests-limit: 1
Expand Down Expand Up @@ -175,6 +175,33 @@ updates:
update-types:
- 'minor'

- directory: /packages/static-build/test/fixtures/parcel-v2
schedule:
interval: 'daily'
open-pull-requests-limit: 1
reviewers:
- 'trek'
- 'TooTallNate'
- 'EndangeredMassa'
- 'erikareads'
- 'jeffsee55'
- 'onsclom'
commit-message:
prefix: '[framework-fixtures]'
package-ecosystem: 'npm'
allow:
- dependency-name: 'parcel'
ignore:
- dependency-name: 'parcel'
update-types:
['version-update:semver-major', 'version-update:semver-patch']
groups:
core:
patterns:
- 'parcel'
update-types:
- 'minor'

- directory: /packages/static-build/test/fixtures/preact-v10
schedule:
interval: 'daily'
Expand Down
110 changes: 55 additions & 55 deletions examples/nextjs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"react": "^18",
"react-dom": "^18",
"next": "14.2.2"
"next": "14.2.3"
},
"devDependencies": {
"typescript": "^5",
Expand All @@ -21,6 +21,6 @@
"postcss": "^8",
"tailwindcss": "^3.4.1",
"eslint": "^8",
"eslint-config-next": "14.2.2"
"eslint-config-next": "14.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@types/jest": "27.4.1",
"@vercel/build-utils": "7.12.0",
"@vercel/build-utils": "8.0.0",
"@vercel/frameworks": "3.0.2"
},
"version": null
Expand Down
7 changes: 7 additions & 0 deletions internals/types/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @vercel-internals/types

## 1.0.31

### Patch Changes

- Updated dependencies [[`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
- @vercel/build-utils@8.0.0

## 1.0.30

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions internals/types/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@vercel-internals/types",
"version": "1.0.30",
"version": "1.0.31",
"types": "index.d.ts",
"main": "index.d.ts",
"files": [
Expand All @@ -10,7 +10,7 @@
"dependencies": {
"@types/node": "14.14.31",
"@vercel-internals/constants": "1.0.4",
"@vercel/build-utils": "7.12.0",
"@vercel/build-utils": "8.0.0",
"@vercel/routing-utils": "3.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"source-map-support": "0.5.12",
"ts-eager": "2.0.2",
"ts-jest": "29.1.0",
"turbo": "1.13.2",
"turbo": "1.13.3",
"typescript": "4.9.5"
},
"scripts": {
Expand Down
10 changes: 10 additions & 0 deletions packages/build-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @vercel/build-utils

## 8.0.0

### Major Changes

- Remove legacy `avoidTopLevelInstall` logic ([#11513](https://github.com/vercel/vercel/pull/11513))

### Patch Changes

- [build-utils] Add `VERCEL_PROJECT_PRODUCTION_URL` framework env var prefix ([#11506](https://github.com/vercel/vercel/pull/11506))

## 7.12.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/build-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vercel/build-utils",
"version": "7.12.0",
"version": "8.0.0",
"license": "Apache-2.0",
"main": "./dist/index.js",
"types": "./dist/index.d.js",
Expand Down
1 change: 1 addition & 0 deletions packages/build-utils/src/get-prefixed-env-vars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export function getPrefixedEnvVars({
'VERCEL_ENV',
'VERCEL_REGION',
'VERCEL_BRANCH_URL',
'VERCEL_PROJECT_PRODUCTION_URL',
];
const newEnvs: Envs = {};
if (envPrefix && envs.VERCEL_URL) {
Expand Down
1 change: 0 additions & 1 deletion packages/build-utils/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export interface Meta {
filesRemoved?: string[];
env?: Env;
buildEnv?: Env;
avoidTopLevelInstall?: boolean;
[key: string]: unknown;
}

Expand Down

0 comments on commit a76afc0

Please sign in to comment.