Skip to content

Commit 3589433

Browse files
dominikgdominikg
authored
update remaining deps and replace express/serve-static with polka/sirv (#1112)
* chore: ensure single version of kit in use * chore: bump minor deps and replace express/serve-static with polka/sirv * chore: bump svelte again * fix: undo replace of inspector dep declaration in package.json * chore: improve polka selector
1 parent fc19a92 commit 3589433

File tree

27 files changed

+763
-1243
lines changed

27 files changed

+763
-1243
lines changed

‎package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
"devDependencies": {
2626
"@changesets/cli": "^2.29.2",
2727
"@eslint/eslintrc": "^3.3.1",
28-
"@eslint/js": "^9.25.0",
28+
"@eslint/js": "^9.25.1",
2929
"@stylistic/eslint-plugin-js": "^4.2.0",
3030
"@sveltejs/eslint-config": "^8.2.0",
31+
"@sveltejs/kit": "^2.20.7",
3132
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
3233
"@types/fs-extra": "^11.0.4",
3334
"@types/node": "^22.14.1",
3435
"cross-env": "^7.0.3",
3536
"dts-buddy": "^0.6.1",
36-
"eslint": "^9.25.0",
37+
"eslint": "^9.25.1",
3738
"eslint-config-prettier": "^10.1.2",
3839
"eslint-plugin-markdown": "^5.1.0",
3940
"eslint-plugin-n": "^17.17.0",
@@ -50,10 +51,10 @@
5051
"prettier": "^3.5.3",
5152
"prettier-plugin-svelte": "^3.3.3",
5253
"publint": "^0.3.12",
53-
"svelte": "^5.28.1",
54+
"svelte": "^5.28.2",
5455
"svelte-eslint-parser": "^1.1.3",
5556
"typescript": "^5.8.3",
56-
"typescript-eslint": "^8.30.1",
57+
"typescript-eslint": "^8.31.0",
5758
"vite": "^6.3.2",
5859
"vitest": "^3.1.2"
5960
},
@@ -69,6 +70,7 @@
6970
},
7071
"pnpm": {
7172
"overrides": {
73+
"@sveltejs/kit": "$@sveltejs/kit",
7274
"@sveltejs/kit>@sveltejs/vite-plugin-svelte": "workspace:^",
7375
"@sveltejs/vite-plugin-svelte": "workspace:^",
7476
"@sveltejs/vite-plugin-svelte-inspector": "workspace:^",

‎packages/e2e-tests/_test_dependencies/svelte-api-only/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
},
1616
"type": "module",
1717
"dependencies": {
18-
"svelte": "^5.28.1"
18+
"svelte": "^5.28.2"
1919
}
2020
}

‎packages/e2e-tests/autoprefixer-browerslist/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"autoprefixer": "^10.4.21",
1616
"postcss": "^8.5.3",
1717
"postcss-load-config": "^6.0.1",
18-
"svelte": "^5.28.1",
18+
"svelte": "^5.28.2",
1919
"svelte-preprocess": "^6.0.3",
20-
"vite": "^6.2.3"
20+
"vite": "^6.3.2"
2121
},
2222
"type": "module"
2323
}

‎packages/e2e-tests/configfile-custom/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:^",
15-
"svelte": "^5.28.1",
16-
"vite": "^6.2.3"
15+
"svelte": "^5.28.2",
16+
"vite": "^6.3.2"
1717
},
1818
"type": "module"
1919
}

‎packages/e2e-tests/configfile-esm/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/vite-plugin-svelte": "workspace:^",
15-
"svelte": "^5.28.1",
15+
"svelte": "^5.28.2",
1616
"svelte-preprocess": "^6.0.3",
17-
"vite": "^6.2.3"
17+
"vite": "^6.3.2"
1818
},
1919
"type": "module"
2020
}

‎packages/e2e-tests/css-dev-sourcemap/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"sass": "^1.86.3",
14-
"svelte": "^5.28.1",
15-
"vite": "^6.2.3"
13+
"sass": "^1.87.0",
14+
"svelte": "^5.28.2",
15+
"vite": "^6.3.2"
1616
}
1717
}

‎packages/e2e-tests/css-treeshake/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"sass": "^1.85.1",
14-
"svelte": "^5.20.5",
15-
"vite": "^6.2.0"
13+
"sass": "^1.87.0",
14+
"svelte": "^5.28.2",
15+
"vite": "^6.3.2"
1616
}
1717
}

‎packages/e2e-tests/custom-extensions/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
12-
"svelte": "^5.28.1",
13-
"vite": "^6.2.3"
12+
"svelte": "^5.28.2",
13+
"vite": "^6.3.2"
1414
},
1515
"type": "module"
1616
}

