From b838938ecddc20a5e746979ce65500f712ca03cf Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 15 Dec 2024 09:36:07 -0500 Subject: [PATCH 1/2] bump svelte --- packages/editor/package.json | 2 +- pnpm-lock.yaml | 107 ++++++++++++++++++++++++++++++----- 2 files changed, 93 insertions(+), 16 deletions(-) diff --git a/packages/editor/package.json b/packages/editor/package.json index b617d2b847..d11f0e97da 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -55,7 +55,7 @@ "prettier": "^3.1.1", "prettier-plugin-svelte": "^3.1.2", "publint": "^0.2.12", - "svelte": "^5.1.11", + "svelte": "^5.14.0", "svelte-check": "^4.1.1", "typescript": "^5.0.0", "vite": "^5.0.11" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b52930155..5ea749f039 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -252,13 +252,13 @@ importers: version: 6.2.1(@codemirror/commands@6.5.0)(@codemirror/language@6.10.3)(@codemirror/search@6.5.6)(@codemirror/state@6.5.0)(@codemirror/view@6.35.3) '@sveltejs/adapter-auto': specifier: ^3.0.0 - version: 3.2.0(@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))) + version: 3.2.0(@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))) '@sveltejs/kit': specifier: ^2.10.1 - version: 2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + version: 2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) '@sveltejs/package': specifier: ^2.0.0 - version: 2.3.1(svelte@5.3.0)(typescript@5.5.4) + version: 2.3.1(svelte@5.14.0)(typescript@5.5.4) '@sveltejs/repl': specifier: workspace:* version: link:../repl @@ -267,7 +267,7 @@ importers: version: link:../site-kit '@sveltejs/vite-plugin-svelte': specifier: ^4.0.0 - version: 4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + version: 4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) codemirror: specifier: ^6.0.1 version: 6.0.1(@lezer/common@1.2.2) @@ -276,16 +276,16 @@ importers: version: 3.3.2 prettier-plugin-svelte: specifier: ^3.1.2 - version: 3.2.4(prettier@3.3.2)(svelte@5.3.0) + version: 3.2.4(prettier@3.3.2)(svelte@5.14.0) publint: specifier: ^0.2.12 version: 0.2.12 svelte: - specifier: ^5.1.11 - version: 5.3.0 + specifier: ^5.14.0 + version: 5.14.0 svelte-check: specifier: ^4.1.1 - version: 4.1.1(picomatch@4.0.2)(svelte@5.3.0)(typescript@5.5.4) + version: 4.1.1(picomatch@4.0.2)(svelte@5.14.0)(typescript@5.5.4) typescript: specifier: ^5.0.0 version: 5.5.4 @@ -3057,6 +3057,10 @@ packages: resolution: {integrity: sha512-XpPcUBKCg2c+L0nDTkv0ekc8LOHMzN328MNOeAHt4sRcX5AROU9tkqwL35VvE6srt8RpmnzsXBGDwyRB5TSbuw==} engines: {node: '>=18'} + svelte@5.14.0: + resolution: {integrity: sha512-xHrS9dd2Ci9GJd2sReNFqJztoe515wB4OzsPw4A8L2M6lddLFkREkWDJnM5DAND30Zyvjwc1icQVzH0F+Sdx5A==} + engines: {node: '>=18'} + svelte@5.3.0: resolution: {integrity: sha512-R9v8vAlW/bO94S7QdBJMYveMyI8gMqNnGOtEVLPveNVws+CEiQHn8BNWrtIIpkB28IXLnmjV2HaRTJz31XJmIw==} engines: {node: '>=18'} @@ -4434,9 +4438,9 @@ snapshots: '@sveltejs/kit': 2.11.0(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.1.11)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.1.11)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) import-meta-resolve: 4.1.0 - '@sveltejs/adapter-auto@3.2.0(@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))': + '@sveltejs/adapter-auto@3.2.0(@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))': dependencies: - '@sveltejs/kit': 2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + '@sveltejs/kit': 2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) import-meta-resolve: 4.1.0 '@sveltejs/adapter-vercel@5.5.2(@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(rollup@4.21.2)': @@ -4501,6 +4505,24 @@ snapshots: tiny-glob: 0.2.9 vite: 5.4.11(@types/node@20.14.2)(lightningcss@1.25.1) + '@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': + dependencies: + '@sveltejs/vite-plugin-svelte': 4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + '@types/cookie': 0.6.0 + cookie: 0.6.0 + devalue: 5.1.1 + esm-env: 1.2.1 + import-meta-resolve: 4.1.0 + kleur: 4.1.5 + magic-string: 0.30.12 + mrmime: 2.0.0 + sade: 1.8.1 + set-cookie-parser: 2.7.1 + sirv: 3.0.0 + svelte: 5.14.0 + tiny-glob: 0.2.9 + vite: 5.4.11(@types/node@20.14.2)(lightningcss@1.25.1) + '@sveltejs/kit@2.11.0(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': dependencies: '@sveltejs/vite-plugin-svelte': 4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) @@ -4530,14 +4552,14 @@ snapshots: transitivePeerDependencies: - typescript - '@sveltejs/package@2.3.1(svelte@5.3.0)(typescript@5.5.4)': + '@sveltejs/package@2.3.1(svelte@5.14.0)(typescript@5.5.4)': dependencies: chokidar: 3.6.0 kleur: 4.1.5 sade: 1.8.1 semver: 7.6.3 - svelte: 5.3.0 - svelte2tsx: 0.7.8(svelte@5.3.0)(typescript@5.5.4) + svelte: 5.14.0 + svelte2tsx: 0.7.8(svelte@5.14.0)(typescript@5.5.4) transitivePeerDependencies: - typescript @@ -4563,6 +4585,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': + dependencies: + '@sveltejs/vite-plugin-svelte': 4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + debug: 4.4.0 + svelte: 5.14.0 + vite: 5.4.11(@types/node@20.14.2)(lightningcss@1.25.1) + transitivePeerDependencies: + - supports-color + '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': dependencies: '@sveltejs/vite-plugin-svelte': 4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) @@ -4598,6 +4629,19 @@ snapshots: transitivePeerDependencies: - supports-color + '@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': + dependencies: + '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.14.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + debug: 4.4.0 + deepmerge: 4.3.1 + kleur: 4.1.5 + magic-string: 0.30.12 + svelte: 5.14.0 + vite: 5.4.11(@types/node@20.14.2)(lightningcss@1.25.1) + vitefu: 1.0.3(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) + transitivePeerDependencies: + - supports-color + '@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1))': dependencies: '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.3(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)))(svelte@5.3.0)(vite@5.4.11(@types/node@20.14.2)(lightningcss@1.25.1)) @@ -5699,6 +5743,11 @@ snapshots: prettier: 3.3.2 svelte: 5.1.11 + prettier-plugin-svelte@3.2.4(prettier@3.3.2)(svelte@5.14.0): + dependencies: + prettier: 3.3.2 + svelte: 5.14.0 + prettier-plugin-svelte@3.2.4(prettier@3.3.2)(svelte@5.3.0): dependencies: prettier: 3.3.2 @@ -5956,6 +6005,18 @@ snapshots: transitivePeerDependencies: - picomatch + svelte-check@4.1.1(picomatch@4.0.2)(svelte@5.14.0)(typescript@5.5.4): + dependencies: + '@jridgewell/trace-mapping': 0.3.25 + chokidar: 4.0.1 + fdir: 6.4.2(picomatch@4.0.2) + picocolors: 1.1.1 + sade: 1.8.1 + svelte: 5.14.0 + typescript: 5.5.4 + transitivePeerDependencies: + - picomatch + svelte-check@4.1.1(picomatch@4.0.2)(svelte@5.3.0)(typescript@5.5.4): dependencies: '@jridgewell/trace-mapping': 0.3.25 @@ -5990,11 +6051,11 @@ snapshots: svelte: 5.1.11 typescript: 5.5.4 - svelte2tsx@0.7.8(svelte@5.3.0)(typescript@5.5.4): + svelte2tsx@0.7.8(svelte@5.14.0)(typescript@5.5.4): dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 5.3.0 + svelte: 5.14.0 typescript: 5.5.4 svelte@5.1.11: @@ -6013,6 +6074,22 @@ snapshots: magic-string: 0.30.12 zimmerframe: 1.1.2 + svelte@5.14.0: + dependencies: + '@ampproject/remapping': 2.3.0 + '@jridgewell/sourcemap-codec': 1.5.0 + '@types/estree': 1.0.6 + acorn: 8.14.0 + acorn-typescript: 1.4.13(acorn@8.14.0) + aria-query: 5.3.2 + axobject-query: 4.1.0 + esm-env: 1.2.1 + esrap: 1.2.3 + is-reference: 3.0.3 + locate-character: 3.0.0 + magic-string: 0.30.12 + zimmerframe: 1.1.2 + svelte@5.3.0: dependencies: '@ampproject/remapping': 2.3.0 From e837fac79624337b15fb16b7694b3878a210c90d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 15 Dec 2024 10:12:02 -0500 Subject: [PATCH 2/2] bump svelte, transfer error names etc --- apps/svelte.dev/package.json | 2 +- packages/repl/package.json | 2 +- packages/repl/src/lib/Output/ReplProxy.ts | 8 + .../src/lib/Output/console/ConsoleLine.svelte | 6 +- .../repl/src/lib/Output/srcdoc/index.html | 15 + packages/site-kit/package.json | 2 +- pnpm-lock.yaml | 308 ++++-------------- 7 files changed, 97 insertions(+), 246 deletions(-) diff --git a/apps/svelte.dev/package.json b/apps/svelte.dev/package.json index c158effcd5..5b50ce832b 100644 --- a/apps/svelte.dev/package.json +++ b/apps/svelte.dev/package.json @@ -72,7 +72,7 @@ "prettier-plugin-svelte": "^3.2.4", "satori": "^0.10.13", "satori-html": "^0.3.2", - "svelte": "5.3.0", + "svelte": "5.14.0", "svelte-check": "^4.1.1", "svelte-preprocess": "^6.0.3", "tiny-glob": "^0.2.9", diff --git a/packages/repl/package.json b/packages/repl/package.json index dced93bc06..bdedeb44b2 100644 --- a/packages/repl/package.json +++ b/packages/repl/package.json @@ -85,7 +85,7 @@ "esrap": "^1.2.2", "marked": "^14.1.2", "resolve.exports": "^2.0.2", - "svelte": "5.1.11", + "svelte": "5.14.0", "tarparser": "^0.0.4", "zimmerframe": "^1.1.2" } diff --git a/packages/repl/src/lib/Output/ReplProxy.ts b/packages/repl/src/lib/Output/ReplProxy.ts index 0523345aef..19c7700171 100644 --- a/packages/repl/src/lib/Output/ReplProxy.ts +++ b/packages/repl/src/lib/Output/ReplProxy.ts @@ -24,6 +24,14 @@ export default class ReplProxy { case 'unhandledrejection': return this.handlers.on_unhandled_rejection(event.data); case 'console': + if (event.data.command === 'info' && event.data.args[0]?.type === '__error') { + const data = event.data.args[0]; + const e = new Error(data.message); + e.name = data.name; + e.stack = data.stack; + event.data.args[0] = e; + } + return this.handlers.on_console(event.data); } }; diff --git a/packages/repl/src/lib/Output/console/ConsoleLine.svelte b/packages/repl/src/lib/Output/console/ConsoleLine.svelte index b188d262f4..07273506a0 100644 --- a/packages/repl/src/lib/Output/console/ConsoleLine.svelte +++ b/packages/repl/src/lib/Output/console/ConsoleLine.svelte @@ -150,7 +150,11 @@ {#if !part.formatted} {' '} {/if}{#if part.type === 'value'} - + {#if part.value instanceof Error} + 
{part.value.name + '\n' + part.value.stack.replace(/^\n+/, '')}
+ {:else} + + {/if} {:else} e.stopPropagation()}> diff --git a/packages/repl/src/lib/Output/srcdoc/index.html b/packages/repl/src/lib/Output/srcdoc/index.html index d93691525b..9e56bf30db 100644 --- a/packages/repl/src/lib/Output/srcdoc/index.html +++ b/packages/repl/src/lib/Output/srcdoc/index.html @@ -68,6 +68,21 @@