From 1b963f8f1f1fe0d6caa53e8fb5383f88390d8f45 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 13 Nov 2019 07:35:07 -0500
Subject: [PATCH 1/2] some cleanup

---
 src/CodeMirror.svelte              | 5 ++---
 src/Input/ComponentSelector.svelte | 2 +-
 src/Input/ModuleEditor.svelte      | 2 +-
 src/Output/Viewer.svelte           | 6 ++----
 src/Repl.svelte                    | 9 +--------
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/CodeMirror.svelte b/src/CodeMirror.svelte
index 45a0403..b5b6bfb 100644
--- a/src/CodeMirror.svelte
+++ b/src/CodeMirror.svelte
@@ -5,7 +5,7 @@
 	let _CodeMirror;
 
 	if (is_browser) {
-		codemirror_promise = import(/* webpackChunkName: "codemirror" */ './codemirror.js');
+		codemirror_promise = import('./codemirror.js');
 
 		codemirror_promise.then(mod => {
 			_CodeMirror = mod.default;
@@ -14,11 +14,10 @@
 </script>
 
 <script>
-	import { onMount, beforeUpdate, createEventDispatcher, getContext } from 'svelte';
+	import { onMount, createEventDispatcher } from 'svelte';
 	import Message from './Message.svelte';
 
 	const dispatch = createEventDispatcher();
-	const { navigate } = getContext('REPL');
 
 	export let readonly = false;
 	export let errorLoc = null;
diff --git a/src/Input/ComponentSelector.svelte b/src/Input/ComponentSelector.svelte
index 7d75ed2..2b68253 100644
--- a/src/Input/ComponentSelector.svelte
+++ b/src/Input/ComponentSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { getContext, createEventDispatcher } from 'svelte';
+	import { getContext } from 'svelte';
 
 	export let handle_select;
 
diff --git a/src/Input/ModuleEditor.svelte b/src/Input/ModuleEditor.svelte
index 19a846a..b6922df 100644
--- a/src/Input/ModuleEditor.svelte
+++ b/src/Input/ModuleEditor.svelte
@@ -3,7 +3,7 @@
 	import CodeMirror from '../CodeMirror.svelte';
 	import Message from '../Message.svelte';
 
-	const { bundle, selected, handle_change, navigate, register_module_editor } = getContext('REPL');
+	const { bundle, selected, handle_change, register_module_editor } = getContext('REPL');
 
 	export let errorLoc;
 
diff --git a/src/Output/Viewer.svelte b/src/Output/Viewer.svelte
index f64bcca..c9cfde5 100644
--- a/src/Output/Viewer.svelte
+++ b/src/Output/Viewer.svelte
@@ -1,13 +1,11 @@
 <script>
-	import { onMount, createEventDispatcher, getContext } from 'svelte';
+	import { onMount, getContext } from 'svelte';
 	import getLocationFromStack from './getLocationFromStack.js';
 	import ReplProxy from './ReplProxy.js';
 	import Message from '../Message.svelte';
 	import srcdoc from './srcdoc/index.js';
-	import { decode } from 'sourcemap-codec';
 
-	const dispatch = createEventDispatcher();
-	const { bundle, navigate } = getContext('REPL');
+	const { bundle } = getContext('REPL');
 
 	export let error; // TODO should this be exposed as a prop?
 
diff --git a/src/Repl.svelte b/src/Repl.svelte
index 8b56030..45f9e0a 100644
--- a/src/Repl.svelte
+++ b/src/Repl.svelte
@@ -1,8 +1,7 @@
 <script>
-	import { onMount, setContext, createEventDispatcher } from 'svelte';
+	import { setContext, createEventDispatcher } from 'svelte';
 	import { writable } from 'svelte/store';
 	import SplitPane from './SplitPane.svelte';
-	import CodeMirror from './CodeMirror.svelte';
 	import ComponentSelector from './Input/ComponentSelector.svelte';
 	import ModuleEditor from './Input/ModuleEditor.svelte';
 	import Output from './Output/index.svelte';
@@ -21,12 +20,6 @@
 	export let injectedCSS = '';
 
 	export function toJSON() {
-		// TODO there's a bug here — Svelte hoists this function because
-		// it wrongly things that $components is global. Needs to
-		// factor in $ variables when determining hoistability
-
-		svelteUrl; // workaround
-
 		return {
 			imports: $bundle.imports,
 			components: $components

From 7f6d55536bb06343431efe4907dd0a5091f04b26 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 13 Nov 2019 07:57:33 -0500
Subject: [PATCH 2/2] use loopGuardTimeout: 100 when supported

---
 src/workers/bundler/index.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/workers/bundler/index.js b/src/workers/bundler/index.js
index b763e04..1d3dd93 100644
--- a/src/workers/bundler/index.js
+++ b/src/workers/bundler/index.js
@@ -38,10 +38,6 @@ self.addEventListener('message', event => {
 	}
 });
 
-const common_options = {
-	dev: true,
-};
-
 let cached = {
 	dom: {},
 	ssr: {}
@@ -80,9 +76,17 @@ async function follow_redirects(url) {
 	return res.url;
 }
 
+function compare_to_version(major, minor, patch) {
+	const v = svelte.VERSION.match(/^(\d+)\.(\d+)\.(\d+)/);
+	return (v[1] - major) || (v[2] - minor) || (v[3] - patch);
+}
+
 function is_legacy_package_structure() {
-	const [, major, minor, patch] = svelte.VERSION.match(/^(\d+)\.(\d+)\.(\d+)/);
-	return ((major - 3) || (minor - 4) || (patch - 4)) <= 0;
+	return compare_to_version(3, 4, 4) <= 0;
+}
+
+function has_loopGuardTimeout_feature() {
+	return compare_to_version(3, 14, 0) >= 0;
 }
 
 async function get_bundle(uid, mode, cache, lookup) {
@@ -180,9 +184,12 @@ async function get_bundle(uid, mode, cache, lookup) {
 				: svelte.compile(code, Object.assign({
 					generate: mode,
 					format: 'esm',
+					dev: true,
 					name,
 					filename: name + '.svelte'
-				}, common_options));
+				}, has_loopGuardTimeout_feature() && {
+					loopGuardTimeout: 100
+				}));
 
 			new_cache[id] = { code, result };