From 0638baa3a17f8bea10f324bb1926238957086e12 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Tue, 19 Feb 2019 07:37:40 -0500
Subject: [PATCH] accommodate changes to stats/vars/warnings

---
 site/static/workers/bundler.js  | 15 ++++++++-------
 site/static/workers/compiler.js |  6 ++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/site/static/workers/bundler.js b/site/static/workers/bundler.js
index 66179bc400..de2152c19e 100644
--- a/site/static/workers/bundler.js
+++ b/site/static/workers/bundler.js
@@ -99,18 +99,19 @@ async function getBundle(mode, cache, lookup) {
 
 					const name = id.replace(/^\.\//, '').replace(/\.svelte$/, '');
 
-					const { js, css, stats } = svelte.compile(code, Object.assign({
+					const { js, stats, warnings } = svelte.compile(code, Object.assign({
 						generate: mode,
 						format: 'esm',
 						name: name,
-						filename: name + '.svelte',
-						onwarn: warning => {
-							console.warn(warning.message);
-							console.log(warning.frame);
-							warningCount += 1;
-						},
+						filename: name + '.svelte'
 					}, commonCompilerOptions));
 
+					(warnings || stats.warnings).forEach(warning => { // TODO remove stats post-launch
+						console.warn(warning.message);
+						console.log(warning.frame);
+						warningCount += 1;
+					});
+
 					return js;
 				}
 			}],
diff --git a/site/static/workers/compiler.js b/site/static/workers/compiler.js
index b01d72dc08..fd185db843 100644
--- a/site/static/workers/compiler.js
+++ b/site/static/workers/compiler.js
@@ -31,13 +31,15 @@ const commonCompilerOptions = {
 
 function compile({ source, options, entry }) {
 	try {
-		const { js, css, stats } = svelte.compile(
+		const { js, css, stats, vars } = svelte.compile(
 			source,
 			Object.assign({}, commonCompilerOptions, options)
 		);
 
+		vars = vars || stats.vars; // TODO remove this post-launch
+
 		const props = entry
-			? stats.vars.map(v => v.export_name).filter(Boolean)
+			? vars.map(v => v.export_name).filter(Boolean)
 			: null;
 
 		return { js: js.code, css: css.code, props };