From 6fe6f2bf1c9ea1a4585e6771c2822ca928ca4c50 Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Tue, 22 Apr 2025 16:54:28 +0300
Subject: [PATCH 1/2] add svelte version selector to REPL

---
 .../src/lib/Input/ComponentSelector.svelte    | 23 +++++++++++-
 .../repl/src/lib/Output/PaneWithPanel.svelte  |  1 +
 packages/repl/src/lib/Output/Viewer.svelte    | 20 +++++------
 packages/repl/src/lib/Repl.svelte             | 28 ++++++++-------
 packages/repl/src/lib/Workspace.svelte.ts     | 12 ++++++-
 .../repl/src/lib/workers/bundler/index.ts     | 35 +++++++++++++------
 packages/repl/src/lib/workers/npm.ts          | 10 ++++--
 packages/repl/src/lib/workers/workers.d.ts    |  1 +
 packages/site-kit/src/lib/styles/base.css     |  2 ++
 9 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/packages/repl/src/lib/Input/ComponentSelector.svelte b/packages/repl/src/lib/Input/ComponentSelector.svelte
index 74caa7f96a..d9b953865e 100644
--- a/packages/repl/src/lib/Input/ComponentSelector.svelte
+++ b/packages/repl/src/lib/Input/ComponentSelector.svelte
@@ -177,6 +177,15 @@
 
 			<button disabled={!can_migrate} onclick={migrate}>Migrate to Svelte 5, if possible</button>
 
+			<label class="option">
+				<span>Svelte version</span>
+				<input
+					value={workspace.svelte_version}
+					placeholder="latest"
+					onchange={(ev) => (workspace.svelte_version = ev.currentTarget.value)}
+				/>
+			</label>
+
 			{#if download}
 				<button onclick={download}>Download app</button>
 			{/if}
@@ -278,7 +287,7 @@
 		}
 	}
 
