tidy up

Author: Rich-Harris

apps/svelte.dev/package.json

@@ -38,7 +38,6 @@
 		"d3-geo": "^3.1.0",
 		"d3-geo-projection": "^4.0.0",
 		"do-not-zip": "^1.0.0",
-		"editor": "workspace:*",
 		"flexsearch": "^0.7.43",
 		"flru": "^1.0.2",
 		"port-authority": "^2.0.1",

apps/svelte.dev/src/lib/tutorial/adapters/rollup/index.svelte.ts

@@ -3,13 +3,14 @@ import Bundler from '@sveltejs/repl/bundler';
 import * as yootils from 'yootils';
 import type { Adapter } from '$lib/tutorial';
 import type { File, Item } from '@sveltejs/repl/workspace';
+import type { BundleResult } from '@sveltejs/repl';
 
 /** Rollup bundler singleton */
 let bundler: Bundler;
 
 export const state = new (class RollupState {
 	progress = $state.raw({ value: 0, text: 'initialising' });
-	bundle = $state.raw<any>(null);
+	bundle = $state.raw<BundleResult | null>(null);
 })();
 
 /**

apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte

@@ -4,7 +4,7 @@
 	import { browser } from '$app/environment';
 	import { afterNavigate, goto, replaceState } from '$app/navigation';
 	import type { Gist } from '$lib/db/types';
-	import Repl from '@sveltejs/repl';
+	import { Repl } from '@sveltejs/repl';
 	import { theme } from '@sveltejs/site-kit/state';
 	import { mapbox_setup } from '../../../../config.js';
 	import AppControls from './AppControls.svelte';

apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte

@@ -9,7 +9,7 @@
 	import ModalDropdown from '$lib/components/ModalDropdown.svelte';
 	import SecondaryNav from '$lib/components/SecondaryNav.svelte';
 	import type { File } from '@sveltejs/repl/workspace';
-	import type Repl from '@sveltejs/repl';
+	import type { Repl } from '@sveltejs/repl';
 
 	interface Props {
 		examples: Array<{ title: string; examples: any[] }>;

apps/svelte.dev/src/routes/(authed)/playground/[id]/embed/+page.svelte

@@ -2,7 +2,7 @@
 	import { browser } from '$app/environment';
 	import { afterNavigate, replaceState } from '$app/navigation';
 	import { theme } from '@sveltejs/site-kit/state';
-	import Repl from '@sveltejs/repl';
+	import { Repl } from '@sveltejs/repl';
 	import { mapbox_setup } from '../../../../../config.js';
 	import { page } from '$app/state';
 	import { decode_and_decompress_text } from '../gzip.js';

packages/repl/package.json

@@ -24,9 +24,9 @@
 	"homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/repl/#readme",
 	"exports": {
 		".": {
-			"types": "./src/lib/Repl.svelte",
-			"svelte": "./src/lib/Repl.svelte",
-			"default": "./src/lib/Repl.svelte"
+			"types": "./src/lib/public.d.ts",
+			"svelte": "./src/lib/index.ts",
+			"default": "./src/lib/index.ts"
 		},
 		"./bundler": {
 			"types": "./src/lib/Bundler.ts",
@@ -93,7 +93,6 @@
 		"@sveltejs/svelte-json-tree": "^2.2.1",
 		"acorn": "^8.11.3",
 		"codemirror": "^6.0.1",
-		"editor": "workspace:*",
 		"esm-env": "^1.0.0",
 		"esrap": "^1.2.2",
 		"locate-character": "^3.0.0",

packages/repl/src/lib/Output/Viewer.svelte

@@ -11,8 +11,8 @@
 	import srcdoc_styles from './srcdoc/styles.css?raw';
 	import ErrorOverlay from './ErrorOverlay.svelte';
 	import type { CompileError } from 'svelte/compiler';
-	import type { Bundle } from '../types';
 	import type { Writable } from 'svelte/store';
+	import type { BundleResult } from '$lib/public';
 
 	export let error: Error | null;
 	/** status by Bundler class instance */
@@ -27,12 +27,12 @@
 	export let injectedCSS = '';
 	export let theme: 'light' | 'dark';
 	/** A store containing the current bundle result. Takes precedence over REPL context, if set */
-	export let bundle: Readable<Bundle | null> | undefined = undefined;
+	export let bundle: Writable<BundleResult | null> | undefined = undefined;
 	/** Called everytime a log is pushed. If this is set, the built-in console coming with the Viewer isn't shown */
 	export let onLog: ((logs: Log[]) => void) | undefined = undefined;
 
 	const context = get_repl_context();
-	bundle = bundle ?? context.bundle;
+	bundle ??= context.bundle;
 
 	let logs: Log[] = [];
 	let log_group_stack: Log[][] = [];
@@ -101,7 +101,7 @@
 
 	$: if (ready) proxy?.iframe_command('set_theme', { theme });
 
-	async function apply_bundle($bundle: Bundle | null | undefined) {
+	async function apply_bundle($bundle: BundleResult | null | undefined) {
 		if (!$bundle) return;
 
 		try {

packages/repl/src/lib/Repl.svelte

@@ -9,7 +9,7 @@
 	import { set_repl_context } from './context.js';
 	import { Workspace, type File } from './Workspace.svelte.js';
 	import Editor from './Editor/Editor.svelte';
-	import type { Bundle, ReplContext } from './types.js';
+	import type { ReplContext } from './types.js';
 
 	interface Props {
 		svelteVersion?: string;
@@ -100,7 +100,7 @@
 		const result = await bundler!.bundle(workspace.files as File[], {
 			tailwind: workspace.tailwind
 		});
-		if (token === current_token) $bundle = result as Bundle;
+		if (token === current_token) $bundle = result;
 	}
 
 	async function migrate() {

packages/repl/src/lib/index.ts

@@ -0,0 +1 @@
+export { default as Repl } from './Repl.svelte';

packages/repl/src/lib/public.d.ts

@@ -0,0 +1,12 @@
+import type { OutputChunk, RollupError } from '@rollup/browser';
+
+export interface BundleResult {
+	uid: number;
+	error: (RollupError & CompileError) | null;
+	client: OutputChunk | null; // TODO
+	server: OutputChunk | null; // TODO
+	tailwind: string | null;
+	imports: string[];
+}
+
+export * from './index';