Skip to content

Commit b111acd

Browse files
committed
merge master
2 parents 4a3d791 + 0aa0826 commit b111acd

File tree

16 files changed

+73
-26
lines changed

16 files changed

+73
-26
lines changed

.changeset/bright-countries-jump.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/adapter-netlify': patch
3+
---
4+
5+
Drop CJS version of adapter-netlify

.changeset/gold-moons-poke.md

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] support undici 5.12.0 and pin it

.changeset/pre.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
"breezy-students-refuse",
114114
"breezy-timers-tan",
115115
"bright-cherries-hug",
116+
"bright-countries-jump",
116117
"bright-dolphins-try",
117118
"bright-icons-own",
118119
"bright-sheep-promise",
@@ -260,6 +261,7 @@
260261
"early-wasps-obey",
261262
"eight-birds-run",
262263
"eight-chicken-sin",
264+
"eight-donkeys-allow",
263265
"eight-files-think",
264266
"eight-glasses-sparkle",
265267
"eight-hats-worry",
@@ -293,6 +295,7 @@
293295
"empty-worms-appear",
294296
"fair-pets-bake",
295297
"fair-rivers-repair",
298+
"fair-seas-clean",
296299
"fair-tables-peel",
297300
"famous-birds-boil",
298301
"famous-birds-cheer",
@@ -421,6 +424,7 @@
421424
"gold-carrots-sniff",
422425
"gold-colts-train",
423426
"gold-moles-hunt",
427+
"gold-moons-poke",
424428
"gold-rocks-hang",
425429
"gold-spies-fail",
426430
"gold-trains-dream",
@@ -474,6 +478,7 @@
474478
"healthy-cows-walk",
475479
"healthy-lions-attend",
476480
"healthy-mangos-nail",
481+
"healthy-mirrors-hide",
477482
"healthy-moons-attend",
478483
"healthy-pandas-pull",
479484
"healthy-penguins-fail",
@@ -534,6 +539,7 @@
534539
"hungry-vans-fly",
535540
"hungry-weeks-exercise",
536541
"immaculate-error-handler",
542+
"itchy-ants-explode",
537543
"itchy-beds-drop",
538544
"itchy-beers-burn",
539545
"itchy-birds-admire",
@@ -1018,6 +1024,7 @@
10181024
"sharp-pillows-warn",
10191025
"shiny-birds-ring",
10201026
"shiny-books-try",
1027+
"shiny-eels-brush",
10211028
"shiny-gifts-drive",
10221029
"shiny-needles-divide",
10231030
"shiny-scissors-listen",

packages/adapter-auto/CHANGELOG.md

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

