From cf7c7d15eda52e0c6da08e8dd7b10805e6679910 Mon Sep 17 00:00:00 2001
From: Vlad Glushchuk <vgluschuk@gmail.com>
Date: Mon, 8 Apr 2019 20:28:16 +0200
Subject: [PATCH 01/24] Add bind:text and bind:html support for contenteditable
 elements

Fixes #310
---
 src/compile/nodes/Element.ts                  | 21 ++++++++-
 .../render-dom/wrappers/Element/Binding.ts    | 16 +++++++
 .../render-dom/wrappers/Element/index.ts      |  6 +++
 src/compile/render-ssr/handlers/Element.ts    | 23 +++++++---
 .../samples/contenteditable-html/_config.js   | 43 +++++++++++++++++++
 .../samples/contenteditable-html/main.svelte  |  6 +++
 .../samples/contenteditable-text/_config.js   | 37 ++++++++++++++++
 .../samples/contenteditable-text/main.svelte  |  6 +++
 .../contenteditable-dynamic/errors.json       | 15 +++++++
 .../contenteditable-dynamic/input.svelte      |  6 +++
 .../contenteditable-missing/errors.json       | 15 +++++++
 .../contenteditable-missing/input.svelte      |  4 ++
 12 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 test/runtime/samples/contenteditable-html/_config.js
 create mode 100644 test/runtime/samples/contenteditable-html/main.svelte
 create mode 100644 test/runtime/samples/contenteditable-text/_config.js
 create mode 100644 test/runtime/samples/contenteditable-text/main.svelte
 create mode 100644 test/validator/samples/contenteditable-dynamic/errors.json
 create mode 100644 test/validator/samples/contenteditable-dynamic/input.svelte
 create mode 100644 test/validator/samples/contenteditable-missing/errors.json
 create mode 100644 test/validator/samples/contenteditable-missing/input.svelte

diff --git a/src/compile/nodes/Element.ts b/src/compile/nodes/Element.ts
index bc1991c57e..2838129e36 100644
--- a/src/compile/nodes/Element.ts
+++ b/src/compile/nodes/Element.ts
@@ -570,7 +570,26 @@ export default class Element extends Node {
 						message: `'${binding.name}' is not a valid binding on void elements like <${this.name}>. Use a wrapper element instead`
 					});
 				}
