From 891d8d9ed319dff0f84246781068070498325645 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Fri, 22 Feb 2019 21:36:25 -0500
Subject: [PATCH] update svelte and sapper, workaround #2127

---
 site/package-lock.json                        | 114 +++++++++++-------
 site/package.json                             |  20 +--
 site/rollup.config.js                         |   2 +-
 site/src/routes/_layout.svelte                |   9 +-
 .../repl/_components/Input/index.svelte       |   3 +-
 .../repl/_components/Output/Viewer.svelte     |  27 ++---
 .../repl/_components/Output/index.svelte      |   3 +-
 7 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/site/package-lock.json b/site/package-lock.json
index a1e899703d..64075c1043 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -14,27 +14,57 @@
       }
     },
     "@babel/core": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz",
-      "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.3.3.tgz",
+      "integrity": "sha512-w445QGI2qd0E0GlSnq6huRZWPMmQGCp5gd5ZWS4hagn0EiwzxD5QMFkpchyusAyVC1n27OKXzQ0/88aVU9n4xQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.2.2",
+        "@babel/generator": "^7.3.3",
         "@babel/helpers": "^7.2.0",
-        "@babel/parser": "^7.2.2",
+        "@babel/parser": "^7.3.3",
         "@babel/template": "^7.2.2",
         "@babel/traverse": "^7.2.2",
-        "@babel/types": "^7.2.2",
+        "@babel/types": "^7.3.3",
         "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
         "json5": "^2.1.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "@babel/generator": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz",
+          "integrity": "sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.3.3",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz",
+          "integrity": "sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+          "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -800,9 +830,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "10.12.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-      "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
+      "version": "11.9.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz",
+      "integrity": "sha512-Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA==",
       "dev": true
     },
     "accepts": {
@@ -815,9 +845,9 @@
       }
     },
     "acorn": {
-      "version": "6.0.7",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.7.tgz",
-      "integrity": "sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+      "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
       "dev": true
     },
     "ansi-regex": {
@@ -1126,9 +1156,9 @@
       }
     },
     "chokidar": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.0.tgz",
-      "integrity": "sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
+      "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
@@ -1231,9 +1261,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.43.0.tgz",
-      "integrity": "sha512-mljwQWUaWIf85I7QwTBryF2ASaIvmYAL4s5UCanCJFfKeXOKhrqdHWdHiZWAMNT+hjLTCnVx2S/SYTORIgxsgA=="
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.44.0.tgz",
+      "integrity": "sha512-3l42syTNakCdCQuYeZJXTyxina6Y9i4V0ighSJXNCQtRbaCN76smKKLu1ZHPHQon3rnzC7l4i/0r4gp809K1wg=="
     },
     "collection-visit": {
       "version": "1.0.0",
@@ -3125,9 +3155,9 @@
       }
     },
     "marked": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.0.tgz",
-      "integrity": "sha512-HduzIW2xApSXKXJSpCipSxKyvMbwRRa/TwMbepmlZziKdH8548WSoDP4SxzulEKjlo8BE39l+2fwJZuRKOln6g=="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+      "integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="
     },
     "math-random": {
       "version": "1.0.4",
@@ -3382,9 +3412,9 @@
       "dev": true
     },
     "now": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/now/-/now-13.1.3.tgz",
-      "integrity": "sha512-DYRaOqYblnyXF8Awzy/1+mCWjXESxVe7H9phXRGOUm6Vu2dXuJ07yOU37BYESmRue+Aw4sc51W2duzkhwBuCOA==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/now/-/now-14.0.0.tgz",
+      "integrity": "sha512-zOdmN6+6dLTiHCDujp683KRWG4BE6OwIGU++aZXmss8C4GXuKuZU/Bp7czhwnzab/2qs8OtlaTW6eibcNNV0xA==",
       "dev": true
     },
     "npm-run-all": {
@@ -4034,14 +4064,14 @@
       }
     },
     "rollup": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.1.2.tgz",
-      "integrity": "sha512-OkdMxqMl8pWoQc5D8y1cIinYQPPLV8ZkfLgCzL6SytXeNA2P7UHynEQXI9tYxuAjAMsSyvRaWnyJDLHMxq0XAg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.2.2.tgz",
+      "integrity": "sha512-fsn5KJcfSuejjrv8GV7kZNciElqxyzZdUq8rA3e528JsR3ccxrWwoptyUY8GGLlgMFAQMB3dZW8nWF2I1/xrZA==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
         "@types/node": "*",
-        "acorn": "^6.0.5"
+        "acorn": "^6.1.0"
       }
     },
     "rollup-plugin-babel": {
@@ -4076,14 +4106,14 @@
       }
     },
     "rollup-plugin-node-resolve": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz",
