Skip to content

update remaining deps and replace express/serve-static with polka/sirv #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 22, 2025
Merged

update remaining deps and replace express/serve-static with polka/sirv #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c72dcb9
chore: ensure single version of kit in use
dominikg Apr 22, 2025
7abd80d
chore: bump minor deps and replace express/serve-static with polka/sirv
dominikg Apr 22, 2025
1284cb7
chore: bump svelte again
dominikg Apr 22, 2025
54dda22
fix: undo replace of inspector dep declaration in package.json
dominikg Apr 22, 2025
ef363c8
chore: improve polka selector
dominikg Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
"devDependencies": {
"@changesets/cli": "^2.29.2",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.25.0",
"@eslint/js": "^9.25.1",
"@stylistic/eslint-plugin-js": "^4.2.0",
"@sveltejs/eslint-config": "^8.2.0",
"@sveltejs/kit": "^2.20.7",
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
"@types/fs-extra": "^11.0.4",
"@types/node": "^22.14.1",
"cross-env": "^7.0.3",
"dts-buddy": "^0.6.1",
"eslint": "^9.25.0",
"eslint": "^9.25.1",
"eslint-config-prettier": "^10.1.2",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-n": "^17.17.0",
Expand All @@ -50,10 +51,10 @@
"prettier": "^3.5.3",
"prettier-plugin-svelte": "^3.3.3",
"publint": "^0.3.12",
"svelte": "^5.28.1",
"svelte": "^5.28.2",
"svelte-eslint-parser": "^1.1.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.30.1",
"typescript-eslint": "^8.31.0",
"vite": "^6.3.2",
"vitest": "^3.1.2"
},
Expand All @@ -69,6 +70,7 @@
},
"pnpm": {
"overrides": {
"@sveltejs/kit": "$@sveltejs/kit",
"@sveltejs/kit>@sveltejs/vite-plugin-svelte": "workspace:^",
"@sveltejs/vite-plugin-svelte": "workspace:^",
"@sveltejs/vite-plugin-svelte-inspector": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e-tests/_test_dependencies/svelte-api-only/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"type": "module",
"dependencies": {
"svelte": "^5.28.1"
"svelte": "^5.28.2"
}
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/autoprefixer-browerslist/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"autoprefixer": "^10.4.21",
"postcss": "^8.5.3",
"postcss-load-config": "^6.0.1",
"svelte": "^5.28.1",
"svelte": "^5.28.2",
"svelte-preprocess": "^6.0.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/configfile-custom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/configfile-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"svelte": "^5.28.2",
"svelte-preprocess": "^6.0.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
},
"type": "module"
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/css-dev-sourcemap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"sass": "^1.87.0",
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/css-treeshake/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.85.1",
"svelte": "^5.20.5",
"vite": "^6.2.0"
"sass": "^1.87.0",
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/custom-extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/dynamic-compile-options/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/env/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/hmr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@sveltejs/vite-plugin-svelte": "workspace:^",
"e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
"node-fetch": "^3.3.2",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/import-queries/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"sass": "^1.87.0",
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/inspector-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"preview": "vite preview"
},
"devDependencies": {
"@sveltejs/kit": "^2.20.2",
"@sveltejs/kit": "^2.20.7",
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/inspector-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/kit-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
},
"devDependencies": {
"@sveltejs/adapter-node": "^5.2.12",
"@sveltejs/kit": "^2.20.2",
"@sveltejs/kit": "^2.20.7",
"@sveltejs/package": "^2.3.11",
"@sveltejs/vite-plugin-svelte": "workspace:^",
"e2e-test-dep-svelte-api-only": "file:../_test_dependencies/svelte-api-only",
"e2e-test-dep-vite-plugins": "file:../_test_dependencies/vite-plugins",
"svelte": "^5.28.1",
"svelte": "^5.28.2",
"svelte-check": "^4.1.6",
"svelte-i18n": "^4.0.1",
"tiny-glob": "^0.2.9",
"typescript": "^5.8.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
},
"type": "module"
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/package-json-svelte-field/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"sass": "^1.87.0",
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/prebundle-svelte-deps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"svelte": "^5.28.1",
"sass": "^1.87.0",
"svelte": "^5.28.2",
"svelte-preprocess": "^6.0.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/preprocess-with-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"sass": "^1.87.0",
"stylus": "^0.64.0",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/resolve-exports-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/scan-deps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/e2e-tests/svelte-preprocess/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"sass": "^1.86.3",
"svelte": "^5.28.1",
"sass": "^1.87.0",
"svelte": "^5.28.2",
"svelte-preprocess": "^6.0.3",
"typescript": "^5.8.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/e2e-tests/ts-type-import/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"@sveltejs/vite-plugin-svelte": "workspace:^",
"@tsconfig/svelte": "^5.0.4",
"@types/node": "^22.14.1",
"svelte": "^5.28.1",
"svelte": "^5.28.2",
"svelte-preprocess": "^6.0.3",
"vite": "^6.2.3"
"vite": "^6.3.2"
},
"type": "module"
}
8 changes: 4 additions & 4 deletions packages/e2e-tests/vite-ssr-esm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"cross-env": "^7.0.3",
"decamelize": "^6.0.0",
"e2e-test-dep-esm-only": "workspace:^",
"express": "^4.21.2",
"npm-run-all2": "^7.0.2",
"serve-static": "^1.16.2",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"polka": "^1.0.0-next.28",
"sirv": "^3.0.1",
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
24 changes: 13 additions & 11 deletions packages/e2e-tests/vite-ssr-esm/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import fs from 'node:fs';
import path from 'node:path';
import process from 'node:process';
import { pathToFileURL } from 'node:url';
import express from 'express';
import polka from 'polka';
import compression from 'compression';
import serveStatic from 'serve-static';
import sirv from 'sirv';

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

const app = express();
const app = polka();

/**
* @type {import('vite').ViteDevServer}
Expand Down Expand Up @@ -52,8 +52,8 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
} else {
app.use(compression());
app.use(
serveStatic(resolve('dist/client'), {
index: false
sirv(resolve('dist/client'), {
extensions: []
})
);
}
Expand All @@ -79,29 +79,31 @@ async function createServer(root = process.cwd(), isProd = process.env.NODE_ENV
const html = template
.replace('<!--head-outlet-->', headElements)
.replace('<!--app-outlet-->', appHtml);

res.status(200).set({ 'Content-Type': 'text/html' }).end(html);
res.writeHead(200, { 'Content-Type': 'text/html' }).end(html);
} catch (e) {
if (vite) vite.ssrFixStacktrace(e);
console.log(e.stack);
res.status(500).end(e.stack);
res.writeHead(500, { 'Content-Type': 'text/plain' }).end(e.stack);
}
});

return { app, vite };
}

createServer().then(({ app }) => {
const server = app.listen(port, () => {
app.listen(port, () => {
console.log('http://localhost:' + port);
});
const exitProcess = async () => {
process.off('SIGTERM', exitProcess);
process.off('SIGINT', exitProcess);
process.stdin.off('end', exitProcess);
try {
await server.close(() => {
console.log('ssr server closed');
await new Promise((resolve) => {
app.server.close(() => {
console.log('ssr server closed');
resolve();
});
});
} finally {
// eslint-disable-next-line n/no-process-exit
Expand Down
4 changes: 2 additions & 2 deletions packages/vite-plugin-svelte-inspector/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"devDependencies": {
"@types/debug": "^4.1.12",
"svelte": "^5.28.1",
"vite": "^6.2.3"
"svelte": "^5.28.2",
"vite": "^6.3.2"
}
}
Loading