-			} else if (name !== 'this') {
+			} else if (
+				name === 'text' ||
+				name === 'html'
+			){
+				const contenteditable = this.attributes.find(
+					(attribute: Attribute) => attribute.name === 'contenteditable'
+				);
+
+				if (!contenteditable) {
+					component.error(binding, {
+						code: `missing-contenteditable-attribute`,
+						message: `'contenteditable' attribute is required for text and html two-way bindings`
+					});
+				} else if (contenteditable && !contenteditable.is_static) {
+					component.error(contenteditable, {
+						code: `dynamic-contenteditable-attribute`,
+						message: `'contenteditable' attribute cannot be dynamic if element uses two-way binding`
+					});
+				}
+		} else if (name !== 'this') {
 				component.error(binding, {
 					code: `invalid-binding`,
 					message: `'${binding.name}' is not a valid binding`
diff --git a/src/compile/render-dom/wrappers/Element/Binding.ts b/src/compile/render-dom/wrappers/Element/Binding.ts
index 828d664001..d0e5375aef 100644
--- a/src/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compile/render-dom/wrappers/Element/Binding.ts
@@ -201,6 +201,14 @@ function get_dom_updater(
 		return `${element.var}.checked = ${condition};`
 	}
 
+	if (binding.node.name === 'text') {
+		return `${element.var}.textContent = ${binding.snippet};`;
+	}
+
+	if (binding.node.name === 'html') {
+		return `${element.var}.innerHTML = ${binding.snippet};`;
+	}
+
 	return `${element.var}.${binding.node.name} = ${binding.snippet};`;
 }
 
@@ -313,6 +321,14 @@ function get_value_from_dom(
 		return `@time_ranges_to_array(this.${name})`
 	}
 
+	if (name === 'text') {
+		return `this.textContent`;
+	}
+
+	if (name === 'html') {
+		return `this.innerHTML`;
+	}
+
 	// everything else
 	return `this.${name}`;
 }
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compile/render-dom/wrappers/Element/index.ts
index 80a8308b93..10a56eaace 100644
--- a/src/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compile/render-dom/wrappers/Element/index.ts
@@ -29,6 +29,12 @@ const events = [
 			node.name === 'textarea' ||
 			node.name === 'input' && !/radio|checkbox|range/.test(node.get_static_attribute_value('type'))
 	},
+	{
+		event_names: ['input'],
+		filter: (node: Element, name: string) =>
+			(name === 'text' || name === 'html') &&
+			node.attributes.some(attribute => attribute.name === 'contenteditable')
+	},
 	{
 		event_names: ['change'],
 		filter: (node: Element, name: string) =>
diff --git a/src/compile/render-ssr/handlers/Element.ts b/src/compile/render-ssr/handlers/Element.ts
index 0c2cdc489e..f38bc0e151 100644
--- a/src/compile/render-ssr/handlers/Element.ts
+++ b/src/compile/render-ssr/handlers/Element.ts
@@ -48,7 +48,12 @@ const boolean_attributes = new Set([
 
 export default function(node, renderer, options) {
 	let opening_tag = `<${node.name}`;
-	let textarea_contents; // awkward special case
+	let node_contents; // awkward special case
+	const contenteditable = (
+		node.name !== 'textarea' &&
+		node.name !== 'input' &&
+		node.attributes.some((attribute: Node) => attribute.name === 'contenteditable')
+	);
 
 	const slot = node.get_static_attribute_value('slot');
 	if (slot && node.has_ancestor('InlineComponent')) {
@@ -77,7 +82,7 @@ export default function(node, renderer, options) {
 				args.push(snip(attribute.expression));
 			} else {
 				if (attribute.name === 'value' && node.name === 'textarea') {
-					textarea_contents = stringify_attribute(attribute, true);
+					node_contents = stringify_attribute(attribute, true);
 				} else if (attribute.is_true) {
 					args.push(`{ ${quote_name_if_necessary(attribute.name)}: true }`);
 				} else if (
@@ -99,7 +104,7 @@ export default function(node, renderer, options) {
 			if (attribute.type !== 'Attribute') return;
 
 			if (attribute.name === 'value' && node.name === 'textarea') {
-				textarea_contents = stringify_attribute(attribute, true);
+				node_contents = stringify_attribute(attribute, true);
 			} else if (attribute.is_true) {
 				opening_tag += ` ${attribute.name}`;
 			} else if (
@@ -128,6 +133,14 @@ export default function(node, renderer, options) {
 
 		if (name === 'group') {
 			// TODO server-render group bindings
+		} else if (contenteditable && (node === 'text' || node === 'html')) {
+			const snippet = snip(expression)
+			if (name == 'text') {
+				node_contents = '${@escape(' + snippet + ')}'
+			} else {
+				// Do not escape HTML content
+				node_contents = '${' + snippet + '}'
+			}
 		} else {
 			const snippet = snip(expression);
 			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
@@ -142,8 +155,8 @@ export default function(node, renderer, options) {
 
 	renderer.append(opening_tag);
 
-	if (node.name === 'textarea' && textarea_contents !== undefined) {
-		renderer.append(textarea_contents);
+	if ((node.name === 'textarea' || contenteditable) && node_contents !== undefined) {
+		renderer.append(node_contents);
 	} else {
 		renderer.render(node.children, options);
 	}
diff --git a/test/runtime/samples/contenteditable-html/_config.js b/test/runtime/samples/contenteditable-html/_config.js
new file mode 100644
index 0000000000..cd2a822655
--- /dev/null
+++ b/test/runtime/samples/contenteditable-html/_config.js
@@ -0,0 +1,43 @@
+export default {
+	props: {
+		name: '<b>world</b>',
+	},
+
+	html: `
+		<editor><b>world</b></editor>
+		<p>hello <b>world</b></p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello <b>world</b></p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const el = target.querySelector('editor');
+		assert.equal(el.innerHTML, '<b>world</b>');
+
+		el.innerHTML = 'every<span>body</span>';
+
+        // No updates to data yet
+		assert.htmlEqual(target.innerHTML, `
+			<editor>every<span>body</span></editor>
+			<p>hello <b>world</b></p>
+		`);
+
+        // Handle user input
+        const event = new window.Event('input');
+		await el.dispatchEvent(event);
+		assert.htmlEqual(target.innerHTML, `
+			<editor>every<span>body</span></editor>
+			<p>hello every<span>body</span></p>
+		`);
+
+		component.name = 'good<span>bye</span>';
+		assert.equal(el.innerHTML, 'good<span>bye</span>');
+		assert.htmlEqual(target.innerHTML, `
+			<editor>good<span>bye</span></editor>
+			<p>hello good<span>bye</span></p>
+		`);
+	},
+};
diff --git a/test/runtime/samples/contenteditable-html/main.svelte b/test/runtime/samples/contenteditable-html/main.svelte
new file mode 100644
index 0000000000..53b4e81c88
--- /dev/null
+++ b/test/runtime/samples/contenteditable-html/main.svelte
@@ -0,0 +1,6 @@
+<script>
+    export let name;
+</script>
+
+<editor contenteditable="true" bind:html={name}></editor>
+<p>hello {@html name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/contenteditable-text/_config.js b/test/runtime/samples/contenteditable-text/_config.js
new file mode 100644
index 0000000000..4935a3a9a7
--- /dev/null
+++ b/test/runtime/samples/contenteditable-text/_config.js
@@ -0,0 +1,37 @@
+export default {
+	props: {
+		name: 'world',
+	},
+
+	html: `
+		<editor>world</editor>
+		<p>hello world</p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true">world</editor>
+		<p>hello world</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const el = target.querySelector('editor');
+		assert.equal(el.textContent, 'world');
+
+		const event = new window.Event('input');
+
+		el.textContent = 'everybody';
+		await el.dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<editor>everybody</editor>
+			<p>hello everybody</p>
+		`);
+
+		component.name = 'goodbye';
+		assert.equal(el.textContent, 'goodbye');
+		assert.htmlEqual(target.innerHTML, `
+			<editor>goodbye</editor>
+			<p>hello goodbye</p>
+		`);
+	},
+};
diff --git a/test/runtime/samples/contenteditable-text/main.svelte b/test/runtime/samples/contenteditable-text/main.svelte
new file mode 100644
index 0000000000..a71d9f0c5b
--- /dev/null
+++ b/test/runtime/samples/contenteditable-text/main.svelte
@@ -0,0 +1,6 @@
+<script>
+    export let name;
+</script>
+
+<editor contenteditable="true" bind:text={name}></editor>
+<p>hello {name}</p>
\ No newline at end of file
diff --git a/test/validator/samples/contenteditable-dynamic/errors.json b/test/validator/samples/contenteditable-dynamic/errors.json
new file mode 100644
index 0000000000..0c4c5585a6
--- /dev/null
+++ b/test/validator/samples/contenteditable-dynamic/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "dynamic-contenteditable-attribute",
+	"message": "'contenteditable' attribute cannot be dynamic if element uses two-way binding",
+	"start": {
+		"line": 6,
+		"column": 8,
+		"character": 73
+	},
+	"end": {
+		"line": 6,
+		"column": 32,
+		"character": 97
+	},
+	"pos": 73
+}]
\ No newline at end of file
diff --git a/test/validator/samples/contenteditable-dynamic/input.svelte b/test/validator/samples/contenteditable-dynamic/input.svelte
new file mode 100644
index 0000000000..97d2c9228c
--- /dev/null
+++ b/test/validator/samples/contenteditable-dynamic/input.svelte
@@ -0,0 +1,6 @@
+<script>
+    export let name;
+
+    let toggle = false;
+</script>
+<editor contenteditable={toggle} bind:html={name}></editor>
diff --git a/test/validator/samples/contenteditable-missing/errors.json b/test/validator/samples/contenteditable-missing/errors.json
new file mode 100644
index 0000000000..9cadb20629
--- /dev/null
+++ b/test/validator/samples/contenteditable-missing/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "missing-contenteditable-attribute",
+	"message": "'contenteditable' attribute is required for text and html two-way bindings",
+	"start": {
+		"line": 4,
+		"column": 8,
+		"character": 48
+	},
+	"end": {
+		"line": 4,
+		"column": 24,
+		"character": 64
+	},
+	"pos": 48
+}]
\ No newline at end of file
diff --git a/test/validator/samples/contenteditable-missing/input.svelte b/test/validator/samples/contenteditable-missing/input.svelte
new file mode 100644
index 0000000000..47f125894a
--- /dev/null
+++ b/test/validator/samples/contenteditable-missing/input.svelte
@@ -0,0 +1,4 @@
+<script>
+    export let name;
+</script>
+<editor bind:text={name}></editor>

From 8deee95f141f32cd027467eb7c1d2bb8ff597007 Mon Sep 17 00:00:00 2001
From: Vlad Glushchuk <vgluschuk@gmail.com>
Date: Mon, 8 Apr 2019 20:56:52 +0200
Subject: [PATCH 02/24] Fix a typo

---
 src/compile/render-ssr/handlers/Element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compile/render-ssr/handlers/Element.ts b/src/compile/render-ssr/handlers/Element.ts
index f38bc0e151..cefe44ede8 100644
--- a/src/compile/render-ssr/handlers/Element.ts
+++ b/src/compile/render-ssr/handlers/Element.ts
@@ -133,7 +133,7 @@ export default function(node, renderer, options) {
 
 		if (name === 'group') {
 			// TODO server-render group bindings
-		} else if (contenteditable && (node === 'text' || node === 'html')) {
+		} else if (contenteditable && (name === 'text' || name === 'html')) {
 			const snippet = snip(expression)
 			if (name == 'text') {
 				node_contents = '${@escape(' + snippet + ')}'

From e3de705cb821de586e5f78fabc4b09692e846276 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 9 Jun 2019 23:31:20 -0400
Subject: [PATCH 03/24] initialise text/html bindings if necessary

---
 src/compiler/compile/nodes/Element.ts         |  4 +-
 .../render-dom/wrappers/Element/Binding.ts    | 28 +++++--------
 .../render-dom/wrappers/Element/index.ts      | 20 ++++++----
 .../compile/render-ssr/handlers/Element.ts    | 24 +++++++----
 .../_config.js                                | 40 +++++++++++++++++++
 .../main.svelte                               |  8 ++++
 .../_config.js                                |  6 +--
 .../main.svelte                               |  2 +-
 .../_config.js                                | 34 ++++++++++++++++
 .../main.svelte                               |  8 ++++
 .../_config.js                                |  0
 .../main.svelte                               |  2 +-
 12 files changed, 138 insertions(+), 38 deletions(-)
 create mode 100644 test/runtime/samples/binding-contenteditable-html-initial/_config.js
 create mode 100644 test/runtime/samples/binding-contenteditable-html-initial/main.svelte
 rename test/runtime/samples/{contenteditable-html => binding-contenteditable-html}/_config.js (89%)
 rename test/runtime/samples/{contenteditable-html => binding-contenteditable-html}/main.svelte (62%)
 create mode 100644 test/runtime/samples/binding-contenteditable-text-initial/_config.js
 create mode 100644 test/runtime/samples/binding-contenteditable-text-initial/main.svelte
 rename test/runtime/samples/{contenteditable-text => binding-contenteditable-text}/_config.js (100%)
 rename test/runtime/samples/{contenteditable-text => binding-contenteditable-text}/main.svelte (66%)

diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index c37ea5020a..3e883200a7 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -610,7 +610,7 @@ export default class Element extends Node {
 			} else if (
 				name === 'text' ||
 				name === 'html'
-			){
+			) {
 				const contenteditable = this.attributes.find(
 					(attribute: Attribute) => attribute.name === 'contenteditable'
 				);
@@ -626,7 +626,7 @@ export default class Element extends Node {
 						message: `'contenteditable' attribute cannot be dynamic if element uses two-way binding`
 					});
 				}
-		} else if (name !== 'this') {
+			} else if (name !== 'this') {
 				component.error(binding, {
 					code: `invalid-binding`,
 					message: `'${binding.name}' is not a valid binding`
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index 22f1f682e4..7de661e3d1 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -133,6 +133,14 @@ export default class BindingWrapper {
 				break;
 			}
 
+			case 'text':
+				update_conditions.push(`${this.snippet} !== ${parent.var}.textContent`);
+				break;
+
+			case 'html':
+				update_conditions.push(`${this.snippet} !== ${parent.var}.innerHTML`);
+				break;
+
 			case 'currentTime':
 			case 'playbackRate':
 			case 'volume':
@@ -162,7 +170,9 @@ export default class BindingWrapper {
 			);
 		}
 
-		if (!/(currentTime|paused)/.test(this.node.name)) {
+		if (this.node.name === 'html' || this.node.name === 'text') {
+			block.builders.mount.add_block(`if (${this.snippet} !== void 0) ${update_dom}`);
+		} else if (!/(currentTime|paused)/.test(this.node.name)) {
 			block.builders.mount.add_block(update_dom);
 		}
 	}
@@ -198,14 +208,6 @@ function get_dom_updater(
 		return `${element.var}.checked = ${condition};`;
 	}
 
-	if (binding.node.name === 'text') {
-		return `if (${binding.snippet} !== ${element.var}.textContent) ${element.var}.textContent = ${binding.snippet};`;
-	}
-
-	if (binding.node.name === 'html') {
-		return `if (${binding.snippet} !== ${element.var}.innerHTML) ${element.var}.innerHTML = ${binding.snippet};`;
-	}
-
 	if (binding.node.name === 'text') {
 		return `${element.var}.textContent = ${binding.snippet};`;
 	}
@@ -334,14 +336,6 @@ function get_value_from_dom(
 		return `this.innerHTML`;
 	}
 
-	if (name === 'text') {
-		return `this.textContent`;
-	}
-
-	if (name === 'html') {
-		return `this.innerHTML`;
-	}
-
 	// everything else
 	return `this.${name}`;
 }
diff --git a/src/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
index c63ebf1693..527a101f6a 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/index.ts
@@ -33,12 +33,6 @@ const events = [
 			(name === 'text' || name === 'html') &&
 			node.attributes.some(attribute => attribute.name === 'contenteditable')
 	},
-	{
-		event_names: ['change'],
-		filter: (node: Element, name: string) =>
-			(name === 'text' || name === 'html') &&
-			node.attributes.some(attribute => attribute.name === 'contenteditable')
-	},
 	{
 		event_names: ['change'],
 		filter: (node: Element, _name: string) =>
@@ -514,7 +508,19 @@ export default class ElementWrapper extends Wrapper {
 				.map(binding => `${binding.snippet} === void 0`)
 				.join(' || ');
 
-			if (this.node.name === 'select' || group.bindings.find(binding => binding.node.name === 'indeterminate' || binding.is_readonly_media_attribute())) {
+			const should_initialise = (
+				this.node.name === 'select' ||
+				group.bindings.find(binding => {
+					return (
+						binding.node.name === 'indeterminate' ||
+						binding.node.name === 'text' ||
+						binding.node.name === 'html' ||
+						binding.is_readonly_media_attribute()
+					);
+				})
+			);
+
+			if (should_initialise) {
 				const callback = has_local_function ? handler : `() => ${callee}.call(${this.var})`;
 				block.builders.hydrate.add_line(
 					`if (${some_initial_state_is_undefined}) @add_render_callback(${callback});`
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index 681e0d4c7b..fb9b935f9a 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -53,7 +53,11 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 	slot_scopes: Map<any, any>;
 }) {
 	let opening_tag = `<${node.name}`;
-	let node_contents; // awkward special case
+
+	// awkward special case
+	let node_contents;
+	let value;
+
 	const contenteditable = (
 		node.name !== 'textarea' &&
 		node.name !== 'input' &&
@@ -151,16 +155,16 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 		if (name === 'group') {
 			// TODO server-render group bindings
 		} else if (contenteditable && (name === 'text' || name === 'html')) {
-			const snippet = snip(expression)
+			node_contents = snip(expression);
 			if (name == 'text') {
-				node_contents = '${@escape(' + snippet + ')}'
+				value = '@escape($$value)';
 			} else {
 				// Do not escape HTML content
-				node_contents = '${' + snippet + '}'
+				value = '$$value';
 			}
 		} else if (binding.name === 'value' && node.name === 'textarea') {
 			const snippet = snip(expression);
-			node_contents='${(' + snippet + ') || ""}';
+			node_contents = '${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
 			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
@@ -175,8 +179,14 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 
 	renderer.append(opening_tag);
 
-	if ((node.name === 'textarea' || contenteditable) && node_contents !== undefined) {
-		renderer.append(node_contents);
+	if (node_contents !== undefined) {
+		if (contenteditable) {
+			renderer.append('${($$value => $$value === void 0 ? `');
+			renderer.render(node.children, options);
+			renderer.append('` : ' + value + ')(' + node_contents + ')}');
+		} else {
+			renderer.append(node_contents);
+		}
 	} else {
 		renderer.render(node.children, options);
 	}
diff --git a/test/runtime/samples/binding-contenteditable-html-initial/_config.js b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
new file mode 100644
index 0000000000..0b1f656a54
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
@@ -0,0 +1,40 @@
+export default {
+	html: `
+		<editor><b>world</b></editor>
+		<p>hello <b>world</b></p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello undefined</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		assert.equal(component.name, '<b>world</b>');
+
+		const el = target.querySelector('editor');
+
+		el.innerHTML = 'every<span>body</span>';
+
+		// No updates to data yet
+		assert.htmlEqual(target.innerHTML, `
+			<editor>every<span>body</span></editor>
+			<p>hello <b>world</b></p>
+		`);
+
+		// Handle user input
+		const event = new window.Event('input');
+		await el.dispatchEvent(event);
+		assert.htmlEqual(target.innerHTML, `
+			<editor>every<span>body</span></editor>
+			<p>hello every<span>body</span></p>
+		`);
+
+		component.name = 'good<span>bye</span>';
+		assert.equal(el.innerHTML, 'good<span>bye</span>');
+		assert.htmlEqual(target.innerHTML, `
+			<editor>good<span>bye</span></editor>
+			<p>hello good<span>bye</span></p>
+		`);
+	},
+};
diff --git a/test/runtime/samples/binding-contenteditable-html-initial/main.svelte b/test/runtime/samples/binding-contenteditable-html-initial/main.svelte
new file mode 100644
index 0000000000..1c05a0950d
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-html-initial/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:html={name}>
+	<b>world</b>
+</editor>
+<p>hello {@html name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/contenteditable-html/_config.js b/test/runtime/samples/binding-contenteditable-html/_config.js
similarity index 89%
rename from test/runtime/samples/contenteditable-html/_config.js
rename to test/runtime/samples/binding-contenteditable-html/_config.js
index cd2a822655..013fa30f39 100644
--- a/test/runtime/samples/contenteditable-html/_config.js
+++ b/test/runtime/samples/binding-contenteditable-html/_config.js
@@ -19,14 +19,14 @@ export default {
 
 		el.innerHTML = 'every<span>body</span>';
 
-        // No updates to data yet
+		// No updates to data yet
 		assert.htmlEqual(target.innerHTML, `
 			<editor>every<span>body</span></editor>
 			<p>hello <b>world</b></p>
 		`);
 
-        // Handle user input
-        const event = new window.Event('input');
+		// Handle user input
+		const event = new window.Event('input');
 		await el.dispatchEvent(event);
 		assert.htmlEqual(target.innerHTML, `
 			<editor>every<span>body</span></editor>
diff --git a/test/runtime/samples/contenteditable-html/main.svelte b/test/runtime/samples/binding-contenteditable-html/main.svelte
similarity index 62%
rename from test/runtime/samples/contenteditable-html/main.svelte
rename to test/runtime/samples/binding-contenteditable-html/main.svelte
index 53b4e81c88..09195ed558 100644
--- a/test/runtime/samples/contenteditable-html/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-html/main.svelte
@@ -1,5 +1,5 @@
 <script>
-    export let name;
+	export let name;
 </script>
 
 <editor contenteditable="true" bind:html={name}></editor>
diff --git a/test/runtime/samples/binding-contenteditable-text-initial/_config.js b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
new file mode 100644
index 0000000000..7345687d29
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
@@ -0,0 +1,34 @@
+export default {
+	html: `
+		<editor><b>world</b></editor>
+		<p>hello world</p>
+	`,
+
+	ssrHtml: `
+		<editor contenteditable="true"><b>world</b></editor>
+		<p>hello undefined</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		assert.equal(component.name, 'world');
+
+		const el = target.querySelector('editor');
+
+		const event = new window.Event('input');
+
+		el.textContent = 'everybody';
+		await el.dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<editor>everybody</editor>
+			<p>hello everybody</p>
+		`);
+
+		component.name = 'goodbye';
+		assert.equal(el.textContent, 'goodbye');
+		assert.htmlEqual(target.innerHTML, `
+			<editor>goodbye</editor>
+			<p>hello goodbye</p>
+		`);
+	},
+};
diff --git a/test/runtime/samples/binding-contenteditable-text-initial/main.svelte b/test/runtime/samples/binding-contenteditable-text-initial/main.svelte
new file mode 100644
index 0000000000..633d268f43
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-text-initial/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:text={name}>
+	<b>world</b>
+</editor>
+<p>hello {name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/contenteditable-text/_config.js b/test/runtime/samples/binding-contenteditable-text/_config.js
similarity index 100%
rename from test/runtime/samples/contenteditable-text/_config.js
rename to test/runtime/samples/binding-contenteditable-text/_config.js
diff --git a/test/runtime/samples/contenteditable-text/main.svelte b/test/runtime/samples/binding-contenteditable-text/main.svelte
similarity index 66%
rename from test/runtime/samples/contenteditable-text/main.svelte
rename to test/runtime/samples/binding-contenteditable-text/main.svelte
index a71d9f0c5b..c47f5ee477 100644
--- a/test/runtime/samples/contenteditable-text/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-text/main.svelte
@@ -1,5 +1,5 @@
 <script>
-    export let name;
+	export let name;
 </script>
 
 <editor contenteditable="true" bind:text={name}></editor>

From 4f626c45a9f520414d395543b2104b645f3688d0 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 9 Jun 2019 23:35:09 -0400
Subject: [PATCH 04/24] tidy up, prevent collisions

---
 src/compiler/compile/render-ssr/handlers/Element.ts | 11 +++--------
 src/runtime/internal/ssr.ts                         |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index fb9b935f9a..4029a7f579 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -156,23 +156,18 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 			// TODO server-render group bindings
 		} else if (contenteditable && (name === 'text' || name === 'html')) {
 			node_contents = snip(expression);
-			if (name == 'text') {
-				value = '@escape($$value)';
-			} else {
-				// Do not escape HTML content
-				value = '$$value';
-			}
+			value = name === 'text' ? '@escape($$value)' : '$$value';
 		} else if (binding.name === 'value' && node.name === 'textarea') {
 			const snippet = snip(expression);
 			node_contents = '${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
-			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
+			opening_tag += ' ${($$value => $$value ? ("' + name + '" + ($$value === true ? "" : "=" + JSON.stringify($$value))) : "")(' + snippet + ')}';
 		}
 	});
 
 	if (add_class_attribute) {
-		opening_tag += `\${((v) => v ? ' class="' + v + '"' : '')([${class_expression}].join(' ').trim())}`;
+		opening_tag += `\${(($$value) => $$value ? ' class="' + $$value + '"' : '')([${class_expression}].join(' ').trim())}`;
 	}
 
 	opening_tag += '>';
diff --git a/src/runtime/internal/ssr.ts b/src/runtime/internal/ssr.ts
index c80b4d9f45..f88f704779 100644
--- a/src/runtime/internal/ssr.ts
+++ b/src/runtime/internal/ssr.ts
@@ -118,4 +118,4 @@ export function get_store_value<T>(store: Readable<T>): T | undefined {
 	let value;
 	store.subscribe(_ => value = _)();
 	return value;
-}
+}
\ No newline at end of file

From b589289b557e441f337647d00fcd239367804ed7 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 9 Jun 2019 23:50:04 -0400
Subject: [PATCH 05/24] use helpers

---
 src/compiler/compile/render-ssr/handlers/Element.ts | 4 ++--
 src/runtime/internal/ssr.ts                         | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index 4029a7f579..0c2181a605 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -162,12 +162,12 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 			node_contents = '${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
-			opening_tag += ' ${($$value => $$value ? ("' + name + '" + ($$value === true ? "" : "=" + JSON.stringify($$value))) : "")(' + snippet + ')}';
+			opening_tag += '${@add_attribute("' + name + '", ' + snippet + ')}';
 		}
 	});
 
 	if (add_class_attribute) {
-		opening_tag += `\${(($$value) => $$value ? ' class="' + $$value + '"' : '')([${class_expression}].join(' ').trim())}`;
+		opening_tag += `\${@add_classes([${class_expression}].join(' ').trim())}`;
 	}
 
 	opening_tag += '>';
diff --git a/src/runtime/internal/ssr.ts b/src/runtime/internal/ssr.ts
index f88f704779..91d6e452fe 100644
--- a/src/runtime/internal/ssr.ts
+++ b/src/runtime/internal/ssr.ts
@@ -118,4 +118,13 @@ export function get_store_value<T>(store: Readable<T>): T | undefined {
 	let value;
 	store.subscribe(_ => value = _)();
 	return value;
+}
+
+export function add_attribute(name, value) {
+	if (!value) return '';
+	return ` ${name}${value === true ? '' : `=${JSON.stringify(value)}`}`;
+}
+
+export function add_classes(classes) {
+	return classes ? ` class="${classes}"` : ``;
 }
\ No newline at end of file

From 2ac599357144f015e19ed373e04deb81225f37cd Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 5 Jun 2019 19:21:16 -0400
Subject: [PATCH 06/24] import globals from helpers (#2612) (#2947)

---
 src/compiler/compile/render-dom/index.ts             | 12 ++++++------
 .../compile/render-dom/wrappers/AwaitBlock.ts        |  4 ++--
 .../compile/render-dom/wrappers/EachBlock.ts         |  4 ++--
 .../compile/render-ssr/handlers/InlineComponent.ts   |  2 +-
 src/runtime/internal/globals.ts                      |  5 +++++
 src/runtime/internal/index.ts                        |  1 +
 src/runtime/internal/utils.ts                        |  2 +-
 test/js/samples/debug-empty/expected.js              |  3 +++
 test/js/samples/debug-foo-bar-baz-things/expected.js |  3 +++
 test/js/samples/debug-foo/expected.js                |  3 +++
 test/js/samples/debug-hoisted/expected.js            |  1 +
 test/js/samples/deconflict-builtins/expected.js      |  1 +
 .../dev-warning-missing-data-computed/expected.js    |  3 +++
 test/js/samples/each-block-array-literal/expected.js |  1 +
 test/js/samples/each-block-changed-check/expected.js |  1 +
 .../js/samples/each-block-keyed-animated/expected.js |  2 ++
 test/js/samples/each-block-keyed/expected.js         |  2 ++
 test/runtime/index.js                                |  1 +
 18 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/runtime/internal/globals.ts

diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
index 46aa705bfb..a9941b838f 100644
--- a/src/compiler/compile/render-dom/index.ts
+++ b/src/compiler/compile/render-dom/index.ts
@@ -57,7 +57,7 @@ export default function dom(
 
 	if (options.dev && !options.hydratable) {
 		block.builders.claim.add_line(
-			'throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");'
+			'throw new @Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");'
 		);
 	}
 
@@ -106,7 +106,7 @@ export default function dom(
 		} else if (component.compile_options.dev) {
 			body.push(deindent`
 				get ${x.export_name}() {
-					throw new Error("<${component.tag}>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+					throw new @Error("<${component.tag}>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 				}
 			`);
 		}
@@ -122,14 +122,14 @@ export default function dom(
 			} else if (component.compile_options.dev) {
 				body.push(deindent`
 					set ${x.export_name}(value) {
-						throw new Error("<${component.tag}>: Cannot set read-only property '${x.export_name}'");
+						throw new @Error("<${component.tag}>: Cannot set read-only property '${x.export_name}'");
 					}
 				`);
 			}
 		} else if (component.compile_options.dev) {
 			body.push(deindent`
 				set ${x.export_name}(value) {
-					throw new Error("<${component.tag}>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+					throw new @Error("<${component.tag}>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 				}
 			`);
 		}
@@ -145,7 +145,7 @@ export default function dom(
 				const props = ${options.customElement ? `this.attributes` : `options.props || {}`};
 				${expected.map(prop => deindent`
 				if (ctx.${prop.name} === undefined && !('${prop.export_name}' in props)) {
-					console.warn("<${component.tag}> was created without expected prop '${prop.export_name}'");
+					@console.warn("<${component.tag}> was created without expected prop '${prop.export_name}'");
 				}`)}
 			`;
 		}
@@ -402,7 +402,7 @@ export default function dom(
 		if (component.compile_options.dev && !component.var_lookup.has('$$props') && writable_props.length) {
 			unknown_props_check = deindent`
 				const writable_props = [${writable_props.map(prop => `'${prop.export_name}'`).join(', ')}];
-				Object.keys($$props).forEach(key => {
+				@Object.keys($$props).forEach(key => {
 					if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
 				});
 			`;
diff --git a/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
index c7af29a073..73ca3fe4f5 100644
--- a/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
@@ -142,7 +142,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 			this.catch.block.name && `catch: ${this.catch.block.name}`,
 			this.then.block.name && `value: '${this.node.value}'`,
 			this.catch.block.name && `error: '${this.node.error}'`,
-			this.pending.block.has_outro_method && `blocks: Array(3)`
+			this.pending.block.has_outro_method && `blocks: [,,,]`
 		].filter(Boolean);
 
 		block.builders.init.add_block(deindent`
@@ -230,4 +230,4 @@ export default class AwaitBlockWrapper extends Wrapper {
 			branch.fragment.render(branch.block, null, 'nodes');
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
index a1a875a12f..dddf415557 100644
--- a/src/compiler/compile/render-dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
@@ -190,7 +190,7 @@ export default class EachBlockWrapper extends Wrapper {
 
 		renderer.blocks.push(deindent`
 			function ${this.vars.get_each_context}(ctx, list, i) {
-				const child_ctx = Object.create(ctx);
+				const child_ctx = @Object.create(ctx);
 				${this.context_props}
 				return child_ctx;
 			}
@@ -296,7 +296,7 @@ export default class EachBlockWrapper extends Wrapper {
 		const lookup = block.get_unique_name(`${this.var}_lookup`);
 
 		block.add_variable(iterations, '[]');
-		block.add_variable(lookup, `new Map()`);
+		block.add_variable(lookup, `new @Map()`);
 
 		if (this.fragment.nodes[0].is_dom_node()) {
 			this.block.first = this.fragment.nodes[0].var;
diff --git a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
index 94fdcfd434..2f407df523 100644
--- a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
+++ b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
@@ -52,7 +52,7 @@ export default function(node: InlineComponent, renderer: Renderer, options: Rend
 	let props;
 
 	if (uses_spread) {
-		props = `Object.assign(${
+		props = `@Object.assign(${
 			node.attributes
 				.map(attribute => {
 					if (attribute.is_spread) {
diff --git a/src/runtime/internal/globals.ts b/src/runtime/internal/globals.ts
new file mode 100644
index 0000000000..91a8e4a16d
--- /dev/null
+++ b/src/runtime/internal/globals.ts
@@ -0,0 +1,5 @@
+import { is_client } from './utils';
+
+const { console, Error, Map, Object } = (is_client ? window : global) as { console, Error, Map, Object };
+
+export { console, Error, Map, Object };
diff --git a/src/runtime/internal/index.ts b/src/runtime/internal/index.ts
index 6487f04525..b5ef3e398e 100644
--- a/src/runtime/internal/index.ts
+++ b/src/runtime/internal/index.ts
@@ -1,6 +1,7 @@
 export * from './animations';
 export * from './await-block';
 export * from './dom';
+export * from './globals';
 export * from './keyed-each';
 export * from './lifecycle';
 export * from './loop';
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 152c0e79b0..5766ac26a5 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -90,7 +90,7 @@ export function once(fn) {
 	}
 }
 
-const is_client = typeof window !== 'undefined';
+export const is_client = typeof window !== 'undefined';
 
 export let now: () => number = is_client
 	? () => window.performance.now()
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index 6f07993590..2e4f9feb13 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -1,8 +1,11 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Error,
+	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
+	console,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index eea35d5ba7..c083ea29c3 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -1,8 +1,11 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Error,
+	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
+	console,
 	destroy_each,
 	detach,
 	element,
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index 5b931d9464..46096466c1 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -1,8 +1,11 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Error,
+	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
+	console,
 	destroy_each,
 	detach,
 	element,
diff --git a/test/js/samples/debug-hoisted/expected.js b/test/js/samples/debug-hoisted/expected.js
index 51d8bf63a3..7f1b7535f3 100644
--- a/test/js/samples/debug-hoisted/expected.js
+++ b/test/js/samples/debug-hoisted/expected.js
@@ -1,5 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Error,
 	SvelteComponentDev,
 	init,
 	noop,
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 3294778aa3..85f3c31597 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -1,5 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index 5c4b2ece1b..d61f8f3de3 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -1,8 +1,11 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Error,
+	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
+	console,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index 455cb2f25f..934c5cfe92 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -1,5 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index 951565bae4..4ed8756b9a 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -1,5 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index ec28e60d5f..9e777f25ee 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -1,5 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Map,
+	Object,
 	SvelteComponent,
 	append,
 	create_animation,
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index efb58ebf6a..7ac66a09a7 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -1,5 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import {
+	Map,
+	Object,
 	SvelteComponent,
 	append,
 	destroy_block,
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 77879edc1f..900f3087fc 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -125,6 +125,7 @@ describe("runtime", () => {
 
 					// Put things we need on window for testing
 					window.SvelteComponent = SvelteComponent;
+					window.Error = global.Error;
 
 					const target = window.document.querySelector("main");
 

From f60ae53d764c6d30a7827d19bc2406796a33fab0 Mon Sep 17 00:00:00 2001
From: mrkishi <mauriciokishi@gmail.com>
Date: Thu, 6 Jun 2019 10:29:09 -0300
Subject: [PATCH 07/24] deconflict more globals

---
 src/compiler/compile/Component.ts             | 25 ++++++-----
 src/compiler/compile/render-dom/Block.ts      |  2 +-
 src/compiler/compile/render-dom/index.ts      | 10 +++--
 .../compile/render-dom/wrappers/Body.ts       |  4 +-
 .../compile/render-dom/wrappers/DebugTag.ts   |  4 +-
 .../render-dom/wrappers/Element/Binding.ts    |  2 +-
 .../render-dom/wrappers/Element/index.ts      |  6 +--
 .../compile/render-dom/wrappers/Head.ts       |  2 +-
 .../compile/render-dom/wrappers/IfBlock.ts    |  2 +-
 .../render-dom/wrappers/RawMustacheTag.ts     |  2 +-
 .../compile/render-dom/wrappers/Title.ts      |  6 +--
 .../compile/render-dom/wrappers/Window.ts     | 38 ++++++++---------
 .../compile/render-ssr/handlers/Element.ts    |  2 +-
 src/runtime/internal/animations.ts            |  2 +-
 src/runtime/internal/dom.ts                   |  2 +
 src/runtime/internal/globals.ts               | 42 +++++++++++++++++--
 src/runtime/internal/style_manager.ts         |  1 +
 src/runtime/internal/utils.ts                 |  2 +
 test/helpers.js                               | 18 +++++---
 test/js/samples/bind-online/expected.js       |  4 +-
 .../expected.js                               |  1 +
 test/js/samples/css-media-query/expected.js   |  1 +
 .../css-shadow-dom-keyframes/expected.js      |  1 +
 test/js/samples/debug-hoisted/expected.js     |  1 +
 .../js/samples/head-no-whitespace/expected.js |  1 +
 test/js/samples/media-bindings/expected.js    |  2 +
 test/js/samples/title/expected.js             |  1 +
 .../samples/window-binding-scroll/expected.js |  5 ++-
 test/runtime/index.js                         | 10 +----
 .../samples/deconflict-globals/_config.js     | 14 +++++++
 .../samples/deconflict-globals/main.svelte    | 20 +++++++++
 test/test.js                                  |  4 ++
 32 files changed, 165 insertions(+), 72 deletions(-)
 create mode 100644 test/runtime/samples/deconflict-globals/_config.js
 create mode 100644 test/runtime/samples/deconflict-globals/main.svelte

diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 89c1e6b4f6..2ad2e2e428 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -101,7 +101,7 @@ export default class Component {
 	reactive_declaration_nodes: Set<Node> = new Set();
 	has_reactive_assignments = false;
 	injected_reactive_declaration_vars: Set<string> = new Set();
-	helpers: Set<string> = new Set();
+	helpers: Map<string, string> = new Map();
 
 	indirect_dependencies: Map<string, Set<string>> = new Map();
 
@@ -233,8 +233,9 @@ export default class Component {
 	}
 
 	helper(name: string) {
-		this.helpers.add(name);
-		return this.alias(name);
+		const alias = this.alias(name)
+		this.helpers.set(name, alias);
+		return alias;
 	}
 
 	generate(result: string) {
@@ -251,23 +252,21 @@ export default class Component {
 				.replace(/__svelte:self__/g, this.name)
 				.replace(compile_options.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (_match: string, sigil: string, name: string) => {
 					if (sigil === '@') {
-						if (internal_exports.has(name)) {
-							if (compile_options.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
-							this.helpers.add(name);
+						if (!internal_exports.has(name)) {
+							throw new Error(`compiler error: this shouldn't happen! generated code is trying to use inexistent internal '${name}'`);
+						}
+
+						if (compile_options.dev && internal_exports.has(`${name}Dev`)) {
+							name = `${name}Dev`;
 						}
 
-						return this.alias(name);
+						return this.helper(name);
 					}
 
 					return sigil.slice(1) + name;
 				});
 
-			const imported_helpers = Array.from(this.helpers)
-				.sort()
-				.map(name => {
-					const alias = this.alias(name);
-					return { name, alias };
-				});
+			const imported_helpers = Array.from(this.helpers, ([name, alias]) => ({ name, alias }));
 
 			const module = create_module(
 				result,
diff --git a/src/compiler/compile/render-dom/Block.ts b/src/compiler/compile/render-dom/Block.ts
index 0c585c5bf0..15e079ceb9 100644
--- a/src/compiler/compile/render-dom/Block.ts
+++ b/src/compiler/compile/render-dom/Block.ts
@@ -164,7 +164,7 @@ export default class Block {
 
 		if (parent_node) {
 			this.builders.mount.add_line(`@append(${parent_node}, ${name});`);
-			if (parent_node === 'document.head' && !no_detach) this.builders.destroy.add_line(`@detach(${name});`);
+			if (parent_node === '@document.head' && !no_detach) this.builders.destroy.add_line(`@detach(${name});`);
 		} else {
 			this.builders.mount.add_line(`@insert(#target, ${name}, anchor);`);
 			if (!no_detach) this.builders.destroy.add_conditional('detaching', `@detach(${name});`);
diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
index a9941b838f..1ba53e7691 100644
--- a/src/compiler/compile/render-dom/index.ts
+++ b/src/compiler/compile/render-dom/index.ts
@@ -36,13 +36,15 @@ export default function dom(
 		`${css.code}\n/*# sourceMappingURL=${css.map.toUrl()} */` :
 		css.code, { only_escape_at_symbol: true });
 
+	const add_css = component.get_unique_name('add_css');
+
 	if (styles && component.compile_options.css !== false && !options.customElement) {
 		builder.add_block(deindent`
-			function @add_css() {
+			function ${add_css}() {
 				var style = @element("style");
 				style.id = '${component.stylesheet.id}-style';
 				style.textContent = ${styles};
-				@append(document.head, style);
+				@append(@document.head, style);
 			}
 		`);
 	}
@@ -481,7 +483,7 @@ export default function dom(
 
 		if (component.tag != null) {
 			builder.add_block(deindent`
-				customElements.define("${component.tag}", ${name});
+				@customElements.define("${component.tag}", ${name});
 			`);
 		}
 	} else {
@@ -491,7 +493,7 @@ export default function dom(
 			class ${name} extends @${superclass} {
 				constructor(options) {
 					super(${options.dev && `options`});
-					${should_add_css && `if (!document.getElementById("${component.stylesheet.id}-style")) @add_css();`}
+					${should_add_css && `if (!@document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
 					@init(this, options, ${definition}, create_fragment, ${not_equal}, ${prop_names});
 
 					${dev_props_check}
diff --git a/src/compiler/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render-dom/wrappers/Body.ts
index 04e677a090..feb28ef8f6 100644
--- a/src/compiler/compile/render-dom/wrappers/Body.ts
+++ b/src/compiler/compile/render-dom/wrappers/Body.ts
@@ -11,11 +11,11 @@ export default class BodyWrapper extends Wrapper {
 			const snippet = handler.render(block);
 
 			block.builders.init.add_block(deindent`
-				document.body.addEventListener("${handler.name}", ${snippet});
+				@document.body.addEventListener("${handler.name}", ${snippet});
 			`);
 
 			block.builders.destroy.add_block(deindent`
-				document.body.removeEventListener("${handler.name}", ${snippet});
+				@document.body.removeEventListener("${handler.name}", ${snippet});
 			`);
 		});
 	}
diff --git a/src/compiler/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
index 713113921d..a600e26297 100644
--- a/src/compiler/compile/render-dom/wrappers/DebugTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
@@ -62,7 +62,7 @@ export default class DebugTagWrapper extends Wrapper {
 			block.builders.update.add_block(deindent`
 				if (${condition}) {
 					const { ${ctx_identifiers} } = ctx;
-					console.${log}({ ${logged_identifiers} });
+					@console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
@@ -70,7 +70,7 @@ export default class DebugTagWrapper extends Wrapper {
 			block.builders.create.add_block(deindent`
 				{
 					const { ${ctx_identifiers} } = ctx;
-					console.${log}({ ${logged_identifiers} });
+					@console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index 15ceabb356..dd31278774 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -136,7 +136,7 @@ export default class BindingWrapper {
 			case 'currentTime':
 			case 'playbackRate':
 			case 'volume':
-				update_conditions.push(`!isNaN(${this.snippet})`);
+				update_conditions.push(`!@isNaN(${this.snippet})`);
 				break;
 
 			case 'paused':
diff --git a/src/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
index 2f7452e8c6..3602ad301d 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/index.ts
@@ -270,7 +270,7 @@ export default class ElementWrapper extends Wrapper {
 				`@append(${parent_node}, ${node});`
 			);
 
-			if (parent_node === 'document.head') {
+			if (parent_node === '@document.head') {
 				block.builders.destroy.add_line(`@detach(${node});`);
 			}
 		} else {
@@ -379,7 +379,7 @@ export default class ElementWrapper extends Wrapper {
 		}
 
 		if (namespace) {
-			return `document.createElementNS("${namespace}", "${name}")`;
+			return `@document.createElementNS("${namespace}", "${name}")`;
 		}
 
 		return `@element("${name}")`;
@@ -465,7 +465,7 @@ export default class ElementWrapper extends Wrapper {
 				block.builders.init.add_block(deindent`
 					function ${handler}() {
 						${animation_frame && deindent`
-						cancelAnimationFrame(${animation_frame});
+						@cancelAnimationFrame(${animation_frame});
 						if (!${this.var}.paused) ${animation_frame} = @raf(${handler});`}
 						${needs_lock && `${lock} = true;`}
 						ctx.${handler}.call(${this.var}${contextual_dependencies.size > 0 ? ', ctx' : ''});
diff --git a/src/compiler/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render-dom/wrappers/Head.ts
index d942a69dc2..794506f1be 100644
--- a/src/compiler/compile/render-dom/wrappers/Head.ts
+++ b/src/compiler/compile/render-dom/wrappers/Head.ts
@@ -30,6 +30,6 @@ export default class HeadWrapper extends Wrapper {
 	}
 
 	render(block: Block, _parent_node: string, _parent_nodes: string) {
-		this.fragment.render(block, 'document.head', 'nodes');
+		this.fragment.render(block, '@document.head', 'nodes');
 	}
 }
diff --git a/src/compiler/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
index 46f17653a1..3634091b99 100644
--- a/src/compiler/compile/render-dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
@@ -154,7 +154,7 @@ export default class IfBlockWrapper extends Wrapper {
 
 		const vars = { name, anchor, if_name, has_else, has_transitions };
 
-		const detaching = (parent_node && parent_node !== 'document.head') ? '' : 'detaching';
+		const detaching = (parent_node && parent_node !== '@document.head') ? '' : 'detaching';
 
 		if (this.node.else) {
 			if (has_outros) {
diff --git a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
index 15a7d41861..3f09b134f8 100644
--- a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
@@ -22,7 +22,7 @@ export default class RawMustacheTagWrapper extends Tag {
 	render(block: Block, parent_node: string, parent_nodes: string) {
 		const name = this.var;
 
-		const in_head = parent_node === 'document.head';
+		const in_head = parent_node === '@document.head';
 		const needs_anchors = !parent_node || in_head;
 
 		// if in head always needs anchors
diff --git a/src/compiler/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render-dom/wrappers/Title.ts
index 456a833a8f..c7f702916c 100644
--- a/src/compiler/compile/render-dom/wrappers/Title.ts
+++ b/src/compiler/compile/render-dom/wrappers/Title.ts
@@ -68,9 +68,9 @@ export default class TitleWrapper extends Wrapper {
 			const init = this.node.should_cache ? `${last} = ${value}` : value;
 
 			block.builders.init.add_line(
-				`document.title = ${init};`
+				`@document.title = ${init};`
 			);
-			const updater = `document.title = ${this.node.should_cache ? last : value};`;
+			const updater = `@document.title = ${this.node.should_cache ? last : value};`;
 
 			if (all_dependencies.size) {
 				const dependencies = Array.from(all_dependencies);
@@ -95,7 +95,7 @@ export default class TitleWrapper extends Wrapper {
 				? stringify((this.node.children[0] as Text).data)
 				: '""';
 
-			block.builders.hydrate.add_line(`document.title = ${value};`);
+			block.builders.hydrate.add_line(`@document.title = ${value};`);
 		}
 	}
 }
diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts
index 585864664a..c267b806c9 100644
--- a/src/compiler/compile/render-dom/wrappers/Window.ts
+++ b/src/compiler/compile/render-dom/wrappers/Window.ts
@@ -44,8 +44,8 @@ export default class WindowWrapper extends Wrapper {
 		const events = {};
 		const bindings: Record<string, string> = {};
 
-		add_actions(component, block, 'window', this.node.actions);
-		add_event_handlers(block, 'window', this.node.handlers);
+		add_actions(component, block, '@window', this.node.actions);
+		add_event_handlers(block, '@window', this.node.handlers);
 
 		this.node.bindings.forEach(binding => {
 			// in dev mode, throw if read-only values are written to
@@ -92,29 +92,29 @@ export default class WindowWrapper extends Wrapper {
 
 				renderer.meta_bindings.add_block(deindent`
 					if (${condition}) {
-						window.scrollTo(${x || 'window.pageXOffset'}, ${y || 'window.pageYOffset'});
+						@window.scrollTo(${x || 'window.pageXOffset'}, ${y || 'window.pageYOffset'});
 					}
-					${x && `${x} = window.pageXOffset;`}
-					${y && `${y} = window.pageYOffset;`}
+					${x && `${x} = @window.pageXOffset;`}
+					${y && `${y} = @window.pageYOffset;`}
 				`);
 
 				block.event_listeners.push(deindent`
-					@listen(window, "${event}", () => {
+					@listen(@window, "${event}", () => {
 						${scrolling} = true;
-						clearTimeout(${scrolling_timeout});
-						${scrolling_timeout} = setTimeout(${clear_scrolling}, 100);
+						@clearTimeout(${scrolling_timeout});
+						${scrolling_timeout} = @setTimeout(${clear_scrolling}, 100);
 						ctx.${handler_name}();
 					})
 				`);
 			} else {
 				props.forEach(prop => {
 					renderer.meta_bindings.add_line(
-						`this._state.${prop.name} = window.${prop.value};`
+						`this._state.${prop.name} = @window.${prop.value};`
 					);
 				});
 
 				block.event_listeners.push(deindent`
-					@listen(window, "${event}", ctx.${handler_name})
+					@listen(@window, "${event}", ctx.${handler_name})
 				`);
 			}
 
@@ -126,7 +126,7 @@ export default class WindowWrapper extends Wrapper {
 
 			component.partly_hoisted.push(deindent`
 				function ${handler_name}() {
-					${props.map(prop => `${prop.name} = window.${prop.value}; $$invalidate('${prop.name}', ${prop.name});`)}
+					${props.map(prop => `${prop.name} = @window.${prop.value}; $$invalidate('${prop.name}', ${prop.name});`)}
 				}
 			`);
 
@@ -146,13 +146,13 @@ export default class WindowWrapper extends Wrapper {
 					).join(' || ')
 				} && !${scrolling}) {
 					${scrolling} = true;
-					clearTimeout(${scrolling_timeout});
-					window.scrollTo(${
-						bindings.scrollX ? `ctx.${bindings.scrollX}` : `window.pageXOffset`
+					@clearTimeout(${scrolling_timeout});
+					@window.scrollTo(${
+						bindings.scrollX ? `ctx.${bindings.scrollX}` : `@window.pageXOffset`
 					}, ${
-						bindings.scrollY ? `ctx.${bindings.scrollY}` : `window.pageYOffset`
+						bindings.scrollY ? `ctx.${bindings.scrollY}` : `@window.pageYOffset`
 					});
-					${scrolling_timeout} = setTimeout(${clear_scrolling}, 100);
+					${scrolling_timeout} = @setTimeout(${clear_scrolling}, 100);
 				}
 			`);
 		}
@@ -170,7 +170,7 @@ export default class WindowWrapper extends Wrapper {
 
 			component.partly_hoisted.push(deindent`
 				function ${handler_name}() {
-					${name} = navigator.onLine; $$invalidate('${name}', ${name});
+					${name} = @navigator.onLine; $$invalidate('${name}', ${name});
 				}
 			`);
 
@@ -179,8 +179,8 @@ export default class WindowWrapper extends Wrapper {
 			`);
 
 			block.event_listeners.push(
-				`@listen(window, "online", ctx.${handler_name})`,
-				`@listen(window, "offline", ctx.${handler_name})`
+				`@listen(@window, "online", ctx.${handler_name})`,
+				`@listen(@window, "offline", ctx.${handler_name})`
 			);
 
 			component.has_reactive_assignments = true;
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index 681e0d4c7b..637b76aad5 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -163,7 +163,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 			node_contents='${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
-			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
+			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + @JSON.stringify(v))) : "")(' + snippet + ')}';
 		}
 	});
 
diff --git a/src/runtime/internal/animations.ts b/src/runtime/internal/animations.ts
index 77c86aff0e..0997e9ae23 100644
--- a/src/runtime/internal/animations.ts
+++ b/src/runtime/internal/animations.ts
@@ -2,7 +2,7 @@ import { identity as linear, noop, now } from './utils';
 import { loop } from './loop';
 import { create_rule, delete_rule } from './style_manager';
 import { AnimationConfig } from '../animate';
-
+import { getComputedStyle } from './globals';
 
 //todo: documentation says it is DOMRect, but in IE it would be ClientRect
 type PositionRect = DOMRect|ClientRect;
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index f65d07117c..c1e16de447 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -1,3 +1,5 @@
+import { document, getComputedStyle, navigator } from './globals';
+
 export function append(target: Node, node: Node) {
 	target.appendChild(node);
 }
diff --git a/src/runtime/internal/globals.ts b/src/runtime/internal/globals.ts
index 91a8e4a16d..789290388e 100644
--- a/src/runtime/internal/globals.ts
+++ b/src/runtime/internal/globals.ts
@@ -1,5 +1,41 @@
-import { is_client } from './utils';
+const {
+	// ecmascript
+	Error,
+	JSON,
+	Map,
+	Object,
+	console,
+	isNaN,
 
-const { console, Error, Map, Object } = (is_client ? window : global) as { console, Error, Map, Object };
+	// dom
+	cancelAnimationFrame,
+	clearTimeout,
+	customElements,
+	document,
+	getComputedStyle,
+	navigator,
+	requestAnimationFrame,
+	setTimeout: export_setTimeout, // TODO: remove when upgrading typescript, bug
+	window: export_window,
+} = (window || global) as unknown as typeof globalThis;
 
-export { console, Error, Map, Object };
+export {
+	// ecmascript
+	Error,
+	JSON,
+	Map,
+	Object,
+	console,
+	isNaN,
+
+	// dom
+	cancelAnimationFrame,
+	clearTimeout,
+	customElements,
+	document,
+	getComputedStyle,
+	navigator,
+	requestAnimationFrame,
+	export_setTimeout as setTimeout,
+	export_window as window,
+};
diff --git a/src/runtime/internal/style_manager.ts b/src/runtime/internal/style_manager.ts
index 2721200627..db8c0e9d17 100644
--- a/src/runtime/internal/style_manager.ts
+++ b/src/runtime/internal/style_manager.ts
@@ -1,5 +1,6 @@
 import { element } from './dom';
 import { raf } from './utils';
+import { document } from './globals';
 
 let stylesheet;
 let active = 0;
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 5766ac26a5..8624c2246a 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -1,3 +1,5 @@
+import { requestAnimationFrame } from './globals';
+
 export function noop() {}
 
 export const identity = x => x;
diff --git a/test/helpers.js b/test/helpers.js
index e07d7c9b06..2e6878f8a5 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -28,7 +28,7 @@ export function exists(path) {
 
 export function tryToLoadJson(file) {
 	try {
-		return JSON.parse(fs.readFileSync(file));
+		return JSON.parse(fs.readFileSync(file, 'utf-8'));
 	} catch (err) {
 		if (err.code !== 'ENOENT') throw err;
 		return null;
@@ -44,14 +44,20 @@ export function tryToReadFile(file) {
 	}
 }
 
-export const virtualConsole = new jsdom.VirtualConsole();
-const { window } = new jsdom.JSDOM('<main></main>', {virtualConsole});
+const virtualConsole = new jsdom.VirtualConsole();
+virtualConsole.sendTo(console);
+
+global.window = new jsdom.JSDOM('<main></main>', {virtualConsole}).window;
 global.document = window.document;
-global.getComputedStyle = window.getComputedStyle;
-global.navigator = {userAgent: 'fake'};
+
+// add missing ecmascript globals to window
+for (const key of Object.getOwnPropertyNames(global)) {
+	window[key] = window[key] || global[key];
+}
 
 export function env() {
 	window._svelteTransitionManager = null;
+	window.document.title = '';
 	window.document.body.innerHTML = '<main></main>';
 
 	return window;
@@ -120,7 +126,7 @@ export function normalizeHtml(window, html) {
 			.replace(/<!--.*?-->/g, '')
 			.replace(/>[\s\r\n]+</g, '><')
 			.trim();
-		cleanChildren(node, '');
+		cleanChildren(node);
 		return node.innerHTML.replace(/<\/?noscript\/?>/g, '');
 	} catch (err) {
 		throw new Error(`Failed to normalize HTML:\n${html}`);
diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js
index 0c9faa3ef6..9c3fdb7385 100644
--- a/test/js/samples/bind-online/expected.js
+++ b/test/js/samples/bind-online/expected.js
@@ -4,9 +4,11 @@ import {
 	add_render_callback,
 	init,
 	listen,
+	navigator,
 	noop,
 	run_all,
-	safe_not_equal
+	safe_not_equal,
+	window
 } from "svelte/internal";
 
 function create_fragment(ctx) {
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index 12164d0579..ed01b6430f 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -3,6 +3,7 @@ import {
 	SvelteComponent,
 	append,
 	detach,
+	document,
 	element,
 	init,
 	insert,
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index d4be134376..8a99d70e8e 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -3,6 +3,7 @@ import {
 	SvelteComponent,
 	append,
 	detach,
+	document,
 	element,
 	init,
 	insert,
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 9f70b8ec66..3be52803d7 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -1,6 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteElement,
+	customElements,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/debug-hoisted/expected.js b/test/js/samples/debug-hoisted/expected.js
index 7f1b7535f3..799f0d4b32 100644
--- a/test/js/samples/debug-hoisted/expected.js
+++ b/test/js/samples/debug-hoisted/expected.js
@@ -2,6 +2,7 @@
 import {
 	Error,
 	SvelteComponentDev,
+	console,
 	init,
 	noop,
 	safe_not_equal
diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js
index b95177bba7..859891e689 100644
--- a/test/js/samples/head-no-whitespace/expected.js
+++ b/test/js/samples/head-no-whitespace/expected.js
@@ -3,6 +3,7 @@ import {
 	SvelteComponent,
 	append,
 	detach,
+	document,
 	element,
 	init,
 	noop,
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index f45f9ce8db..ec30a98161 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -2,10 +2,12 @@
 import {
 	SvelteComponent,
 	add_render_callback,
+	cancelAnimationFrame,
 	detach,
 	element,
 	init,
 	insert,
+	isNaN,
 	listen,
 	noop,
 	raf,
diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js
index 884f39e246..2e551ae426 100644
--- a/test/js/samples/title/expected.js
+++ b/test/js/samples/title/expected.js
@@ -1,6 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteComponent,
+	document,
 	init,
 	noop,
 	safe_not_equal
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index 18f5210bea..1e63973518 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -3,6 +3,7 @@ import {
 	SvelteComponent,
 	add_render_callback,
 	append,
+	clearTimeout,
 	detach,
 	element,
 	init,
@@ -10,8 +11,10 @@ import {
 	listen,
 	noop,
 	safe_not_equal,
+	setTimeout,
 	set_data,
-	text
+	text,
+	window
 } from "svelte/internal";
 
 function create_fragment(ctx) {
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 900f3087fc..87be528a61 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -3,7 +3,7 @@ import * as path from "path";
 import * as fs from "fs";
 import { rollup } from 'rollup';
 import * as virtual from 'rollup-plugin-virtual';
-import { clear_loops, set_now, set_raf } from "../../internal";
+import { clear_loops, flush, set_now, set_raf } from "../../internal";
 
 import {
 	showOutput,
@@ -20,7 +20,6 @@ let compileOptions = null;
 let compile = null;
 
 const sveltePath = process.cwd().split('\\').join('/');
-const internal = `${sveltePath}/internal`;
 
 describe("runtime", () => {
 	before(() => {
@@ -47,8 +46,6 @@ describe("runtime", () => {
 	function runTest(dir, hydrate) {
 		if (dir[0] === ".") return;
 
-		const { flush } = require(internal);
-
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
 
 		if (hydrate && config.skip_if_hydrate) return;
@@ -66,7 +63,6 @@ describe("runtime", () => {
 			compile = (config.preserveIdentifiers ? svelte : svelte$).compile;
 
 			const cwd = path.resolve(`test/runtime/samples/${dir}`);
-			global.document.title = '';
 
 			compileOptions = config.compileOptions || {};
 			compileOptions.sveltePath = sveltePath;
@@ -119,13 +115,10 @@ describe("runtime", () => {
 						throw err;
 					}
 
-					global.window = window;
-
 					if (config.before_test) config.before_test();
 
 					// Put things we need on window for testing
 					window.SvelteComponent = SvelteComponent;
-					window.Error = global.Error;
 
 					const target = window.document.querySelector("main");
 
@@ -222,6 +215,7 @@ describe("runtime", () => {
 					'main.js': js.code
 				}),
 				{
+					name: 'svelte-packages',
 					resolveId: (importee, importer) => {
 						if (importee.startsWith('svelte/')) {
 							return importee.replace('svelte', process.cwd()) + '/index.mjs';
diff --git a/test/runtime/samples/deconflict-globals/_config.js b/test/runtime/samples/deconflict-globals/_config.js
new file mode 100644
index 0000000000..c29f022a37
--- /dev/null
+++ b/test/runtime/samples/deconflict-globals/_config.js
@@ -0,0 +1,14 @@
+export default {
+	preserveIdentifiers: true,
+	compileOptions: {
+		name: 'window'
+	},
+
+	html: `
+		<p>I hereby declare Svelte the bestest framework.</p>
+		<p>nintendo sixty four</p>
+		<p>Woops.</p>
+		<p>42</p>
+		<p>false</p>
+	`
+};
diff --git a/test/runtime/samples/deconflict-globals/main.svelte b/test/runtime/samples/deconflict-globals/main.svelte
new file mode 100644
index 0000000000..d1928ea533
--- /dev/null
+++ b/test/runtime/samples/deconflict-globals/main.svelte
@@ -0,0 +1,20 @@
+<script>
+	const document = 'I hereby declare Svelte the bestest framework.';
+	const console = 'nintendo sixty four';
+	const Error = 'Woops.';
+	const Object = 42;
+	const Map = false;
+
+	const everyone = [document, console, Error, Object, Map];
+</script>
+
+<svelte:head>
+	<title>Cute test</title>
+</svelte:head>
+
+<svelte:window on:click></svelte:window>
+<svelte:body on:mouseenter></svelte:body>
+
+{#each everyone as someone (someone)}
+	<p>{someone}</p>
+{/each}
diff --git a/test/test.js b/test/test.js
index 7759941dbb..cb89b3e9d1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2,6 +2,10 @@ const glob = require("tiny-glob/sync.js");
 
 require("./setup");
 
+// bind internal to jsdom
+require("./helpers");
+require("../internal");
+
 glob("*/index.{js,ts}", { cwd: "test" }).forEach((file) => {
 	require("./" + file);
 });

From 788cf97a93343b7f80985ba4e31dd67312786d8f Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 9 Jun 2019 11:27:03 -0400
Subject: [PATCH 08/24] prevent compiled output blowing up in Node if window is
 not defined

---
 src/runtime/internal/globals.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/runtime/internal/globals.ts b/src/runtime/internal/globals.ts
index 789290388e..314f17dfeb 100644
--- a/src/runtime/internal/globals.ts
+++ b/src/runtime/internal/globals.ts
@@ -1,3 +1,5 @@
+const win = typeof window !== 'undefined' ? window : global;
+
 const {
 	// ecmascript
 	Error,
@@ -15,9 +17,8 @@ const {
 	getComputedStyle,
 	navigator,
 	requestAnimationFrame,
-	setTimeout: export_setTimeout, // TODO: remove when upgrading typescript, bug
-	window: export_window,
-} = (window || global) as unknown as typeof globalThis;
+	setTimeout: export_setTimeout // TODO: remove when upgrading typescript, bug
+} = win as unknown as typeof globalThis;
 
 export {
 	// ecmascript
@@ -37,5 +38,5 @@ export {
 	navigator,
 	requestAnimationFrame,
 	export_setTimeout as setTimeout,
-	export_window as window,
+	win as window,
 };

From cd4c2f2075bbf720f630cfa74b29b65997b27a27 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 12 Jun 2019 21:09:42 -0400
Subject: [PATCH 09/24] use `@_` sigil for globals

---
 src/compiler/compile/Component.ts             | 16 +++++++
 src/compiler/compile/create_module.ts         | 15 ++++++-
 src/compiler/compile/render-dom/Block.ts      |  2 +-
 src/compiler/compile/render-dom/index.ts      | 18 ++++----
 .../compile/render-dom/wrappers/Body.ts       |  4 +-
 .../compile/render-dom/wrappers/DebugTag.ts   |  4 +-
 .../compile/render-dom/wrappers/EachBlock.ts  |  4 +-
 .../render-dom/wrappers/Element/Binding.ts    |  2 +-
 .../render-dom/wrappers/Element/index.ts      |  6 +--
 .../compile/render-dom/wrappers/Head.ts       |  2 +-
 .../compile/render-dom/wrappers/IfBlock.ts    |  2 +-
 .../render-dom/wrappers/RawMustacheTag.ts     |  2 +-
 .../compile/render-dom/wrappers/Title.ts      |  6 +--
 .../compile/render-dom/wrappers/Window.ts     | 38 ++++++++--------
 .../compile/render-ssr/handlers/Element.ts    |  2 +-
 .../render-ssr/handlers/InlineComponent.ts    |  2 +-
 src/runtime/internal/animations.ts            |  2 +-
 src/runtime/internal/dom.ts                   |  2 -
 src/runtime/internal/globals.ts               | 43 +------------------
 src/runtime/internal/style_manager.ts         |  1 -
 src/runtime/internal/utils.ts                 |  2 -
 21 files changed, 78 insertions(+), 97 deletions(-)

diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 2ad2e2e428..c4924697f8 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -102,6 +102,7 @@ export default class Component {
 	has_reactive_assignments = false;
 	injected_reactive_declaration_vars: Set<string> = new Set();
 	helpers: Map<string, string> = new Map();
+	globals: Map<string, string> = new Map();
 
 	indirect_dependencies: Map<string, Set<string>> = new Map();
 
@@ -238,6 +239,12 @@ export default class Component {
 		return alias;
 	}
 
+	global(name: string) {
+		const alias = this.alias(name);
+		this.globals.set(name, alias);
+		return alias;
+	}
+
 	generate(result: string) {
 		let js = null;
 		let css = null;
@@ -252,6 +259,10 @@ export default class Component {
 				.replace(/__svelte:self__/g, this.name)
 				.replace(compile_options.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (_match: string, sigil: string, name: string) => {
 					if (sigil === '@') {
+						if (name[0] === '_') {
+							return this.global(name.slice(1));
+						}
+
 						if (!internal_exports.has(name)) {
 							throw new Error(`compiler error: this shouldn't happen! generated code is trying to use inexistent internal '${name}'`);
 						}
@@ -266,6 +277,10 @@ export default class Component {
 					return sigil.slice(1) + name;
 				});
 
+			const referenced_globals = Array.from(this.globals, ([name, alias]) => name !== alias && ({ name, alias })).filter(Boolean);
+			if (referenced_globals.length) {
+				this.helper('globals');
+			}
 			const imported_helpers = Array.from(this.helpers, ([name, alias]) => ({ name, alias }));
 
 			const module = create_module(
@@ -275,6 +290,7 @@ export default class Component {
 				banner,
 				compile_options.sveltePath,
 				imported_helpers,
+				referenced_globals,
 				this.imports,
 				this.vars.filter(variable => variable.module && variable.export_name).map(variable => ({
 					name: variable.name,
diff --git a/src/compiler/compile/create_module.ts b/src/compiler/compile/create_module.ts
index 54b891d4ac..79cb33549c 100644
--- a/src/compiler/compile/create_module.ts
+++ b/src/compiler/compile/create_module.ts
@@ -17,6 +17,7 @@ export default function create_module(
 	banner: string,
 	sveltePath = 'svelte',
 	helpers: Array<{ name: string; alias: string }>,
+	globals: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[],
 	source: string
@@ -24,10 +25,10 @@ export default function create_module(
 	const internal_path = `${sveltePath}/internal`;
 
 	if (format === 'esm') {
-		return esm(code, name, banner, sveltePath, internal_path, helpers, imports, module_exports, source);
+		return esm(code, name, banner, sveltePath, internal_path, helpers, globals, imports, module_exports, source);
 	}
 
-	if (format === 'cjs') return cjs(code, name, banner, sveltePath, internal_path, helpers, imports, module_exports);
+	if (format === 'cjs') return cjs(code, name, banner, sveltePath, internal_path, helpers, globals, imports, module_exports);
 
 	throw new Error(`options.format is invalid (must be ${list(Object.keys(wrappers))})`);
 }
@@ -45,6 +46,7 @@ function esm(
 	sveltePath: string,
 	internal_path: string,
 	helpers: Array<{ name: string; alias: string }>,
+	globals: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[],
 	source: string
@@ -52,6 +54,9 @@ function esm(
 	const internal_imports = helpers.length > 0 && (
 		`import ${stringify_props(helpers.map(h => h.name === h.alias ? h.name : `${h.name} as ${h.alias}`).sort())} from ${JSON.stringify(internal_path)};`
 	);
+	const internal_globals = globals.length > 0 && (
+		`const ${stringify_props(globals.map(g => `${g.name}: ${g.alias}`).sort())} = ${helpers.find(({ name }) => name === 'globals').alias};`
+	);
 
 	const user_imports = imports.length > 0 && (
 		imports
@@ -70,6 +75,7 @@ function esm(
 	return deindent`
 		${banner}
 		${internal_imports}
+		${internal_globals}
 		${user_imports}
 
 		${code}
@@ -85,6 +91,7 @@ function cjs(
 	sveltePath: string,
 	internal_path: string,
 	helpers: Array<{ name: string; alias: string }>,
+	globals: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[]
 ) {
@@ -93,6 +100,9 @@ function cjs(
 	const internal_imports = helpers.length > 0 && (
 		`const ${stringify_props(declarations)} = require(${JSON.stringify(internal_path)});\n`
 	);
+	const internal_globals = globals.length > 0 && (
+		`const ${stringify_props(globals.map(g => `${g.name}: ${g.alias}`).sort())} = ${helpers.find(({ name }) => name === 'globals').alias};`
+	);
 
 	const requires = imports.map(node => {
 		let lhs;
@@ -127,6 +137,7 @@ function cjs(
 		"use strict";
 
 		${internal_imports}
+		${internal_globals}
 		${requires}
 
 		${code}
diff --git a/src/compiler/compile/render-dom/Block.ts b/src/compiler/compile/render-dom/Block.ts
index 15e079ceb9..d7986e167b 100644
--- a/src/compiler/compile/render-dom/Block.ts
+++ b/src/compiler/compile/render-dom/Block.ts
@@ -164,7 +164,7 @@ export default class Block {
 
 		if (parent_node) {
 			this.builders.mount.add_line(`@append(${parent_node}, ${name});`);
-			if (parent_node === '@document.head' && !no_detach) this.builders.destroy.add_line(`@detach(${name});`);
+			if (parent_node === '@_document.head' && !no_detach) this.builders.destroy.add_line(`@detach(${name});`);
 		} else {
 			this.builders.mount.add_line(`@insert(#target, ${name}, anchor);`);
 			if (!no_detach) this.builders.destroy.add_conditional('detaching', `@detach(${name});`);
diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
index 1ba53e7691..3dec1a81b3 100644
--- a/src/compiler/compile/render-dom/index.ts
+++ b/src/compiler/compile/render-dom/index.ts
@@ -44,7 +44,7 @@ export default function dom(
 				var style = @element("style");
 				style.id = '${component.stylesheet.id}-style';
 				style.textContent = ${styles};
-				@append(@document.head, style);
+				@append(@_document.head, style);
 			}
 		`);
 	}
@@ -59,7 +59,7 @@ export default function dom(
 
 	if (options.dev && !options.hydratable) {
 		block.builders.claim.add_line(
-			'throw new @Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");'
+			'throw new @_Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");'
 		);
 	}
 
@@ -108,7 +108,7 @@ export default function dom(
 		} else if (component.compile_options.dev) {
 			body.push(deindent`
 				get ${x.export_name}() {
-					throw new @Error("<${component.tag}>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+					throw new @_Error("<${component.tag}>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 				}
 			`);
 		}
@@ -124,14 +124,14 @@ export default function dom(
 			} else if (component.compile_options.dev) {
 				body.push(deindent`
 					set ${x.export_name}(value) {
-						throw new @Error("<${component.tag}>: Cannot set read-only property '${x.export_name}'");
+						throw new @_Error("<${component.tag}>: Cannot set read-only property '${x.export_name}'");
 					}
 				`);
 			}
 		} else if (component.compile_options.dev) {
 			body.push(deindent`
 				set ${x.export_name}(value) {
-					throw new @Error("<${component.tag}>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+					throw new @_Error("<${component.tag}>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 				}
 			`);
 		}
@@ -147,7 +147,7 @@ export default function dom(
 				const props = ${options.customElement ? `this.attributes` : `options.props || {}`};
 				${expected.map(prop => deindent`
 				if (ctx.${prop.name} === undefined && !('${prop.export_name}' in props)) {
-					@console.warn("<${component.tag}> was created without expected prop '${prop.export_name}'");
+					@_console.warn("<${component.tag}> was created without expected prop '${prop.export_name}'");
 				}`)}
 			`;
 		}
@@ -404,7 +404,7 @@ export default function dom(
 		if (component.compile_options.dev && !component.var_lookup.has('$$props') && writable_props.length) {
 			unknown_props_check = deindent`
 				const writable_props = [${writable_props.map(prop => `'${prop.export_name}'`).join(', ')}];
-				@Object.keys($$props).forEach(key => {
+				@_Object.keys($$props).forEach(key => {
 					if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
 				});
 			`;
@@ -483,7 +483,7 @@ export default function dom(
 
 		if (component.tag != null) {
 			builder.add_block(deindent`
-				@customElements.define("${component.tag}", ${name});
+				@_customElements.define("${component.tag}", ${name});
 			`);
 		}
 	} else {
@@ -493,7 +493,7 @@ export default function dom(
 			class ${name} extends @${superclass} {
 				constructor(options) {
 					super(${options.dev && `options`});
-					${should_add_css && `if (!@document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
+					${should_add_css && `if (!@_document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
 					@init(this, options, ${definition}, create_fragment, ${not_equal}, ${prop_names});
 
 					${dev_props_check}
diff --git a/src/compiler/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render-dom/wrappers/Body.ts
index feb28ef8f6..623625ce6d 100644
--- a/src/compiler/compile/render-dom/wrappers/Body.ts
+++ b/src/compiler/compile/render-dom/wrappers/Body.ts
@@ -11,11 +11,11 @@ export default class BodyWrapper extends Wrapper {
 			const snippet = handler.render(block);
 
 			block.builders.init.add_block(deindent`
-				@document.body.addEventListener("${handler.name}", ${snippet});
+				@_document.body.addEventListener("${handler.name}", ${snippet});
 			`);
 
 			block.builders.destroy.add_block(deindent`
-				@document.body.removeEventListener("${handler.name}", ${snippet});
+				@_document.body.removeEventListener("${handler.name}", ${snippet});
 			`);
 		});
 	}
diff --git a/src/compiler/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
index a600e26297..6705b51cc5 100644
--- a/src/compiler/compile/render-dom/wrappers/DebugTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
@@ -62,7 +62,7 @@ export default class DebugTagWrapper extends Wrapper {
 			block.builders.update.add_block(deindent`
 				if (${condition}) {
 					const { ${ctx_identifiers} } = ctx;
-					@console.${log}({ ${logged_identifiers} });
+					@_console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
@@ -70,7 +70,7 @@ export default class DebugTagWrapper extends Wrapper {
 			block.builders.create.add_block(deindent`
 				{
 					const { ${ctx_identifiers} } = ctx;
-					@console.${log}({ ${logged_identifiers} });
+					@_console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
index dddf415557..3ce2a342a3 100644
--- a/src/compiler/compile/render-dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
@@ -190,7 +190,7 @@ export default class EachBlockWrapper extends Wrapper {
 
 		renderer.blocks.push(deindent`
 			function ${this.vars.get_each_context}(ctx, list, i) {
-				const child_ctx = @Object.create(ctx);
+				const child_ctx = @_Object.create(ctx);
 				${this.context_props}
 				return child_ctx;
 			}
@@ -296,7 +296,7 @@ export default class EachBlockWrapper extends Wrapper {
 		const lookup = block.get_unique_name(`${this.var}_lookup`);
 
 		block.add_variable(iterations, '[]');
-		block.add_variable(lookup, `new @Map()`);
+		block.add_variable(lookup, `new @_Map()`);
 
 		if (this.fragment.nodes[0].is_dom_node()) {
 			this.block.first = this.fragment.nodes[0].var;
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index dd31278774..5b1fe6dee1 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -136,7 +136,7 @@ export default class BindingWrapper {
 			case 'currentTime':
 			case 'playbackRate':
 			case 'volume':
-				update_conditions.push(`!@isNaN(${this.snippet})`);
+				update_conditions.push(`!@_isNaN(${this.snippet})`);
 				break;
 
 			case 'paused':
diff --git a/src/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
index 3602ad301d..1b19281461 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/index.ts
@@ -270,7 +270,7 @@ export default class ElementWrapper extends Wrapper {
 				`@append(${parent_node}, ${node});`
 			);
 
-			if (parent_node === '@document.head') {
+			if (parent_node === '@_document.head') {
 				block.builders.destroy.add_line(`@detach(${node});`);
 			}
 		} else {
@@ -379,7 +379,7 @@ export default class ElementWrapper extends Wrapper {
 		}
 
 		if (namespace) {
-			return `@document.createElementNS("${namespace}", "${name}")`;
+			return `@_document.createElementNS("${namespace}", "${name}")`;
 		}
 
 		return `@element("${name}")`;
@@ -465,7 +465,7 @@ export default class ElementWrapper extends Wrapper {
 				block.builders.init.add_block(deindent`
 					function ${handler}() {
 						${animation_frame && deindent`
-						@cancelAnimationFrame(${animation_frame});
+						@_cancelAnimationFrame(${animation_frame});
 						if (!${this.var}.paused) ${animation_frame} = @raf(${handler});`}
 						${needs_lock && `${lock} = true;`}
 						ctx.${handler}.call(${this.var}${contextual_dependencies.size > 0 ? ', ctx' : ''});
diff --git a/src/compiler/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render-dom/wrappers/Head.ts
index 794506f1be..a5226e7efa 100644
--- a/src/compiler/compile/render-dom/wrappers/Head.ts
+++ b/src/compiler/compile/render-dom/wrappers/Head.ts
@@ -30,6 +30,6 @@ export default class HeadWrapper extends Wrapper {
 	}
 
 	render(block: Block, _parent_node: string, _parent_nodes: string) {
-		this.fragment.render(block, '@document.head', 'nodes');
+		this.fragment.render(block, '@_document.head', 'nodes');
 	}
 }
diff --git a/src/compiler/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
index 3634091b99..bce4743488 100644
--- a/src/compiler/compile/render-dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
@@ -154,7 +154,7 @@ export default class IfBlockWrapper extends Wrapper {
 
 		const vars = { name, anchor, if_name, has_else, has_transitions };
 
-		const detaching = (parent_node && parent_node !== '@document.head') ? '' : 'detaching';
+		const detaching = (parent_node && parent_node !== '@_document.head') ? '' : 'detaching';
 
 		if (this.node.else) {
 			if (has_outros) {
diff --git a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
index 3f09b134f8..f85c48935e 100644
--- a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
@@ -22,7 +22,7 @@ export default class RawMustacheTagWrapper extends Tag {
 	render(block: Block, parent_node: string, parent_nodes: string) {
 		const name = this.var;
 
-		const in_head = parent_node === '@document.head';
+		const in_head = parent_node === '@_document.head';
 		const needs_anchors = !parent_node || in_head;
 
 		// if in head always needs anchors
diff --git a/src/compiler/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render-dom/wrappers/Title.ts
index c7f702916c..302c9f1aa9 100644
--- a/src/compiler/compile/render-dom/wrappers/Title.ts
+++ b/src/compiler/compile/render-dom/wrappers/Title.ts
@@ -68,9 +68,9 @@ export default class TitleWrapper extends Wrapper {
 			const init = this.node.should_cache ? `${last} = ${value}` : value;
 
 			block.builders.init.add_line(
-				`@document.title = ${init};`
+				`@_document.title = ${init};`
 			);
-			const updater = `@document.title = ${this.node.should_cache ? last : value};`;
+			const updater = `@_document.title = ${this.node.should_cache ? last : value};`;
 
 			if (all_dependencies.size) {
 				const dependencies = Array.from(all_dependencies);
@@ -95,7 +95,7 @@ export default class TitleWrapper extends Wrapper {
 				? stringify((this.node.children[0] as Text).data)
 				: '""';
 
-			block.builders.hydrate.add_line(`@document.title = ${value};`);
+			block.builders.hydrate.add_line(`@_document.title = ${value};`);
 		}
 	}
 }
diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts
index c267b806c9..8c8e6c623d 100644
--- a/src/compiler/compile/render-dom/wrappers/Window.ts
+++ b/src/compiler/compile/render-dom/wrappers/Window.ts
@@ -44,8 +44,8 @@ export default class WindowWrapper extends Wrapper {
 		const events = {};
 		const bindings: Record<string, string> = {};
 
-		add_actions(component, block, '@window', this.node.actions);
-		add_event_handlers(block, '@window', this.node.handlers);
+		add_actions(component, block, '@_window', this.node.actions);
+		add_event_handlers(block, '@_window', this.node.handlers);
 
 		this.node.bindings.forEach(binding => {
 			// in dev mode, throw if read-only values are written to
@@ -92,29 +92,29 @@ export default class WindowWrapper extends Wrapper {
 
 				renderer.meta_bindings.add_block(deindent`
 					if (${condition}) {
-						@window.scrollTo(${x || 'window.pageXOffset'}, ${y || 'window.pageYOffset'});
+						@_scrollTo(${x || '@_pageXOffset'}, ${y || '@pageYOffset'});
 					}
-					${x && `${x} = @window.pageXOffset;`}
-					${y && `${y} = @window.pageYOffset;`}
+					${x && `${x} = @_pageXOffset;`}
+					${y && `${y} = @_pageYOffset;`}
 				`);
 
 				block.event_listeners.push(deindent`
-					@listen(@window, "${event}", () => {
+					@listen(@_window, "${event}", () => {
 						${scrolling} = true;
-						@clearTimeout(${scrolling_timeout});
-						${scrolling_timeout} = @setTimeout(${clear_scrolling}, 100);
+						@_clearTimeout(${scrolling_timeout});
+						${scrolling_timeout} = @_setTimeout(${clear_scrolling}, 100);
 						ctx.${handler_name}();
 					})
 				`);
 			} else {
 				props.forEach(prop => {
 					renderer.meta_bindings.add_line(
-						`this._state.${prop.name} = @window.${prop.value};`
+						`this._state.${prop.name} = @_window.${prop.value};`
 					);
 				});
 
 				block.event_listeners.push(deindent`
-					@listen(@window, "${event}", ctx.${handler_name})
+					@listen(@_window, "${event}", ctx.${handler_name})
 				`);
 			}
 
@@ -126,7 +126,7 @@ export default class WindowWrapper extends Wrapper {
 
 			component.partly_hoisted.push(deindent`
 				function ${handler_name}() {
-					${props.map(prop => `${prop.name} = @window.${prop.value}; $$invalidate('${prop.name}', ${prop.name});`)}
+					${props.map(prop => `${prop.name} = @_window.${prop.value}; $$invalidate('${prop.name}', ${prop.name});`)}
 				}
 			`);
 
@@ -146,13 +146,13 @@ export default class WindowWrapper extends Wrapper {
 					).join(' || ')
 				} && !${scrolling}) {
 					${scrolling} = true;
-					@clearTimeout(${scrolling_timeout});
-					@window.scrollTo(${
-						bindings.scrollX ? `ctx.${bindings.scrollX}` : `@window.pageXOffset`
+					@_clearTimeout(${scrolling_timeout});
+					@_scrollTo(${
+						bindings.scrollX ? `ctx.${bindings.scrollX}` : `@_pageXOffset`
 					}, ${
-						bindings.scrollY ? `ctx.${bindings.scrollY}` : `@window.pageYOffset`
+						bindings.scrollY ? `ctx.${bindings.scrollY}` : `@_pageYOffset`
 					});
-					${scrolling_timeout} = @setTimeout(${clear_scrolling}, 100);
+					${scrolling_timeout} = @_setTimeout(${clear_scrolling}, 100);
 				}
 			`);
 		}
@@ -170,7 +170,7 @@ export default class WindowWrapper extends Wrapper {
 
 			component.partly_hoisted.push(deindent`
 				function ${handler_name}() {
-					${name} = @navigator.onLine; $$invalidate('${name}', ${name});
+					${name} = @_navigator.onLine; $$invalidate('${name}', ${name});
 				}
 			`);
 
@@ -179,8 +179,8 @@ export default class WindowWrapper extends Wrapper {
 			`);
 
 			block.event_listeners.push(
-				`@listen(@window, "online", ctx.${handler_name})`,
-				`@listen(@window, "offline", ctx.${handler_name})`
+				`@listen(@_window, "online", ctx.${handler_name})`,
+				`@listen(@_window, "offline", ctx.${handler_name})`
 			);
 
 			component.has_reactive_assignments = true;
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index 637b76aad5..78b95075b2 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -163,7 +163,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 			node_contents='${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
-			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + @JSON.stringify(v))) : "")(' + snippet + ')}';
+			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + @_JSON.stringify(v))) : "")(' + snippet + ')}';
 		}
 	});
 
diff --git a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
index 2f407df523..320bf5e6a0 100644
--- a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
+++ b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
@@ -52,7 +52,7 @@ export default function(node: InlineComponent, renderer: Renderer, options: Rend
 	let props;
 
 	if (uses_spread) {
-		props = `@Object.assign(${
+		props = `@_Object.assign(${
 			node.attributes
 				.map(attribute => {
 					if (attribute.is_spread) {
diff --git a/src/runtime/internal/animations.ts b/src/runtime/internal/animations.ts
index 0997e9ae23..77c86aff0e 100644
--- a/src/runtime/internal/animations.ts
+++ b/src/runtime/internal/animations.ts
@@ -2,7 +2,7 @@ import { identity as linear, noop, now } from './utils';
 import { loop } from './loop';
 import { create_rule, delete_rule } from './style_manager';
 import { AnimationConfig } from '../animate';
-import { getComputedStyle } from './globals';
+
 
 //todo: documentation says it is DOMRect, but in IE it would be ClientRect
 type PositionRect = DOMRect|ClientRect;
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index c1e16de447..f65d07117c 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -1,5 +1,3 @@
-import { document, getComputedStyle, navigator } from './globals';
-
 export function append(target: Node, node: Node) {
 	target.appendChild(node);
 }
diff --git a/src/runtime/internal/globals.ts b/src/runtime/internal/globals.ts
index 314f17dfeb..2f189d0c0a 100644
--- a/src/runtime/internal/globals.ts
+++ b/src/runtime/internal/globals.ts
@@ -1,42 +1 @@
-const win = typeof window !== 'undefined' ? window : global;
-
-const {
-	// ecmascript
-	Error,
-	JSON,
-	Map,
-	Object,
-	console,
-	isNaN,
-
-	// dom
-	cancelAnimationFrame,
-	clearTimeout,
-	customElements,
-	document,
-	getComputedStyle,
-	navigator,
-	requestAnimationFrame,
-	setTimeout: export_setTimeout // TODO: remove when upgrading typescript, bug
-} = win as unknown as typeof globalThis;
-
-export {
-	// ecmascript
-	Error,
-	JSON,
-	Map,
-	Object,
-	console,
-	isNaN,
-
-	// dom
-	cancelAnimationFrame,
-	clearTimeout,
-	customElements,
-	document,
-	getComputedStyle,
-	navigator,
-	requestAnimationFrame,
-	export_setTimeout as setTimeout,
-	win as window,
-};
+export const globals = (typeof window !== 'undefined' ? window : global) as unknown as typeof globalThis;
diff --git a/src/runtime/internal/style_manager.ts b/src/runtime/internal/style_manager.ts
index db8c0e9d17..2721200627 100644
--- a/src/runtime/internal/style_manager.ts
+++ b/src/runtime/internal/style_manager.ts
@@ -1,6 +1,5 @@
 import { element } from './dom';
 import { raf } from './utils';
-import { document } from './globals';
 
 let stylesheet;
 let active = 0;
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 8624c2246a..5766ac26a5 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -1,5 +1,3 @@
-import { requestAnimationFrame } from './globals';
-
 export function noop() {}
 
 export const identity = x => x;

From e5d4162092d5a9560ed957d183759cbb1b49135a Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 12 Jun 2019 21:10:25 -0400
Subject: [PATCH 10/24] update tests

---
 test/helpers.js                                            | 1 +
 test/js/samples/bind-online/expected.js                    | 4 +---
 test/js/samples/collapses-text-around-comments/expected.js | 1 -
 test/js/samples/css-media-query/expected.js                | 1 -
 test/js/samples/css-shadow-dom-keyframes/expected.js       | 1 -
 test/js/samples/debug-empty/expected.js                    | 3 ---
 test/js/samples/debug-foo-bar-baz-things/expected.js       | 3 ---
 test/js/samples/debug-foo/expected.js                      | 3 ---
 test/js/samples/debug-hoisted/expected.js                  | 2 --
 test/js/samples/deconflict-builtins/expected.js            | 1 -
 .../samples/dev-warning-missing-data-computed/expected.js  | 3 ---
 test/js/samples/each-block-array-literal/expected.js       | 1 -
 test/js/samples/each-block-changed-check/expected.js       | 1 -
 test/js/samples/each-block-keyed-animated/expected.js      | 2 --
 test/js/samples/each-block-keyed/expected.js               | 2 --
 test/js/samples/head-no-whitespace/expected.js             | 1 -
 test/js/samples/media-bindings/expected.js                 | 2 --
 test/js/samples/title/expected.js                          | 1 -
 test/js/samples/window-binding-scroll/expected.js          | 7 ++-----
 19 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/test/helpers.js b/test/helpers.js
index 2e6878f8a5..514d084698 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -49,6 +49,7 @@ virtualConsole.sendTo(console);
 
 global.window = new jsdom.JSDOM('<main></main>', {virtualConsole}).window;
 global.document = window.document;
+global.requestAnimationFrame = null; // placeholder, filled in using set_raf
 
 // add missing ecmascript globals to window
 for (const key of Object.getOwnPropertyNames(global)) {
diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js
index 9c3fdb7385..0c9faa3ef6 100644
--- a/test/js/samples/bind-online/expected.js
+++ b/test/js/samples/bind-online/expected.js
@@ -4,11 +4,9 @@ import {
 	add_render_callback,
 	init,
 	listen,
-	navigator,
 	noop,
 	run_all,
-	safe_not_equal,
-	window
+	safe_not_equal
 } from "svelte/internal";
 
 function create_fragment(ctx) {
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index ed01b6430f..12164d0579 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -3,7 +3,6 @@ import {
 	SvelteComponent,
 	append,
 	detach,
-	document,
 	element,
 	init,
 	insert,
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index 8a99d70e8e..d4be134376 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -3,7 +3,6 @@ import {
 	SvelteComponent,
 	append,
 	detach,
-	document,
 	element,
 	init,
 	insert,
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 3be52803d7..9f70b8ec66 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -1,7 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteElement,
-	customElements,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index 2e4f9feb13..6f07993590 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -1,11 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Error,
-	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
-	console,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index c083ea29c3..eea35d5ba7 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -1,11 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Error,
-	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
-	console,
 	destroy_each,
 	detach,
 	element,
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index 46096466c1..5b931d9464 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -1,11 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Error,
-	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
-	console,
 	destroy_each,
 	detach,
 	element,
diff --git a/test/js/samples/debug-hoisted/expected.js b/test/js/samples/debug-hoisted/expected.js
index 799f0d4b32..51d8bf63a3 100644
--- a/test/js/samples/debug-hoisted/expected.js
+++ b/test/js/samples/debug-hoisted/expected.js
@@ -1,8 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Error,
 	SvelteComponentDev,
-	console,
 	init,
 	noop,
 	safe_not_equal
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 85f3c31597..3294778aa3 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -1,6 +1,5 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index d61f8f3de3..5c4b2ece1b 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -1,11 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Error,
-	Object,
 	SvelteComponentDev,
 	add_location,
 	append,
-	console,
 	detach,
 	element,
 	init,
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index 934c5cfe92..455cb2f25f 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -1,6 +1,5 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index 4ed8756b9a..951565bae4 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -1,6 +1,5 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Object,
 	SvelteComponent,
 	append,
 	destroy_each,
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index 9e777f25ee..ec28e60d5f 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -1,7 +1,5 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Map,
-	Object,
 	SvelteComponent,
 	append,
 	create_animation,
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index 7ac66a09a7..efb58ebf6a 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -1,7 +1,5 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	Map,
-	Object,
 	SvelteComponent,
 	append,
 	destroy_block,
diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js
index 859891e689..b95177bba7 100644
--- a/test/js/samples/head-no-whitespace/expected.js
+++ b/test/js/samples/head-no-whitespace/expected.js
@@ -3,7 +3,6 @@ import {
 	SvelteComponent,
 	append,
 	detach,
-	document,
 	element,
 	init,
 	noop,
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index ec30a98161..f45f9ce8db 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -2,12 +2,10 @@
 import {
 	SvelteComponent,
 	add_render_callback,
-	cancelAnimationFrame,
 	detach,
 	element,
 	init,
 	insert,
-	isNaN,
 	listen,
 	noop,
 	raf,
diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js
index 2e551ae426..884f39e246 100644
--- a/test/js/samples/title/expected.js
+++ b/test/js/samples/title/expected.js
@@ -1,7 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteComponent,
-	document,
 	init,
 	noop,
 	safe_not_equal
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index 1e63973518..ed76058ee2 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -3,7 +3,6 @@ import {
 	SvelteComponent,
 	add_render_callback,
 	append,
-	clearTimeout,
 	detach,
 	element,
 	init,
@@ -11,10 +10,8 @@ import {
 	listen,
 	noop,
 	safe_not_equal,
-	setTimeout,
 	set_data,
-	text,
-	window
+	text
 } from "svelte/internal";
 
 function create_fragment(ctx) {
@@ -45,7 +42,7 @@ function create_fragment(ctx) {
 			if (changed.y && !scrolling) {
 				scrolling = true;
 				clearTimeout(scrolling_timeout);
-				window.scrollTo(window.pageXOffset, ctx.y);
+				scrollTo(pageXOffset, ctx.y);
 				scrolling_timeout = setTimeout(clear_scrolling, 100);
 			}
 

From 59f04c93c5dda9e05f286911acddc01db1be73d7 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Tue, 18 Jun 2019 11:07:00 -0400
Subject: [PATCH 11/24] don't grab page offsets too early

---
 src/compiler/compile/render-dom/wrappers/Window.ts | 10 +++++-----
 test/js/samples/window-binding-scroll/expected.js  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts
index 8c8e6c623d..c47f12593c 100644
--- a/src/compiler/compile/render-dom/wrappers/Window.ts
+++ b/src/compiler/compile/render-dom/wrappers/Window.ts
@@ -92,10 +92,10 @@ export default class WindowWrapper extends Wrapper {
 
 				renderer.meta_bindings.add_block(deindent`
 					if (${condition}) {
-						@_scrollTo(${x || '@_pageXOffset'}, ${y || '@pageYOffset'});
+						@_scrollTo(${x || '@_window.pageXOffset'}, ${y || '@_window.pageYOffset'});
 					}
-					${x && `${x} = @_pageXOffset;`}
-					${y && `${y} = @_pageYOffset;`}
+					${x && `${x} = @_window.pageXOffset;`}
+					${y && `${y} = @_window.pageYOffset;`}
 				`);
 
 				block.event_listeners.push(deindent`
@@ -148,9 +148,9 @@ export default class WindowWrapper extends Wrapper {
 					${scrolling} = true;
 					@_clearTimeout(${scrolling_timeout});
 					@_scrollTo(${
-						bindings.scrollX ? `ctx.${bindings.scrollX}` : `@_pageXOffset`
+						bindings.scrollX ? `ctx.${bindings.scrollX}` : `@_window.pageXOffset`
 					}, ${
-						bindings.scrollY ? `ctx.${bindings.scrollY}` : `@_pageYOffset`
+						bindings.scrollY ? `ctx.${bindings.scrollY}` : `@_window.pageYOffset`
 					});
 					${scrolling_timeout} = @_setTimeout(${clear_scrolling}, 100);
 				}
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index ed76058ee2..fbe4596e2b 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -42,7 +42,7 @@ function create_fragment(ctx) {
 			if (changed.y && !scrolling) {
 				scrolling = true;
 				clearTimeout(scrolling_timeout);
-				scrollTo(pageXOffset, ctx.y);
+				scrollTo(window.pageXOffset, ctx.y);
 				scrolling_timeout = setTimeout(clear_scrolling, 100);
 			}
 

From b424a88a5f8221817218d53ef1e9f41500606279 Mon Sep 17 00:00:00 2001
From: mrkishi <mauriciokishi@gmail.com>
Date: Fri, 21 Jun 2019 17:24:03 -0300
Subject: [PATCH 12/24] replace ninja globals

---
 src/compiler/compile/render-dom/index.ts              | 2 +-
 src/compiler/compile/render-dom/wrappers/EachBlock.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
index 3dec1a81b3..17b6fd86f2 100644
--- a/src/compiler/compile/render-dom/index.ts
+++ b/src/compiler/compile/render-dom/index.ts
@@ -405,7 +405,7 @@ export default function dom(
 			unknown_props_check = deindent`
 				const writable_props = [${writable_props.map(prop => `'${prop.export_name}'`).join(', ')}];
 				@_Object.keys($$props).forEach(key => {
-					if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
+					if (!writable_props.includes(key) && !key.startsWith('$$')) @_console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
 				});
 			`;
 		}
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
index 3ce2a342a3..a117a717c5 100644
--- a/src/compiler/compile/render-dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
@@ -509,7 +509,7 @@ export default class EachBlockWrapper extends Wrapper {
 
 		if (outro_block) {
 			block.builders.outro.add_block(deindent`
-				${iterations} = ${iterations}.filter(Boolean);
+				${iterations} = ${iterations}.filter(@_Boolean);
 				for (let #i = 0; #i < ${view_length}; #i += 1) ${outro_block}(#i, 0, 0);`
 			);
 		}

From 8ed9ac8dbccbe47d64e0bb963fb7f3c43380775e Mon Sep 17 00:00:00 2001
From: Lwazi Dlamini <teamallghostanon@gmail.com>
Date: Sun, 23 Jun 2019 19:59:24 +0200
Subject: [PATCH 13/24] Added Nonkosi Telecoms Logo

---
 site/static/organisations/nonkosi.svg | 428 ++++++++++++++++++++++++++
 1 file changed, 428 insertions(+)
 create mode 100644 site/static/organisations/nonkosi.svg

diff --git a/site/static/organisations/nonkosi.svg b/site/static/organisations/nonkosi.svg
new file mode 100644
index 0000000000..c9e32c133c
--- /dev/null
+++ b/site/static/organisations/nonkosi.svg
@@ -0,0 +1,428 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="4134.000000pt" height="2575.000000pt" viewBox="0 0 4134.000000 2575.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.15, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,2575.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2340 18456 c-772 -82 -1198 -370 -1332 -901 -20 -81 -23 -114 -23
+-320 0 -249 9 -316 66 -550 325 -1315 1716 -3354 4034 -5910 416 -459 896
+-966 1306 -1380 319 -323 360 -362 337 -325 -8 14 -167 264 -353 555 -186 292
+-552 865 -813 1275 -261 410 -543 851 -625 980 -82 129 -227 357 -322 505 -94
+149 -340 533 -545 855 -791 1241 -736 1153 -886 1420 -328 588 -533 1071 -615
+1450 -33 153 -33 387 0 480 57 162 169 259 340 296 87 18 291 18 415 -1 522
+-79 1385 -449 2261 -971 94 -56 301 -160 555 -278 579 -270 1365 -635 1575
+-731 99 -46 349 -160 555 -255 493 -226 926 -421 1184 -532 409 -175 550 -226
+831 -299 219 -56 453 -131 749 -238 138 -50 251 -89 253 -88 5 5 -1164 828
+-1817 1278 -2524 1742 -4586 3024 -5680 3529 -243 112 -298 129 -458 146 -205
+21 -825 27 -992 10z"/>
+<path d="M10695 18023 c34 -67 61 -110 68 -106 6 3 7 1 3 -6 -10 -16 3 -53 16
+-45 6 4 8 -1 4 -14 -4 -12 -2 -23 5 -28 8 -5 9 -3 4 6 -5 9 -4 11 4 6 6 -4 9
+-11 6 -16 -8 -14 57 -150 69 -143 5 3 6 1 2 -5 -4 -6 5 -36 19 -65 14 -30 25
+-59 25 -64 0 -6 7 -14 16 -17 8 -3 13 -10 9 -16 -3 -5 2 -24 12 -42 9 -18 18
+-37 19 -43 8 -33 42 -107 46 -99 3 5 4 4 2 -3 -4 -17 18 -83 26 -78 4 3 7 -1
+7 -8 -2 -26 24 -97 34 -91 6 4 9 -2 7 -13 -3 -21 22 -103 31 -103 4 0 7 -10 8
+-21 1 -12 7 -27 14 -33 8 -8 10 -5 5 14 -6 21 -5 22 4 7 6 -9 8 -22 5 -27 -4
+-6 4 -35 16 -65 19 -46 25 -53 37 -42 13 10 14 9 4 -10 -7 -13 -8 -24 -3 -27
+5 -4 12 0 15 6 3 7 3 3 1 -8 -7 -27 42 -127 57 -118 6 4 8 3 5 -4 -10 -15 42
+-114 55 -106 7 4 8 2 4 -5 -7 -10 61 -147 90 -181 7 -8 14 -19 15 -25 1 -5 6
+-21 12 -33 10 -22 12 -23 24 -6 15 20 18 7 3 -16 -6 -10 -2 -23 14 -45 13 -16
+26 -40 30 -53 4 -12 11 -20 16 -17 5 3 12 0 16 -6 4 -8 3 -9 -4 -5 -21 13 -13
+-5 48 -106 33 -54 60 -101 60 -104 0 -3 9 -19 21 -35 20 -28 22 -29 35 -12 16
+22 19 10 3 -15 -10 -15 -4 -31 31 -90 24 -39 47 -69 53 -65 6 4 7 1 3 -6 -5
+-7 7 -36 27 -69 19 -31 42 -72 51 -90 10 -19 21 -30 28 -26 6 4 8 3 4 -4 -6
+-11 42 -101 73 -136 9 -10 15 -21 15 -25 -1 -3 3 -16 9 -28 10 -22 27 -23 27
+-2 0 6 -5 7 -12 3 -7 -4 -8 -3 -4 5 12 19 27 2 20 -24 -4 -16 1 -34 13 -52 10
+-15 24 -40 31 -55 6 -16 16 -28 22 -28 5 0 9 -4 8 -8 -5 -14 65 -121 75 -115
+6 3 7 1 4 -5 -10 -15 3 -43 16 -35 6 3 7 1 3 -5 -9 -16 63 -134 77 -125 6 3 7
+1 3 -5 -4 -6 8 -36 26 -67 18 -31 39 -67 46 -81 7 -13 17 -24 23 -24 5 0 8 -4
+6 -9 -4 -16 116 -210 126 -204 6 3 8 2 4 -3 -6 -11 57 -127 65 -119 2 3 5 -1
+5 -8 0 -23 85 -157 96 -150 6 3 7 1 3 -5 -4 -6 15 -48 41 -92 26 -44 53 -88
+58 -98 81 -138 129 -211 136 -206 5 3 7 -1 4 -8 -2 -7 18 -49 45 -93 27 -44
+57 -95 66 -112 9 -18 19 -31 23 -28 4 2 8 -2 8 -8 0 -24 85 -157 96 -150 6 3
+7 1 3 -5 -9 -15 43 -104 56 -96 6 4 5 10 -3 15 -8 5 -9 9 -3 9 18 0 24 -12 13
+-26 -8 -10 -6 -21 7 -44 11 -16 50 -82 87 -145 41 -68 73 -112 79 -109 7 4 8
+2 4 -4 -9 -15 55 -123 68 -115 5 3 6 1 2 -5 -4 -6 5 -30 20 -52 20 -30 30 -38
+36 -28 6 9 8 7 4 -7 -4 -13 4 -30 22 -50 15 -16 40 -49 56 -72 16 -24 32 -40
+37 -38 4 3 11 0 15 -6 4 -8 3 -9 -4 -5 -7 4 -12 3 -12 -2 0 -12 35 -43 42 -37
+3 3 8 -1 12 -10 4 -11 2 -14 -6 -9 -7 5 -2 -5 10 -21 13 -17 37 -51 54 -77 17
+-27 35 -48 39 -48 5 0 8 -6 6 -12 -1 -7 4 -12 11 -10 8 1 11 -1 8 -6 -7 -12
+23 -54 35 -47 5 3 6 0 3 -8 -3 -8 0 -18 7 -23 8 -5 10 -3 4 6 -5 9 -4 11 4 6
+6 -4 9 -11 6 -16 -10 -16 36 -69 54 -63 13 4 13 3 2 -5 -12 -9 -12 -15 5 -39
+10 -15 23 -36 29 -46 5 -9 43 -64 83 -122 39 -58 72 -108 72 -111 0 -3 14 -27
+32 -52 61 -90 68 -101 68 -106 0 -3 32 -57 70 -121 39 -64 70 -118 70 -120 0
+-3 41 -73 79 -135 9 -14 16 -27 16 -30 4 -21 30 -58 36 -54 5 3 6 -3 2 -12 -5
+-13 -3 -15 7 -9 9 5 11 4 6 -3 -8 -13 7 -47 38 -81 11 -13 15 -21 8 -17 -7 5
+4 -25 24 -66 39 -74 40 -78 43 -100 1 -9 4 -9 12 2 9 12 10 12 5 -4 -4 -10 -2
+-24 2 -30 5 -6 17 -34 27 -63 10 -29 23 -49 28 -46 6 3 7 1 4 -4 -10 -16 13
+-73 29 -73 8 0 14 -5 14 -11 0 -5 -5 -7 -12 -3 -8 5 -9 2 -3 -12 4 -10 15 -39
+23 -64 9 -25 22 -51 29 -58 7 -8 11 -18 8 -22 -9 -14 16 -100 27 -94 5 3 6 -5
+3 -19 -4 -14 -2 -28 4 -32 6 -3 9 -10 7 -14 -3 -4 1 -43 9 -87 19 -105 19
+-267 -1 -361 -8 -41 -13 -82 -9 -91 4 -12 3 -13 -10 -2 -12 10 -15 10 -15 0 0
+-7 -12 -28 -26 -47 -25 -33 -29 -49 -8 -35 6 4 18 18 27 32 9 13 17 19 17 13
+0 -17 -33 -54 -51 -56 -8 -2 -32 -17 -53 -34 -48 -39 -145 -86 -216 -104 -38
+-10 -115 -14 -255 -13 -177 0 -217 4 -345 29 -80 15 -152 29 -160 30 -8 1 -22
+5 -30 8 -8 3 -40 13 -70 21 -30 8 -101 28 -158 45 -57 16 -111 27 -120 25 -12
+-4 -13 -3 -4 3 9 7 2 13 -27 21 -21 7 -45 11 -52 9 -8 -2 -10 -2 -5 1 14 7
+-65 31 -83 25 -9 -4 -12 -2 -8 2 10 11 -143 66 -163 59 -8 -3 -11 -2 -7 2 4 4
+-32 23 -80 41 -49 19 -96 38 -106 44 -10 5 -22 7 -27 4 -6 -4 -10 -1 -10 5 0
+6 -4 9 -9 6 -5 -4 -11 -3 -13 2 -1 4 -70 36 -153 71 -82 35 -175 75 -205 89
+-60 26 -575 278 -600 292 -69 41 -114 60 -127 56 -9 -4 -11 -2 -7 6 5 7 0 9
+-14 6 -12 -4 -20 -3 -18 1 6 9 -90 68 -125 76 -16 4 -30 2 -33 -4 -4 -6 -13
+-11 -19 -11 -7 0 -4 5 7 11 17 10 16 12 -10 30 -16 10 -35 17 -42 14 -7 -3
+-10 0 -7 5 8 12 -43 33 -57 24 -7 -5 -8 -2 -3 6 6 10 3 12 -13 8 -12 -4 -20
+-3 -18 1 7 11 -53 43 -66 35 -7 -4 -8 -3 -4 4 9 14 -40 35 -57 25 -7 -3 -9 -3
+-5 1 9 11 -81 58 -94 50 -7 -4 -8 -2 -4 5 9 13 -32 31 -53 23 -10 -4 -12 -1
+-6 8 6 10 3 12 -14 7 -13 -3 -20 -3 -17 0 10 10 -33 35 -46 27 -7 -5 -8 -3 -3
+6 6 10 4 12 -9 7 -9 -4 -15 -3 -12 1 5 9 -156 92 -179 92 -8 0 -15 4 -15 9 0
+10 -78 46 -97 44 -7 0 -10 4 -6 10 4 7 0 8 -13 3 -10 -4 -15 -4 -11 0 10 10
+-122 76 -136 67 -6 -4 -7 -1 -2 7 6 10 4 12 -11 6 -10 -4 -15 -4 -11 0 8 8
+-75 54 -98 54 -8 0 -15 5 -15 11 0 6 -7 8 -17 5 -10 -4 -14 -4 -10 0 10 10
+-162 96 -176 87 -7 -3 -9 -2 -4 2 9 11 -122 77 -136 68 -6 -4 -7 -1 -2 7 6 10
+4 12 -11 6 -10 -4 -15 -4 -11 0 10 10 -143 85 -157 77 -6 -3 -8 -3 -4 2 12 13
+-403 216 -427 209 -14 -4 -16 -2 -7 4 16 11 -592 317 -609 306 -7 -4 -9 -3 -6
+3 7 11 -192 113 -220 113 -9 0 -14 3 -10 6 6 6 -124 73 -148 77 -5 1 -12 5
+-15 8 -10 12 -150 79 -150 72 0 -5 -4 -3 -8 3 -12 19 -112 65 -124 58 -7 -4
+-8 -3 -4 4 6 11 0 14 -20 11 -4 0 -10 4 -13 9 -9 13 -151 84 -151 75 0 -5 -4
+-3 -8 3 -9 15 -152 86 -152 77 0 -5 -4 -3 -8 3 -9 15 -152 86 -152 77 0 -5 -4
+-3 -8 3 -8 13 -152 87 -152 78 0 -3 -7 2 -16 11 -10 9 -24 13 -38 10 -14 -4
+-17 -3 -8 3 9 6 -3 16 -40 33 -28 13 -56 23 -60 22 -4 -2 -8 1 -8 6 0 8 -53
+34 -65 32 -3 -1 -13 5 -21 14 -8 8 -27 18 -42 22 -15 3 -29 9 -32 13 -3 4 -37
+23 -76 43 -48 23 -76 32 -85 26 -12 -7 -12 -9 0 -9 8 0 12 -3 8 -6 -12 -12
+-28 7 -17 21 8 9 3 16 -21 25 -17 8 -37 13 -45 13 -8 0 -14 4 -14 9 0 7 -63
+38 -77 37 -3 -1 -9 3 -12 8 -3 4 -22 17 -41 27 -40 21 -37 18 42 -48 34 -27
+63 -44 69 -40 7 4 9 3 6 -3 -4 -6 2 -18 13 -28 11 -10 20 -14 20 -9 0 5 5 1
+11 -9 6 -9 15 -14 21 -11 6 4 8 3 5 -3 -4 -6 5 -18 19 -28 14 -9 34 -25 45
+-36 11 -11 25 -17 31 -13 6 4 8 3 5 -3 -4 -6 30 -38 74 -72 81 -62 96 -71 83
+-48 -4 7 -3 9 2 4 5 -5 9 -12 9 -16 0 -16 75 -72 86 -65 8 5 9 3 4 -6 -6 -9
+-1 -10 16 -5 18 5 20 4 9 -4 -13 -9 -11 -13 10 -28 14 -10 28 -17 32 -15 5 1
+7 -1 5 -6 -1 -4 1 -8 5 -10 4 -1 20 -15 36 -30 16 -15 51 -43 77 -62 26 -19
+63 -48 81 -63 19 -16 38 -25 45 -21 7 4 9 3 6 -3 -9 -14 19 -37 33 -28 6 4 9
+1 8 -7 -2 -7 3 -12 10 -10 8 1 11 -2 7 -8 -3 -5 2 -13 12 -17 10 -4 23 -12 28
+-19 6 -7 89 -72 185 -143 187 -139 193 -144 228 -175 20 -18 24 -18 33 -6 8
+13 9 12 7 -2 -2 -11 27 -39 85 -82 48 -36 87 -63 87 -61 0 2 11 -6 24 -18 37
+-34 54 -47 110 -84 28 -19 59 -42 68 -50 9 -8 22 -12 29 -7 8 4 10 3 5 -4 -4
+-7 10 -23 34 -39 22 -16 55 -40 73 -55 17 -15 39 -28 48 -28 9 0 19 -6 22 -13
+3 -7 36 -36 75 -64 53 -39 73 -48 82 -40 8 9 10 8 5 -5 -4 -11 1 -21 17 -29
+13 -7 26 -12 31 -11 4 1 6 -4 5 -10 -2 -7 5 -12 14 -12 10 1 16 -2 13 -6 -3
+-5 12 -19 32 -31 21 -13 43 -27 48 -31 68 -51 145 -106 145 -103 0 2 12 -7 26
+-20 15 -14 33 -25 40 -25 7 0 17 -6 21 -13 9 -13 94 -76 132 -96 18 -10 26
+-10 39 1 15 12 16 11 3 -5 -8 -9 -12 -19 -10 -21 40 -34 288 -193 294 -188 3
+4 5 2 3 -5 -4 -14 219 -165 227 -153 3 4 0 10 -7 12 -8 3 -7 6 4 10 11 5 15 0
+14 -20 -1 -23 3 -27 24 -24 19 1 21 0 10 -7 -12 -8 -11 -11 5 -17 11 -4 22
+-10 25 -13 18 -21 72 -51 82 -45 6 4 8 3 5 -3 -4 -6 11 -22 32 -36 30 -20 41
+-23 51 -14 10 9 12 9 7 -4 -4 -12 16 -30 74 -68 45 -30 84 -49 90 -45 8 4 9 3
+5 -4 -8 -13 52 -54 66 -46 5 3 7 0 6 -8 -2 -7 5 -12 14 -12 10 1 15 -2 12 -7
+-3 -5 8 -14 23 -21 15 -7 30 -15 33 -18 3 -3 14 -11 25 -18 11 -6 46 -29 78
+-50 32 -20 93 -59 135 -86 42 -27 96 -62 120 -78 23 -16 42 -26 42 -22 0 4 10
+-2 23 -13 32 -29 66 -45 79 -37 6 4 8 3 5 -3 -8 -13 101 -85 116 -76 5 3 7 1
+4 -4 -4 -6 1 -14 10 -17 9 -4 56 -32 104 -62 52 -33 93 -53 100 -48 7 4 9 3 5
+-4 -3 -6 13 -21 36 -35 24 -13 83 -47 131 -76 49 -28 92 -49 97 -46 5 3 15 -4
+24 -16 8 -12 19 -18 25 -14 7 3 10 1 9 -5 -2 -6 15 -21 37 -34 115 -64 138
+-75 148 -69 5 3 7 1 3 -5 -8 -14 163 -105 187 -98 13 3 16 1 8 -8 -8 -9 8 -21
+62 -47 39 -19 73 -33 75 -31 2 2 9 -4 16 -14 8 -11 18 -14 26 -9 8 5 11 4 7
+-1 -3 -5 21 -24 54 -41 33 -18 58 -29 55 -25 -2 4 7 8 20 8 22 2 23 1 8 -10
+-16 -12 -16 -13 0 -19 10 -4 23 -4 28 0 7 3 8 1 4 -5 -5 -8 0 -12 13 -12 12 0
+21 -4 21 -8 0 -11 131 -77 148 -73 6 1 12 -2 12 -7 0 -13 50 -33 63 -26 7 4 9
+3 5 -1 -9 -10 63 -56 75 -48 5 3 14 -3 21 -12 7 -9 24 -18 38 -18 14 -1 24 -6
+20 -11 -3 -5 2 -6 12 -3 9 4 15 3 12 -1 -7 -11 110 -66 123 -58 5 4 13 1 17
+-5 4 -8 3 -9 -4 -5 -7 4 -12 4 -12 1 0 -3 17 -13 38 -22 20 -8 56 -24 80 -34
+23 -11 48 -17 54 -13 6 4 8 3 5 -3 -4 -6 13 -18 36 -28 23 -9 50 -21 60 -26
+10 -5 23 -7 29 -3 6 4 8 3 5 -3 -9 -14 47 -34 71 -27 14 5 15 4 2 -5 -11 -8
+-12 -11 -2 -11 7 0 37 -11 65 -23 29 -13 90 -39 137 -57 47 -18 101 -40 120
+-48 19 -9 48 -15 63 -15 16 0 23 -4 16 -8 -7 -4 2 -10 22 -14 19 -4 40 -12 46
+-17 7 -6 19 -8 28 -5 8 4 20 1 27 -6 20 -20 166 -70 184 -63 8 3 12 2 9 -4 -3
+-6 2 -11 12 -11 28 -2 35 -4 78 -23 22 -10 56 -19 76 -20 20 0 35 -4 33 -7 -6
+-10 253 -72 271 -65 10 4 14 2 9 -5 -4 -8 4 -9 27 -4 22 4 29 3 21 -3 -10 -6
+-1 -11 30 -16 24 -4 58 -9 77 -13 24 -4 32 -2 27 6 -5 7 3 11 26 10 23 -1 26
+-3 11 -6 -43 -8 -25 -26 20 -19 24 4 37 3 29 -2 -21 -14 195 -32 369 -31 85 0
+195 7 244 15 50 8 105 16 123 19 65 11 198 57 221 78 13 12 21 16 16 8 -8 -14
+76 27 128 62 20 14 25 22 17 27 -7 4 0 8 16 8 17 0 35 8 47 23 11 13 22 23 26
+23 3 -1 5 2 3 8 -1 5 1 7 6 4 12 -7 56 40 48 52 -3 5 2 9 12 8 11 -1 16 5 14
+16 -2 12 2 16 11 12 8 -3 17 2 21 11 8 21 -2 38 -16 29 -7 -4 -8 -2 -4 5 6 9
+11 9 22 0 10 -8 17 -8 26 3 42 44 128 206 120 227 -3 8 0 11 6 7 9 -5 36 52
+37 79 0 6 4 13 10 17 5 4 9 23 9 42 0 20 3 31 6 25 9 -14 31 91 25 121 -5 21
+-4 22 3 5 7 -16 12 -5 21 49 7 37 10 71 7 74 -3 3 -1 11 5 18 37 44 30 774 -8
+847 -8 16 -10 26 -4 23 16 -10 13 24 -4 58 -17 33 -20 48 -4 26 7 -11 9 -3 4
+30 -12 88 -37 235 -41 242 -2 3 -7 32 -10 63 -3 31 -9 66 -13 78 -5 12 -12 45
+-16 74 -4 29 -13 57 -21 64 -8 6 -14 17 -14 23 0 6 5 4 10 -4 20 -30 9 4 -16
+54 -15 28 -35 67 -45 87 -34 68 -117 199 -121 192 -3 -5 -3 -2 -1 6 3 14 -41
+88 -62 103 -5 4 -7 8 -3 8 4 0 -18 36 -48 81 -30 44 -54 83 -54 85 0 13 -44
+63 -51 58 -5 -3 -6 1 -4 8 3 8 -6 30 -20 49 -14 18 -49 69 -76 112 -29 44 -55
+74 -61 70 -7 -3 -8 -1 -4 5 8 13 -22 64 -34 57 -4 -3 -11 7 -14 21 -4 15 -19
+43 -34 63 -15 20 -31 42 -37 49 -5 8 -20 25 -32 38 -13 14 -23 28 -24 32 0 4
+-5 6 -9 5 -4 -1 -7 4 -6 12 2 20 -207 305 -218 298 -5 -4 -6 -1 -2 5 3 5 -4
+23 -17 39 -12 15 -39 54 -60 86 -23 35 -42 55 -49 51 -7 -4 -8 -3 -4 4 4 6 -2
+20 -14 32 -11 11 -20 23 -20 26 0 14 -63 84 -71 79 -5 -4 -6 0 -4 7 3 8 -2 23
+-12 34 -10 11 -34 42 -53 69 -40 57 -58 80 -82 107 -10 10 -18 22 -18 26 0 14
+-37 44 -42 35 -3 -4 -3 -2 -1 6 4 18 -16 43 -30 34 -6 -4 -7 -1 -2 6 8 14 -33
+63 -46 55 -5 -3 -6 1 -3 9 3 8 -10 31 -30 52 -20 21 -36 41 -36 45 0 4 -21 35
+-47 68 -27 33 -68 85 -92 116 -33 41 -47 53 -53 44 -6 -9 -8 -7 -4 7 4 13 -4
+31 -24 54 -17 18 -30 36 -30 40 0 13 -72 81 -81 76 -5 -3 -6 1 -3 9 6 16 -43
+83 -58 79 -4 -2 -7 3 -5 10 1 6 -4 11 -11 9 -8 -1 -11 2 -7 8 3 5 -4 20 -16
+32 -12 13 -18 17 -14 9 5 -10 4 -12 -4 -7 -6 4 -9 12 -6 17 8 13 -56 90 -68
+82 -6 -4 -7 -1 -2 6 8 14 -33 64 -46 56 -4 -3 -11 0 -15 6 -5 8 -3 9 6 4 8 -5
+11 -3 8 6 -3 8 -11 13 -17 11 -7 -1 -10 2 -6 7 3 6 -9 25 -27 42 -18 18 -26
+29 -18 25 8 -4 -3 9 -25 30 -22 20 -33 33 -25 29 8 -5 4 4 -9 18 -13 15 -28
+24 -34 20 -6 -4 -7 -1 -3 6 10 15 -23 53 -37 44 -6 -3 -7 -1 -3 5 4 7 -18 42
+-50 82 -43 53 -60 68 -67 58 -6 -9 -7 -8 -3 5 5 17 -53 100 -105 150 -11 10
+-19 22 -19 28 0 6 -4 7 -10 4 -5 -3 -10 -1 -10 6 0 11 -107 149 -116 149 -2 0
+-1 -7 2 -15 4 -8 1 -15 -4 -15 -6 0 -9 10 -7 21 4 21 -69 124 -101 142 -8 4
+-14 14 -14 21 0 18 -35 48 -45 39 -4 -5 -5 -2 -1 5 4 6 2 12 -3 12 -6 0 -10 6
+-8 13 1 6 -4 11 -11 9 -8 -1 -11 1 -8 6 7 12 -38 54 -49 45 -4 -5 -5 -2 -1 5
+8 14 -61 105 -74 97 -4 -3 -14 3 -21 12 -10 12 -10 14 -1 9 24 -14 12 7 -35
+63 -26 31 -50 58 -53 61 -3 3 -17 21 -32 42 -38 50 -58 69 -68 63 -4 -3 -14 3
+-21 13 -13 15 -12 16 4 3 10 -8 17 -9 17 -3 0 6 -12 20 -26 31 -15 12 -23 21
+-19 21 5 0 -2 11 -15 25 -12 13 -27 22 -31 19 -5 -3 -6 3 -2 12 5 13 2 16 -9
+12 -10 -4 -15 -1 -14 10 0 9 -5 16 -12 14 -8 -1 -11 1 -8 6 3 5 -9 25 -26 46
+-24 29 -33 35 -40 24 -7 -9 -8 -7 -4 7 4 15 -11 39 -56 90 -34 39 -66 69 -71
+67 -4 -1 -6 2 -2 8 3 5 -9 26 -27 45 -75 82 -85 94 -82 98 3 2 -14 21 -36 41
+-22 20 -37 36 -34 36 4 0 1 7 -6 15 -7 8 -16 12 -21 9 -5 -3 -8 -1 -7 4 2 6
+-35 54 -82 108 -47 54 -103 120 -124 147 -29 37 -41 45 -48 35 -6 -9 -8 -7 -3
+8 3 14 -1 26 -12 35 -15 12 -16 12 -10 -4 4 -11 3 -16 -4 -12 -6 4 -8 13 -5
+20 5 15 -31 58 -44 50 -5 -3 -12 0 -16 6 -4 8 -3 9 4 5 19 -12 14 3 -14 40
+-14 18 -30 31 -35 28 -5 -3 -8 -1 -7 4 2 5 -35 54 -82 108 -133 154 -142 164
+-154 157 -6 -3 -8 -3 -4 2 11 11 -31 67 -44 59 -7 -5 -8 -2 -3 6 4 7 4 15 -1
+19 -5 3 -27 29 -49 56 -22 28 -58 69 -81 92 -22 24 -39 44 -37 46 2 3 -15 21
+-37 41 -22 20 -37 36 -33 36 4 0 -15 24 -43 53 -28 28 -77 84 -110 122 -32 39
+-106 123 -163 188 -57 64 -114 129 -127 145 -111 130 -187 211 -197 209 -6 -1
+-11 5 -12 13 0 23 -118 159 -133 154 -7 -2 -10 1 -7 6 5 8 -92 126 -172 210
+-8 8 11 -36 42 -97z"/>
+<path d="M27832 14958 l3 -1933 420 0 420 0 5 484 5 484 305 -319 c168 -175
+358 -375 424 -444 65 -69 138 -144 162 -167 l43 -43 580 0 c390 0 581 3 581
+10 0 6 -181 194 -402 418 -221 224 -504 510 -628 635 l-225 228 50 47 c28 26
+271 250 540 497 269 248 514 473 545 502 l55 52 -577 1 -577 0 -416 -407
+c-229 -223 -428 -415 -441 -425 l-24 -19 0 1165 0 1166 -425 0 -425 0 2 -1932z"/>
+<path d="M37015 16786 c-120 -39 -237 -141 -289 -250 -125 -264 26 -587 309
+-661 165 -43 335 5 456 127 227 227 162 607 -128 754 -74 38 -79 39 -192 41
+-75 2 -130 -2 -156 -11z"/>
+<path d="M17300 14780 l0 -1760 453 2 452 3 5 1075 5 1074 121 -154 c66 -85
+170 -218 230 -295 60 -77 134 -171 164 -210 65 -85 99 -129 171 -220 83 -105
+269 -343 629 -805 177 -228 334 -427 348 -443 l26 -27 450 2 451 3 3 1758 2
+1757 -455 0 -455 0 0 -1064 c0 -586 -4 -1067 -8 -1070 -5 -3 -150 175 -323
+396 -173 221 -381 488 -463 592 -82 105 -206 263 -274 351 -69 88 -164 210
+-212 270 -47 61 -159 203 -249 318 l-162 207 -455 0 -454 0 0 -1760z"/>
+<path d="M22645 15493 c-445 -38 -792 -218 -1028 -532 -171 -227 -240 -435
+-240 -726 -1 -370 111 -652 358 -901 243 -245 529 -365 938 -394 249 -17 503
+12 711 81 434 145 756 506 843 946 23 120 23 376 0 494 -46 232 -148 432 -308
+603 -275 295 -639 439 -1094 434 -77 -1 -158 -3 -180 -5z m253 -723 c176 -29
+325 -135 406 -290 116 -219 76 -481 -98 -656 -112 -113 -235 -164 -391 -164
+-162 0 -285 50 -395 160 -218 217 -226 553 -18 775 69 74 129 116 205 145 99
+37 189 46 291 30z"/>
+<path d="M32270 15494 c-219 -26 -374 -64 -521 -128 -309 -136 -561 -400 -677
+-709 -124 -332 -88 -763 90 -1071 198 -343 551 -570 983 -632 135 -19 413 -22
+550 -5 576 72 1006 431 1140 951 32 127 45 353 26 492 -38 282 -159 521 -371
+727 -189 184 -434 306 -715 357 -86 15 -424 27 -505 18z m351 -748 c164 -57
+296 -194 349 -365 25 -79 27 -226 4 -315 -30 -118 -107 -229 -212 -303 -93
+-67 -175 -94 -297 -100 -177 -9 -294 35 -416 156 -119 118 -169 237 -169 399
+0 147 46 267 144 378 143 162 386 223 597 150z"/>
+<path d="M35266 15489 c-131 -14 -235 -38 -341 -80 -158 -63 -272 -148 -365
+-271 -115 -152 -161 -289 -162 -483 -2 -212 49 -344 175 -461 94 -87 192 -133
+377 -179 301 -73 346 -86 400 -113 61 -30 87 -61 100 -115 22 -99 -40 -185
+-149 -208 -77 -16 -247 -6 -346 21 -99 26 -236 85 -350 151 -48 28 -88 49 -90
+47 -2 -2 -53 -102 -115 -223 -62 -121 -130 -253 -151 -292 l-38 -73 42 -24
+c157 -92 386 -180 565 -216 201 -41 487 -45 672 -10 401 75 688 308 780 630
+30 106 37 280 16 390 -45 243 -215 423 -486 515 -38 13 -142 40 -231 60 -89
+20 -179 43 -201 51 -110 39 -152 116 -113 210 30 73 102 104 241 104 132 0
+249 -27 395 -93 l56 -25 139 265 c76 146 140 268 142 272 6 16 -210 85 -363
+116 -207 42 -412 54 -599 34z"/>
+<path d="M26116 15444 c-182 -36 -293 -94 -432 -227 l-104 -99 0 146 0 146
+-425 0 -425 0 2 -1192 3 -1193 420 0 420 0 5 715 c5 655 7 720 24 770 39 120
+109 199 224 253 64 31 72 32 192 32 142 0 185 -13 259 -81 57 -51 87 -105 108
+-194 15 -66 18 -159 23 -785 l5 -710 418 -3 417 -2 0 834 c0 905 -1 923 -56
+1078 -14 40 -42 102 -62 138 -46 84 -176 214 -267 268 -79 47 -219 96 -315
+111 -90 15 -351 12 -434 -5z"/>
+<path d="M36732 14218 l3 -1193 420 0 420 0 3 1193 2 1192 -425 0 -425 0 2
+-1192z"/>
+<path d="M23440 12189 c0 -5 -4 -8 -9 -5 -5 3 -33 1 -62 -5 -58 -12 -70 -14
+-169 -24 -36 -3 -72 -9 -80 -11 -15 -5 -170 -24 -362 -45 l-118 -12 0 -29 c0
+-26 3 -28 38 -29 43 -1 86 0 122 5 14 2 19 1 13 -1 -25 -9 -12 -23 20 -23 44
+0 146 -27 176 -47 22 -14 24 -14 18 0 -3 9 -2 19 3 22 4 3 7 -7 5 -22 -1 -15
+1 -38 6 -51 14 -36 12 -1726 -2 -1791 -7 -36 -20 -61 -40 -78 -16 -14 -26 -30
+-22 -36 3 -6 2 -7 -4 -4 -6 4 -41 0 -79 -9 -67 -15 -104 -20 -192 -25 -49 -3
+-56 -10 -47 -40 6 -17 9 -19 16 -8 6 10 9 10 9 2 0 -10 133 -12 591 -13 524 0
+591 1 585 15 -3 8 -1 15 4 15 12 0 14 29 3 31 -5 1 -35 3 -68 5 -126 9 -251
+25 -280 36 -16 7 -34 13 -39 13 -5 0 -11 16 -15 35 -3 19 -5 449 -5 955 1 949
+1 926 39 1136 6 32 5 37 -16 42 -33 9 -39 9 -39 -4z"/>
+<path d="M17258 11935 c-3 -3 -1 -26 3 -53 5 -26 11 -138 15 -249 l7 -203 66
+0 67 0 32 88 c38 101 99 189 156 225 130 80 252 98 695 98 184 0 313 4 316 10
+4 5 12 9 18 9 7 0 6 -4 -3 -10 -8 -5 -10 -10 -5 -10 7 0 8 -292 5 -864 l-5
+-865 -34 -35 c-39 -40 -119 -74 -190 -81 -25 -3 -66 -8 -91 -11 -25 -3 -83 -8
+-129 -9 -46 -2 -85 -5 -86 -7 -2 -2 -1 -15 2 -30 6 -32 39 -39 46 -10 4 16 5
+16 6 0 1 -17 42 -18 724 -18 397 0 727 4 732 8 6 4 11 17 11 30 2 28 -17 33
+-114 29 -41 -1 -76 1 -78 5 -3 5 -29 8 -57 8 -142 0 -260 40 -283 96 -11 27
+-14 185 -14 894 l0 861 322 0 c431 0 582 -19 680 -86 39 -26 64 -33 52 -13 -4
+7 -3 8 5 4 6 -4 9 -11 6 -16 -8 -12 36 -71 47 -64 5 3 8 2 7 -3 -4 -21 2 -34
+13 -27 6 4 8 3 5 -4 -9 -13 2 -44 13 -37 4 3 7 -1 6 -8 0 -6 10 -44 23 -83
+l24 -71 67 -2 68 -2 6 108 c3 59 14 174 24 256 l18 147 -1597 0 c-878 0 -1598
+-2 -1601 -5z"/>
+<path d="M21376 11149 c-60 -4 -149 -15 -197 -24 -99 -18 -268 -69 -254 -77 6
+-3 4 -3 -3 -1 -22 5 -183 -68 -175 -80 3 -5 1 -7 -5 -3 -15 9 -103 -46 -98
+-61 3 -7 -1 -10 -8 -7 -33 13 -211 -174 -200 -211 4 -16 3 -17 -5 -5 -8 11
+-14 4 -31 -34 -11 -27 -22 -69 -25 -92 -2 -24 -6 -48 -9 -52 -3 -5 -1 -36 4
+-70 9 -63 43 -143 86 -200 22 -28 28 -31 47 -20 20 10 21 9 9 -5 -11 -13 -11
+-19 0 -36 7 -12 19 -19 26 -16 7 3 11 1 8 -4 -8 -13 21 -34 35 -25 7 4 9 3 6
+-3 -9 -14 29 -47 44 -37 8 4 10 3 5 -4 -9 -14 191 -115 212 -107 7 2 11 1 8
+-4 -6 -10 -6 -10 154 -50 63 -16 156 -35 205 -41 105 -13 430 -6 490 10 22 6
+56 13 75 16 19 2 39 9 44 14 4 4 15 6 24 2 11 -4 14 -1 9 11 -3 9 -2 17 3 17
+6 0 10 -5 10 -10 0 -13 30 -6 135 30 112 39 116 41 108 53 -3 5 -1 7 5 3 11
+-6 147 60 191 93 31 24 20 45 -14 29 -21 -9 -23 -14 -12 -27 10 -14 10 -14 -5
+-3 -9 8 -22 11 -28 7 -5 -3 -10 -4 -10 -1 0 3 14 13 32 22 l32 16 -25 14 c-34
+19 -40 18 -120 -21 -40 -19 -78 -35 -86 -35 -7 0 -13 -5 -13 -11 0 -5 -4 -8
+-8 -5 -5 3 -30 -2 -57 -10 -69 -20 -261 -44 -360 -44 -46 0 -135 7 -196 16
+-61 8 -118 13 -126 10 -8 -3 -11 -1 -8 4 3 6 -2 10 -12 10 -66 1 -277 101
+-350 164 -34 31 -53 42 -57 34 -3 -7 -4 -4 -3 7 1 12 -3 19 -11 17 -8 -1 -10
+2 -7 8 9 14 -24 52 -38 43 -6 -3 -7 -1 -3 5 3 6 -5 39 -19 73 -14 34 -25 75
+-25 91 0 15 -4 28 -9 28 -5 0 -6 11 -3 25 l7 25 753 0 c835 0 800 -3 822 65
+14 43 -4 139 -32 167 -10 10 -18 24 -18 32 0 23 -106 108 -188 151 -155 81
+-300 113 -572 129 -30 1 -104 -1 -164 -5z m269 -129 c39 -12 78 -22 87 -23 9
+-1 15 -4 12 -8 -2 -4 6 -11 18 -14 32 -10 96 -73 119 -117 25 -49 25 -119 0
+-142 -17 -15 -65 -17 -557 -16 -390 0 -540 3 -543 11 -2 6 1 14 6 18 6 3 20
+25 32 48 27 54 90 118 166 169 53 35 96 53 235 93 20 6 103 9 195 7 129 -3
+174 -8 230 -26z"/>
+<path d="M25180 11148 c-149 -9 -197 -15 -270 -33 -36 -9 -93 -23 -128 -31
+-39 -10 -60 -20 -56 -26 4 -6 2 -8 -3 -5 -21 13 -226 -78 -250 -110 -7 -9 -13
+-13 -13 -9 0 4 -13 -1 -30 -11 -16 -9 -29 -24 -27 -31 1 -8 -9 -21 -23 -29
+l-25 -15 25 21 c14 12 19 21 12 21 -33 0 -206 -201 -216 -252 -2 -7 -9 -26
+-16 -43 -6 -16 -13 -66 -13 -110 -1 -65 4 -92 26 -145 25 -60 142 -218 153
+-207 3 3 16 -5 29 -17 58 -53 128 -91 146 -80 7 4 9 3 5 -4 -8 -14 30 -36 46
+-26 6 4 8 3 5 -3 -4 -6 30 -22 81 -38 48 -15 97 -32 109 -38 12 -5 29 -7 38
+-3 9 3 14 2 11 -3 -10 -15 199 -44 360 -49 155 -4 267 4 396 30 32 7 54 16 51
+21 -3 6 -1 7 5 3 14 -8 94 12 88 22 -3 5 10 8 27 8 39 1 239 83 231 95 -3 5 1
+7 8 4 15 -6 104 50 91 57 -4 3 -2 3 5 2 15 -4 52 17 52 29 0 5 -8 6 -17 3 -10
+-4 -14 -4 -10 0 8 9 -47 44 -69 44 -8 0 -13 -4 -10 -8 2 -4 -3 -8 -12 -9 -9 0
+-60 -19 -112 -40 -53 -22 -129 -46 -170 -53 -41 -7 -79 -15 -85 -18 -17 -11
+-358 -12 -405 -2 -25 5 -85 18 -133 29 -48 11 -95 17 -104 14 -11 -4 -14 -2
+-9 5 4 7 1 12 -7 12 -18 0 -174 76 -205 100 -13 10 -31 16 -40 13 -11 -3 -13
+-2 -5 4 8 6 -4 25 -41 63 -60 62 -102 138 -112 202 -4 24 -11 51 -16 61 -5 10
+-7 25 -4 35 5 16 54 17 743 14 406 -1 752 0 769 3 52 9 73 37 72 97 0 29 -3
+58 -7 63 -5 10 -6 13 -10 45 -1 13 -2 13 -12 0 -8 -12 -9 -11 -5 6 4 13 -3 32
+-19 53 -28 38 -65 75 -65 65 0 -4 -11 5 -24 21 -16 18 -28 25 -37 20 -8 -5
+-11 -5 -7 0 5 5 -2 14 -15 21 -69 40 -100 52 -114 47 -10 -4 -14 -2 -10 5 9
+13 -88 43 -111 35 -9 -4 -13 -2 -9 4 18 28 -319 63 -503 51z m204 -119 c98
+-24 171 -56 218 -98 l36 -31 22 27 c12 16 18 21 14 13 -4 -8 -14 -23 -22 -32
+-13 -15 -13 -20 1 -41 35 -54 33 -137 -3 -157 -12 -7 -199 -10 -539 -10 -323
+-1 -523 -4 -526 -10 -3 -6 -10 -10 -15 -10 -12 0 -3 47 18 90 31 66 204 218
+242 212 9 -2 6 4 -7 15 l-23 18 27 2 c15 0 21 -2 14 -7 -10 -5 -9 -9 3 -13 9
+-4 16 -3 16 2 0 5 6 9 13 8 6 0 21 1 32 2 17 1 18 3 5 12 -12 9 -12 10 4 5 10
+-3 37 -1 60 5 48 14 210 26 281 21 28 -2 86 -13 129 -23z"/>
+<path d="M27695 11153 c-63 -3 -199 -17 -250 -27 -11 -2 -40 -7 -65 -10 -25
+-4 -56 -11 -70 -16 -14 -4 -52 -13 -84 -20 -32 -7 -54 -15 -48 -19 7 -4 -3 -7
+-21 -7 -17 -1 -50 -9 -72 -19 -22 -10 -46 -19 -54 -21 -27 -5 -71 -27 -71 -34
+0 -4 -6 -7 -12 -6 -17 1 -128 -55 -128 -65 0 -4 9 -11 21 -14 11 -4 18 -9 15
+-12 -3 -3 -16 1 -30 10 -20 13 -26 14 -35 3 -6 -7 -7 -17 -3 -21 4 -5 1 -5 -6
+-1 -36 21 -269 -228 -247 -264 3 -6 1 -10 -5 -10 -7 0 -10 -6 -7 -14 3 -8 1
+-16 -5 -18 -7 -3 -11 -34 -11 -79 -1 -85 4 -119 16 -119 4 0 6 -4 3 -9 -10
+-15 13 -63 26 -55 7 4 8 3 4 -5 -15 -24 102 -170 124 -156 6 4 9 1 8 -5 -4
+-17 114 -99 131 -92 8 3 12 1 8 -5 -4 -5 5 -15 19 -22 20 -9 24 -9 18 1 -4 7
+4 4 17 -8 24 -21 114 -60 157 -69 12 -2 27 -7 33 -11 6 -3 15 0 20 7 7 11 9
+10 9 -5 0 -13 5 -16 17 -12 9 4 19 2 23 -3 5 -9 45 -18 106 -25 11 -1 26 -6
+33 -10 7 -5 97 -10 199 -13 183 -5 334 7 462 37 25 6 56 13 70 15 45 10 172
+55 242 87 49 22 65 34 56 41 -9 6 -8 7 5 3 17 -5 46 5 71 25 6 5 26 20 44 35
+17 14 29 30 26 36 -3 5 2 8 11 6 35 -6 24 17 -17 37 -53 25 -57 25 -92 1 -16
+-10 -53 -31 -82 -46 -49 -25 -65 -46 -26 -33 14 4 15 3 3 -5 -9 -7 -21 -7 -31
+-2 -25 14 -62 1 -55 -19 5 -13 4 -14 -6 -3 -7 6 -20 12 -28 12 -14 0 -14 -2
+-1 -11 12 -8 11 -9 -5 -5 -11 3 -56 -1 -100 -10 -44 -8 -96 -17 -115 -18 -50
+-5 -258 -6 -305 -1 -62 5 -187 33 -252 56 -32 11 -65 21 -73 21 -8 1 -17 4
+-20 8 -3 3 -35 23 -71 43 -36 20 -72 43 -79 52 -10 12 -16 13 -29 3 -9 -7 -13
+-9 -9 -4 9 10 -44 89 -72 109 -11 8 -17 17 -13 20 3 4 1 7 -5 7 -7 0 -11 3
+-10 8 1 4 -5 21 -14 37 -9 17 -21 64 -28 107 -10 62 -10 86 1 130 7 29 13 55
+14 58 0 3 14 28 32 56 34 56 100 116 163 150 22 12 38 23 35 25 -2 3 4 5 13 6
+9 0 49 12 89 26 95 34 249 51 393 42 120 -7 189 -21 302 -60 36 -13 69 -21 72
+-19 3 2 4 1 1 -2 -2 -4 25 -22 61 -40 76 -38 97 -37 189 8 98 49 133 89 114
+132 -14 29 -69 60 -83 45 -6 -5 -15 -9 -20 -9 -6 0 -4 4 4 10 19 12 -13 24
+-122 45 -68 13 -401 39 -418 33 -3 -1 -36 -3 -75 -5z"/>
+<path d="M29920 11156 c-3 -2 -39 -5 -80 -6 -174 -4 -423 -57 -585 -126 -36
+-15 -38 -18 -20 -26 17 -7 17 -8 -4 -4 -13 3 -40 -2 -60 -11 -33 -14 -34 -16
+-16 -24 18 -8 17 -9 -4 -5 -16 3 -30 -1 -38 -12 -8 -9 -11 -11 -7 -3 5 10 3
+12 -7 6 -60 -37 -179 -134 -179 -147 0 -5 6 -6 13 -2 7 4 9 3 4 -2 -5 -5 -12
+-9 -16 -9 -22 0 -115 -141 -104 -158 3 -5 -1 -13 -8 -18 -10 -6 -14 -34 -14
+-111 0 -97 2 -107 34 -173 24 -47 56 -91 102 -136 72 -71 183 -146 207 -141 8
+2 11 -1 8 -6 -9 -15 39 -32 53 -19 10 9 12 9 9 -2 -4 -21 136 -77 212 -85 14
+-1 34 -7 45 -13 48 -26 225 -45 460 -49 132 -3 235 -1 228 3 -6 4 12 8 40 8
+69 1 207 26 207 38 0 5 7 7 15 3 32 -12 351 107 338 127 -3 6 -1 7 5 3 15 -9
+54 12 47 25 -4 5 -3 8 2 7 19 -5 54 15 49 27 -3 10 0 12 11 8 12 -5 14 -3 8 7
+-5 8 -4 11 2 7 28 -18 182 150 215 233 23 58 36 196 22 228 -4 9 -9 27 -10 39
+-4 36 -44 105 -98 169 -54 65 -180 159 -198 148 -6 -4 -8 -3 -5 2 9 16 -161
+91 -279 123 -142 39 -258 60 -369 66 -49 2 -121 7 -160 11 -38 3 -72 3 -75 0z
+m105 -101 c103 -9 219 -41 309 -86 43 -21 83 -36 90 -32 6 3 8 2 3 -2 -10 -11
+33 -56 46 -48 6 3 7 2 4 -4 -8 -13 58 -77 72 -69 6 4 9 1 5 -7 -3 -8 6 -31 20
+-51 14 -21 28 -46 31 -57 4 -11 11 -16 17 -13 7 4 8 2 4 -4 -4 -6 1 -37 10
+-69 10 -32 19 -69 20 -83 7 -57 3 -153 -7 -172 -6 -11 -8 -26 -5 -34 3 -8 2
+-13 -3 -9 -8 4 -14 -13 -24 -62 -6 -33 -147 -166 -209 -198 -31 -16 -54 -33
+-52 -37 3 -4 -5 -7 -18 -6 -13 0 -54 -10 -93 -22 -63 -22 -87 -24 -245 -23
+-149 1 -185 4 -245 22 -38 12 -74 23 -80 24 -5 1 -16 6 -22 10 -7 5 -17 5 -23
+2 -5 -3 -10 -2 -10 4 0 5 -10 13 -22 17 -13 4 -34 15 -48 26 -16 13 -33 17
+-50 13 -16 -4 -20 -3 -12 3 10 7 0 22 -44 63 -31 30 -63 53 -70 53 -7 -1 -10
+4 -7 12 2 7 -6 28 -19 46 -63 85 -105 240 -93 345 3 32 7 68 8 80 1 11 5 20 8
+18 3 -2 11 13 19 33 7 20 23 52 36 71 19 28 21 38 11 50 -10 14 -10 14 5 3 14
+-11 19 -10 32 9 8 12 13 26 10 31 -3 4 1 5 9 3 7 -3 22 4 32 15 19 20 18 21
+-1 14 -15 -5 -16 -4 -4 4 8 6 18 9 22 6 9 -6 95 42 105 59 4 7 0 8 -13 3 -10
+-4 -15 -3 -10 1 4 4 24 9 44 9 20 1 57 7 82 14 54 15 245 38 280 34 14 -2 57
+-6 95 -9z"/>
+<path d="M33061 11149 c-125 -8 -299 -36 -317 -51 -7 -5 -16 -8 -20 -6 -19 5
+-232 -57 -244 -71 -3 -3 -9 -6 -15 -6 -5 0 -27 -6 -47 -13 -27 -10 -36 -18
+-32 -30 5 -14 4 -14 -4 -3 -9 12 -15 13 -36 3 -26 -12 -26 -11 -26 36 1 26 5
+66 9 89 7 37 6 42 -13 47 -23 6 -53 3 -143 -13 -32 -6 -78 -13 -103 -16 -25
+-4 -67 -10 -95 -15 -41 -8 -417 -60 -431 -60 -7 0 -4 -25 4 -38 5 -6 46 -17
+93 -22 131 -16 147 -19 183 -34 18 -7 42 -26 54 -41 22 -27 22 -33 22 -394 0
+-228 -4 -380 -11 -404 -9 -32 -69 -114 -69 -94 0 3 -17 0 -37 -7 -21 -7 -85
+-19 -143 -25 -136 -16 -140 -18 -140 -47 l0 -24 590 0 c465 0 590 3 591 13 0
+6 2 20 4 29 4 22 -9 25 -125 33 -139 9 -193 22 -221 51 l-24 26 -3 402 -4 403
+39 15 c21 8 59 21 86 28 26 7 47 16 47 20 0 5 10 6 23 3 18 -4 19 -3 7 6 -11
+8 -7 10 18 5 17 -4 32 -3 32 2 0 5 10 10 23 10 12 1 46 6 75 12 171 37 403 33
+518 -7 31 -11 61 -18 67 -14 6 3 7 2 4 -4 -3 -5 9 -17 27 -26 43 -20 99 -91
+114 -143 8 -28 12 -144 13 -342 1 -298 -4 -352 -35 -391 -15 -19 -92 -51 -122
+-51 -13 0 -24 -3 -24 -7 0 -5 -39 -9 -86 -11 -48 -1 -90 -4 -94 -7 -4 -2 -5
+-16 -3 -30 l5 -25 570 0 569 0 -3 32 c-3 33 -4 33 -56 34 -29 1 -56 4 -59 8
+-3 3 -30 6 -58 6 -70 0 -146 25 -168 55 -16 22 -18 59 -21 372 -2 191 -5 359
+-8 373 -3 14 -6 30 -7 37 0 7 -8 10 -18 6 -15 -6 -14 -4 2 14 11 11 32 23 48
+27 26 6 38 26 15 26 -6 0 -8 3 -5 6 4 4 13 2 21 -5 11 -9 27 -7 72 8 77 26
+201 56 292 71 83 14 329 20 352 9 8 -4 29 -9 46 -12 17 -3 53 -14 79 -26 26
+-11 52 -18 58 -14 6 4 7 1 2 -7 -6 -10 -4 -12 9 -7 9 4 14 3 11 -2 -3 -5 4
+-12 15 -16 11 -3 25 -15 31 -26 5 -11 14 -17 20 -14 5 4 9 3 8 -2 -4 -21 2
+-34 13 -27 7 4 8 3 4 -5 -4 -6 0 -23 9 -37 14 -22 16 -66 15 -357 0 -293 -2
+-335 -18 -367 -25 -51 -81 -75 -204 -90 -134 -15 -140 -17 -136 -43 l3 -22
+525 -3 c289 -2 544 0 566 3 34 5 43 10 46 30 4 21 1 24 -31 29 -20 2 -45 5
+-56 5 -11 0 -62 5 -113 11 -98 11 -132 26 -151 68 -7 15 -11 143 -12 360 0
+185 -4 346 -9 357 l-9 20 -1 -20 c-1 -12 -4 -15 -7 -7 -3 7 0 19 7 27 26 31
+-34 145 -115 217 -39 35 -136 87 -152 81 -7 -3 -13 0 -13 5 0 10 -55 26 -144
+42 -74 12 -343 13 -417 1 -30 -5 -90 -15 -134 -21 -44 -7 -84 -17 -90 -21 -5
+-5 -16 -9 -25 -9 -35 0 -239 -64 -233 -73 3 -6 1 -7 -5 -3 -14 9 -55 -12 -47
+-24 3 -5 1 -12 -5 -15 -6 -4 -9 -1 -8 7 3 15 -35 12 -40 -3 -2 -5 -10 -9 -18
+-9 -8 0 -33 -9 -56 -21 l-41 -21 -18 23 c-10 13 -19 20 -19 15 0 -5 -9 -1 -20
+9 -11 10 -17 21 -15 26 8 12 -26 41 -42 35 -8 -3 -12 -2 -8 3 8 13 -115 69
+-188 86 -34 7 -96 17 -137 20 -41 3 -88 7 -105 9 -16 2 -81 0 -144 -5z"/>
+<path d="M36785 11149 c-187 -11 -423 -58 -408 -82 3 -6 1 -7 -6 -3 -6 4 -21
+4 -32 1 -17 -6 -19 -9 -8 -17 11 -8 10 -8 -4 -4 -21 7 -120 -43 -150 -75 -10
+-10 -23 -19 -29 -19 -6 0 -9 -3 -6 -6 3 -3 -5 -16 -18 -29 -13 -13 -24 -33
+-24 -44 0 -11 -4 -23 -10 -26 -14 -8 -13 -90 2 -118 6 -12 14 -29 19 -37 4 -8
+12 -14 19 -12 6 1 9 -2 6 -7 -4 -5 0 -13 8 -18 8 -4 15 -12 16 -18 1 -5 6 -9
+11 -8 5 2 9 -1 9 -7 0 -14 99 -62 112 -54 6 4 8 3 5 -3 -4 -6 0 -14 9 -17 9
+-4 13 -2 8 5 -4 7 6 2 22 -9 31 -23 241 -85 261 -78 6 3 13 1 15 -4 2 -5 26
+-14 53 -19 81 -16 176 -39 235 -56 30 -8 72 -16 94 -16 26 -1 34 -4 25 -10
+-10 -6 -7 -9 12 -9 14 0 30 -5 36 -11 8 -8 17 -8 32 1 12 6 21 7 20 3 -3 -21
+3 -31 27 -42 14 -6 30 -8 36 -5 6 4 8 3 5 -2 -3 -6 7 -18 23 -29 31 -21 63
+-69 66 -100 7 -68 -36 -127 -116 -159 -25 -10 -56 -23 -69 -30 -38 -17 -471
+-13 -471 5 0 3 -27 14 -61 24 -48 15 -65 16 -80 7 -10 -7 -22 -12 -26 -12 -5
+0 0 5 11 11 17 10 16 12 -10 30 -16 10 -35 17 -42 14 -7 -3 -11 -1 -8 4 3 5
+-20 24 -52 44 -67 42 -221 194 -222 220 0 6 -120 0 -127 -6 -1 -1 7 -27 17
+-57 11 -30 19 -68 20 -83 0 -19 4 -26 12 -21 8 5 9 0 5 -15 -3 -11 1 -52 9
+-89 8 -37 14 -79 14 -94 0 -24 4 -28 28 -29 42 -2 74 -5 248 -28 183 -24 160
+-23 434 -24 224 -1 323 6 415 28 68 17 88 22 128 31 20 4 27 10 22 21 -4 13
+-3 13 8 4 17 -13 81 12 163 64 93 59 124 99 144 182 9 38 -2 99 -17 96 -6 -1
+-9 6 -6 17 10 38 -164 171 -204 156 -8 -3 -12 -2 -9 2 6 11 -143 64 -155 56
+-6 -3 -15 -1 -22 4 -15 12 -225 66 -302 77 -5 0 -17 4 -25 8 -20 8 -138 29
+-167 29 -13 0 -21 4 -18 8 4 6 -66 29 -105 35 -24 3 -155 84 -167 102 -10 14
+-19 20 -22 14 -4 -6 -6 17 -5 50 1 50 5 64 28 88 14 15 23 31 19 36 -5 4 -3 5
+3 2 7 -4 15 0 18 9 4 9 9 14 12 11 3 -3 27 4 52 15 68 29 99 33 287 33 159 0
+176 -2 253 -28 46 -15 93 -32 104 -38 15 -8 19 -8 14 0 -10 16 7 14 30 -4 19
+-15 19 -15 -1 -8 -11 4 9 -16 44 -43 48 -36 74 -66 99 -112 l34 -63 55 2 54 2
+-1 106 c0 58 3 135 8 171 5 36 7 68 3 71 -3 4 -73 10 -156 14 -82 4 -166 9
+-185 11 -166 17 -292 21 -435 13z"/>
+</g>
+</svg>

From 7aee021522e7a68434aa1491247ca02b78c348ac Mon Sep 17 00:00:00 2001
From: Lwazi Dlamini <teamallghostanon@gmail.com>
Date: Sun, 23 Jun 2019 20:01:21 +0200
Subject: [PATCH 14/24] Updated organizations link list

---
 site/src/routes/_components/WhosUsingSvelte.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/src/routes/_components/WhosUsingSvelte.svelte b/site/src/routes/_components/WhosUsingSvelte.svelte
index 98a2696f64..a855639c40 100644
--- a/site/src/routes/_components/WhosUsingSvelte.svelte
+++ b/site/src/routes/_components/WhosUsingSvelte.svelte
@@ -52,6 +52,7 @@
 	<a target="_blank" rel="noopener" href="https://itslearning.com"><img src="organisations/itslearning.svg" alt="itslearning logo"></a>
 	<a target="_blank" rel="noopener" href="http://mustlab.ru"><img src="organisations/mustlab.png" alt="Mustlab logo"></a>
 	<a target="_blank" rel="noopener" href="https://www.nesta.org.uk"><img src="organisations/nesta.svg" alt="Nesta logo"></a>
+		<a target="_blank" rel="noopener" href="https://www.nonkositelecoms.com"><img src="organisations/nonkosi.svg" alt="Nonkosi Telecoms logo"></a>
 	<a target="_blank" rel="noopener" href="https://nytimes.com"><img src="organisations/nyt.svg" alt="The New York Times logo"></a>
 	<a target="_blank" rel="noopener" href="https://openstate.eu"><img src="organisations/open-state-foundation.svg" alt="Open State Foundation logo"></a>
 	<a target="_blank" rel="noopener" href="https://razorpay.com"><img src="organisations/razorpay.svg" alt="Razorpay logo"></a>

From dddc69ec7f0e5b6bcac991275fdeda4ed873b210 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 11:40:41 -0400
Subject: [PATCH 15/24] update tests

---
 .../binding-contenteditable-html-initial/_config.js       | 8 ++++----
 .../samples/binding-contenteditable-html/_config.js       | 5 -----
 .../binding-contenteditable-text-initial/_config.js       | 6 +++---
 .../samples/binding-contenteditable-text/_config.js       | 5 -----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/test/runtime/samples/binding-contenteditable-html-initial/_config.js b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
index 0b1f656a54..9eac2c9b17 100644
--- a/test/runtime/samples/binding-contenteditable-html-initial/_config.js
+++ b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
@@ -1,6 +1,6 @@
 export default {
 	html: `
-		<editor><b>world</b></editor>
+		<editor contenteditable="true"><b>world</b></editor>
 		<p>hello <b>world</b></p>
 	`,
 
@@ -18,7 +18,7 @@ export default {
 
 		// No updates to data yet
 		assert.htmlEqual(target.innerHTML, `
-			<editor>every<span>body</span></editor>
+			<editor contenteditable="true">every<span>body</span></editor>
 			<p>hello <b>world</b></p>
 		`);
 
@@ -26,14 +26,14 @@ export default {
 		const event = new window.Event('input');
 		await el.dispatchEvent(event);
 		assert.htmlEqual(target.innerHTML, `
-			<editor>every<span>body</span></editor>
+			<editor contenteditable="true">every<span>body</span></editor>
 			<p>hello every<span>body</span></p>
 		`);
 
 		component.name = 'good<span>bye</span>';
 		assert.equal(el.innerHTML, 'good<span>bye</span>');
 		assert.htmlEqual(target.innerHTML, `
-			<editor>good<span>bye</span></editor>
+			<editor contenteditable="true">good<span>bye</span></editor>
 			<p>hello good<span>bye</span></p>
 		`);
 	},
diff --git a/test/runtime/samples/binding-contenteditable-html/_config.js b/test/runtime/samples/binding-contenteditable-html/_config.js
index 285512b6c9..ceb6a75c70 100644
--- a/test/runtime/samples/binding-contenteditable-html/_config.js
+++ b/test/runtime/samples/binding-contenteditable-html/_config.js
@@ -8,11 +8,6 @@ export default {
 		<p>hello <b>world</b></p>
 	`,
 
-	ssrHtml: `
-		<editor contenteditable="true"><b>world</b></editor>
-		<p>hello <b>world</b></p>
-	`,
-
 	async test({ assert, component, target, window }) {
 		const el = target.querySelector('editor');
 		assert.equal(el.innerHTML, '<b>world</b>');
diff --git a/test/runtime/samples/binding-contenteditable-text-initial/_config.js b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
index 7345687d29..4899f30f12 100644
--- a/test/runtime/samples/binding-contenteditable-text-initial/_config.js
+++ b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
@@ -1,6 +1,6 @@
 export default {
 	html: `
-		<editor><b>world</b></editor>
+		<editor contenteditable="true"><b>world</b></editor>
 		<p>hello world</p>
 	`,
 
@@ -20,14 +20,14 @@ export default {
 		await el.dispatchEvent(event);
 
 		assert.htmlEqual(target.innerHTML, `
-			<editor>everybody</editor>
+			<editor contenteditable="true">everybody</editor>
 			<p>hello everybody</p>
 		`);
 
 		component.name = 'goodbye';
 		assert.equal(el.textContent, 'goodbye');
 		assert.htmlEqual(target.innerHTML, `
-			<editor>goodbye</editor>
+			<editor contenteditable="true">goodbye</editor>
 			<p>hello goodbye</p>
 		`);
 	},
diff --git a/test/runtime/samples/binding-contenteditable-text/_config.js b/test/runtime/samples/binding-contenteditable-text/_config.js
index 059cda7cfe..9f8645724d 100644
--- a/test/runtime/samples/binding-contenteditable-text/_config.js
+++ b/test/runtime/samples/binding-contenteditable-text/_config.js
@@ -8,11 +8,6 @@ export default {
 		<p>hello world</p>
 	`,
 
-	ssrHtml: `
-		<editor contenteditable="true">world</editor>
-		<p>hello world</p>
-	`,
-
 	async test({ assert, component, target, window }) {
 		const el = target.querySelector('editor');
 		assert.equal(el.textContent, 'world');

From 86c5086c54481f7572765b73c4a3fe93c79c08d5 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 13:00:16 -0400
Subject: [PATCH 16/24] add some docs, rename to textContent and innerHTML

---
 site/content/docs/02-template-syntax.md       |  8 +++++++
 src/compiler/compile/nodes/Element.ts         |  6 ++---
 .../render-dom/wrappers/Element/Binding.ts    | 22 +++----------------
 .../render-dom/wrappers/Element/index.ts      |  6 ++---
 .../compile/render-ssr/handlers/Element.ts    |  4 ++--
 .../main.svelte                               |  2 +-
 .../binding-contenteditable-html/main.svelte  |  2 +-
 .../main.svelte                               |  2 +-
 .../binding-contenteditable-text/main.svelte  |  2 +-
 .../contenteditable-dynamic/input.svelte      |  2 +-
 .../contenteditable-missing/errors.json       |  2 +-
 .../contenteditable-missing/input.svelte      |  2 +-
 12 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index 682012d88b..ceaa19a398 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -510,6 +510,14 @@ When the value of an `<option>` matches its text content, the attribute can be o
 </select>
 ```
 
+---
+
+Elements with the `contenteditable` attribute support `innerHTML` and `textContent` bindings.
+
+```html
+<div contenteditable="true" bind:innerHTML={html}></div>
+```
+
 ##### Media element bindings
 
 ---
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 3e883200a7..3fcc453926 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -608,8 +608,8 @@ export default class Element extends Node {
 					});
 				}
 			} else if (
-				name === 'text' ||
-				name === 'html'
+				name === 'textContent' ||
+				name === 'innerHTML'
 			) {
 				const contenteditable = this.attributes.find(
 					(attribute: Attribute) => attribute.name === 'contenteditable'
@@ -618,7 +618,7 @@ export default class Element extends Node {
 				if (!contenteditable) {
 					component.error(binding, {
 						code: `missing-contenteditable-attribute`,
-						message: `'contenteditable' attribute is required for text and html two-way bindings`
+						message: `'contenteditable' attribute is required for texContent and innerHTML two-way bindings`
 					});
 				} else if (contenteditable && !contenteditable.is_static) {
 					component.error(contenteditable, {
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index 7de661e3d1..a96b44f7f6 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -133,11 +133,11 @@ export default class BindingWrapper {
 				break;
 			}
 
-			case 'text':
+			case 'textContent':
 				update_conditions.push(`${this.snippet} !== ${parent.var}.textContent`);
 				break;
 
-			case 'html':
+			case 'innerHTML':
 				update_conditions.push(`${this.snippet} !== ${parent.var}.innerHTML`);
 				break;
 
@@ -170,7 +170,7 @@ export default class BindingWrapper {
 			);
 		}
 
-		if (this.node.name === 'html' || this.node.name === 'text') {
+		if (this.node.name === 'innerHTML' || this.node.name === 'textContent') {
 			block.builders.mount.add_block(`if (${this.snippet} !== void 0) ${update_dom}`);
 		} else if (!/(currentTime|paused)/.test(this.node.name)) {
 			block.builders.mount.add_block(update_dom);
@@ -208,14 +208,6 @@ function get_dom_updater(
 		return `${element.var}.checked = ${condition};`;
 	}
 
-	if (binding.node.name === 'text') {
-		return `${element.var}.textContent = ${binding.snippet};`;
-	}
-
-	if (binding.node.name === 'html') {
-		return `${element.var}.innerHTML = ${binding.snippet};`;
-	}
-
 	return `${element.var}.${binding.node.name} = ${binding.snippet};`;
 }
 
@@ -328,14 +320,6 @@ function get_value_from_dom(
 		return `@time_ranges_to_array(this.${name})`;
 	}
 
-	if (name === 'text') {
-		return `this.textContent`;
-	}
-
-	if (name === 'html') {
-		return `this.innerHTML`;
-	}
-
 	// everything else
 	return `this.${name}`;
 }
diff --git a/src/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
index 2062ba1f14..9db034092b 100644
--- a/src/compiler/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/index.ts
@@ -30,7 +30,7 @@ const events = [
 	{
 		event_names: ['input'],
 		filter: (node: Element, name: string) =>
-			(name === 'text' || name === 'html') &&
+			(name === 'textContent' || name === 'innerHTML') &&
 			node.attributes.some(attribute => attribute.name === 'contenteditable')
 	},
 	{
@@ -515,8 +515,8 @@ export default class ElementWrapper extends Wrapper {
 				group.bindings.find(binding => {
 					return (
 						binding.node.name === 'indeterminate' ||
-						binding.node.name === 'text' ||
-						binding.node.name === 'html' ||
+						binding.node.name === 'textContent' ||
+						binding.node.name === 'innerHTML' ||
 						binding.is_readonly_media_attribute()
 					);
 				})
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
index 0c2181a605..27cf858f1f 100644
--- a/src/compiler/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -154,9 +154,9 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 
 		if (name === 'group') {
 			// TODO server-render group bindings
-		} else if (contenteditable && (name === 'text' || name === 'html')) {
+		} else if (contenteditable && (name === 'textContent' || name === 'innerHTML')) {
 			node_contents = snip(expression);
-			value = name === 'text' ? '@escape($$value)' : '$$value';
+			value = name === 'textContent' ? '@escape($$value)' : '$$value';
 		} else if (binding.name === 'value' && node.name === 'textarea') {
 			const snippet = snip(expression);
 			node_contents = '${(' + snippet + ') || ""}';
diff --git a/test/runtime/samples/binding-contenteditable-html-initial/main.svelte b/test/runtime/samples/binding-contenteditable-html-initial/main.svelte
index 1c05a0950d..119b41b52d 100644
--- a/test/runtime/samples/binding-contenteditable-html-initial/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-html-initial/main.svelte
@@ -2,7 +2,7 @@
 	export let name;
 </script>
 
-<editor contenteditable="true" bind:html={name}>
+<editor contenteditable="true" bind:innerHTML={name}>
 	<b>world</b>
 </editor>
 <p>hello {@html name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-contenteditable-html/main.svelte b/test/runtime/samples/binding-contenteditable-html/main.svelte
index 09195ed558..f576cf1868 100644
--- a/test/runtime/samples/binding-contenteditable-html/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-html/main.svelte
@@ -2,5 +2,5 @@
 	export let name;
 </script>
 
-<editor contenteditable="true" bind:html={name}></editor>
+<editor contenteditable="true" bind:innerHTML={name}></editor>
 <p>hello {@html name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-contenteditable-text-initial/main.svelte b/test/runtime/samples/binding-contenteditable-text-initial/main.svelte
index 633d268f43..b0938d4d0b 100644
--- a/test/runtime/samples/binding-contenteditable-text-initial/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-text-initial/main.svelte
@@ -2,7 +2,7 @@
 	export let name;
 </script>
 
-<editor contenteditable="true" bind:text={name}>
+<editor contenteditable="true" bind:textContent={name}>
 	<b>world</b>
 </editor>
 <p>hello {name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-contenteditable-text/main.svelte b/test/runtime/samples/binding-contenteditable-text/main.svelte
index c47f5ee477..70f65e8824 100644
--- a/test/runtime/samples/binding-contenteditable-text/main.svelte
+++ b/test/runtime/samples/binding-contenteditable-text/main.svelte
@@ -2,5 +2,5 @@
 	export let name;
 </script>
 
-<editor contenteditable="true" bind:text={name}></editor>
+<editor contenteditable="true" bind:textContent={name}></editor>
 <p>hello {name}</p>
\ No newline at end of file
diff --git a/test/validator/samples/contenteditable-dynamic/input.svelte b/test/validator/samples/contenteditable-dynamic/input.svelte
index 97d2c9228c..8dfa91a354 100644
--- a/test/validator/samples/contenteditable-dynamic/input.svelte
+++ b/test/validator/samples/contenteditable-dynamic/input.svelte
@@ -3,4 +3,4 @@
 
     let toggle = false;
 </script>
-<editor contenteditable={toggle} bind:html={name}></editor>
+<editor contenteditable={toggle} bind:innerHTML={name}></editor>
diff --git a/test/validator/samples/contenteditable-missing/errors.json b/test/validator/samples/contenteditable-missing/errors.json
index 9cadb20629..a6452bdac6 100644
--- a/test/validator/samples/contenteditable-missing/errors.json
+++ b/test/validator/samples/contenteditable-missing/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "missing-contenteditable-attribute",
-	"message": "'contenteditable' attribute is required for text and html two-way bindings",
+	"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
 	"start": {
 		"line": 4,
 		"column": 8,
diff --git a/test/validator/samples/contenteditable-missing/input.svelte b/test/validator/samples/contenteditable-missing/input.svelte
index 47f125894a..dae1088994 100644
--- a/test/validator/samples/contenteditable-missing/input.svelte
+++ b/test/validator/samples/contenteditable-missing/input.svelte
@@ -1,4 +1,4 @@
 <script>
     export let name;
 </script>
-<editor bind:text={name}></editor>
+<editor bind:textContent={name}></editor>

From abcdc740b1a244b66afc9f66d32fbb0d93f684f1 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 13:05:03 -0400
Subject: [PATCH 17/24] typo

---
 src/compiler/compile/nodes/Element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 3fcc453926..a3030f52a5 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -618,7 +618,7 @@ export default class Element extends Node {
 				if (!contenteditable) {
 					component.error(binding, {
 						code: `missing-contenteditable-attribute`,
-						message: `'contenteditable' attribute is required for texContent and innerHTML two-way bindings`
+						message: `'contenteditable' attribute is required for textContent and innerHTML two-way bindings`
 					});
 				} else if (contenteditable && !contenteditable.is_static) {
 					component.error(contenteditable, {

From 820490fb4dc1ff0f17c5e3cf1dcca7baa3df8a69 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 13:28:04 -0400
Subject: [PATCH 18/24] add a tutorial chapter

---
 .../app-a/App.svelte                           | 15 +++++++++++++++
 .../app-b/App.svelte                           | 18 ++++++++++++++++++
 .../08-contenteditable-bindings/text.md        | 12 ++++++++++++
 .../app-a/App.svelte                           |  0
 .../app-b/App.svelte                           |  0
 .../text.md                                    |  0
 .../app-a/App.svelte                           |  0
 .../app-b/App.svelte                           |  0
 .../text.md                                    |  0
 .../app-a/App.svelte                           |  0
 .../app-b/App.svelte                           |  0
 .../{10-dimensions => 11-dimensions}/text.md   |  0
 .../app-a/App.svelte                           |  0
 .../app-b/App.svelte                           |  0
 .../{11-bind-this => 12-bind-this}/text.md     |  0
 .../app-a/App.svelte                           |  0
 .../app-a/Keypad.svelte                        |  0
 .../app-b/App.svelte                           |  0
 .../app-b/Keypad.svelte                        |  0
 .../text.md                                    |  0
 20 files changed, 45 insertions(+)
 create mode 100644 site/content/tutorial/06-bindings/08-contenteditable-bindings/app-a/App.svelte
 create mode 100644 site/content/tutorial/06-bindings/08-contenteditable-bindings/app-b/App.svelte
 create mode 100644 site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
 rename site/content/tutorial/06-bindings/{08-each-block-bindings => 09-each-block-bindings}/app-a/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{08-each-block-bindings => 09-each-block-bindings}/app-b/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{08-each-block-bindings => 09-each-block-bindings}/text.md (100%)
 rename site/content/tutorial/06-bindings/{09-media-elements => 10-media-elements}/app-a/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{09-media-elements => 10-media-elements}/app-b/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{09-media-elements => 10-media-elements}/text.md (100%)
 rename site/content/tutorial/06-bindings/{10-dimensions => 11-dimensions}/app-a/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{10-dimensions => 11-dimensions}/app-b/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{10-dimensions => 11-dimensions}/text.md (100%)
 rename site/content/tutorial/06-bindings/{11-bind-this => 12-bind-this}/app-a/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{11-bind-this => 12-bind-this}/app-b/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{11-bind-this => 12-bind-this}/text.md (100%)
 rename site/content/tutorial/06-bindings/{12-component-bindings => 13-component-bindings}/app-a/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{12-component-bindings => 13-component-bindings}/app-a/Keypad.svelte (100%)
 rename site/content/tutorial/06-bindings/{12-component-bindings => 13-component-bindings}/app-b/App.svelte (100%)
 rename site/content/tutorial/06-bindings/{12-component-bindings => 13-component-bindings}/app-b/Keypad.svelte (100%)
 rename site/content/tutorial/06-bindings/{12-component-bindings => 13-component-bindings}/text.md (100%)

diff --git a/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-a/App.svelte b/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-a/App.svelte
new file mode 100644
index 0000000000..55d699959c
--- /dev/null
+++ b/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-a/App.svelte
@@ -0,0 +1,15 @@
+<script>
+	let html = '<p>Write some text!</p>';
+</script>
+
+<div contenteditable="true"></div>
+
+<pre>{html}</pre>
+
+<style>
+	[contenteditable] {
+		padding: 0.5em;
+		border: 1px solid #eee;
+		border-radius: 4px;
+	}
+</style>
\ No newline at end of file
diff --git a/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-b/App.svelte b/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-b/App.svelte
new file mode 100644
index 0000000000..ee97cf19c0
--- /dev/null
+++ b/site/content/tutorial/06-bindings/08-contenteditable-bindings/app-b/App.svelte
@@ -0,0 +1,18 @@
+<script>
+	let html = '<p>Write some text!</p>';
+</script>
+
+<div
+	contenteditable="true"
+	bind:innerHTML={html}
+></div>
+
+<pre>{html}</pre>
+
+<style>
+	[contenteditable] {
+		padding: 0.5em;
+		border: 1px solid #eee;
+		border-radius: 4px;
+	}
+</style>
\ No newline at end of file
diff --git a/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md b/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
new file mode 100644
index 0000000000..a73b07c0ba
--- /dev/null
+++ b/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
@@ -0,0 +1,12 @@
+---
+title: Contenteditable bindings
+---
+
+Elements with a `contenteditable="true"` attribute support `textContent` and `innerHTML` bindings:
+
+```html
+<div
+	contenteditable="true"
+	bind:innerHTML={html}
+></div>
+```
\ No newline at end of file
diff --git a/site/content/tutorial/06-bindings/08-each-block-bindings/app-a/App.svelte b/site/content/tutorial/06-bindings/09-each-block-bindings/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/08-each-block-bindings/app-a/App.svelte
rename to site/content/tutorial/06-bindings/09-each-block-bindings/app-a/App.svelte
diff --git a/site/content/tutorial/06-bindings/08-each-block-bindings/app-b/App.svelte b/site/content/tutorial/06-bindings/09-each-block-bindings/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/08-each-block-bindings/app-b/App.svelte
rename to site/content/tutorial/06-bindings/09-each-block-bindings/app-b/App.svelte
diff --git a/site/content/tutorial/06-bindings/08-each-block-bindings/text.md b/site/content/tutorial/06-bindings/09-each-block-bindings/text.md
similarity index 100%
rename from site/content/tutorial/06-bindings/08-each-block-bindings/text.md
rename to site/content/tutorial/06-bindings/09-each-block-bindings/text.md
diff --git a/site/content/tutorial/06-bindings/09-media-elements/app-a/App.svelte b/site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/09-media-elements/app-a/App.svelte
rename to site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte
diff --git a/site/content/tutorial/06-bindings/09-media-elements/app-b/App.svelte b/site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/09-media-elements/app-b/App.svelte
rename to site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte
diff --git a/site/content/tutorial/06-bindings/09-media-elements/text.md b/site/content/tutorial/06-bindings/10-media-elements/text.md
similarity index 100%
rename from site/content/tutorial/06-bindings/09-media-elements/text.md
rename to site/content/tutorial/06-bindings/10-media-elements/text.md
diff --git a/site/content/tutorial/06-bindings/10-dimensions/app-a/App.svelte b/site/content/tutorial/06-bindings/11-dimensions/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/10-dimensions/app-a/App.svelte
rename to site/content/tutorial/06-bindings/11-dimensions/app-a/App.svelte
diff --git a/site/content/tutorial/06-bindings/10-dimensions/app-b/App.svelte b/site/content/tutorial/06-bindings/11-dimensions/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/10-dimensions/app-b/App.svelte
rename to site/content/tutorial/06-bindings/11-dimensions/app-b/App.svelte
diff --git a/site/content/tutorial/06-bindings/10-dimensions/text.md b/site/content/tutorial/06-bindings/11-dimensions/text.md
similarity index 100%
rename from site/content/tutorial/06-bindings/10-dimensions/text.md
rename to site/content/tutorial/06-bindings/11-dimensions/text.md
diff --git a/site/content/tutorial/06-bindings/11-bind-this/app-a/App.svelte b/site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/11-bind-this/app-a/App.svelte
rename to site/content/tutorial/06-bindings/12-bind-this/app-a/App.svelte
diff --git a/site/content/tutorial/06-bindings/11-bind-this/app-b/App.svelte b/site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/11-bind-this/app-b/App.svelte
rename to site/content/tutorial/06-bindings/12-bind-this/app-b/App.svelte
diff --git a/site/content/tutorial/06-bindings/11-bind-this/text.md b/site/content/tutorial/06-bindings/12-bind-this/text.md
similarity index 100%
rename from site/content/tutorial/06-bindings/11-bind-this/text.md
rename to site/content/tutorial/06-bindings/12-bind-this/text.md
diff --git a/site/content/tutorial/06-bindings/12-component-bindings/app-a/App.svelte b/site/content/tutorial/06-bindings/13-component-bindings/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/12-component-bindings/app-a/App.svelte
rename to site/content/tutorial/06-bindings/13-component-bindings/app-a/App.svelte
diff --git a/site/content/tutorial/06-bindings/12-component-bindings/app-a/Keypad.svelte b/site/content/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/12-component-bindings/app-a/Keypad.svelte
rename to site/content/tutorial/06-bindings/13-component-bindings/app-a/Keypad.svelte
diff --git a/site/content/tutorial/06-bindings/12-component-bindings/app-b/App.svelte b/site/content/tutorial/06-bindings/13-component-bindings/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/12-component-bindings/app-b/App.svelte
rename to site/content/tutorial/06-bindings/13-component-bindings/app-b/App.svelte
diff --git a/site/content/tutorial/06-bindings/12-component-bindings/app-b/Keypad.svelte b/site/content/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte
similarity index 100%
rename from site/content/tutorial/06-bindings/12-component-bindings/app-b/Keypad.svelte
rename to site/content/tutorial/06-bindings/13-component-bindings/app-b/Keypad.svelte
diff --git a/site/content/tutorial/06-bindings/12-component-bindings/text.md b/site/content/tutorial/06-bindings/13-component-bindings/text.md
similarity index 100%
rename from site/content/tutorial/06-bindings/12-component-bindings/text.md
rename to site/content/tutorial/06-bindings/13-component-bindings/text.md

From 4e8755338ae1226d59b25ebb764ba7b6e8efd320 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 13:34:18 -0400
Subject: [PATCH 19/24] oops

---
 test/validator/samples/contenteditable-missing/errors.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/validator/samples/contenteditable-missing/errors.json b/test/validator/samples/contenteditable-missing/errors.json
index a6452bdac6..53d5af4928 100644
--- a/test/validator/samples/contenteditable-missing/errors.json
+++ b/test/validator/samples/contenteditable-missing/errors.json
@@ -8,8 +8,8 @@
 	},
 	"end": {
 		"line": 4,
-		"column": 24,
-		"character": 64
+		"column": 31,
+		"character": 71
 	},
 	"pos": 48
 }]
\ No newline at end of file

From 09eb8330a3a27bbb63d94488bb7f6719ce88f84a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 13:51:14 -0400
Subject: [PATCH 20/24] handle member expressions in destructuring assignments
 - fixes #3092

---
 src/compiler/compile/utils/scope.ts           |  5 ++++
 .../destructuring-assignment-array/_config.js | 23 +++++++++++++++++++
 .../main.svelte                               | 18 +++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 test/runtime/samples/destructuring-assignment-array/_config.js
 create mode 100644 test/runtime/samples/destructuring-assignment-array/main.svelte

diff --git a/src/compiler/compile/utils/scope.ts b/src/compiler/compile/utils/scope.ts
index 6bf3f9eaf4..75e44f0adf 100644
--- a/src/compiler/compile/utils/scope.ts
+++ b/src/compiler/compile/utils/scope.ts
@@ -2,6 +2,7 @@ import { walk } from 'estree-walker';
 import is_reference from 'is-reference';
 import { Node } from '../../interfaces';
 import { Node as ESTreeNode } from 'estree';
+import get_object from './get_object';
 
 export function create_scopes(expression: Node) {
 	const map = new WeakMap();
@@ -114,6 +115,10 @@ const extractors = {
 		nodes.push(param);
 	},
 
+	MemberExpression(nodes: Node[], param: Node) {
+		nodes.push(get_object(param));
+	},
+
 	ObjectPattern(nodes: Node[], param: Node) {
 		param.properties.forEach((prop: Node) => {
 			if (prop.type === 'RestElement') {
diff --git a/test/runtime/samples/destructuring-assignment-array/_config.js b/test/runtime/samples/destructuring-assignment-array/_config.js
new file mode 100644
index 0000000000..ede4552803
--- /dev/null
+++ b/test/runtime/samples/destructuring-assignment-array/_config.js
@@ -0,0 +1,23 @@
+export default {
+	html: `
+		<ul>
+			<li>Gruyere</li>
+			<li>Compté</li>
+			<li>Beaufort</li>
+			<li>Abondance</li>
+		</ul>
+	`,
+
+	async test({ assert, component, target }) {
+		await component.swap(0, 1);
+
+		assert.htmlEqual(target.innerHTML, `
+			<ul>
+				<li>Compté</li>
+				<li>Gruyere</li>
+				<li>Beaufort</li>
+				<li>Abondance</li>
+			</ul>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/destructuring-assignment-array/main.svelte b/test/runtime/samples/destructuring-assignment-array/main.svelte
new file mode 100644
index 0000000000..aebbfe204c
--- /dev/null
+++ b/test/runtime/samples/destructuring-assignment-array/main.svelte
@@ -0,0 +1,18 @@
+<script>
+	let cheese = [
+		'Gruyere',
+		'Compté',
+		'Beaufort',
+		'Abondance',
+	];
+
+	export function swap(a, b) {
+		[cheese[a], cheese[b]] = [cheese[b], cheese[a]];
+	}
+</script>
+
+<ul>
+	{#each cheese as cheese}
+		<li>{cheese}</li>
+	{/each}
+</ul>
\ No newline at end of file

From b2da2ebcc746b37a988779a3dacc3fd8d869e81a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 14:18:54 -0400
Subject: [PATCH 21/24] replace SVG

---
 site/static/organisations/nonkosi.svg | 429 +-------------------------
 1 file changed, 1 insertion(+), 428 deletions(-)

diff --git a/site/static/organisations/nonkosi.svg b/site/static/organisations/nonkosi.svg
index c9e32c133c..8904cdae9d 100644
--- a/site/static/organisations/nonkosi.svg
+++ b/site/static/organisations/nonkosi.svg
@@ -1,428 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="4134.000000pt" height="2575.000000pt" viewBox="0 0 4134.000000 2575.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.15, written by Peter Selinger 2001-2017
-</metadata>
-<g transform="translate(0.000000,2575.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M2340 18456 c-772 -82 -1198 -370 -1332 -901 -20 -81 -23 -114 -23
--320 0 -249 9 -316 66 -550 325 -1315 1716 -3354 4034 -5910 416 -459 896
--966 1306 -1380 319 -323 360 -362 337 -325 -8 14 -167 264 -353 555 -186 292
--552 865 -813 1275 -261 410 -543 851 -625 980 -82 129 -227 357 -322 505 -94
-149 -340 533 -545 855 -791 1241 -736 1153 -886 1420 -328 588 -533 1071 -615
-1450 -33 153 -33 387 0 480 57 162 169 259 340 296 87 18 291 18 415 -1 522
--79 1385 -449 2261 -971 94 -56 301 -160 555 -278 579 -270 1365 -635 1575
--731 99 -46 349 -160 555 -255 493 -226 926 -421 1184 -532 409 -175 550 -226
-831 -299 219 -56 453 -131 749 -238 138 -50 251 -89 253 -88 5 5 -1164 828
--1817 1278 -2524 1742 -4586 3024 -5680 3529 -243 112 -298 129 -458 146 -205
-21 -825 27 -992 10z"/>
-<path d="M10695 18023 c34 -67 61 -110 68 -106 6 3 7 1 3 -6 -10 -16 3 -53 16
--45 6 4 8 -1 4 -14 -4 -12 -2 -23 5 -28 8 -5 9 -3 4 6 -5 9 -4 11 4 6 6 -4 9
--11 6 -16 -8 -14 57 -150 69 -143 5 3 6 1 2 -5 -4 -6 5 -36 19 -65 14 -30 25
--59 25 -64 0 -6 7 -14 16 -17 8 -3 13 -10 9 -16 -3 -5 2 -24 12 -42 9 -18 18
--37 19 -43 8 -33 42 -107 46 -99 3 5 4 4 2 -3 -4 -17 18 -83 26 -78 4 3 7 -1
-7 -8 -2 -26 24 -97 34 -91 6 4 9 -2 7 -13 -3 -21 22 -103 31 -103 4 0 7 -10 8
--21 1 -12 7 -27 14 -33 8 -8 10 -5 5 14 -6 21 -5 22 4 7 6 -9 8 -22 5 -27 -4
--6 4 -35 16 -65 19 -46 25 -53 37 -42 13 10 14 9 4 -10 -7 -13 -8 -24 -3 -27
-5 -4 12 0 15 6 3 7 3 3 1 -8 -7 -27 42 -127 57 -118 6 4 8 3 5 -4 -10 -15 42
--114 55 -106 7 4 8 2 4 -5 -7 -10 61 -147 90 -181 7 -8 14 -19 15 -25 1 -5 6
--21 12 -33 10 -22 12 -23 24 -6 15 20 18 7 3 -16 -6 -10 -2 -23 14 -45 13 -16
-26 -40 30 -53 4 -12 11 -20 16 -17 5 3 12 0 16 -6 4 -8 3 -9 -4 -5 -21 13 -13
--5 48 -106 33 -54 60 -101 60 -104 0 -3 9 -19 21 -35 20 -28 22 -29 35 -12 16
-22 19 10 3 -15 -10 -15 -4 -31 31 -90 24 -39 47 -69 53 -65 6 4 7 1 3 -6 -5
--7 7 -36 27 -69 19 -31 42 -72 51 -90 10 -19 21 -30 28 -26 6 4 8 3 4 -4 -6
--11 42 -101 73 -136 9 -10 15 -21 15 -25 -1 -3 3 -16 9 -28 10 -22 27 -23 27
--2 0 6 -5 7 -12 3 -7 -4 -8 -3 -4 5 12 19 27 2 20 -24 -4 -16 1 -34 13 -52 10
--15 24 -40 31 -55 6 -16 16 -28 22 -28 5 0 9 -4 8 -8 -5 -14 65 -121 75 -115
-6 3 7 1 4 -5 -10 -15 3 -43 16 -35 6 3 7 1 3 -5 -9 -16 63 -134 77 -125 6 3 7
-1 3 -5 -4 -6 8 -36 26 -67 18 -31 39 -67 46 -81 7 -13 17 -24 23 -24 5 0 8 -4
-6 -9 -4 -16 116 -210 126 -204 6 3 8 2 4 -3 -6 -11 57 -127 65 -119 2 3 5 -1
-5 -8 0 -23 85 -157 96 -150 6 3 7 1 3 -5 -4 -6 15 -48 41 -92 26 -44 53 -88
-58 -98 81 -138 129 -211 136 -206 5 3 7 -1 4 -8 -2 -7 18 -49 45 -93 27 -44
-57 -95 66 -112 9 -18 19 -31 23 -28 4 2 8 -2 8 -8 0 -24 85 -157 96 -150 6 3
-7 1 3 -5 -9 -15 43 -104 56 -96 6 4 5 10 -3 15 -8 5 -9 9 -3 9 18 0 24 -12 13
--26 -8 -10 -6 -21 7 -44 11 -16 50 -82 87 -145 41 -68 73 -112 79 -109 7 4 8
-2 4 -4 -9 -15 55 -123 68 -115 5 3 6 1 2 -5 -4 -6 5 -30 20 -52 20 -30 30 -38
-36 -28 6 9 8 7 4 -7 -4 -13 4 -30 22 -50 15 -16 40 -49 56 -72 16 -24 32 -40
-37 -38 4 3 11 0 15 -6 4 -8 3 -9 -4 -5 -7 4 -12 3 -12 -2 0 -12 35 -43 42 -37
-3 3 8 -1 12 -10 4 -11 2 -14 -6 -9 -7 5 -2 -5 10 -21 13 -17 37 -51 54 -77 17
--27 35 -48 39 -48 5 0 8 -6 6 -12 -1 -7 4 -12 11 -10 8 1 11 -1 8 -6 -7 -12
-23 -54 35 -47 5 3 6 0 3 -8 -3 -8 0 -18 7 -23 8 -5 10 -3 4 6 -5 9 -4 11 4 6
-6 -4 9 -11 6 -16 -10 -16 36 -69 54 -63 13 4 13 3 2 -5 -12 -9 -12 -15 5 -39
-10 -15 23 -36 29 -46 5 -9 43 -64 83 -122 39 -58 72 -108 72 -111 0 -3 14 -27
-32 -52 61 -90 68 -101 68 -106 0 -3 32 -57 70 -121 39 -64 70 -118 70 -120 0
--3 41 -73 79 -135 9 -14 16 -27 16 -30 4 -21 30 -58 36 -54 5 3 6 -3 2 -12 -5
--13 -3 -15 7 -9 9 5 11 4 6 -3 -8 -13 7 -47 38 -81 11 -13 15 -21 8 -17 -7 5
-4 -25 24 -66 39 -74 40 -78 43 -100 1 -9 4 -9 12 2 9 12 10 12 5 -4 -4 -10 -2
--24 2 -30 5 -6 17 -34 27 -63 10 -29 23 -49 28 -46 6 3 7 1 4 -4 -10 -16 13
--73 29 -73 8 0 14 -5 14 -11 0 -5 -5 -7 -12 -3 -8 5 -9 2 -3 -12 4 -10 15 -39
-23 -64 9 -25 22 -51 29 -58 7 -8 11 -18 8 -22 -9 -14 16 -100 27 -94 5 3 6 -5
-3 -19 -4 -14 -2 -28 4 -32 6 -3 9 -10 7 -14 -3 -4 1 -43 9 -87 19 -105 19
--267 -1 -361 -8 -41 -13 -82 -9 -91 4 -12 3 -13 -10 -2 -12 10 -15 10 -15 0 0
--7 -12 -28 -26 -47 -25 -33 -29 -49 -8 -35 6 4 18 18 27 32 9 13 17 19 17 13
-0 -17 -33 -54 -51 -56 -8 -2 -32 -17 -53 -34 -48 -39 -145 -86 -216 -104 -38
--10 -115 -14 -255 -13 -177 0 -217 4 -345 29 -80 15 -152 29 -160 30 -8 1 -22
-5 -30 8 -8 3 -40 13 -70 21 -30 8 -101 28 -158 45 -57 16 -111 27 -120 25 -12
--4 -13 -3 -4 3 9 7 2 13 -27 21 -21 7 -45 11 -52 9 -8 -2 -10 -2 -5 1 14 7
--65 31 -83 25 -9 -4 -12 -2 -8 2 10 11 -143 66 -163 59 -8 -3 -11 -2 -7 2 4 4
--32 23 -80 41 -49 19 -96 38 -106 44 -10 5 -22 7 -27 4 -6 -4 -10 -1 -10 5 0
-6 -4 9 -9 6 -5 -4 -11 -3 -13 2 -1 4 -70 36 -153 71 -82 35 -175 75 -205 89
--60 26 -575 278 -600 292 -69 41 -114 60 -127 56 -9 -4 -11 -2 -7 6 5 7 0 9
--14 6 -12 -4 -20 -3 -18 1 6 9 -90 68 -125 76 -16 4 -30 2 -33 -4 -4 -6 -13
--11 -19 -11 -7 0 -4 5 7 11 17 10 16 12 -10 30 -16 10 -35 17 -42 14 -7 -3
--10 0 -7 5 8 12 -43 33 -57 24 -7 -5 -8 -2 -3 6 6 10 3 12 -13 8 -12 -4 -20
--3 -18 1 7 11 -53 43 -66 35 -7 -4 -8 -3 -4 4 9 14 -40 35 -57 25 -7 -3 -9 -3
--5 1 9 11 -81 58 -94 50 -7 -4 -8 -2 -4 5 9 13 -32 31 -53 23 -10 -4 -12 -1
--6 8 6 10 3 12 -14 7 -13 -3 -20 -3 -17 0 10 10 -33 35 -46 27 -7 -5 -8 -3 -3
-6 6 10 4 12 -9 7 -9 -4 -15 -3 -12 1 5 9 -156 92 -179 92 -8 0 -15 4 -15 9 0
-10 -78 46 -97 44 -7 0 -10 4 -6 10 4 7 0 8 -13 3 -10 -4 -15 -4 -11 0 10 10
--122 76 -136 67 -6 -4 -7 -1 -2 7 6 10 4 12 -11 6 -10 -4 -15 -4 -11 0 8 8
--75 54 -98 54 -8 0 -15 5 -15 11 0 6 -7 8 -17 5 -10 -4 -14 -4 -10 0 10 10
--162 96 -176 87 -7 -3 -9 -2 -4 2 9 11 -122 77 -136 68 -6 -4 -7 -1 -2 7 6 10
-4 12 -11 6 -10 -4 -15 -4 -11 0 10 10 -143 85 -157 77 -6 -3 -8 -3 -4 2 12 13
--403 216 -427 209 -14 -4 -16 -2 -7 4 16 11 -592 317 -609 306 -7 -4 -9 -3 -6
-3 7 11 -192 113 -220 113 -9 0 -14 3 -10 6 6 6 -124 73 -148 77 -5 1 -12 5
--15 8 -10 12 -150 79 -150 72 0 -5 -4 -3 -8 3 -12 19 -112 65 -124 58 -7 -4
--8 -3 -4 4 6 11 0 14 -20 11 -4 0 -10 4 -13 9 -9 13 -151 84 -151 75 0 -5 -4
--3 -8 3 -9 15 -152 86 -152 77 0 -5 -4 -3 -8 3 -9 15 -152 86 -152 77 0 -5 -4
--3 -8 3 -8 13 -152 87 -152 78 0 -3 -7 2 -16 11 -10 9 -24 13 -38 10 -14 -4
--17 -3 -8 3 9 6 -3 16 -40 33 -28 13 -56 23 -60 22 -4 -2 -8 1 -8 6 0 8 -53
-34 -65 32 -3 -1 -13 5 -21 14 -8 8 -27 18 -42 22 -15 3 -29 9 -32 13 -3 4 -37
-23 -76 43 -48 23 -76 32 -85 26 -12 -7 -12 -9 0 -9 8 0 12 -3 8 -6 -12 -12
--28 7 -17 21 8 9 3 16 -21 25 -17 8 -37 13 -45 13 -8 0 -14 4 -14 9 0 7 -63
-38 -77 37 -3 -1 -9 3 -12 8 -3 4 -22 17 -41 27 -40 21 -37 18 42 -48 34 -27
-63 -44 69 -40 7 4 9 3 6 -3 -4 -6 2 -18 13 -28 11 -10 20 -14 20 -9 0 5 5 1
-11 -9 6 -9 15 -14 21 -11 6 4 8 3 5 -3 -4 -6 5 -18 19 -28 14 -9 34 -25 45
--36 11 -11 25 -17 31 -13 6 4 8 3 5 -3 -4 -6 30 -38 74 -72 81 -62 96 -71 83
--48 -4 7 -3 9 2 4 5 -5 9 -12 9 -16 0 -16 75 -72 86 -65 8 5 9 3 4 -6 -6 -9
--1 -10 16 -5 18 5 20 4 9 -4 -13 -9 -11 -13 10 -28 14 -10 28 -17 32 -15 5 1
-7 -1 5 -6 -1 -4 1 -8 5 -10 4 -1 20 -15 36 -30 16 -15 51 -43 77 -62 26 -19
-63 -48 81 -63 19 -16 38 -25 45 -21 7 4 9 3 6 -3 -9 -14 19 -37 33 -28 6 4 9
-1 8 -7 -2 -7 3 -12 10 -10 8 1 11 -2 7 -8 -3 -5 2 -13 12 -17 10 -4 23 -12 28
--19 6 -7 89 -72 185 -143 187 -139 193 -144 228 -175 20 -18 24 -18 33 -6 8
-13 9 12 7 -2 -2 -11 27 -39 85 -82 48 -36 87 -63 87 -61 0 2 11 -6 24 -18 37
--34 54 -47 110 -84 28 -19 59 -42 68 -50 9 -8 22 -12 29 -7 8 4 10 3 5 -4 -4
--7 10 -23 34 -39 22 -16 55 -40 73 -55 17 -15 39 -28 48 -28 9 0 19 -6 22 -13
-3 -7 36 -36 75 -64 53 -39 73 -48 82 -40 8 9 10 8 5 -5 -4 -11 1 -21 17 -29
-13 -7 26 -12 31 -11 4 1 6 -4 5 -10 -2 -7 5 -12 14 -12 10 1 16 -2 13 -6 -3
--5 12 -19 32 -31 21 -13 43 -27 48 -31 68 -51 145 -106 145 -103 0 2 12 -7 26
--20 15 -14 33 -25 40 -25 7 0 17 -6 21 -13 9 -13 94 -76 132 -96 18 -10 26
--10 39 1 15 12 16 11 3 -5 -8 -9 -12 -19 -10 -21 40 -34 288 -193 294 -188 3
-4 5 2 3 -5 -4 -14 219 -165 227 -153 3 4 0 10 -7 12 -8 3 -7 6 4 10 11 5 15 0
-14 -20 -1 -23 3 -27 24 -24 19 1 21 0 10 -7 -12 -8 -11 -11 5 -17 11 -4 22
--10 25 -13 18 -21 72 -51 82 -45 6 4 8 3 5 -3 -4 -6 11 -22 32 -36 30 -20 41
--23 51 -14 10 9 12 9 7 -4 -4 -12 16 -30 74 -68 45 -30 84 -49 90 -45 8 4 9 3
-5 -4 -8 -13 52 -54 66 -46 5 3 7 0 6 -8 -2 -7 5 -12 14 -12 10 1 15 -2 12 -7
--3 -5 8 -14 23 -21 15 -7 30 -15 33 -18 3 -3 14 -11 25 -18 11 -6 46 -29 78
--50 32 -20 93 -59 135 -86 42 -27 96 -62 120 -78 23 -16 42 -26 42 -22 0 4 10
--2 23 -13 32 -29 66 -45 79 -37 6 4 8 3 5 -3 -8 -13 101 -85 116 -76 5 3 7 1
-4 -4 -4 -6 1 -14 10 -17 9 -4 56 -32 104 -62 52 -33 93 -53 100 -48 7 4 9 3 5
--4 -3 -6 13 -21 36 -35 24 -13 83 -47 131 -76 49 -28 92 -49 97 -46 5 3 15 -4
-24 -16 8 -12 19 -18 25 -14 7 3 10 1 9 -5 -2 -6 15 -21 37 -34 115 -64 138
--75 148 -69 5 3 7 1 3 -5 -8 -14 163 -105 187 -98 13 3 16 1 8 -8 -8 -9 8 -21
-62 -47 39 -19 73 -33 75 -31 2 2 9 -4 16 -14 8 -11 18 -14 26 -9 8 5 11 4 7
--1 -3 -5 21 -24 54 -41 33 -18 58 -29 55 -25 -2 4 7 8 20 8 22 2 23 1 8 -10
--16 -12 -16 -13 0 -19 10 -4 23 -4 28 0 7 3 8 1 4 -5 -5 -8 0 -12 13 -12 12 0
-21 -4 21 -8 0 -11 131 -77 148 -73 6 1 12 -2 12 -7 0 -13 50 -33 63 -26 7 4 9
-3 5 -1 -9 -10 63 -56 75 -48 5 3 14 -3 21 -12 7 -9 24 -18 38 -18 14 -1 24 -6
-20 -11 -3 -5 2 -6 12 -3 9 4 15 3 12 -1 -7 -11 110 -66 123 -58 5 4 13 1 17
--5 4 -8 3 -9 -4 -5 -7 4 -12 4 -12 1 0 -3 17 -13 38 -22 20 -8 56 -24 80 -34
-23 -11 48 -17 54 -13 6 4 8 3 5 -3 -4 -6 13 -18 36 -28 23 -9 50 -21 60 -26
-10 -5 23 -7 29 -3 6 4 8 3 5 -3 -9 -14 47 -34 71 -27 14 5 15 4 2 -5 -11 -8
--12 -11 -2 -11 7 0 37 -11 65 -23 29 -13 90 -39 137 -57 47 -18 101 -40 120
--48 19 -9 48 -15 63 -15 16 0 23 -4 16 -8 -7 -4 2 -10 22 -14 19 -4 40 -12 46
--17 7 -6 19 -8 28 -5 8 4 20 1 27 -6 20 -20 166 -70 184 -63 8 3 12 2 9 -4 -3
--6 2 -11 12 -11 28 -2 35 -4 78 -23 22 -10 56 -19 76 -20 20 0 35 -4 33 -7 -6
--10 253 -72 271 -65 10 4 14 2 9 -5 -4 -8 4 -9 27 -4 22 4 29 3 21 -3 -10 -6
--1 -11 30 -16 24 -4 58 -9 77 -13 24 -4 32 -2 27 6 -5 7 3 11 26 10 23 -1 26
--3 11 -6 -43 -8 -25 -26 20 -19 24 4 37 3 29 -2 -21 -14 195 -32 369 -31 85 0
-195 7 244 15 50 8 105 16 123 19 65 11 198 57 221 78 13 12 21 16 16 8 -8 -14
-76 27 128 62 20 14 25 22 17 27 -7 4 0 8 16 8 17 0 35 8 47 23 11 13 22 23 26
-23 3 -1 5 2 3 8 -1 5 1 7 6 4 12 -7 56 40 48 52 -3 5 2 9 12 8 11 -1 16 5 14
-16 -2 12 2 16 11 12 8 -3 17 2 21 11 8 21 -2 38 -16 29 -7 -4 -8 -2 -4 5 6 9
-11 9 22 0 10 -8 17 -8 26 3 42 44 128 206 120 227 -3 8 0 11 6 7 9 -5 36 52
-37 79 0 6 4 13 10 17 5 4 9 23 9 42 0 20 3 31 6 25 9 -14 31 91 25 121 -5 21
--4 22 3 5 7 -16 12 -5 21 49 7 37 10 71 7 74 -3 3 -1 11 5 18 37 44 30 774 -8
-847 -8 16 -10 26 -4 23 16 -10 13 24 -4 58 -17 33 -20 48 -4 26 7 -11 9 -3 4
-30 -12 88 -37 235 -41 242 -2 3 -7 32 -10 63 -3 31 -9 66 -13 78 -5 12 -12 45
--16 74 -4 29 -13 57 -21 64 -8 6 -14 17 -14 23 0 6 5 4 10 -4 20 -30 9 4 -16
-54 -15 28 -35 67 -45 87 -34 68 -117 199 -121 192 -3 -5 -3 -2 -1 6 3 14 -41
-88 -62 103 -5 4 -7 8 -3 8 4 0 -18 36 -48 81 -30 44 -54 83 -54 85 0 13 -44
-63 -51 58 -5 -3 -6 1 -4 8 3 8 -6 30 -20 49 -14 18 -49 69 -76 112 -29 44 -55
-74 -61 70 -7 -3 -8 -1 -4 5 8 13 -22 64 -34 57 -4 -3 -11 7 -14 21 -4 15 -19
-43 -34 63 -15 20 -31 42 -37 49 -5 8 -20 25 -32 38 -13 14 -23 28 -24 32 0 4
--5 6 -9 5 -4 -1 -7 4 -6 12 2 20 -207 305 -218 298 -5 -4 -6 -1 -2 5 3 5 -4
-23 -17 39 -12 15 -39 54 -60 86 -23 35 -42 55 -49 51 -7 -4 -8 -3 -4 4 4 6 -2
-20 -14 32 -11 11 -20 23 -20 26 0 14 -63 84 -71 79 -5 -4 -6 0 -4 7 3 8 -2 23
--12 34 -10 11 -34 42 -53 69 -40 57 -58 80 -82 107 -10 10 -18 22 -18 26 0 14
--37 44 -42 35 -3 -4 -3 -2 -1 6 4 18 -16 43 -30 34 -6 -4 -7 -1 -2 6 8 14 -33
-63 -46 55 -5 -3 -6 1 -3 9 3 8 -10 31 -30 52 -20 21 -36 41 -36 45 0 4 -21 35
--47 68 -27 33 -68 85 -92 116 -33 41 -47 53 -53 44 -6 -9 -8 -7 -4 7 4 13 -4
-31 -24 54 -17 18 -30 36 -30 40 0 13 -72 81 -81 76 -5 -3 -6 1 -3 9 6 16 -43
-83 -58 79 -4 -2 -7 3 -5 10 1 6 -4 11 -11 9 -8 -1 -11 2 -7 8 3 5 -4 20 -16
-32 -12 13 -18 17 -14 9 5 -10 4 -12 -4 -7 -6 4 -9 12 -6 17 8 13 -56 90 -68
-82 -6 -4 -7 -1 -2 6 8 14 -33 64 -46 56 -4 -3 -11 0 -15 6 -5 8 -3 9 6 4 8 -5
-11 -3 8 6 -3 8 -11 13 -17 11 -7 -1 -10 2 -6 7 3 6 -9 25 -27 42 -18 18 -26
-29 -18 25 8 -4 -3 9 -25 30 -22 20 -33 33 -25 29 8 -5 4 4 -9 18 -13 15 -28
-24 -34 20 -6 -4 -7 -1 -3 6 10 15 -23 53 -37 44 -6 -3 -7 -1 -3 5 4 7 -18 42
--50 82 -43 53 -60 68 -67 58 -6 -9 -7 -8 -3 5 5 17 -53 100 -105 150 -11 10
--19 22 -19 28 0 6 -4 7 -10 4 -5 -3 -10 -1 -10 6 0 11 -107 149 -116 149 -2 0
--1 -7 2 -15 4 -8 1 -15 -4 -15 -6 0 -9 10 -7 21 4 21 -69 124 -101 142 -8 4
--14 14 -14 21 0 18 -35 48 -45 39 -4 -5 -5 -2 -1 5 4 6 2 12 -3 12 -6 0 -10 6
--8 13 1 6 -4 11 -11 9 -8 -1 -11 1 -8 6 7 12 -38 54 -49 45 -4 -5 -5 -2 -1 5
-8 14 -61 105 -74 97 -4 -3 -14 3 -21 12 -10 12 -10 14 -1 9 24 -14 12 7 -35
-63 -26 31 -50 58 -53 61 -3 3 -17 21 -32 42 -38 50 -58 69 -68 63 -4 -3 -14 3
--21 13 -13 15 -12 16 4 3 10 -8 17 -9 17 -3 0 6 -12 20 -26 31 -15 12 -23 21
--19 21 5 0 -2 11 -15 25 -12 13 -27 22 -31 19 -5 -3 -6 3 -2 12 5 13 2 16 -9
-12 -10 -4 -15 -1 -14 10 0 9 -5 16 -12 14 -8 -1 -11 1 -8 6 3 5 -9 25 -26 46
--24 29 -33 35 -40 24 -7 -9 -8 -7 -4 7 4 15 -11 39 -56 90 -34 39 -66 69 -71
-67 -4 -1 -6 2 -2 8 3 5 -9 26 -27 45 -75 82 -85 94 -82 98 3 2 -14 21 -36 41
--22 20 -37 36 -34 36 4 0 1 7 -6 15 -7 8 -16 12 -21 9 -5 -3 -8 -1 -7 4 2 6
--35 54 -82 108 -47 54 -103 120 -124 147 -29 37 -41 45 -48 35 -6 -9 -8 -7 -3
-8 3 14 -1 26 -12 35 -15 12 -16 12 -10 -4 4 -11 3 -16 -4 -12 -6 4 -8 13 -5
-20 5 15 -31 58 -44 50 -5 -3 -12 0 -16 6 -4 8 -3 9 4 5 19 -12 14 3 -14 40
--14 18 -30 31 -35 28 -5 -3 -8 -1 -7 4 2 5 -35 54 -82 108 -133 154 -142 164
--154 157 -6 -3 -8 -3 -4 2 11 11 -31 67 -44 59 -7 -5 -8 -2 -3 6 4 7 4 15 -1
-19 -5 3 -27 29 -49 56 -22 28 -58 69 -81 92 -22 24 -39 44 -37 46 2 3 -15 21
--37 41 -22 20 -37 36 -33 36 4 0 -15 24 -43 53 -28 28 -77 84 -110 122 -32 39
--106 123 -163 188 -57 64 -114 129 -127 145 -111 130 -187 211 -197 209 -6 -1
--11 5 -12 13 0 23 -118 159 -133 154 -7 -2 -10 1 -7 6 5 8 -92 126 -172 210
--8 8 11 -36 42 -97z"/>
-<path d="M27832 14958 l3 -1933 420 0 420 0 5 484 5 484 305 -319 c168 -175
-358 -375 424 -444 65 -69 138 -144 162 -167 l43 -43 580 0 c390 0 581 3 581
-10 0 6 -181 194 -402 418 -221 224 -504 510 -628 635 l-225 228 50 47 c28 26
-271 250 540 497 269 248 514 473 545 502 l55 52 -577 1 -577 0 -416 -407
-c-229 -223 -428 -415 -441 -425 l-24 -19 0 1165 0 1166 -425 0 -425 0 2 -1932z"/>
-<path d="M37015 16786 c-120 -39 -237 -141 -289 -250 -125 -264 26 -587 309
--661 165 -43 335 5 456 127 227 227 162 607 -128 754 -74 38 -79 39 -192 41
--75 2 -130 -2 -156 -11z"/>
-<path d="M17300 14780 l0 -1760 453 2 452 3 5 1075 5 1074 121 -154 c66 -85
-170 -218 230 -295 60 -77 134 -171 164 -210 65 -85 99 -129 171 -220 83 -105
-269 -343 629 -805 177 -228 334 -427 348 -443 l26 -27 450 2 451 3 3 1758 2
-1757 -455 0 -455 0 0 -1064 c0 -586 -4 -1067 -8 -1070 -5 -3 -150 175 -323
-396 -173 221 -381 488 -463 592 -82 105 -206 263 -274 351 -69 88 -164 210
--212 270 -47 61 -159 203 -249 318 l-162 207 -455 0 -454 0 0 -1760z"/>
-<path d="M22645 15493 c-445 -38 -792 -218 -1028 -532 -171 -227 -240 -435
--240 -726 -1 -370 111 -652 358 -901 243 -245 529 -365 938 -394 249 -17 503
-12 711 81 434 145 756 506 843 946 23 120 23 376 0 494 -46 232 -148 432 -308
-603 -275 295 -639 439 -1094 434 -77 -1 -158 -3 -180 -5z m253 -723 c176 -29
-325 -135 406 -290 116 -219 76 -481 -98 -656 -112 -113 -235 -164 -391 -164
--162 0 -285 50 -395 160 -218 217 -226 553 -18 775 69 74 129 116 205 145 99
-37 189 46 291 30z"/>
-<path d="M32270 15494 c-219 -26 -374 -64 -521 -128 -309 -136 -561 -400 -677
--709 -124 -332 -88 -763 90 -1071 198 -343 551 -570 983 -632 135 -19 413 -22
-550 -5 576 72 1006 431 1140 951 32 127 45 353 26 492 -38 282 -159 521 -371
-727 -189 184 -434 306 -715 357 -86 15 -424 27 -505 18z m351 -748 c164 -57
-296 -194 349 -365 25 -79 27 -226 4 -315 -30 -118 -107 -229 -212 -303 -93
--67 -175 -94 -297 -100 -177 -9 -294 35 -416 156 -119 118 -169 237 -169 399
-0 147 46 267 144 378 143 162 386 223 597 150z"/>
-<path d="M35266 15489 c-131 -14 -235 -38 -341 -80 -158 -63 -272 -148 -365
--271 -115 -152 -161 -289 -162 -483 -2 -212 49 -344 175 -461 94 -87 192 -133
-377 -179 301 -73 346 -86 400 -113 61 -30 87 -61 100 -115 22 -99 -40 -185
--149 -208 -77 -16 -247 -6 -346 21 -99 26 -236 85 -350 151 -48 28 -88 49 -90
-47 -2 -2 -53 -102 -115 -223 -62 -121 -130 -253 -151 -292 l-38 -73 42 -24
-c157 -92 386 -180 565 -216 201 -41 487 -45 672 -10 401 75 688 308 780 630
-30 106 37 280 16 390 -45 243 -215 423 -486 515 -38 13 -142 40 -231 60 -89
-20 -179 43 -201 51 -110 39 -152 116 -113 210 30 73 102 104 241 104 132 0
-249 -27 395 -93 l56 -25 139 265 c76 146 140 268 142 272 6 16 -210 85 -363
-116 -207 42 -412 54 -599 34z"/>
-<path d="M26116 15444 c-182 -36 -293 -94 -432 -227 l-104 -99 0 146 0 146
--425 0 -425 0 2 -1192 3 -1193 420 0 420 0 5 715 c5 655 7 720 24 770 39 120
-109 199 224 253 64 31 72 32 192 32 142 0 185 -13 259 -81 57 -51 87 -105 108
--194 15 -66 18 -159 23 -785 l5 -710 418 -3 417 -2 0 834 c0 905 -1 923 -56
-1078 -14 40 -42 102 -62 138 -46 84 -176 214 -267 268 -79 47 -219 96 -315
-111 -90 15 -351 12 -434 -5z"/>
-<path d="M36732 14218 l3 -1193 420 0 420 0 3 1193 2 1192 -425 0 -425 0 2
--1192z"/>
-<path d="M23440 12189 c0 -5 -4 -8 -9 -5 -5 3 -33 1 -62 -5 -58 -12 -70 -14
--169 -24 -36 -3 -72 -9 -80 -11 -15 -5 -170 -24 -362 -45 l-118 -12 0 -29 c0
--26 3 -28 38 -29 43 -1 86 0 122 5 14 2 19 1 13 -1 -25 -9 -12 -23 20 -23 44
-0 146 -27 176 -47 22 -14 24 -14 18 0 -3 9 -2 19 3 22 4 3 7 -7 5 -22 -1 -15
-1 -38 6 -51 14 -36 12 -1726 -2 -1791 -7 -36 -20 -61 -40 -78 -16 -14 -26 -30
--22 -36 3 -6 2 -7 -4 -4 -6 4 -41 0 -79 -9 -67 -15 -104 -20 -192 -25 -49 -3
--56 -10 -47 -40 6 -17 9 -19 16 -8 6 10 9 10 9 2 0 -10 133 -12 591 -13 524 0
-591 1 585 15 -3 8 -1 15 4 15 12 0 14 29 3 31 -5 1 -35 3 -68 5 -126 9 -251
-25 -280 36 -16 7 -34 13 -39 13 -5 0 -11 16 -15 35 -3 19 -5 449 -5 955 1 949
-1 926 39 1136 6 32 5 37 -16 42 -33 9 -39 9 -39 -4z"/>
-<path d="M17258 11935 c-3 -3 -1 -26 3 -53 5 -26 11 -138 15 -249 l7 -203 66
-0 67 0 32 88 c38 101 99 189 156 225 130 80 252 98 695 98 184 0 313 4 316 10
-4 5 12 9 18 9 7 0 6 -4 -3 -10 -8 -5 -10 -10 -5 -10 7 0 8 -292 5 -864 l-5
--865 -34 -35 c-39 -40 -119 -74 -190 -81 -25 -3 -66 -8 -91 -11 -25 -3 -83 -8
--129 -9 -46 -2 -85 -5 -86 -7 -2 -2 -1 -15 2 -30 6 -32 39 -39 46 -10 4 16 5
-16 6 0 1 -17 42 -18 724 -18 397 0 727 4 732 8 6 4 11 17 11 30 2 28 -17 33
--114 29 -41 -1 -76 1 -78 5 -3 5 -29 8 -57 8 -142 0 -260 40 -283 96 -11 27
--14 185 -14 894 l0 861 322 0 c431 0 582 -19 680 -86 39 -26 64 -33 52 -13 -4
-7 -3 8 5 4 6 -4 9 -11 6 -16 -8 -12 36 -71 47 -64 5 3 8 2 7 -3 -4 -21 2 -34
-13 -27 6 4 8 3 5 -4 -9 -13 2 -44 13 -37 4 3 7 -1 6 -8 0 -6 10 -44 23 -83
-l24 -71 67 -2 68 -2 6 108 c3 59 14 174 24 256 l18 147 -1597 0 c-878 0 -1598
--2 -1601 -5z"/>
-<path d="M21376 11149 c-60 -4 -149 -15 -197 -24 -99 -18 -268 -69 -254 -77 6
--3 4 -3 -3 -1 -22 5 -183 -68 -175 -80 3 -5 1 -7 -5 -3 -15 9 -103 -46 -98
--61 3 -7 -1 -10 -8 -7 -33 13 -211 -174 -200 -211 4 -16 3 -17 -5 -5 -8 11
--14 4 -31 -34 -11 -27 -22 -69 -25 -92 -2 -24 -6 -48 -9 -52 -3 -5 -1 -36 4
--70 9 -63 43 -143 86 -200 22 -28 28 -31 47 -20 20 10 21 9 9 -5 -11 -13 -11
--19 0 -36 7 -12 19 -19 26 -16 7 3 11 1 8 -4 -8 -13 21 -34 35 -25 7 4 9 3 6
--3 -9 -14 29 -47 44 -37 8 4 10 3 5 -4 -9 -14 191 -115 212 -107 7 2 11 1 8
--4 -6 -10 -6 -10 154 -50 63 -16 156 -35 205 -41 105 -13 430 -6 490 10 22 6
-56 13 75 16 19 2 39 9 44 14 4 4 15 6 24 2 11 -4 14 -1 9 11 -3 9 -2 17 3 17
-6 0 10 -5 10 -10 0 -13 30 -6 135 30 112 39 116 41 108 53 -3 5 -1 7 5 3 11
--6 147 60 191 93 31 24 20 45 -14 29 -21 -9 -23 -14 -12 -27 10 -14 10 -14 -5
--3 -9 8 -22 11 -28 7 -5 -3 -10 -4 -10 -1 0 3 14 13 32 22 l32 16 -25 14 c-34
-19 -40 18 -120 -21 -40 -19 -78 -35 -86 -35 -7 0 -13 -5 -13 -11 0 -5 -4 -8
--8 -5 -5 3 -30 -2 -57 -10 -69 -20 -261 -44 -360 -44 -46 0 -135 7 -196 16
--61 8 -118 13 -126 10 -8 -3 -11 -1 -8 4 3 6 -2 10 -12 10 -66 1 -277 101
--350 164 -34 31 -53 42 -57 34 -3 -7 -4 -4 -3 7 1 12 -3 19 -11 17 -8 -1 -10
-2 -7 8 9 14 -24 52 -38 43 -6 -3 -7 -1 -3 5 3 6 -5 39 -19 73 -14 34 -25 75
--25 91 0 15 -4 28 -9 28 -5 0 -6 11 -3 25 l7 25 753 0 c835 0 800 -3 822 65
-14 43 -4 139 -32 167 -10 10 -18 24 -18 32 0 23 -106 108 -188 151 -155 81
--300 113 -572 129 -30 1 -104 -1 -164 -5z m269 -129 c39 -12 78 -22 87 -23 9
--1 15 -4 12 -8 -2 -4 6 -11 18 -14 32 -10 96 -73 119 -117 25 -49 25 -119 0
--142 -17 -15 -65 -17 -557 -16 -390 0 -540 3 -543 11 -2 6 1 14 6 18 6 3 20
-25 32 48 27 54 90 118 166 169 53 35 96 53 235 93 20 6 103 9 195 7 129 -3
-174 -8 230 -26z"/>
-<path d="M25180 11148 c-149 -9 -197 -15 -270 -33 -36 -9 -93 -23 -128 -31
--39 -10 -60 -20 -56 -26 4 -6 2 -8 -3 -5 -21 13 -226 -78 -250 -110 -7 -9 -13
--13 -13 -9 0 4 -13 -1 -30 -11 -16 -9 -29 -24 -27 -31 1 -8 -9 -21 -23 -29
-l-25 -15 25 21 c14 12 19 21 12 21 -33 0 -206 -201 -216 -252 -2 -7 -9 -26
--16 -43 -6 -16 -13 -66 -13 -110 -1 -65 4 -92 26 -145 25 -60 142 -218 153
--207 3 3 16 -5 29 -17 58 -53 128 -91 146 -80 7 4 9 3 5 -4 -8 -14 30 -36 46
--26 6 4 8 3 5 -3 -4 -6 30 -22 81 -38 48 -15 97 -32 109 -38 12 -5 29 -7 38
--3 9 3 14 2 11 -3 -10 -15 199 -44 360 -49 155 -4 267 4 396 30 32 7 54 16 51
-21 -3 6 -1 7 5 3 14 -8 94 12 88 22 -3 5 10 8 27 8 39 1 239 83 231 95 -3 5 1
-7 8 4 15 -6 104 50 91 57 -4 3 -2 3 5 2 15 -4 52 17 52 29 0 5 -8 6 -17 3 -10
--4 -14 -4 -10 0 8 9 -47 44 -69 44 -8 0 -13 -4 -10 -8 2 -4 -3 -8 -12 -9 -9 0
--60 -19 -112 -40 -53 -22 -129 -46 -170 -53 -41 -7 -79 -15 -85 -18 -17 -11
--358 -12 -405 -2 -25 5 -85 18 -133 29 -48 11 -95 17 -104 14 -11 -4 -14 -2
--9 5 4 7 1 12 -7 12 -18 0 -174 76 -205 100 -13 10 -31 16 -40 13 -11 -3 -13
--2 -5 4 8 6 -4 25 -41 63 -60 62 -102 138 -112 202 -4 24 -11 51 -16 61 -5 10
--7 25 -4 35 5 16 54 17 743 14 406 -1 752 0 769 3 52 9 73 37 72 97 0 29 -3
-58 -7 63 -5 10 -6 13 -10 45 -1 13 -2 13 -12 0 -8 -12 -9 -11 -5 6 4 13 -3 32
--19 53 -28 38 -65 75 -65 65 0 -4 -11 5 -24 21 -16 18 -28 25 -37 20 -8 -5
--11 -5 -7 0 5 5 -2 14 -15 21 -69 40 -100 52 -114 47 -10 -4 -14 -2 -10 5 9
-13 -88 43 -111 35 -9 -4 -13 -2 -9 4 18 28 -319 63 -503 51z m204 -119 c98
--24 171 -56 218 -98 l36 -31 22 27 c12 16 18 21 14 13 -4 -8 -14 -23 -22 -32
--13 -15 -13 -20 1 -41 35 -54 33 -137 -3 -157 -12 -7 -199 -10 -539 -10 -323
--1 -523 -4 -526 -10 -3 -6 -10 -10 -15 -10 -12 0 -3 47 18 90 31 66 204 218
-242 212 9 -2 6 4 -7 15 l-23 18 27 2 c15 0 21 -2 14 -7 -10 -5 -9 -9 3 -13 9
--4 16 -3 16 2 0 5 6 9 13 8 6 0 21 1 32 2 17 1 18 3 5 12 -12 9 -12 10 4 5 10
--3 37 -1 60 5 48 14 210 26 281 21 28 -2 86 -13 129 -23z"/>
-<path d="M27695 11153 c-63 -3 -199 -17 -250 -27 -11 -2 -40 -7 -65 -10 -25
--4 -56 -11 -70 -16 -14 -4 -52 -13 -84 -20 -32 -7 -54 -15 -48 -19 7 -4 -3 -7
--21 -7 -17 -1 -50 -9 -72 -19 -22 -10 -46 -19 -54 -21 -27 -5 -71 -27 -71 -34
-0 -4 -6 -7 -12 -6 -17 1 -128 -55 -128 -65 0 -4 9 -11 21 -14 11 -4 18 -9 15
--12 -3 -3 -16 1 -30 10 -20 13 -26 14 -35 3 -6 -7 -7 -17 -3 -21 4 -5 1 -5 -6
--1 -36 21 -269 -228 -247 -264 3 -6 1 -10 -5 -10 -7 0 -10 -6 -7 -14 3 -8 1
--16 -5 -18 -7 -3 -11 -34 -11 -79 -1 -85 4 -119 16 -119 4 0 6 -4 3 -9 -10
--15 13 -63 26 -55 7 4 8 3 4 -5 -15 -24 102 -170 124 -156 6 4 9 1 8 -5 -4
--17 114 -99 131 -92 8 3 12 1 8 -5 -4 -5 5 -15 19 -22 20 -9 24 -9 18 1 -4 7
-4 4 17 -8 24 -21 114 -60 157 -69 12 -2 27 -7 33 -11 6 -3 15 0 20 7 7 11 9
-10 9 -5 0 -13 5 -16 17 -12 9 4 19 2 23 -3 5 -9 45 -18 106 -25 11 -1 26 -6
-33 -10 7 -5 97 -10 199 -13 183 -5 334 7 462 37 25 6 56 13 70 15 45 10 172
-55 242 87 49 22 65 34 56 41 -9 6 -8 7 5 3 17 -5 46 5 71 25 6 5 26 20 44 35
-17 14 29 30 26 36 -3 5 2 8 11 6 35 -6 24 17 -17 37 -53 25 -57 25 -92 1 -16
--10 -53 -31 -82 -46 -49 -25 -65 -46 -26 -33 14 4 15 3 3 -5 -9 -7 -21 -7 -31
--2 -25 14 -62 1 -55 -19 5 -13 4 -14 -6 -3 -7 6 -20 12 -28 12 -14 0 -14 -2
--1 -11 12 -8 11 -9 -5 -5 -11 3 -56 -1 -100 -10 -44 -8 -96 -17 -115 -18 -50
--5 -258 -6 -305 -1 -62 5 -187 33 -252 56 -32 11 -65 21 -73 21 -8 1 -17 4
--20 8 -3 3 -35 23 -71 43 -36 20 -72 43 -79 52 -10 12 -16 13 -29 3 -9 -7 -13
--9 -9 -4 9 10 -44 89 -72 109 -11 8 -17 17 -13 20 3 4 1 7 -5 7 -7 0 -11 3
--10 8 1 4 -5 21 -14 37 -9 17 -21 64 -28 107 -10 62 -10 86 1 130 7 29 13 55
-14 58 0 3 14 28 32 56 34 56 100 116 163 150 22 12 38 23 35 25 -2 3 4 5 13 6
-9 0 49 12 89 26 95 34 249 51 393 42 120 -7 189 -21 302 -60 36 -13 69 -21 72
--19 3 2 4 1 1 -2 -2 -4 25 -22 61 -40 76 -38 97 -37 189 8 98 49 133 89 114
-132 -14 29 -69 60 -83 45 -6 -5 -15 -9 -20 -9 -6 0 -4 4 4 10 19 12 -13 24
--122 45 -68 13 -401 39 -418 33 -3 -1 -36 -3 -75 -5z"/>
-<path d="M29920 11156 c-3 -2 -39 -5 -80 -6 -174 -4 -423 -57 -585 -126 -36
--15 -38 -18 -20 -26 17 -7 17 -8 -4 -4 -13 3 -40 -2 -60 -11 -33 -14 -34 -16
--16 -24 18 -8 17 -9 -4 -5 -16 3 -30 -1 -38 -12 -8 -9 -11 -11 -7 -3 5 10 3
-12 -7 6 -60 -37 -179 -134 -179 -147 0 -5 6 -6 13 -2 7 4 9 3 4 -2 -5 -5 -12
--9 -16 -9 -22 0 -115 -141 -104 -158 3 -5 -1 -13 -8 -18 -10 -6 -14 -34 -14
--111 0 -97 2 -107 34 -173 24 -47 56 -91 102 -136 72 -71 183 -146 207 -141 8
-2 11 -1 8 -6 -9 -15 39 -32 53 -19 10 9 12 9 9 -2 -4 -21 136 -77 212 -85 14
--1 34 -7 45 -13 48 -26 225 -45 460 -49 132 -3 235 -1 228 3 -6 4 12 8 40 8
-69 1 207 26 207 38 0 5 7 7 15 3 32 -12 351 107 338 127 -3 6 -1 7 5 3 15 -9
-54 12 47 25 -4 5 -3 8 2 7 19 -5 54 15 49 27 -3 10 0 12 11 8 12 -5 14 -3 8 7
--5 8 -4 11 2 7 28 -18 182 150 215 233 23 58 36 196 22 228 -4 9 -9 27 -10 39
--4 36 -44 105 -98 169 -54 65 -180 159 -198 148 -6 -4 -8 -3 -5 2 9 16 -161
-91 -279 123 -142 39 -258 60 -369 66 -49 2 -121 7 -160 11 -38 3 -72 3 -75 0z
-m105 -101 c103 -9 219 -41 309 -86 43 -21 83 -36 90 -32 6 3 8 2 3 -2 -10 -11
-33 -56 46 -48 6 3 7 2 4 -4 -8 -13 58 -77 72 -69 6 4 9 1 5 -7 -3 -8 6 -31 20
--51 14 -21 28 -46 31 -57 4 -11 11 -16 17 -13 7 4 8 2 4 -4 -4 -6 1 -37 10
--69 10 -32 19 -69 20 -83 7 -57 3 -153 -7 -172 -6 -11 -8 -26 -5 -34 3 -8 2
--13 -3 -9 -8 4 -14 -13 -24 -62 -6 -33 -147 -166 -209 -198 -31 -16 -54 -33
--52 -37 3 -4 -5 -7 -18 -6 -13 0 -54 -10 -93 -22 -63 -22 -87 -24 -245 -23
--149 1 -185 4 -245 22 -38 12 -74 23 -80 24 -5 1 -16 6 -22 10 -7 5 -17 5 -23
-2 -5 -3 -10 -2 -10 4 0 5 -10 13 -22 17 -13 4 -34 15 -48 26 -16 13 -33 17
--50 13 -16 -4 -20 -3 -12 3 10 7 0 22 -44 63 -31 30 -63 53 -70 53 -7 -1 -10
-4 -7 12 2 7 -6 28 -19 46 -63 85 -105 240 -93 345 3 32 7 68 8 80 1 11 5 20 8
-18 3 -2 11 13 19 33 7 20 23 52 36 71 19 28 21 38 11 50 -10 14 -10 14 5 3 14
--11 19 -10 32 9 8 12 13 26 10 31 -3 4 1 5 9 3 7 -3 22 4 32 15 19 20 18 21
--1 14 -15 -5 -16 -4 -4 4 8 6 18 9 22 6 9 -6 95 42 105 59 4 7 0 8 -13 3 -10
--4 -15 -3 -10 1 4 4 24 9 44 9 20 1 57 7 82 14 54 15 245 38 280 34 14 -2 57
--6 95 -9z"/>
-<path d="M33061 11149 c-125 -8 -299 -36 -317 -51 -7 -5 -16 -8 -20 -6 -19 5
--232 -57 -244 -71 -3 -3 -9 -6 -15 -6 -5 0 -27 -6 -47 -13 -27 -10 -36 -18
--32 -30 5 -14 4 -14 -4 -3 -9 12 -15 13 -36 3 -26 -12 -26 -11 -26 36 1 26 5
-66 9 89 7 37 6 42 -13 47 -23 6 -53 3 -143 -13 -32 -6 -78 -13 -103 -16 -25
--4 -67 -10 -95 -15 -41 -8 -417 -60 -431 -60 -7 0 -4 -25 4 -38 5 -6 46 -17
-93 -22 131 -16 147 -19 183 -34 18 -7 42 -26 54 -41 22 -27 22 -33 22 -394 0
--228 -4 -380 -11 -404 -9 -32 -69 -114 -69 -94 0 3 -17 0 -37 -7 -21 -7 -85
--19 -143 -25 -136 -16 -140 -18 -140 -47 l0 -24 590 0 c465 0 590 3 591 13 0
-6 2 20 4 29 4 22 -9 25 -125 33 -139 9 -193 22 -221 51 l-24 26 -3 402 -4 403
-39 15 c21 8 59 21 86 28 26 7 47 16 47 20 0 5 10 6 23 3 18 -4 19 -3 7 6 -11
-8 -7 10 18 5 17 -4 32 -3 32 2 0 5 10 10 23 10 12 1 46 6 75 12 171 37 403 33
-518 -7 31 -11 61 -18 67 -14 6 3 7 2 4 -4 -3 -5 9 -17 27 -26 43 -20 99 -91
-114 -143 8 -28 12 -144 13 -342 1 -298 -4 -352 -35 -391 -15 -19 -92 -51 -122
--51 -13 0 -24 -3 -24 -7 0 -5 -39 -9 -86 -11 -48 -1 -90 -4 -94 -7 -4 -2 -5
--16 -3 -30 l5 -25 570 0 569 0 -3 32 c-3 33 -4 33 -56 34 -29 1 -56 4 -59 8
--3 3 -30 6 -58 6 -70 0 -146 25 -168 55 -16 22 -18 59 -21 372 -2 191 -5 359
--8 373 -3 14 -6 30 -7 37 0 7 -8 10 -18 6 -15 -6 -14 -4 2 14 11 11 32 23 48
-27 26 6 38 26 15 26 -6 0 -8 3 -5 6 4 4 13 2 21 -5 11 -9 27 -7 72 8 77 26
-201 56 292 71 83 14 329 20 352 9 8 -4 29 -9 46 -12 17 -3 53 -14 79 -26 26
--11 52 -18 58 -14 6 4 7 1 2 -7 -6 -10 -4 -12 9 -7 9 4 14 3 11 -2 -3 -5 4
--12 15 -16 11 -3 25 -15 31 -26 5 -11 14 -17 20 -14 5 4 9 3 8 -2 -4 -21 2
--34 13 -27 7 4 8 3 4 -5 -4 -6 0 -23 9 -37 14 -22 16 -66 15 -357 0 -293 -2
--335 -18 -367 -25 -51 -81 -75 -204 -90 -134 -15 -140 -17 -136 -43 l3 -22
-525 -3 c289 -2 544 0 566 3 34 5 43 10 46 30 4 21 1 24 -31 29 -20 2 -45 5
--56 5 -11 0 -62 5 -113 11 -98 11 -132 26 -151 68 -7 15 -11 143 -12 360 0
-185 -4 346 -9 357 l-9 20 -1 -20 c-1 -12 -4 -15 -7 -7 -3 7 0 19 7 27 26 31
--34 145 -115 217 -39 35 -136 87 -152 81 -7 -3 -13 0 -13 5 0 10 -55 26 -144
-42 -74 12 -343 13 -417 1 -30 -5 -90 -15 -134 -21 -44 -7 -84 -17 -90 -21 -5
--5 -16 -9 -25 -9 -35 0 -239 -64 -233 -73 3 -6 1 -7 -5 -3 -14 9 -55 -12 -47
--24 3 -5 1 -12 -5 -15 -6 -4 -9 -1 -8 7 3 15 -35 12 -40 -3 -2 -5 -10 -9 -18
--9 -8 0 -33 -9 -56 -21 l-41 -21 -18 23 c-10 13 -19 20 -19 15 0 -5 -9 -1 -20
-9 -11 10 -17 21 -15 26 8 12 -26 41 -42 35 -8 -3 -12 -2 -8 3 8 13 -115 69
--188 86 -34 7 -96 17 -137 20 -41 3 -88 7 -105 9 -16 2 -81 0 -144 -5z"/>
-<path d="M36785 11149 c-187 -11 -423 -58 -408 -82 3 -6 1 -7 -6 -3 -6 4 -21
-4 -32 1 -17 -6 -19 -9 -8 -17 11 -8 10 -8 -4 -4 -21 7 -120 -43 -150 -75 -10
--10 -23 -19 -29 -19 -6 0 -9 -3 -6 -6 3 -3 -5 -16 -18 -29 -13 -13 -24 -33
--24 -44 0 -11 -4 -23 -10 -26 -14 -8 -13 -90 2 -118 6 -12 14 -29 19 -37 4 -8
-12 -14 19 -12 6 1 9 -2 6 -7 -4 -5 0 -13 8 -18 8 -4 15 -12 16 -18 1 -5 6 -9
-11 -8 5 2 9 -1 9 -7 0 -14 99 -62 112 -54 6 4 8 3 5 -3 -4 -6 0 -14 9 -17 9
--4 13 -2 8 5 -4 7 6 2 22 -9 31 -23 241 -85 261 -78 6 3 13 1 15 -4 2 -5 26
--14 53 -19 81 -16 176 -39 235 -56 30 -8 72 -16 94 -16 26 -1 34 -4 25 -10
--10 -6 -7 -9 12 -9 14 0 30 -5 36 -11 8 -8 17 -8 32 1 12 6 21 7 20 3 -3 -21
-3 -31 27 -42 14 -6 30 -8 36 -5 6 4 8 3 5 -2 -3 -6 7 -18 23 -29 31 -21 63
--69 66 -100 7 -68 -36 -127 -116 -159 -25 -10 -56 -23 -69 -30 -38 -17 -471
--13 -471 5 0 3 -27 14 -61 24 -48 15 -65 16 -80 7 -10 -7 -22 -12 -26 -12 -5
-0 0 5 11 11 17 10 16 12 -10 30 -16 10 -35 17 -42 14 -7 -3 -11 -1 -8 4 3 5
--20 24 -52 44 -67 42 -221 194 -222 220 0 6 -120 0 -127 -6 -1 -1 7 -27 17
--57 11 -30 19 -68 20 -83 0 -19 4 -26 12 -21 8 5 9 0 5 -15 -3 -11 1 -52 9
--89 8 -37 14 -79 14 -94 0 -24 4 -28 28 -29 42 -2 74 -5 248 -28 183 -24 160
--23 434 -24 224 -1 323 6 415 28 68 17 88 22 128 31 20 4 27 10 22 21 -4 13
--3 13 8 4 17 -13 81 12 163 64 93 59 124 99 144 182 9 38 -2 99 -17 96 -6 -1
--9 6 -6 17 10 38 -164 171 -204 156 -8 -3 -12 -2 -9 2 6 11 -143 64 -155 56
--6 -3 -15 -1 -22 4 -15 12 -225 66 -302 77 -5 0 -17 4 -25 8 -20 8 -138 29
--167 29 -13 0 -21 4 -18 8 4 6 -66 29 -105 35 -24 3 -155 84 -167 102 -10 14
--19 20 -22 14 -4 -6 -6 17 -5 50 1 50 5 64 28 88 14 15 23 31 19 36 -5 4 -3 5
-3 2 7 -4 15 0 18 9 4 9 9 14 12 11 3 -3 27 4 52 15 68 29 99 33 287 33 159 0
-176 -2 253 -28 46 -15 93 -32 104 -38 15 -8 19 -8 14 0 -10 16 7 14 30 -4 19
--15 19 -15 -1 -8 -11 4 9 -16 44 -43 48 -36 74 -66 99 -112 l34 -63 55 2 54 2
--1 106 c0 58 3 135 8 171 5 36 7 68 3 71 -3 4 -73 10 -156 14 -82 4 -166 9
--185 11 -166 17 -292 21 -435 13z"/>
-</g>
-</svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1860.5 516.6"><defs><style>.cls-1{fill:#2258a1}.cls-2{fill:#ef7d38}</style></defs><path class="cls-1" d="M520 251.6l-6.2-2c-20-6.3-40.3-11.2-59.6-19-34.4-14-68.3-29.5-102.2-44.8a4740 4740 0 0 1-107.5-50c-17.8-8.6-34.6-19.3-52.2-28.3A271.6 271.6 0 0 0 125.2 82c-9.7-2.1-19.5-3.3-29.2-.6a22 22 0 0 0-16.3 21.4c-.6 13.6 3 26.3 7.7 38.7 12.4 32.8 30.4 62.7 49.3 92.1Q212 351.2 287 469.1c1 1.5 1.4 3.1 2.4 4-10.5-9.8-21.4-19.4-31.4-29.7a1989.6 1989.6 0 0 1-166.7-194 678.3 678.3 0 0 1-71.9-115.9c-8.5-18.2-15.6-37-18.3-57C-1.6 57-.1 38.2 14.4 23A70.8 70.8 0 0 1 53.5 3.4c24-4.8 48-4 72.1-1 4.4.4 8.6 2.7 12.6 4.5a977 977 0 0 1 105.2 58A4911.4 4911.4 0 0 1 518.2 249l2.2 1.7z"/><path class="cls-2" d="M295 272.1l46.5 22.9c77.6 38.6 155 77.4 232.8 115.7a334 334 0 0 0 80.9 29.1 68.9 68.9 0 0 0 33.6.5 21 21 0 0 0 16-19.3 70.7 70.7 0 0 0-5.6-32.7 288.6 288.6 0 0 0-37.2-68.2c-33-45.4-60.2-94.3-89-142.2-17.6-29.4-35-59-51.3-89.1-7.9-14.6-13.3-30.5-20-45.7-3.6-8.3-7.7-16.3-11.5-24.5L492 17c.7 1.5 1.1 3.2 2.1 4.4 75.4 86 150.3 172.3 219.1 263.6 19.5 26 37.2 53.2 56 79.7a86.7 86.7 0 0 1 15.3 44.2c1.3 15.4 2.6 30.9 2 46.2-1 19.6-6.6 37.8-23.3 50.4a58.7 58.7 0 0 1-33.1 11 180.5 180.5 0 0 1-68.3-11.7c-43.6-14.7-84-36.2-123.5-59.4-65.2-38.3-127-81.8-187.3-127.5-19.2-14.6-38-29.8-57-44.8z"/><path class="cls-1" d="M958.8 206.7V98.6h46.4v177.8c-11.3 0-22.4-.7-33.4.2-9.8.8-15.5-2.7-21.3-10.4-24.2-32-49.2-63.4-74-95-.6-.9-1.3-1.7-2.7-3.2v108h-46.4V98.6l4.2-.3c12.5 0 25 .1 37.5-.1 3.6 0 5.7 1.2 7.8 4q39.1 50.2 78.4 100.3l3.5 4.2z"/><path class="cls-1" d="M1511.5 276.4c-16.9 0-32.5-.6-48 .2-9 .5-15.1-2.4-21-9-11.9-13.4-24.6-26.1-38-40.2v48.8h-43V80.6h42.8v117.7l4.9-4.3 36.9-36c1.4-1.3 3.6-2.6 5.4-2.6 18.4-.2 36.7-.2 56.4-.2l-60.6 56z"/><path class="cls-1" d="M1204.2 155.4h42.5v13.8l1.6 1.1a18.8 18.8 0 0 1 1.9-3.4c16.4-19.3 49.6-16.8 63.9-6.8a38.8 38.8 0 0 1 17.4 32c.7 27.7.3 55.4.3 83 0 .3-.2.6-.5 1h-42.5V271v-58a81.8 81.8 0 0 0-1.1-12.4 16.5 16.5 0 0 0-15.7-14.2c-15.5-1.1-24.9 8.2-25.1 25.8-.3 19.5 0 39 0 58.5v5.5h-42.7z"/><path class="cls-1" d="M1773.3 184.8l-25.7-4.4a10.5 10.5 0 0 0-4.4.6c-3.7 1-6.2 3.3-6.4 7.4s2.3 6.2 5.5 7.3c4.6 1.5 9.3 2.5 14 3.6 8.5 2 16.8 4.5 23.4 10.5 14.3 12.8 14.7 37.8 1 53.4a53.6 53.6 0 0 1-34.6 17 92 92 0 0 1-56.4-10.1l-5.3-3.2 14.9-29c9.3 3.5 18 7.3 27 9.8 4.5 1.2 9.8.5 14.7-.1 4.1-.5 6.3-3.6 6.5-7.7a7.8 7.8 0 0 0-5.5-8.1c-5-1.8-10.2-3-15.4-4.4l-6.7-1.6c-23-5.1-30.4-23.6-24-44.8a36.9 36.9 0 0 1 20.7-23.7c23.5-10.6 47-7.2 70.6 1.2z"/><path class="cls-2" d="M1664.8 386v32.7c0 9.6 0 9.6 9.3 11.2 3 .5 6 .5 9.7 2-1.1.8-2.3 2.4-3.4 2.4-17.5.2-35 .2-52.5 0-1 0-2-1-3.1-1.5 1-.7 2-2.1 3-2.2 17.3-1 15-4 15.2-17.3v-17c0-8.4-3-12.4-11-15a57.7 57.7 0 0 0-32.5 1.1c-3.6.9-7 2.1-10.7 3.3v38c0 3.6 2 5.2 5.2 5.6 4.4.6 8.9 1 14 2.7-1.2.8-2.4 2.3-3.7 2.3q-27.2.3-54.4 0c-1 0-2-1-3-1.5 1-.8 2-2.1 3-2.2 19.6-1 17.1-5.3 17.3-19.8q.2-10.3 0-20.5c-.1-6.8-1.2-8-7.9-9.2-2.3-.5-4.6-.5-6.9-1a19.3 19.3 0 0 1-4-2l.5-1.4 41-6-1.2 9c8-2.3 15.6-5 23.4-6.7a66.8 66.8 0 0 1 34.6-.4c4.6 1.3 8.6 4.7 13 6.8 1.5.8 3.7 1.4 5 .8 12.2-5 24.8-9 38-9.2a86.8 86.8 0 0 1 25.5 3.6c8.5 2.5 12.7 9.6 12.6 18.9V422c0 4.6 2 7 6.7 7.4a51 51 0 0 1 12.4 2.4c-1.2.8-2.4 2.4-3.7 2.4-17.5.2-35 .2-52.5 0-1 0-1.9-1-2.9-1.7 1-.7 1.7-1.8 2.7-2 3.3-.6 6.6-.7 9.9-1.3 3.5-.6 5.5-2.8 5.5-6.6 0-9.6.2-19.3.1-29a11.2 11.2 0 0 0-7.8-11 55.3 55.3 0 0 0-16-3.2c-10.8 0-21 3-30.4 6.5z"/><path class="cls-1" d="M1854.7 276.2h-42.5V155.6h42.5z"/><path class="cls-2" d="M945.7 432.2c-1.3.7-2.5 2.1-3.7 2.1q-35.7.2-71.4 0c-1.3 0-2.5-1.6-4.8-3.2 7.5-.7 13-1 18.7-1.8 6.8-.9 9.5-3.7 10-10.2.2-1.5.1-3 .1-4.5v-77.8c-11 0-21.7-.2-32.5 0a63 63 0 0 0-10.3 1.5c-8 1.4-13.8 6-16 14-1.5 5.3-4.6 6.1-9.5 4.7l-1.2-26h162.3l-2.2 26.2h-7l-1.7-4.2c-3-9.4-9.7-14.9-19.4-15.3-12.9-.7-25.9-.2-39.4-.2l-.2 4V419c0 7.6 1.9 9.7 9.4 10.4l17.8 1.5z"/><path class="cls-2" d="M1161.1 432c-1 .8-2.2 2.3-3.3 2.3q-28.2.2-56.5 0c-1 0-1.9-1.2-2.8-1.8 1-.7 1.8-1.7 2.8-1.9a28.3 28.3 0 0 1 5-.3c9-.4 12.3-3.7 12.3-12.6v-76-5c.3-5-2.5-7.6-7.3-8.3-3.4-.4-7-.6-10.3-1.2-1.3-.2-2.5-1.4-3.7-2l.6-1.5 43.5-5.6c-.6 8.7-1.6 16.7-1.6 24.8-.3 26-.1 52-.1 78 0 6.6.9 7.6 7.4 8.5l6.4.9c2.1.2 4.3 0 6.5 0z"/><path class="cls-2" d="M1854.7 373l-1 18c-3.7 1-5.9.5-8-3.4-4-7.7-12-10-19.8-10.7a70.3 70.3 0 0 0-20.2 1.2c-2.9.5-6.6 4-7.3 7-1.1 4 3 6.4 6.6 7.5 9.6 2.8 19.5 5 29.1 7.9 6.7 2 13.5 3.9 19.6 7.1 9 5 9 14.1.6 20a50.6 50.6 0 0 1-29.7 8.6c-15 0-30.1-1.3-45-2l-4.3-20.4c3.3-1.8 6-1.7 9 2 12.3 14.8 28.5 17.7 46.4 14.4a15.6 15.6 0 0 0 5-2.2c5-3 5.4-8 .5-11.2a46 46 0 0 0-12.2-5.4c-8.5-2.4-17.2-4-25.6-6.5a56.2 56.2 0 0 1-14-6.2c-7.6-4.8-7.5-13.1-.5-18.6 6.8-5.4 15-7.3 23.2-8.4a110 110 0 0 1 18-1c9.7.4 19.5 1.5 29.6 2.2z"/><path class="cls-2" d="M1395 421a49.5 49.5 0 0 1-25.3 12.8 85 85 0 0 1-60-5.7 39.5 39.5 0 0 1-8.2-5.8c-10.4-9.4-11.3-22.4-1-31.8a71.6 71.6 0 0 1 22-13.2c20-7.7 40.9-8.7 61.8-3.7 2.4.5 4.3 2.9 6.5 4.4-1.9 2.1-3.4 4.7-5.7 6.2-3.6 2.3-7.4 2-11.6 0a52.3 52.3 0 0 0-42.6-2.8c-7.7 2.7-14 7.4-15.1 16.2-1.4 9.6 3.3 16.8 11.1 21.2a61.3 61.3 0 0 0 58.7 1.5c3.6-1.6 6-2.2 9.3.8z"/><path class="cls-1" d="M1833.5 132.6c-13.5 0-23.3-10.1-24-23.4a24 24 0 1 1 48.2-.8c0 14-10.2 24.2-24.2 24.2z"/><path class="cls-2" d="M294 273l-1.4-1.5.2-.3 2.2.9z"/><path class="cls-2" d="M292.6 271.5l-.7-.7 1 .5z"/><path class="cls-2" d="M290.3 269.7l.1.3h-.3l.2-.3z"/><path class="cls-1" d="M1634.8 160.2c-18.5-10.5-38.4-11.2-58.7-7.7a63.7 63.7 0 0 0-54.6 63c.2 30 18.2 53.8 47 62a96.3 96.3 0 0 0 49.7.7 64 64 0 0 0 16.6-118zm-40.6 84.2a28.4 28.4 0 0 1-27.8-28.6 28 28 0 0 1 28.2-28.2 28.3 28.3 0 0 1 28.1 28.8 28.5 28.5 0 0 1-28.5 28z"/><path class="cls-1" d="M1169.5 181.2c-15.3-23.1-38.3-31.1-68.5-30.4-3.4.5-10.3 1.1-16.9 2.7a64.2 64.2 0 0 0-50.3 56.4 63.4 63.4 0 0 0 41.6 66c18 6.6 36.5 7 54.9 2.4a63.8 63.8 0 0 0 39.2-97zm-63 63.1a28.4 28.4 0 0 1-28-28.5 28.1 28.1 0 1 1 56.2 0 28 28 0 0 1-28.2 28.5z"/><path class="cls-2" d="M1521.4 387.7a58 58 0 0 0-18-11.2 96.3 96.3 0 0 0-49.1-4.8 67.6 67.6 0 0 0-34.5 13.5c-7.5 6.1-12.3 13.7-10 24 2 8.3 8 13.6 15.2 17.6 13.4 7.5 28 10 43.2 10.3 7.4-.9 14.9-1.3 22.2-2.8 11.9-2.4 23-6.7 31.4-16 9-9.5 9.1-21.7-.4-30.6zm-18 24.2c-2.6 11-11.5 15.8-21.6 18.4-3.5.8-7.2 1-10.8 1.3l-.4 1c-6.8-2-13.9-3.2-20.2-6.1a27.9 27.9 0 0 1-16.6-29.6c1.7-10 10.6-18 23.6-20 13.1-2 26-.9 36.8 8.2 8.4 7 11.5 16.4 9.1 26.8z"/><path class="cls-2" d="M1201.3 399.2h66c7.6 0 9.8-2.8 7.4-10-2.4-7.5-8.7-11.1-15.5-13.7a80.8 80.8 0 0 0-47.6-2.4 59.7 59.7 0 0 0-30.3 15.5c-10.1 10.4-10.2 23.1.5 33a48 48 0 0 0 13.8 8.7 84.2 84.2 0 0 0 54.2 3.5 55 55 0 0 0 24.3-12c-2.6-1-5.6-2-7.5-1-12 6.1-24.8 7-37.5 5.2-7.7-1-15.4-4-22.3-7.7s-11.3-9.7-11.2-19zm5.4-17.6a41.2 41.2 0 0 1 36.2-2c1.5.6 3.3 1.4 4.1 2.6a94.1 94.1 0 0 1 4.6 9.4c-2.8 1-5.7 2.6-8.5 2.6-15.4.3-30.7.1-46.7.1 1.3-6.6 5.6-10 10.3-12.7z"/><path class="cls-2" d="M1074 421a66 66 0 0 1-51.4 1.3c-10.3-3.7-17.7-10.5-19-23h73.4c5.7-.3 7-1.7 6.6-7.5-.5-7.5-5.7-12-11.7-14.2-8.2-3-16.8-5.6-25.4-6.4a74 74 0 0 0-51.3 12.8c-6.6 4.7-12 10.5-12.6 19.4-.7 11.1 5.7 18.1 14.3 23.3a78.5 78.5 0 0 0 50.5 9.2 74.1 74.1 0 0 0 35.3-13c-2.5-3.1-5-3.5-8.7-1.8zm-60.6-38.3a39.8 39.8 0 0 1 39-2.4 15.8 15.8 0 0 1 6.5 5.8c3.1 5 1.3 8-4.5 8.2h-49.7a18 18 0 0 1 8.7-11.6z"/></svg>
\ No newline at end of file

From 80ebdc17843aaf4c8905286481436d472ea4e814 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 24 Jun 2019 14:50:26 -0400
Subject: [PATCH 22/24] rename kebab-case files - supercedes #2890

---
 .gitignore                                                    | 2 +-
 rollup.config.js                                              | 2 +-
 src/compiler/compile/Component.ts                             | 2 +-
 src/compiler/compile/index.ts                                 | 4 ++--
 src/compiler/compile/nodes/EventHandler.ts                    | 2 +-
 src/compiler/compile/nodes/Fragment.ts                        | 2 +-
 src/compiler/compile/nodes/shared/AbstractBlock.ts            | 2 +-
 src/compiler/compile/nodes/shared/Expression.ts               | 4 ++--
 src/compiler/compile/{render-dom => render_dom}/Block.ts      | 0
 src/compiler/compile/{render-dom => render_dom}/Renderer.ts   | 0
 src/compiler/compile/{render-dom => render_dom}/index.ts      | 0
 .../compile/{render-dom => render_dom}/wrappers/AwaitBlock.ts | 0
 .../compile/{render-dom => render_dom}/wrappers/Body.ts       | 0
 .../compile/{render-dom => render_dom}/wrappers/DebugTag.ts   | 0
 .../compile/{render-dom => render_dom}/wrappers/EachBlock.ts  | 0
 .../{render-dom => render_dom}/wrappers/Element/Attribute.ts  | 0
 .../{render-dom => render_dom}/wrappers/Element/Binding.ts    | 0
 .../wrappers/Element/StyleAttribute.ts                        | 0
 .../wrappers/Element/fix_attribute_casing.ts                  | 0
 .../{render-dom => render_dom}/wrappers/Element/index.ts      | 0
 .../compile/{render-dom => render_dom}/wrappers/Fragment.ts   | 0
 .../compile/{render-dom => render_dom}/wrappers/Head.ts       | 0
 .../compile/{render-dom => render_dom}/wrappers/IfBlock.ts    | 0
 .../wrappers/InlineComponent/index.ts                         | 0
 .../{render-dom => render_dom}/wrappers/MustacheTag.ts        | 0
 .../{render-dom => render_dom}/wrappers/RawMustacheTag.ts     | 0
 .../compile/{render-dom => render_dom}/wrappers/Slot.ts       | 0
 .../compile/{render-dom => render_dom}/wrappers/Text.ts       | 0
 .../compile/{render-dom => render_dom}/wrappers/Title.ts      | 0
 .../compile/{render-dom => render_dom}/wrappers/Window.ts     | 0
 .../compile/{render-dom => render_dom}/wrappers/shared/Tag.ts | 0
 .../{render-dom => render_dom}/wrappers/shared/Wrapper.ts     | 0
 .../{render-dom => render_dom}/wrappers/shared/add_actions.ts | 0
 .../wrappers/shared/add_event_handlers.ts                     | 0
 .../wrappers/shared/create_debugging_comment.ts               | 0
 .../wrappers/shared/get_context_merger.ts                     | 0
 src/compiler/compile/{render-ssr => render_ssr}/Renderer.ts   | 0
 .../compile/{render-ssr => render_ssr}/handlers/AwaitBlock.ts | 0
 .../compile/{render-ssr => render_ssr}/handlers/Comment.ts    | 0
 .../compile/{render-ssr => render_ssr}/handlers/DebugTag.ts   | 0
 .../compile/{render-ssr => render_ssr}/handlers/EachBlock.ts  | 0
 .../compile/{render-ssr => render_ssr}/handlers/Element.ts    | 0
 .../compile/{render-ssr => render_ssr}/handlers/Head.ts       | 0
 .../compile/{render-ssr => render_ssr}/handlers/HtmlTag.ts    | 0
 .../compile/{render-ssr => render_ssr}/handlers/IfBlock.ts    | 0
 .../{render-ssr => render_ssr}/handlers/InlineComponent.ts    | 0
 .../compile/{render-ssr => render_ssr}/handlers/Slot.ts       | 0
 .../compile/{render-ssr => render_ssr}/handlers/Tag.ts        | 0
 .../compile/{render-ssr => render_ssr}/handlers/Text.ts       | 0
 .../compile/{render-ssr => render_ssr}/handlers/Title.ts      | 0
 .../handlers/shared/get_slot_scope.ts                         | 0
 src/compiler/compile/{render-ssr => render_ssr}/index.ts      | 0
 src/runtime/internal/{await-block.ts => await_block.ts}       | 2 +-
 src/runtime/internal/index.ts                                 | 4 ++--
 src/runtime/internal/{keyed-each.ts => keyed_each.ts}         | 0
 55 files changed, 13 insertions(+), 13 deletions(-)
 rename src/compiler/compile/{render-dom => render_dom}/Block.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/Renderer.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/index.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/AwaitBlock.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Body.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/DebugTag.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/EachBlock.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Element/Attribute.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Element/Binding.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Element/StyleAttribute.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Element/fix_attribute_casing.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Element/index.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Fragment.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Head.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/IfBlock.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/InlineComponent/index.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/MustacheTag.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/RawMustacheTag.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Slot.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Text.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Title.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/Window.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/Tag.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/Wrapper.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/add_actions.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/add_event_handlers.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/create_debugging_comment.ts (100%)
 rename src/compiler/compile/{render-dom => render_dom}/wrappers/shared/get_context_merger.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/Renderer.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/AwaitBlock.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Comment.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/DebugTag.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/EachBlock.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Element.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Head.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/HtmlTag.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/IfBlock.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/InlineComponent.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Slot.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Tag.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Text.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/Title.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/handlers/shared/get_slot_scope.ts (100%)
 rename src/compiler/compile/{render-ssr => render_ssr}/index.ts (100%)
 rename src/runtime/internal/{await-block.ts => await_block.ts} (96%)
 rename src/runtime/internal/{keyed-each.ts => keyed_each.ts} (100%)

diff --git a/.gitignore b/.gitignore
index 923dd5901e..590bd1d88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .nyc_output
 node_modules
 *.map
-/src/compiler/compile/internal-exports.ts
+/src/compiler/compile/internal_exports.ts
 /compiler.d.ts
 /compiler.*js
 /index.*js
diff --git a/rollup.config.js b/rollup.config.js
index fb329534a2..8c3068dcbd 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -66,7 +66,7 @@ export default [
 						if (dir === 'internal') {
 							const mod = bundle['index.mjs'];
 							if (mod) {
-								fs.writeFileSync('src/compiler/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+								fs.writeFileSync('src/compiler/compile/internal_exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
 							}
 						}
 
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 89c1e6b4f6..7a77055ca3 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -10,7 +10,7 @@ import { create_scopes, extract_names, Scope, extract_identifiers } from './util
 import Stylesheet from './css/Stylesheet';
 import { test } from '../config';
 import Fragment from './nodes/Fragment';
-import internal_exports from './internal-exports';
+import internal_exports from './internal_exports';
 import { Node, Ast, CompileOptions, Var, Warning } from '../interfaces';
 import error from '../utils/error';
 import get_code_frame from '../utils/get_code_frame';
diff --git a/src/compiler/compile/index.ts b/src/compiler/compile/index.ts
index 30787f8d88..98004ba5da 100644
--- a/src/compiler/compile/index.ts
+++ b/src/compiler/compile/index.ts
@@ -1,8 +1,8 @@
 import { assign } from '../../runtime/internal/utils';
 import Stats from '../Stats';
 import parse from '../parse/index';
-import render_dom from './render-dom/index';
-import render_ssr from './render-ssr/index';
+import render_dom from './render_dom/index';
+import render_ssr from './render_ssr/index';
 import { CompileOptions, Warning } from '../interfaces';
 import Component from './Component';
 import fuzzymatch from '../utils/fuzzymatch';
diff --git a/src/compiler/compile/nodes/EventHandler.ts b/src/compiler/compile/nodes/EventHandler.ts
index dab60858d5..20e662a22b 100644
--- a/src/compiler/compile/nodes/EventHandler.ts
+++ b/src/compiler/compile/nodes/EventHandler.ts
@@ -2,7 +2,7 @@ import Node from './shared/Node';
 import Expression from './shared/Expression';
 import Component from '../Component';
 import deindent from '../utils/deindent';
-import Block from '../render-dom/Block';
+import Block from '../render_dom/Block';
 
 export default class EventHandler extends Node {
 	type: 'EventHandler';
diff --git a/src/compiler/compile/nodes/Fragment.ts b/src/compiler/compile/nodes/Fragment.ts
index 6025b036a6..9a0399305c 100644
--- a/src/compiler/compile/nodes/Fragment.ts
+++ b/src/compiler/compile/nodes/Fragment.ts
@@ -1,7 +1,7 @@
 import Node from './shared/Node';
 import Component from '../Component';
 import map_children from './shared/map_children';
-import Block from '../render-dom/Block';
+import Block from '../render_dom/Block';
 import TemplateScope from './shared/TemplateScope';
 import { INode } from './interfaces';
 
diff --git a/src/compiler/compile/nodes/shared/AbstractBlock.ts b/src/compiler/compile/nodes/shared/AbstractBlock.ts
index 931dd4d82d..940ae07d88 100644
--- a/src/compiler/compile/nodes/shared/AbstractBlock.ts
+++ b/src/compiler/compile/nodes/shared/AbstractBlock.ts
@@ -1,4 +1,4 @@
-import Block from '../../render-dom/Block';
+import Block from '../../render_dom/Block';
 import Component from '../../Component';
 import Node from './Node';
 import { INode } from '../interfaces';
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index 004ae716b9..8a5d0af284 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -6,12 +6,12 @@ import { create_scopes, Scope, extract_names } from '../../utils/scope';
 import { Node } from '../../../interfaces';
 import { globals , sanitize } from '../../../utils/names';
 import deindent from '../../utils/deindent';
-import Wrapper from '../../render-dom/wrappers/shared/Wrapper';
+import Wrapper from '../../render_dom/wrappers/shared/Wrapper';
 
 import TemplateScope from './TemplateScope';
 import get_object from '../../utils/get_object';
 import { nodes_match } from '../../../utils/nodes_match';
-import Block from '../../render-dom/Block';
+import Block from '../../render_dom/Block';
 import { INode } from '../interfaces';
 
 const binary_operators: Record<string, number> = {
diff --git a/src/compiler/compile/render-dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
similarity index 100%
rename from src/compiler/compile/render-dom/Block.ts
rename to src/compiler/compile/render_dom/Block.ts
diff --git a/src/compiler/compile/render-dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
similarity index 100%
rename from src/compiler/compile/render-dom/Renderer.ts
rename to src/compiler/compile/render_dom/Renderer.ts
diff --git a/src/compiler/compile/render-dom/index.ts b/src/compiler/compile/render_dom/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/index.ts
rename to src/compiler/compile/render_dom/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
rename to src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render_dom/wrappers/Body.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Body.ts
rename to src/compiler/compile/render_dom/wrappers/Body.ts
diff --git a/src/compiler/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render_dom/wrappers/DebugTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/DebugTag.ts
rename to src/compiler/compile/render_dom/wrappers/DebugTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/EachBlock.ts
rename to src/compiler/compile/render_dom/wrappers/EachBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
rename to src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/Binding.ts
rename to src/compiler/compile/render_dom/wrappers/Element/Binding.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts b/src/compiler/compile/render_dom/wrappers/Element/StyleAttribute.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
rename to src/compiler/compile/render_dom/wrappers/Element/StyleAttribute.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts b/src/compiler/compile/render_dom/wrappers/Element/fix_attribute_casing.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
rename to src/compiler/compile/render_dom/wrappers/Element/fix_attribute_casing.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Element/index.ts
rename to src/compiler/compile/render_dom/wrappers/Element/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Fragment.ts
rename to src/compiler/compile/render_dom/wrappers/Fragment.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render_dom/wrappers/Head.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Head.ts
rename to src/compiler/compile/render_dom/wrappers/Head.ts
diff --git a/src/compiler/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/IfBlock.ts
rename to src/compiler/compile/render_dom/wrappers/IfBlock.ts
diff --git a/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
rename to src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
diff --git a/src/compiler/compile/render-dom/wrappers/MustacheTag.ts b/src/compiler/compile/render_dom/wrappers/MustacheTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/MustacheTag.ts
rename to src/compiler/compile/render_dom/wrappers/MustacheTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
rename to src/compiler/compile/render_dom/wrappers/RawMustacheTag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Slot.ts b/src/compiler/compile/render_dom/wrappers/Slot.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Slot.ts
rename to src/compiler/compile/render_dom/wrappers/Slot.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Text.ts b/src/compiler/compile/render_dom/wrappers/Text.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Text.ts
rename to src/compiler/compile/render_dom/wrappers/Text.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render_dom/wrappers/Title.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Title.ts
rename to src/compiler/compile/render_dom/wrappers/Title.ts
diff --git a/src/compiler/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render_dom/wrappers/Window.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/Window.ts
rename to src/compiler/compile/render_dom/wrappers/Window.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/Tag.ts b/src/compiler/compile/render_dom/wrappers/shared/Tag.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/Tag.ts
rename to src/compiler/compile/render_dom/wrappers/shared/Tag.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
rename to src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/add_actions.ts b/src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
rename to src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts b/src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts
rename to src/compiler/compile/render_dom/wrappers/shared/add_event_handlers.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts b/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
rename to src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
diff --git a/src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts b/src/compiler/compile/render_dom/wrappers/shared/get_context_merger.ts
similarity index 100%
rename from src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts
rename to src/compiler/compile/render_dom/wrappers/shared/get_context_merger.ts
diff --git a/src/compiler/compile/render-ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/Renderer.ts
rename to src/compiler/compile/render_ssr/Renderer.ts
diff --git a/src/compiler/compile/render-ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
rename to src/compiler/compile/render_ssr/handlers/AwaitBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Comment.ts b/src/compiler/compile/render_ssr/handlers/Comment.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Comment.ts
rename to src/compiler/compile/render_ssr/handlers/Comment.ts
diff --git a/src/compiler/compile/render-ssr/handlers/DebugTag.ts b/src/compiler/compile/render_ssr/handlers/DebugTag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/DebugTag.ts
rename to src/compiler/compile/render_ssr/handlers/DebugTag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/EachBlock.ts b/src/compiler/compile/render_ssr/handlers/EachBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/EachBlock.ts
rename to src/compiler/compile/render_ssr/handlers/EachBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Element.ts
rename to src/compiler/compile/render_ssr/handlers/Element.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Head.ts b/src/compiler/compile/render_ssr/handlers/Head.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Head.ts
rename to src/compiler/compile/render_ssr/handlers/Head.ts
diff --git a/src/compiler/compile/render-ssr/handlers/HtmlTag.ts b/src/compiler/compile/render_ssr/handlers/HtmlTag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/HtmlTag.ts
rename to src/compiler/compile/render_ssr/handlers/HtmlTag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/IfBlock.ts b/src/compiler/compile/render_ssr/handlers/IfBlock.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/IfBlock.ts
rename to src/compiler/compile/render_ssr/handlers/IfBlock.ts
diff --git a/src/compiler/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/InlineComponent.ts
rename to src/compiler/compile/render_ssr/handlers/InlineComponent.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Slot.ts b/src/compiler/compile/render_ssr/handlers/Slot.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Slot.ts
rename to src/compiler/compile/render_ssr/handlers/Slot.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Tag.ts b/src/compiler/compile/render_ssr/handlers/Tag.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Tag.ts
rename to src/compiler/compile/render_ssr/handlers/Tag.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Text.ts b/src/compiler/compile/render_ssr/handlers/Text.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Text.ts
rename to src/compiler/compile/render_ssr/handlers/Text.ts
diff --git a/src/compiler/compile/render-ssr/handlers/Title.ts b/src/compiler/compile/render_ssr/handlers/Title.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/Title.ts
rename to src/compiler/compile/render_ssr/handlers/Title.ts
diff --git a/src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts b/src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts
rename to src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts
diff --git a/src/compiler/compile/render-ssr/index.ts b/src/compiler/compile/render_ssr/index.ts
similarity index 100%
rename from src/compiler/compile/render-ssr/index.ts
rename to src/compiler/compile/render_ssr/index.ts
diff --git a/src/runtime/internal/await-block.ts b/src/runtime/internal/await_block.ts
similarity index 96%
rename from src/runtime/internal/await-block.ts
rename to src/runtime/internal/await_block.ts
index a3313497ff..a8cce36c3f 100644
--- a/src/runtime/internal/await-block.ts
+++ b/src/runtime/internal/await_block.ts
@@ -1,6 +1,6 @@
 import { assign, is_promise } from './utils';
 import { check_outros, group_outros, transition_in, transition_out } from './transitions';
-import { flush } from '../internal/scheduler';
+import { flush } from './scheduler';
 
 export function handle_promise(promise, info) {
 	const token = info.token = {};
diff --git a/src/runtime/internal/index.ts b/src/runtime/internal/index.ts
index d9d95541eb..fcac6b6ccc 100644
--- a/src/runtime/internal/index.ts
+++ b/src/runtime/internal/index.ts
@@ -1,8 +1,8 @@
 export * from './animations';
-export * from './await-block';
+export * from './await_block';
 export * from './dom';
 export * from './environment';
-export * from './keyed-each';
+export * from './keyed_each';
 export * from './lifecycle';
 export * from './loop';
 export * from './scheduler';
diff --git a/src/runtime/internal/keyed-each.ts b/src/runtime/internal/keyed_each.ts
similarity index 100%
rename from src/runtime/internal/keyed-each.ts
rename to src/runtime/internal/keyed_each.ts

From 39623dbdef67a7849afad54b8c19cb6b59e38863 Mon Sep 17 00:00:00 2001
From: 43081j <43081j@users.noreply.github.com>
Date: Mon, 24 Jun 2019 21:17:23 +0100
Subject: [PATCH 23/24] add lint to build script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 96a1dd8f99..c2dd066def 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "coverage": "c8 report --reporter=text-lcov > coverage.lcov && c8 report --reporter=html",
     "codecov": "codecov",
     "precodecov": "npm run coverage",
-    "build": "rollup -c && npm run tsd",
+    "build": "rollup -c && npm run lint && npm run tsd",
     "prepare": "npm run build",
     "dev": "rollup -cw",
     "pretest": "npm run build",

From 5d638d32bab67c288904c4b91d51cfbdc046e108 Mon Sep 17 00:00:00 2001
From: 43081j <43081j@users.noreply.github.com>
Date: Mon, 24 Jun 2019 21:29:11 +0100
Subject: [PATCH 24/24] fix existing lint errors

---
 .eslintrc.json                                         |  3 +++
 src/compiler/compile/Component.ts                      |  2 +-
 .../compile/render_dom/wrappers/Element/index.ts       | 10 ++++------
 test/runtime/samples/nbsp-div/_config.js               |  8 +++-----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index c821993c40..26b87eab68 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,6 +39,9 @@
     }],
     "@typescript-eslint/no-unused-vars": "off"
   },
+  "globals": {
+    "globalThis": false
+  },
   "env": {
     "es6": true,
     "browser": true,
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index f6a8785e5f..53838f90b8 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -234,7 +234,7 @@ export default class Component {
 	}
 
 	helper(name: string) {
-		const alias = this.alias(name)
+		const alias = this.alias(name);
 		this.helpers.set(name, alias);
 		return alias;
 	}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 842201381c..e66e6c7e4f 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -344,12 +344,10 @@ export default class ElementWrapper extends Wrapper {
 					parent.name === 'style'
 				);
 
-				return (raw
-					? wrapper.node.data
-					: escape_html(wrapper.node.data))
-						.replace(/\\/g, '\\\\')
-						.replace(/`/g, '\\`')
-						.replace(/\$/g, '\\$');
+				return (raw ? wrapper.node.data : escape_html(wrapper.node.data))
+					.replace(/\\/g, '\\\\')
+					.replace(/`/g, '\\`')
+					.replace(/\$/g, '\\$');
 			}
 
 			if (wrapper.node.name === 'noscript') return '';
diff --git a/test/runtime/samples/nbsp-div/_config.js b/test/runtime/samples/nbsp-div/_config.js
index 6026af2c90..5ab7a7f04b 100644
--- a/test/runtime/samples/nbsp-div/_config.js
+++ b/test/runtime/samples/nbsp-div/_config.js
@@ -4,16 +4,14 @@ export default {
 	<div>&nbsp;hello&nbsp; &nbsp;hello</div>`,
 
 	test({ assert, component, target }) {
-		var divList = target.querySelectorAll('div')
+		const divList = target.querySelectorAll('div');
 		assert.equal( divList[0].textContent.charCodeAt( 0 ), 160 );
 		assert.equal( divList[1].textContent.charCodeAt( 0 ), 160 );
 		assert.equal( divList[1].textContent.charCodeAt( 6 ), 160 );
 		assert.equal( divList[1].textContent.charCodeAt( 7 ), 160 );
 		assert.equal( divList[2].textContent.charCodeAt( 0 ), 160 );
 		assert.equal( divList[2].textContent.charCodeAt( 6 ), 160 );
-		assert.equal( divList[2].textContent.charCodeAt( 7 ), 32 );//normal space
+		assert.equal( divList[2].textContent.charCodeAt( 7 ), 32 ); //normal space
 		assert.equal( divList[2].textContent.charCodeAt( 8 ), 160 );
-
-		
 	}
-};
\ No newline at end of file
+};