3+
## 1.0.0-next.85
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`97d45c0c`](https://github.com/sveltejs/kit/commit/97d45c0cca9c06e71f91a0777d4748f96d400b4d)]:
8+
- @sveltejs/adapter-netlify@1.0.0-next.82
9+
- @sveltejs/adapter-vercel@1.0.0-next.80
10+
311
## 1.0.0-next.84
412

513
### Patch Changes

packages/adapter-auto/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sveltejs/adapter-auto",
3-
"version": "1.0.0-next.84",
3+
"version": "1.0.0-next.85",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/sveltejs/kit",

packages/adapter-netlify/CHANGELOG.md

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

3+
## 1.0.0-next.82
4+
5+
### Patch Changes
6+
7+
- Drop CJS version of adapter-netlify ([#7401](https://github.com/sveltejs/kit/pull/7401))
8+
39
## 1.0.0-next.81
410

511
### Patch Changes

packages/adapter-netlify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sveltejs/adapter-netlify",
3-
"version": "1.0.0-next.81",
3+
"version": "1.0.0-next.82",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/sveltejs/kit",

packages/adapter-netlify/rollup.config.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@ const config = {
88
serverless: 'src/serverless.js',
99
shims: 'src/shims.js'
1010
},
11-
output: [
12-
{
13-
dir: 'files/cjs',
14-
format: 'cjs'
15-
},
16-
{
17-
dir: 'files/esm',
18-
format: 'esm'
19-
}
20-
],
11+
output: {
12+
dir: 'files/esm',
13+
format: 'esm'
14+
},
2115
plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json()],
2216
external: (id) => id === '0SERVER' || id.startsWith('node:'),
2317
preserveEntrySignatures: 'exports-only'

packages/create-svelte/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# create-svelte
22

3+
## 2.0.0-next.188
4+
5+
### Patch Changes
6+
7+
- Use aria-current instead of active class in nav ([#7376](https://github.com/sveltejs/kit/pull/7376))
8+
39
## 2.0.0-next.187
410

511
### Patch Changes

packages/create-svelte/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-svelte",
3-
"version": "2.0.0-next.187",
3+
"version": "2.0.0-next.188",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/sveltejs/kit",

packages/kit/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# @sveltejs/kit
22

3+
## 1.0.0-next.526
4+
5+
### Patch Changes
6+
7+
- declare function type with named syntax ([#7396](https://github.com/sveltejs/kit/pull/7396))
8+
9+
* [fix] optional params can be undefined ([#7379](https://github.com/sveltejs/kit/pull/7379))
10+
11+
- [fix] support undici 5.12.0 and pin it ([#7412](https://github.com/sveltejs/kit/pull/7412))
12+
13+
* [chore] upgrade to vite-plugin-svelte 1.1.0 and enable prebundleSvelteLibraries ([#7388](https://github.com/sveltejs/kit/pull/7388))
14+
15+
- Show more descriptive error if data returned from `load` is a non-POJO ([#7386](https://github.com/sveltejs/kit/pull/7386))
16+
317
## 1.0.0-next.525
418

519
### Patch Changes

packages/kit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sveltejs/kit",
3-
"version": "1.0.0-next.525",
3+
"version": "1.0.0-next.526",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/sveltejs/kit",
@@ -21,7 +21,7 @@
2121
"set-cookie-parser": "^2.5.1",
2222
"sirv": "^2.0.2",
2323
"tiny-glob": "^0.2.9",
24-
"undici": "^5.11.0"
24+
"undici": "5.12.0"
2525
},
2626
"devDependencies": {
2727
"@playwright/test": "1.25.0",

packages/kit/src/exports/node/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ function get_raw_body(req, body_size_limit) {
9595
/** @type {import('@sveltejs/kit/node').getRequest} */
9696
export async function getRequest({ request, base, bodySizeLimit }) {
9797
return new Request(base + request.url, {
98+
// @ts-expect-error
99+
duplex: 'half',
98100
method: request.method,
99101
headers: /** @type {Record<string, string>} */ (request.headers),
100102
body: get_raw_body(request, bodySizeLimit)

pnpm-lock.yaml

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

sites/kit.svelte.dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@sveltejs/adapter-static": "workspace:*",
1414
"@sveltejs/amp": "workspace:*",
1515
"@sveltejs/kit": "workspace:*",
16-
"@sveltejs/site-kit": "^2.1.2",
16+
"@sveltejs/site-kit": "^2.1.4",
1717
"@types/node": "^16.11.68",
1818
"flexsearch": "^0.7.31",
1919
"magic-string": "^0.26.7",

sites/kit.svelte.dev/src/routes/+layout.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</svelte:fragment>
2727

2828
<svelte:fragment slot="nav-right">
29-
<NavItem href="/docs">Docs</NavItem>
30-
<NavItem href="/faq">FAQ</NavItem>
29+
<NavItem selected={$page.url.pathname.startsWith('/docs') || undefined} href="/docs">Docs</NavItem>
30+
<NavItem selected={$page.url.pathname.startsWith('/faq') || undefined} href="/faq">FAQ</NavItem>
3131

3232
<li aria-hidden="true"><span class="separator" /></li>
3333

0 commit comments

Comments
 (0)