‎packages/e2e-tests/dynamic-compile-options/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
12-
"svelte": "^5.28.1",
13-
"vite": "^6.2.3"
12+
"svelte": "^5.28.2",
13+
"vite": "^6.3.2"
1414
},
1515
"type": "module"
1616
}

‎packages/e2e-tests/env/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
12-
"svelte": "^5.28.1",
13-
"vite": "^6.2.3"
12+
"svelte": "^5.28.2",
13+
"vite": "^6.3.2"
1414
},
1515
"type": "module"
1616
}

‎packages/e2e-tests/hmr/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"@sveltejs/vite-plugin-svelte": "workspace:^",
1515
"e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
1616
"node-fetch": "^3.3.2",
17-
"svelte": "^5.28.1",
18-
"vite": "^6.2.3"
17+
"svelte": "^5.28.2",
18+
"vite": "^6.3.2"
1919
},
2020
"type": "module"
2121
}

‎packages/e2e-tests/import-queries/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"sass": "^1.86.3",
14-
"svelte": "^5.28.1",
15-
"vite": "^6.2.3"
13+
"sass": "^1.87.0",
14+
"svelte": "^5.28.2",
15+
"vite": "^6.3.2"
1616
}
1717
}

‎packages/e2e-tests/inspector-kit/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"preview": "vite preview"
99
},
1010
"devDependencies": {
11-
"@sveltejs/kit": "^2.20.2",
11+
"@sveltejs/kit": "^2.20.7",
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"svelte": "^5.28.1",
14-
"vite": "^6.2.3"
13+
"svelte": "^5.28.2",
14+
"vite": "^6.3.2"
1515
},
1616
"type": "module"
1717
}

‎packages/e2e-tests/inspector-vite/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"svelte": "^5.28.1",
14-
"vite": "^6.2.3"
13+
"svelte": "^5.28.2",
14+
"vite": "^6.3.2"
1515
}
1616
}

‎packages/e2e-tests/kit-node/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"devDependencies": {
1414
"@sveltejs/adapter-node": "^5.2.12",
15-
"@sveltejs/kit": "^2.20.2",
15+
"@sveltejs/kit": "^2.20.7",
1616
"@sveltejs/package": "^2.3.11",
1717
"@sveltejs/vite-plugin-svelte": "workspace:^",
1818
"e2e-test-dep-svelte-api-only": "file:../_test_dependencies/svelte-api-only",
1919
"e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
20-
"svelte": "^5.28.1",
20+
"svelte": "^5.28.2",
2121
"svelte-check": "^4.1.6",
2222
"svelte-i18n": "^4.0.1",
2323
"tiny-glob": "^0.2.9",
2424
"typescript": "^5.8.3",
25-
"vite": "^6.2.3"
25+
"vite": "^6.3.2"
2626
},
2727
"type": "module"
2828
}

‎packages/e2e-tests/package-json-svelte-field/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
},
1414
"devDependencies": {
1515
"@sveltejs/vite-plugin-svelte": "workspace:^",
16-
"sass": "^1.86.3",
17-
"svelte": "^5.28.1",
18-
"vite": "^6.2.3"
16+
"sass": "^1.87.0",
17+
"svelte": "^5.28.2",
18+
"vite": "^6.3.2"
1919
},
2020
"type": "module"
2121
}

‎packages/e2e-tests/prebundle-svelte-deps/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
},
1919
"devDependencies": {
2020
"@sveltejs/vite-plugin-svelte": "workspace:^",
21-
"sass": "^1.86.3",
22-
"svelte": "^5.28.1",
21+
"sass": "^1.87.0",
22+
"svelte": "^5.28.2",
2323
"svelte-preprocess": "^6.0.3",
24-
"vite": "^6.2.3"
24+
"vite": "^6.3.2"
2525
}
2626
}

‎packages/e2e-tests/preprocess-with-vite/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
12-
"sass": "^1.86.3",
12+
"sass": "^1.87.0",
1313
"stylus": "^0.64.0",
14-
"svelte": "^5.28.1",
15-
"vite": "^6.2.3"
14+
"svelte": "^5.28.2",
15+
"vite": "^6.3.2"
1616
},
1717
"type": "module"
1818
}

‎packages/e2e-tests/resolve-exports-svelte/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@sveltejs/vite-plugin-svelte": "workspace:^",
16-
"svelte": "^5.28.1",
17-
"vite": "^6.2.3"
16+
"svelte": "^5.28.2",
17+
"vite": "^6.3.2"
1818
}
1919
}