-	input {
+	.file-tabs input {
 		position: absolute;
 		width: calc(100% - var(--padding-left) - var(--padding-right));
 		border: none;
@@ -318,6 +327,18 @@
 		justify-content: flex-end;
 	}
 
+	.option input {
+		background: transparent;
+		border: 1px solid var(--sk-border);
+		border-radius: var(--sk-border-radius);
+		color: currentColor;
+		width: 0;
+		flex: 1;
+		padding: 0.2rem 0.6rem;
+		height: 3.2rem;
+		font: var(--sk-font-ui-medium);
+	}
+
 	svg {
 		position: relative;
 		overflow: hidden;
diff --git a/packages/repl/src/lib/Output/PaneWithPanel.svelte b/packages/repl/src/lib/Output/PaneWithPanel.svelte
index d0750694ff..a550263f2f 100644
--- a/packages/repl/src/lib/Output/PaneWithPanel.svelte
+++ b/packages/repl/src/lib/Output/PaneWithPanel.svelte
@@ -137,6 +137,7 @@
 	}
 
 	section {
+		position: relative;
 		overflow: hidden;
 	}
 </style>
diff --git a/packages/repl/src/lib/Output/Viewer.svelte b/packages/repl/src/lib/Output/Viewer.svelte
index ddb224bf81..e3bb1abb61 100644
--- a/packages/repl/src/lib/Output/Viewer.svelte
+++ b/packages/repl/src/lib/Output/Viewer.svelte
@@ -313,9 +313,15 @@
 		srcdoc={BROWSER ? srcdoc : ''}
 	></iframe>
 
-	{#if bundle?.error}
-		<ErrorOverlay error={bundle.error} />
-	{/if}
+	<div class="overlay">
+		{#if bundle?.error}
+			<ErrorOverlay error={bundle.error} />
+		{:else if error}
+			<Message kind="error" details={error} />
+		{:else if status || !bundle}
+			<Message kind="info" truncate>{status || 'loading Svelte compiler...'}</Message>
+		{/if}
+	</div>
 {/snippet}
 
 <div class="iframe-container">
@@ -344,14 +350,6 @@
 	{:else}
 		{@render main()}
 	{/if}
-
-	<div class="overlay">
-		{#if error}
-			<Message kind="error" details={error} />
-		{:else if status || !bundle}
-			<Message kind="info" truncate>{status || 'loading Svelte compiler...'}</Message>
-		{/if}
-	</div>
 </div>
 
 <style>
diff --git a/packages/repl/src/lib/Repl.svelte b/packages/repl/src/lib/Repl.svelte
index 5843fedd65..fa4fd8a020 100644
--- a/packages/repl/src/lib/Repl.svelte
+++ b/packages/repl/src/lib/Repl.svelte
@@ -87,6 +87,7 @@
 
 	async function rebundle() {
 		bundler!.bundle(workspace.files as File[], {
+			svelte_version: workspace.svelte_version,
 			tailwind: workspace.tailwind
 		});
 	}
@@ -112,7 +113,10 @@
 	const bundler = BROWSER
 		? new Bundler({
 				svelte_version: svelteVersion,
-				onversion,
+				onversion: (version) => {
+					workspace.svelte_version = version;
+					onversion?.(version);
+				},
 				onstatus: (message) => {
 					if (message) {
 						// show bundler status, but only after time has elapsed, to
@@ -204,7 +208,7 @@
 						{injectedCSS}
 						{previewTheme}
 						{workspace}
-						runtimeError={status_visible ? runtime_error : null}
+						runtimeError={runtime_error}
 					/>
 				</section>
 			{/snippet}
@@ -229,13 +233,13 @@
 			height: 100%;
 		}
 
-		:global {
-			section {
-				position: relative;
-				padding: var(--sk-pane-controls-height) 0 0 0;
-				height: 100%;
-				box-sizing: border-box;
+		section {
+			position: relative;
+			padding: var(--sk-pane-controls-height) 0 0 0;
+			height: 100%;
+			box-sizing: border-box;
 
+			:global {
 				& > :first-child {
 					position: absolute;
 					top: 0;
@@ -250,11 +254,11 @@
 					height: 100%;
 				}
 			}
+		}
 
-			[data-pane='main'] > svelte-split-pane-divider::after {
-				height: calc(100% - var(--sk-pane-controls-height));
-				top: var(--sk-pane-controls-height);
-			}
+		:global [data-pane='main'] > svelte-split-pane-divider::after {
+			height: calc(100% - var(--sk-pane-controls-height));
+			top: var(--sk-pane-controls-height);
 		}
 	}
 
diff --git a/packages/repl/src/lib/Workspace.svelte.ts b/packages/repl/src/lib/Workspace.svelte.ts
index 6b9d9f31fa..607d5393c3 100644
--- a/packages/repl/src/lib/Workspace.svelte.ts
+++ b/packages/repl/src/lib/Workspace.svelte.ts
@@ -108,7 +108,7 @@ export class Workspace {
 	});
 	compiled = $state<Record<string, Compiled>>({});
 
-	#svelte_version: string;
+	#svelte_version = $state('');
 	#readonly = false; // TODO do we need workspaces for readonly stuff?
 	#files = $state.raw<Item[]>([]);
 	#current = $state.raw() as File;
@@ -479,6 +479,16 @@ export class Workspace {
 		this.#onupdate(this.#current);
 	}
 
+	get svelte_version() {
+		return this.#svelte_version;
+	}
+
+	set svelte_version(value) {
+		this.#svelte_version = value;
+		this.#update_file(this.#current);
+		this.#reset_diagnostics();
+	}
+
 	get vim() {
 		return this.#vim;
 	}
diff --git a/packages/repl/src/lib/workers/bundler/index.ts b/packages/repl/src/lib/workers/bundler/index.ts
index b6e0287173..44066cae15 100644
--- a/packages/repl/src/lib/workers/bundler/index.ts
+++ b/packages/repl/src/lib/workers/bundler/index.ts
@@ -42,25 +42,21 @@ const ESM_ENV = '__esm-env.js';
 
 let current_id: number;
 
-let ready: ReturnType<typeof load_svelte>;
-
 self.addEventListener('message', async (event: MessageEvent<BundleMessageData>) => {
 	switch (event.data.type) {
 		case 'init': {
-			ready = load_svelte(event.data.svelte_version, (version) => {
-				self.postMessage({
-					type: 'version',
-					message: version
-				});
-			});
-
+			get_svelte(event.data.svelte_version);
 			break;
 		}
 
 		case 'bundle': {
 			try {
-				const { svelte, version: svelte_version, can_use_experimental_async } = await ready;
 				const { uid, files, options } = event.data;
+				const {
+					svelte,
+					version: svelte_version,
+					can_use_experimental_async
+				} = await get_svelte(options.svelte_version);
 
 				current_id = uid;
 
@@ -92,6 +88,25 @@ self.addEventListener('message', async (event: MessageEvent<BundleMessageData>)
 	}
 });
 
+let ready: ReturnType<typeof load_svelte>;
+let ready_version: string;
+
+function get_svelte(svelte_version: string) {
+	if (ready_version === svelte_version) return ready;
+
+	self.postMessage({ type: 'status', message: `fetching svelte@${svelte_version}` });
+	ready_version = svelte_version;
+	ready = load_svelte(svelte_version || 'latest');
+	ready.then(({ version }) => {
+		ready_version = version;
+		self.postMessage({
+			type: 'version',
+			message: version
+		});
+	});
+	return ready;
+}
+
 const ABORT = { aborted: true };
 
 let previous: {
diff --git a/packages/repl/src/lib/workers/npm.ts b/packages/repl/src/lib/workers/npm.ts
index 232a0f7dfd..3ce9de93e0 100644
--- a/packages/repl/src/lib/workers/npm.ts
+++ b/packages/repl/src/lib/workers/npm.ts
@@ -13,13 +13,17 @@ const packages = new Map<string, Promise<Package>>();
 
 const pkg_pr_new_regex = /^(pr|commit|branch)-(.+)/;
 
-export async function load_svelte(version: string, onresolve?: (resolved: string) => void) {
+export async function load_svelte(version: string) {
 	if (version === 'local') {
 		await import(/* @vite-ignore */ `${location.origin}/svelte/compiler/index.js`);
 	} else {
 		if (!pkg_pr_new_regex.test(version)) {
-			version = await resolve_version('svelte', version);
-			onresolve?.(version);
+			const resolved_version = await resolve_version('svelte', version);
+			if (resolved_version) {
+				version = resolved_version;
+			} else {
+				throw new Error(`Failed to resolve svelte@${version}`);
+			}
 		}
 
 		const pkg = await fetch_package('svelte', version);
diff --git a/packages/repl/src/lib/workers/workers.d.ts b/packages/repl/src/lib/workers/workers.d.ts
index 700a43f04d..5a721ecb23 100644
--- a/packages/repl/src/lib/workers/workers.d.ts
+++ b/packages/repl/src/lib/workers/workers.d.ts
@@ -50,6 +50,7 @@ export interface MigrateOutput {
 }
 
 export interface BundleOptions {
+	svelte_version: string;
 	tailwind?: boolean;
 	runes?: boolean;
 }
diff --git a/packages/site-kit/src/lib/styles/base.css b/packages/site-kit/src/lib/styles/base.css
index 7205d93ff3..1baecc105b 100644
--- a/packages/site-kit/src/lib/styles/base.css
+++ b/packages/site-kit/src/lib/styles/base.css
@@ -157,10 +157,12 @@ button {
 	background-color: transparent;
 	border: none;
 	color: currentColor;
+	cursor: pointer;
 }
 
 button[disabled] {
 	color: var(--sk-fg-4);
+	cursor: not-allowed;
 }
 
 /*  links ------------------------------------- */

From fecc4e3b2ff4b6d41a0b51ffd3f3966b2c5acc46 Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Tue, 22 Apr 2025 17:33:17 +0300
Subject: [PATCH 2/2] fix lint

---
 .../src/lib/tutorial/adapters/rollup/index.svelte.ts     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/svelte.dev/src/lib/tutorial/adapters/rollup/index.svelte.ts b/apps/svelte.dev/src/lib/tutorial/adapters/rollup/index.svelte.ts
index 0b4ddff71c..1a5a44a9da 100644
--- a/apps/svelte.dev/src/lib/tutorial/adapters/rollup/index.svelte.ts
+++ b/apps/svelte.dev/src/lib/tutorial/adapters/rollup/index.svelte.ts
@@ -5,16 +5,20 @@ import type { Adapter } from '$lib/tutorial';
 import type { File, Item } from '@sveltejs/repl/workspace';
 
 let done = false;
+let svelte_version = 'latest';
 
 export const state = new (class RollupState {
 	progress = $state.raw({ value: 0, text: 'initialising' });
 	bundler = new Bundler({
-		svelte_version: 'latest',
+		svelte_version,
 		onstatus: (val) => {
 			if (!done && val === null) {
 				done = true;
 				this.progress = { value: 1, text: 'ready' };
 			}
+		},
+		onversion: (version) => {
+			svelte_version = version;
 		}
 	});
 })();
@@ -33,7 +37,8 @@ export async function create(): Promise<Adapter> {
 				.map((f) => ({ ...f, name: f.name.slice(9) })),
 			{
 				// TODO support Tailwind here?
-				runes: true
+				runes: true,
+				svelte_version
 			}
 		);
 	}