-      "integrity": "sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz",
+      "integrity": "sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==",
       "dev": true,
       "requires": {
         "builtin-modules": "^3.0.0",
         "is-module": "^1.0.0",
-        "resolve": "^1.8.1"
+        "resolve": "^1.10.0"
       }
     },
     "rollup-plugin-replace": {
@@ -4098,9 +4128,9 @@
       }
     },
     "rollup-plugin-svelte": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-5.0.1.tgz",
-      "integrity": "sha512-iwm4ANbdoEQqoCL8m70R3F2Oe/auSr0zIOBVVJWx7IMSkzFZjhd0PeqzKe3BWCllLAnBXIbqTSOHmU2mnvy0SA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-5.0.3.tgz",
+      "integrity": "sha512-3W/jbtBcsxohKQMI1Po2ZsUHRGUy3vEtgXLHvBin1+ms3wl2eomSyYBV7pwrkh6tWok9BVzdxGQgd7IqibG+Ew==",
       "dev": true,
       "requires": {
         "require-relative": "^0.8.7",
@@ -4261,9 +4291,9 @@
       }
     },
     "sapper": {
-      "version": "0.26.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.26.0-alpha.8.tgz",
-      "integrity": "sha512-2Tre33WHBBBYbXQLmVlgALK4AEJ2QD9l6zRJT+w6CSqw+74fegw50XQcLbnzRxjNQ9menQPpaJE1hmz6jTAwxg==",
+      "version": "0.26.0-alpha.9",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.26.0-alpha.9.tgz",
+      "integrity": "sha512-3CnC8rQWgVv8IfqSgWV+MXfn+f/ZKMISQBwPsSBBX0x+vBckfmLZ31omKDRDyVnit1WgzFW4mXW/I3PdqRVMZw==",
       "dev": true,
       "requires": {
         "html-minifier": "^3.5.21",
@@ -4729,9 +4759,9 @@
       }
     },
     "svelte": {
-      "version": "3.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.0.0-beta.3.tgz",
-      "integrity": "sha512-kEPbvpmzZqVsUMgMQ1DFx1W+05hWiHVSQaQYPv55AzcCAeXHRZD9N55Pv4LKH6sOHvvNhkb4GVLSK2yBQZn5CQ==",
+      "version": "3.0.0-beta.8",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.0.0-beta.8.tgz",
+      "integrity": "sha512-9cJHYdEs5h/6TJPwY+vfzwrznCLDjfS1rlJQz8SzPKfUJHCPxnDCbIZ95iPzATkv8aLHGcn1a/nLthyG+xh2IQ==",
       "dev": true
     },
     "tar": {
diff --git a/site/package.json b/site/package.json
index a542d2dd9c..fcc3c23e9b 100644
--- a/site/package.json
+++ b/site/package.json
@@ -15,7 +15,7 @@
     "stage": "now"
   },
   "dependencies": {
-    "codemirror": "^5.43.0",
+    "codemirror": "^5.44.0",
     "compression": "^1.7.3",
     "devalue": "^1.1.0",
     "do-not-zip": "^1.0.0",
@@ -23,7 +23,7 @@
     "express": "^4.16.4",
     "express-session": "^1.15.6",
     "golden-fleece": "^1.0.9",
-    "marked": "^0.6.0",
+    "marked": "^0.6.1",
     "node-fetch": "^2.3.0",
     "passport": "^0.4.0",
     "passport-github": "^1.1.0",
@@ -34,25 +34,25 @@
     "yootils": "0.0.14"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.2",
+    "@babel/core": "^7.3.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.2.0",
     "@babel/preset-env": "^7.3.1",
     "@babel/runtime": "^7.3.1",
-    "chokidar": "^2.1.0",
+    "chokidar": "^2.1.2",
     "degit": "^2.1.3",
     "eslint-plugin-svelte3": "git+https://github.com/sveltejs/eslint-plugin-svelte3.git#semver:*",
-    "now": "^13.1.3",
+    "now": "^14.0.0",
     "npm-run-all": "^4.1.5",
-    "rollup": "^1.1.2",
+    "rollup": "^1.2.2",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-node-resolve": "^4.0.1",
     "rollup-plugin-replace": "^2.1.0",
-    "rollup-plugin-svelte": "^5.0.1",
+    "rollup-plugin-svelte": "^5.0.3",
     "rollup-plugin-terser": "^4.0.4",
-    "sapper": "^0.26.0-alpha.8",
-    "svelte": "^3.0.0-beta.3"
+    "sapper": "^0.26.0-alpha.9",
+    "svelte": "^3.0.0-beta.8"
   }
 }
