diff --git a/example/svelte-kit/jsconfig.json b/example/svelte-kit/jsconfig.json index f1da068b..9281dfc4 100644 --- a/example/svelte-kit/jsconfig.json +++ b/example/svelte-kit/jsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./.svelte-kit/tsconfig.json", + "extends": "$app/tsconfig", "compilerOptions": { "allowJs": true, "checkJs": true, diff --git a/example/svelte-kit/package.json b/example/svelte-kit/package.json index b356d356..561cb053 100644 --- a/example/svelte-kit/package.json +++ b/example/svelte-kit/package.json @@ -13,9 +13,10 @@ "@exceptionless/browser": "3.0.0-dev" }, "devDependencies": { - "@sveltejs/adapter-auto": "^7.0.1", - "@sveltejs/kit": "^2.70.3", + "@sveltejs/adapter-auto": "^8.0.0", + "@sveltejs/kit": "^3.1.0", "@sveltejs/vite-plugin-svelte": "^7.3.1", + "cookie": "^2.0.1", "svelte": "^5.57.1", "svelte-check": "^4.7.6", "typescript": "^6.0.3", diff --git a/example/svelte-kit/src/hooks.client.js b/example/svelte-kit/src/hooks.client.js index 72523b33..98681295 100644 --- a/example/svelte-kit/src/hooks.client.js +++ b/example/svelte-kit/src/hooks.client.js @@ -8,10 +8,12 @@ Exceptionless.startup((c) => { c.defaultTags.push("Example", "svelte-kit", "client"); }); -/** @type {import('@sveltejs/kit').HandleClientError} */ -export async function handleError({ error, event, message, status }) { - console.warn({ error, event, message, source: "client error handler", status }); - await Exceptionless.createException(toError(error ?? message)) - .setProperty("status", status) - .submit(); -} +/** @type {import('@sveltejs/kit/hooks').HandleClientError} */ +export const handleError = async ({ error, event, kind }) => { + console.warn({ error, event, kind, source: "client error handler" }); + const builder = Exceptionless.createException(toError(error)); + if (kind !== "unknown" && error.status != null) { + builder.setProperty("status", error.status); + } + await builder.submit(); +}; diff --git a/example/svelte-kit/src/hooks.server.js b/example/svelte-kit/src/hooks.server.js index 78d32d83..b04d41b6 100644 --- a/example/svelte-kit/src/hooks.server.js +++ b/example/svelte-kit/src/hooks.server.js @@ -8,8 +8,8 @@ Exceptionless.startup((c) => { c.defaultTags.push("Example", "svelte-kit", "server"); }); -/** @type {import("@sveltejs/kit").HandleServerError} */ -export async function handleError({ error, event }) { +/** @type {import("@sveltejs/kit/hooks").HandleServerError} */ +export const handleError = async ({ error, event }) => { console.log("server error handler"); await Exceptionless.submitException(toError(error)); -} +}; diff --git a/example/svelte-kit/svelte.config.js b/example/svelte-kit/svelte.config.js deleted file mode 100644 index c2b930dc..00000000 --- a/example/svelte-kit/svelte.config.js +++ /dev/null @@ -1,10 +0,0 @@ -import adapter from "@sveltejs/adapter-auto"; - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - kit: { - adapter: adapter() - } -}; - -export default config; diff --git a/example/svelte-kit/vite.config.js b/example/svelte-kit/vite.config.js index 9e118353..e152790c 100644 --- a/example/svelte-kit/vite.config.js +++ b/example/svelte-kit/vite.config.js @@ -1,6 +1,7 @@ +import adapter from "@sveltejs/adapter-auto"; import { sveltekit } from "@sveltejs/kit/vite"; import { defineConfig } from "vitest/config"; export default defineConfig({ - plugins: [sveltekit()] + plugins: [sveltekit({ adapter: adapter() })] }); diff --git a/package-lock.json b/package-lock.json index 6a61e795..d836a338 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,9 +116,10 @@ "@exceptionless/browser": "3.0.0-dev" }, "devDependencies": { - "@sveltejs/adapter-auto": "^7.0.1", - "@sveltejs/kit": "^2.70.3", + "@sveltejs/adapter-auto": "^8.0.0", + "@sveltejs/kit": "^3.1.0", "@sveltejs/vite-plugin-svelte": "^7.3.1", + "cookie": "^2.0.1", "svelte": "^5.57.1", "svelte-check": "^4.7.6", "typescript": "^6.0.3", @@ -126,6 +127,20 @@ "vitest": "^5.0.2" } }, + "example/svelte-kit/node_modules/cookie": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-2.0.1.tgz", + "integrity": "sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=22" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "example/vue": { "name": "vue-example", "version": "3.0.0-dev", @@ -4033,47 +4048,43 @@ } }, "node_modules/@sveltejs/adapter-auto": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-7.0.1.tgz", - "integrity": "sha512-dvuPm1E7M9NI/+canIQ6KKQDU2AkEefEZ2Dp7cY6uKoPq9Z/PhOXABe526UdW2mN986gjVkuSLkOYIBnS/M2LQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-8.0.0.tgz", + "integrity": "sha512-CKOwUS865xfoZn3CpM868slPfitsQ4vmxAR/yOfTIguAwStgkhjhzV0zEhmkzPalH338LJ9XnQX9vfQeY7220A==", "dev": true, "license": "MIT", "peerDependencies": { - "@sveltejs/kit": "^2.0.0" + "@sveltejs/kit": "^3.0.0-next.0" } }, "node_modules/@sveltejs/kit": { - "version": "2.70.3", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.70.3.tgz", - "integrity": "sha512-UDvEYuZqAMbfB/oXIoqKvbKcb7YczK5zYrzmsGV1zRJk03jntwp8dXiYoIJotxAndsKvcPFtx9H1GRSKFdSHgg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-3.1.0.tgz", + "integrity": "sha512-JTWlq2HQlkqx6vIoxhC0R6sc4WVqbQoRyEmr5YlqKmiYbzY1U3awtSWTmjMLlS056a49AmkQR6rnNANXIE8B0Q==", "dev": true, "license": "MIT", "dependencies": { - "@standard-schema/spec": "^1.0.0", - "@sveltejs/acorn-typescript": "^1.0.9", - "@types/cookie": "^0.6.0", - "acorn": "^8.16.0", - "cookie": "^0.6.0", - "devalue": "^5.8.1", + "@rolldown/pluginutils": "^1.0.1", + "@standard-schema/spec": "^1.1.0", + "cookie": "^2.0.1", + "devalue": "^5.9.4", "esm-env": "^1.2.2", - "kleur": "^4.1.5", - "magic-string": "^0.30.5", - "mrmime": "^2.0.0", - "set-cookie-parser": "^3.0.0", - "sirv": "^3.0.0" + "magic-string": "^1.2.3", + "mrmime": "^2.0.1", + "sirv": "^3.0.2" }, "bin": { "svelte-kit": "svelte-kit.js" }, "engines": { - "node": ">=18.13" + "node": ">=22.17" }, "peerDependencies": { "@opentelemetry/api": "^1.0.0", - "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0", - "svelte": "^4.0.0 || ^5.0.0-next.0", - "typescript": "^5.3.3 || ^6.0.0", - "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0" + "@sveltejs/vite-plugin-svelte": "^7.0.0", + "svelte": "^5.57.1", + "typescript": "^6.0.0", + "vite": "^8.0.12" }, "peerDependenciesMeta": { "@opentelemetry/api": { @@ -4084,6 +4095,30 @@ } } }, + "node_modules/@sveltejs/kit/node_modules/cookie": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-2.0.1.tgz", + "integrity": "sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=22" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/@sveltejs/kit/node_modules/magic-string": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.5.tgz", + "integrity": "sha512-oLLC2+YvQUfAa+vxoufE/yc1icb87M9iXIRqAoR/2EhE/8cb3SF/+Gi0c2By1B+5Vz2e2vQtUvHiu1+63Znh+w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.6.0" + } + }, "node_modules/@sveltejs/load-config": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@sveltejs/load-config/-/load-config-0.2.3.tgz", @@ -4255,13 +4290,6 @@ "assertion-error": "^2.0.1" } }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/deep-eql": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", @@ -8363,16 +8391,6 @@ "@keyv/serialize": "^1.1.1" } }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/lan-network": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/lan-network/-/lan-network-0.2.1.tgz", @@ -11018,13 +11036,6 @@ "node": ">= 0.8.0" } }, - "node_modules/set-cookie-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-3.1.2.tgz", - "integrity": "sha512-5/r/lTwbJ3zQ+qwdUFZYeRNqda7P5HD8zQKqlSjdGt1/S0cjLAphHusj4Y58ahDtWn/g32xrIS58/ikOvwl0Lw==", - "dev": true, - "license": "MIT" - }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", diff --git a/package.json b/package.json index 5e9037b5..76579c45 100644 --- a/package.json +++ b/package.json @@ -49,9 +49,6 @@ "fsevents@2.3.3": false }, "overrides": { - "@sveltejs/kit": { - "cookie": "0.7.2" - }, "xcode": { "uuid": "11.1.1" }