‎packages/e2e-tests/scan-deps/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@sveltejs/vite-plugin-svelte": "workspace:^",
13-
"svelte": "^5.28.1",
14-
"vite": "^6.2.3"
13+
"svelte": "^5.28.2",
14+
"vite": "^6.3.2"
1515
}
1616
}

‎packages/e2e-tests/svelte-preprocess/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
},
1010
"devDependencies": {
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
12-
"sass": "^1.86.3",
13-
"svelte": "^5.28.1",
12+
"sass": "^1.87.0",
13+
"svelte": "^5.28.2",
1414
"svelte-preprocess": "^6.0.3",
1515
"typescript": "^5.8.3",
16-
"vite": "^6.2.3"
16+
"vite": "^6.3.2"
1717
},
1818
"type": "module"
1919
}

‎packages/e2e-tests/ts-type-import/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"@sveltejs/vite-plugin-svelte": "workspace:^",
1212
"@tsconfig/svelte": "^5.0.4",
1313
"@types/node": "^22.14.1",
14-
"svelte": "^5.28.1",
14+
"svelte": "^5.28.2",
1515
"svelte-preprocess": "^6.0.3",
16-
"vite": "^6.2.3"
16+
"vite": "^6.3.2"
1717
},
1818
"type": "module"
1919
}

‎packages/e2e-tests/vite-ssr-esm/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"cross-env": "^7.0.3",
1818
"decamelize": "^6.0.0",
1919
"e2e-test-dep-esm-only": "workspace:^",
20-
"express": "^4.21.2",
2120
"npm-run-all2": "^7.0.2",
22-
"serve-static": "^1.16.2",
23-
"svelte": "^5.28.1",
24-
"vite": "^6.2.3"
21+
"polka": "^1.0.0-next.28",
22+
"sirv": "^3.0.1",
23+
"svelte": "^5.28.2",
24+
"vite": "^6.3.2"
2525
}
2626
}

‎packages/e2e-tests/vite-ssr-esm/server.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import fs from 'node:fs';
33
import path from 'node:path';
44
import process from 'node:process';
55
import { pathToFileURL } from 'node:url';
6-
import express from 'express';
6+
import polka from 'polka';
77
import compression from 'compression';
8-
import serveStatic from 'serve-static';
8+
import sirv from 'sirv';
99

1010
let port = 3000;
1111
const args = process.argv.slice(2);
@@ -23,7 +23,7 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
2323
? JSON.parse(fs.readFileSync(resolve('dist/client/.vite/ssr-manifest.json'), 'utf-8'))
2424
: {};
2525

26-
const app = express();
26+
const app = polka();
2727

2828
/**
2929
* @type {import('vite').ViteDevServer}
@@ -52,8 +52,8 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
5252
} else {
5353
app.use(compression());
5454
app.use(
55-
serveStatic(resolve('dist/client'), {
56-
index: false
55+
sirv(resolve('dist/client'), {
56+
extensions: []
5757
})
5858
);
5959
}
@@ -79,29 +79,31 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
7979
const html = template
8080
.replace('<!--head-outlet-->', headElements)
8181
.replace('<!--app-outlet-->', appHtml);
82-
83-
res.status(200).set({ 'Content-Type': 'text/html' }).end(html);
82+
res.writeHead(200, { 'Content-Type': 'text/html' }).end(html);
8483
} catch (e) {
8584
if (vite) vite.ssrFixStacktrace(e);
8685
console.log(e.stack);
87-
res.status(500).end(e.stack);
86+
res.writeHead(500, { 'Content-Type': 'text/plain' }).end(e.stack);
8887
}
8988
});
9089

9190
return { app, vite };
9291
}
9392

9493
createServer().then(({ app }) => {
95-
const server = app.listen(port, () => {
94+
app.listen(port, () => {
9695
console.log('http://localhost:' + port);
9796
});
9897
const exitProcess = async () => {
9998
process.off('SIGTERM', exitProcess);
10099
process.off('SIGINT', exitProcess);
101100
process.stdin.off('end', exitProcess);
102101
try {
103-
await server.close(() => {
104-
console.log('ssr server closed');
102+
await new Promise((resolve) => {
103+
app.server.close(() => {
104+
console.log('ssr server closed');
105+
resolve();
106+
});
105107
});
106108
} finally {
107109
// eslint-disable-next-line n/no-process-exit

‎packages/vite-plugin-svelte-inspector/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
"devDependencies": {
5252
"@types/debug": "^4.1.12",
53-
"svelte": "^5.28.1",
54-
"vite": "^6.2.3"
53+
"svelte": "^5.28.2",
54+
"vite": "^6.3.2"
5555
}
5656
}

0 commit comments

Comments
 (0)