diff --git a/site/rollup.config.js b/site/rollup.config.js
index e5c230ba8e..48f5559a8c 100644
--- a/site/rollup.config.js
+++ b/site/rollup.config.js
@@ -31,7 +31,7 @@ export default {
 			json(),
 
 			legacy && babel({
-				extensions: ['.js', '.html'],
+				extensions: ['.js', '.mjs', '.html', '.svelte'],
 				runtimeHelpers: true,
 				exclude: ['node_modules/@babel/**'],
 				presets: [
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index b9cc668e95..386c27ac39 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -1,18 +1,19 @@
 <script>
+	import { page } from '@sapper/app';
 	import InlineSvg from '../components/InlineSvg.svelte';
 	import Nav from '../components/TopNav.svelte';
 
-	export let child;
+	export let segment;
 	export let path;
 </script>
 
 <InlineSvg />
-{#if path !== '/repl/embed'}
-	<Nav segment={child.segment} />
+{#if $page.path !== '/repl/embed'}
+	<Nav {segment}/>
 {/if}
 
 <main>
-	<svelte:component this={child.component} {...child.props} />
+	<slot></slot>
 </main>
 
 <style>
diff --git a/site/src/routes/repl/_components/Input/index.svelte b/site/src/routes/repl/_components/Input/index.svelte
index d858257b3d..0e824dd389 100644
--- a/site/src/routes/repl/_components/Input/index.svelte
+++ b/site/src/routes/repl/_components/Input/index.svelte
@@ -2,9 +2,8 @@
 	import ComponentSelector from './ComponentSelector.svelte';
 	import ModuleEditor from './ModuleEditor.svelte';
 
-	export let component_store;
 	export let selected_store;
-
+	export let component_store;
 	export let error;
 	export let errorLoc;
 	export let warningCount;
diff --git a/site/src/routes/repl/_components/Output/Viewer.svelte b/site/src/routes/repl/_components/Output/Viewer.svelte
index f4e9f868fa..e204b3c79d 100644
--- a/site/src/routes/repl/_components/Output/Viewer.svelte
+++ b/site/src/routes/repl/_components/Output/Viewer.svelte
@@ -6,10 +6,10 @@
 
 	const dispatch = createEventDispatcher();
 
+	export let values_store;
 	export let bundle;
 	export let dom;
 	export let ssr;
-	export let values_store;
 	export let props;
 	export let sourceError;
 	export let error;
@@ -17,7 +17,7 @@
 	export function setProp(prop, value) {
 		if (!replProxy) return;
 		replProxy.setProp(prop, value);
-	}		
+	}
 
 	let hasComponent = false;
 
@@ -74,7 +74,7 @@
 	});
 	onMount(() => {
 		replProxy = new ReplProxy(refs.child);
-	
+
 		refs.child.addEventListener('load', () => {
 
 			replProxy.onPropUpdate = (prop, value) => {
@@ -87,9 +87,9 @@
 			replProxy.onFetchProgress = (progress) => {
 				pendingImports = progress
 			}
-			
+
 			replProxy.handleLinks();
-			
+
 			let promise = null;
 			let updating = false;
 
@@ -108,7 +108,7 @@
 
 				const destroyComponent = () => {
 					replProxy.eval(`if (window.component)
-										 window.component.\$destroy(); 
+										 window.component.\$destroy();
 									window.component = null`);
 				};
 
@@ -120,7 +120,7 @@
 						destroyComponent();
 						toDestroy = null;
 					}
-			
+
 					if (ssr) { // this only gets generated if component uses lifecycle hooks
 						pending = true;
 						createHtml();
@@ -153,7 +153,7 @@
 						error = e;
 					});
 				};
-				
+
 				const createComponent = () => {
 					// remove leftover styles from SSR renderer
 					if (ssr) removeStyles();
@@ -184,7 +184,7 @@
 						error = e;
 					});
 				};
-				
+
 				// Download the imports (sets them on iframe window when complete)
 			 	{
 					let cancelled = false;
@@ -198,7 +198,7 @@
 							error = e;
 						});
 				}
-		
+
 				run = () => {
 					pending = false;
 
@@ -221,7 +221,7 @@
 				init();
 			};
 
-			
+
 		});
 	});
 
@@ -232,11 +232,6 @@
 
 	$: bundle_handler(bundle);
 	$: props_handler(props);
-
-	// pending https://github.com/sveltejs/svelte/issues/1889
-	$: {
-		$values_store;
-	}
 </script>
 
 <style>
diff --git a/site/src/routes/repl/_components/Output/index.svelte b/site/src/routes/repl/_components/Output/index.svelte
index b97ec17aa6..aea23e51d1 100644
--- a/site/src/routes/repl/_components/Output/index.svelte
+++ b/site/src/routes/repl/_components/Output/index.svelte
@@ -5,13 +5,14 @@
 	import PropEditor from './PropEditor.svelte';
 	import CodeMirror from '../CodeMirror.svelte';
 
+	export let values_store;
+
 	export let bundle;
 	export let js;
 	export let css;
 	export let dom;
 	export let ssr;
 	export let props;
-	export let values_store;
 	export let json5;
 	export let sourceError;
 	export let sourceErrorLoc;