Skip to content

Commit 85dbbd6

Browse files
authored
Merge branch 'main' into fix-remote-files-graph-take-10000
2 parents 7164007 + c63e158 commit 85dbbd6

File tree

38 files changed

+287
-427
lines changed

38 files changed

+287
-427
lines changed

.changeset/easy-plants-remain.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/kit': patch
3+
---
4+
5+
fix: allow `read` to be used at the top-level of remote function files

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v5
2121
- uses: pnpm/[email protected]
22-
- uses: actions/setup-node@v5
22+
- uses: actions/setup-node@v6
2323
with:
2424
node-version: '22.x'
2525
cache: pnpm

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v5
2626
- uses: pnpm/[email protected]
27-
- uses: actions/setup-node@v5
27+
- uses: actions/setup-node@v6
2828
with:
2929
node-version: 22
3030
cache: pnpm
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v5
3838
- uses: pnpm/[email protected]
39-
- uses: actions/setup-node@v5
39+
- uses: actions/setup-node@v6
4040
with:
4141
node-version: 22
4242
cache: pnpm
@@ -66,7 +66,7 @@ jobs:
6666
- run: git config --global core.autocrlf false
6767
- uses: actions/checkout@v5
6868
- uses: pnpm/[email protected]
69-
- uses: actions/setup-node@v5
69+
- uses: actions/setup-node@v6
7070
with:
7171
node-version: ${{ matrix.node-version }}
7272
cache: pnpm
@@ -126,7 +126,7 @@ jobs:
126126
- run: git config --global core.autocrlf false
127127
- uses: actions/checkout@v5
128128
- uses: pnpm/[email protected]
129-
- uses: actions/setup-node@v5
129+
- uses: actions/setup-node@v6
130130
with:
131131
node-version: ${{ matrix.node-version }}
132132
cache: pnpm
@@ -160,7 +160,7 @@ jobs:
160160
- run: git config --global core.autocrlf false
161161
- uses: actions/checkout@v5
162162
- uses: pnpm/[email protected]
163-
- uses: actions/setup-node@v5
163+
- uses: actions/setup-node@v6
164164
with:
165165
node-version: 22
166166
cache: pnpm
@@ -189,7 +189,7 @@ jobs:
189189
steps:
190190
- uses: actions/checkout@v5
191191
- uses: pnpm/[email protected]
192-
- uses: actions/setup-node@v5
192+
- uses: actions/setup-node@v6
193193
with:
194194
node-version: ${{matrix.node-version}}
195195
cache: pnpm

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525
- uses: pnpm/[email protected]
2626
- name: Setup Node.js
27-
uses: actions/setup-node@v5
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version: 24.x
3030
cache: pnpm

documentation/docs/20-core-concepts/60-remote-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ export const getProfile = query(async () => {
11471147

11481148
// this query could be called from multiple places, but
11491149
// the function will only run once per request
1150-
const getUser = query(() => {
1150+
const getUser = query(async () => {
11511151
const { cookies } = getRequestEvent();
11521152

11531153
return await findUser(cookies.get('session_id'));

documentation/docs/25-build-and-deploy/90-adapter-vercel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const config = {
4242

4343
The following options apply to all functions:
4444

45-
- `runtime`: `'edge'`, `'nodejs18.x'`, `'nodejs20.x'` or `'nodejs22.x'`. By default, the adapter will select the `'nodejs<version>.x'` corresponding to the Node version your project is configured to use on the Vercel dashboard
45+
- `runtime`: `'edge'`, `'nodejs20.x'` or `'nodejs22.x'`. By default, the adapter will select the `'nodejs<version>.x'` corresponding to the Node version your project is configured to use on the Vercel dashboard
4646
> [!NOTE] This option is deprecated and will be removed in a future version, at which point all your functions will use whichever Node version is specified in the project configuration on Vercel
4747
- `regions`: an array of [edge network regions](https://vercel.com/docs/concepts/edge-network/regions) (defaulting to `["iad1"]` for serverless functions) or `'all'` if `runtime` is `edge` (its default). Note that multiple regions for serverless functions are only supported on Enterprise plans
4848
- `split`: if `true`, causes a route to be deployed as an individual function. If `split` is set to `true` at the adapter level, all routes will be deployed as individual functions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"prettier-plugin-svelte": "^3.4.0",
3232
"typescript-eslint": "catalog:"
3333
},
34-
"packageManager": "[email protected].1",
34+
"packageManager": "[email protected].3",
3535
"engines": {
3636
"pnpm": ">=9.0.0"
3737
},

packages/adapter-auto/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @sveltejs/adapter-auto
22

3+
## 7.0.0
4+
### Major Changes
5+
6+
7+
- feat: update adapter-vercel to version 6 ([#14737](https://github.com/sveltejs/kit/pull/14737))
8+
39
## 6.1.1
410
### Patch Changes
511

packages/adapter-auto/adapters.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const adapters = [
77
name: 'Vercel',
88
test: () => !!process.env.VERCEL,
99
module: '@sveltejs/adapter-vercel',
10-
version: '5'
10+
version: '6'
1111
},
1212
{
1313
name: 'Cloudflare Pages',

0 commit comments

Comments
 (0)