From da540ef15f9107a57d86766ebc84b1be1f7a8ec4 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 30 Jan 2019 10:21:55 -0500
Subject: [PATCH] update some tests

---
 test/apps/basics/src/routes/b/index.html      | 20 +++++-----
 .../basics/src/routes/delete-test/index.html  | 32 ++++++++--------
 .../basics/src/routes/unsafe-replacement.html | 14 +++----
 .../src/routes/credentials/index.html         | 20 +++++-----
 test/apps/css/src/routes/bar.html             | 22 ++++++-----
 .../encoding/src/routes/echo/page/[slug].html | 21 ++++++-----
 test/apps/encoding/src/routes/fünke.html      | 20 +++++-----
 test/apps/errors/src/routes/blog/[slug].html  | 34 +++++++++--------
 .../errors/src/routes/enhance-your-calm.html  | 10 ++---
 test/apps/errors/src/routes/throw.html        | 10 ++---
 test/apps/export/src/routes/blog/[slug].html  | 20 +++++-----
 test/apps/export/src/routes/blog/index.html   | 24 ++++++------
 test/apps/ignore/src/routes/b/index.html      | 20 +++++-----
 test/apps/layout/src/routes/[x]/[y]/[z].html  | 32 ++++++++--------
 .../layout/src/routes/[x]/[y]/_layout.html    | 37 +++++++++----------
 test/apps/preloading/src/routes/_layout.html  | 26 +++++++------
 .../routes/preload-values/custom-class.html   | 30 ++++++++-------
 .../src/routes/preload-values/set.html        | 20 +++++-----
 .../preloading/src/routes/slow-preload.html   | 26 ++++++-------
 .../redirects/src/routes/redirect-from.html   | 14 +++----
 .../src/routes/redirect-to-external.html      | 14 +++----
 .../src/routes/redirect-to-root.html          | 14 +++----
 test/apps/scroll/src/routes/tall-page.html    | 26 ++++++-------
 23 files changed, 255 insertions(+), 251 deletions(-)

diff --git a/test/apps/basics/src/routes/b/index.html b/test/apps/basics/src/routes/b/index.html
index d93079d..8b1cfa6 100644
--- a/test/apps/basics/src/routes/b/index.html
+++ b/test/apps/basics/src/routes/b/index.html
@@ -1,11 +1,13 @@
-<h1>{letter}</h1>
+<script context="module">
+	export function preload() {
+		return this.fetch('b.json').then(r => r.json()).then(letter => {
+			return { letter };
+		});
+	}
+</script>
 
 <script>
-	export default {
-		preload() {
-			return this.fetch('b.json').then(r => r.json()).then(letter => {
-				return { letter };
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	export let letter;
+</script>
+
+<h1>{letter}</h1>
\ No newline at end of file
diff --git a/test/apps/basics/src/routes/delete-test/index.html b/test/apps/basics/src/routes/delete-test/index.html
index a5280cb..e8a2b6e 100644
--- a/test/apps/basics/src/routes/delete-test/index.html
+++ b/test/apps/basics/src/routes/delete-test/index.html
@@ -1,19 +1,17 @@
-<button class='del' on:click='del()'>delete</button>
-
 <script>
-	export default {
-		oncreate() {
-			window.deleted = null;
-		},
+	import { onMount } from 'svelte';
 
-		methods: {
-			del() {
-				fetch(`delete-test/42.json`, { method: 'DELETE' })
-					.then(r => r.json())
-					.then(data => {
-						window.deleted = data;
-					});
-			}
-		}
-	};
-</script>
\ No newline at end of file
+	onMount(() => {
+		window.deleted = null;
+	});
+
+	function del() {
+		fetch(`delete-test/42.json`, { method: 'DELETE' })
+			.then(r => r.json())
+			.then(data => {
+				window.deleted = data;
+			});
+	}
+</script>
+
+<button class="del" on:click={del}>delete</button>
\ No newline at end of file
diff --git a/test/apps/basics/src/routes/unsafe-replacement.html b/test/apps/basics/src/routes/unsafe-replacement.html
index 98c654f..49fb001 100644
--- a/test/apps/basics/src/routes/unsafe-replacement.html
+++ b/test/apps/basics/src/routes/unsafe-replacement.html
@@ -1,9 +1,7 @@
-$&
+<script context="module">
+	export function preload() {
+		return '$&';
+	}
+</script>
 
-<script>
-	export default {
-		preload() {
-			return '$&';
-		}
-	};
-</script>
\ No newline at end of file
+$&
\ No newline at end of file
diff --git a/test/apps/credentials/src/routes/credentials/index.html b/test/apps/credentials/src/routes/credentials/index.html
index 688ece6..04a19ee 100644
--- a/test/apps/credentials/src/routes/credentials/index.html
+++ b/test/apps/credentials/src/routes/credentials/index.html
@@ -1,11 +1,13 @@
-<h1>{message}</h1>
+<script context="module">
+	export function preload({ query }) {
+		return this.fetch(`credentials/test.json`, {
+			credentials: query.creds
+		}).then(r => r.json());
+	}
+</script>
 
 <script>
-	export default {
-		preload({ query }) {
-			return this.fetch(`credentials/test.json`, {
-				credentials: query.creds
-			}).then(r => r.json());
-		}
-	};
-</script>
\ No newline at end of file
+	export let message;
+</script>
+
+<h1>{message}</h1>
\ No newline at end of file
diff --git a/test/apps/css/src/routes/bar.html b/test/apps/css/src/routes/bar.html
index 876ee63..d63d069 100644
--- a/test/apps/css/src/routes/bar.html
+++ b/test/apps/css/src/routes/bar.html
@@ -1,11 +1,13 @@
-<svelte:component this={Title}/>
-
 <script>
-	export default {
-		oncreate() {
-			import('./_components/Title.html').then(({ default: Title }) => {
-				this.set({ Title });
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	import { onMount } from 'svelte';
+
+	export let Title;
+
+	onMount(() => {
+		import('./_components/Title.html').then(mod => {
+			Title = mod.default;
+		});
+	});
+</script>
+
+<svelte:component this={Title}/>
\ No newline at end of file
diff --git a/test/apps/encoding/src/routes/echo/page/[slug].html b/test/apps/encoding/src/routes/echo/page/[slug].html
index 2cdc03d..deead40 100644
--- a/test/apps/encoding/src/routes/echo/page/[slug].html
+++ b/test/apps/encoding/src/routes/echo/page/[slug].html
@@ -1,11 +1,14 @@
-<h1>{slug} {JSON.stringify(query)}</h1>
+<script context="module">
+	export function preload({ params }) {
+		return {
+			slug: params.slug
+		};
+	}
+</script>
 
 <script>
-	export default {
-		preload({ params }) {
-			return {
-				slug: params.slug
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let slug;
+	export let query;
+</script>
+
+<h1>{slug} {JSON.stringify(query)}</h1>
\ No newline at end of file
diff --git a/test/apps/encoding/src/routes/fünke.html b/test/apps/encoding/src/routes/fünke.html
index e1fba6c..dbff62e 100644
--- a/test/apps/encoding/src/routes/fünke.html
+++ b/test/apps/encoding/src/routes/fünke.html
@@ -1,11 +1,13 @@
-<h1>{phrase}</h1>
+<script context="module">
+	export function preload() {
+		return this.fetch('fünke.json').then(r => r.json()).then(phrase => {
+			return { phrase };
+		});
+	}
+</script>
 
 <script>
-	export default {
-		preload() {
-			return this.fetch('fünke.json').then(r => r.json()).then(phrase => {
-				return { phrase };
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	export let phrase;
+</script>
+
+<h1>{phrase}</h1>
\ No newline at end of file
diff --git a/test/apps/errors/src/routes/blog/[slug].html b/test/apps/errors/src/routes/blog/[slug].html
index 8a304d0..1fe2daa 100644
--- a/test/apps/errors/src/routes/blog/[slug].html
+++ b/test/apps/errors/src/routes/blog/[slug].html
@@ -1,19 +1,21 @@
-<h1>{post.title}</h1>
+<script context="module">
+	export function preload({ params }) {
+		const { slug } = params;
+
+		return this.fetch(`blog/${slug}.json`).then(r => {
+			return r.json().then(data => {
+				if (r.status !== 200) {
+					this.error(r.status, data);
+				}
+
+				return data;
+			});
+		});
+	}
+</script>
 
 <script>
-	export default {
-		preload({ params }) {
-			const { slug } = params;
+	export let post;
+</script>
 
-			return this.fetch(`blog/${slug}.json`).then(r => {
-				return r.json().then(data => {
-					if (r.status !== 200) {
-						this.error(r.status, data);
-					}
-
-					return data;
-				});
-			});
-		}
-	};
-</script>
\ No newline at end of file
+<h1>{post.title}</h1>
\ No newline at end of file
diff --git a/test/apps/errors/src/routes/enhance-your-calm.html b/test/apps/errors/src/routes/enhance-your-calm.html
index 398584e..799755b 100644
--- a/test/apps/errors/src/routes/enhance-your-calm.html
+++ b/test/apps/errors/src/routes/enhance-your-calm.html
@@ -1,7 +1,5 @@
-<script>
-	export default {
-		preload() {
-			this.error(420, 'Enhance your calm');
-		}
-	};
+<script context="module">
+	export function preload() {
+		this.error(420, 'Enhance your calm');
+	}
 </script>
\ No newline at end of file
diff --git a/test/apps/errors/src/routes/throw.html b/test/apps/errors/src/routes/throw.html
index 16b4131..4e4cc9a 100644
--- a/test/apps/errors/src/routes/throw.html
+++ b/test/apps/errors/src/routes/throw.html
@@ -1,7 +1,5 @@
-<script>
-	export default {
-		preload() {
-			throw new Error('nope');
-		}
-	};
+<script context="module">
+	export function preload() {
+		throw new Error('nope');
+	}
 </script>
\ No newline at end of file
diff --git a/test/apps/export/src/routes/blog/[slug].html b/test/apps/export/src/routes/blog/[slug].html
index f44adaa..2febdf2 100644
--- a/test/apps/export/src/routes/blog/[slug].html
+++ b/test/apps/export/src/routes/blog/[slug].html
@@ -1,11 +1,13 @@
-<h1>{post.title}</h1>
+<script context="module">
+	export function preload({ params }) {
+		return this.fetch(`blog/${params.slug}.json`).then(r => r.json()).then(post => {
+			return { post };
+		});
+	}
+</script>
 
 <script>
-	export default {
-		preload({ params }) {
-			return this.fetch(`blog/${params.slug}.json`).then(r => r.json()).then(post => {
-				return { post };
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	export let post;
+</script>
+
+<h1>{post.title}</h1>
\ No newline at end of file
diff --git a/test/apps/export/src/routes/blog/index.html b/test/apps/export/src/routes/blog/index.html
index 2eea681..d12e432 100644
--- a/test/apps/export/src/routes/blog/index.html
+++ b/test/apps/export/src/routes/blog/index.html
@@ -1,15 +1,17 @@
+<script context="module">
+	export function preload() {
+		return this.fetch('blog.json').then(r => r.json()).then(posts => {
+			return { posts };
+		});
+	}
+</script>
+
+<script>
+	export let posts;
+</script>
+
 <h1>blog</h1>
 
 {#each posts as post}
 	<p><a href="blog/{post.slug}">{post.title}</a></p>
-{/each}
-
-<script>
-	export default {
-		preload() {
-			return this.fetch('blog.json').then(r => r.json()).then(posts => {
-				return { posts };
-			});
-		}
-	};
-</script>
\ No newline at end of file
+{/each}
\ No newline at end of file
diff --git a/test/apps/ignore/src/routes/b/index.html b/test/apps/ignore/src/routes/b/index.html
index d93079d..8b1cfa6 100644
--- a/test/apps/ignore/src/routes/b/index.html
+++ b/test/apps/ignore/src/routes/b/index.html
@@ -1,11 +1,13 @@
-<h1>{letter}</h1>
+<script context="module">
+	export function preload() {
+		return this.fetch('b.json').then(r => r.json()).then(letter => {
+			return { letter };
+		});
+	}
+</script>
 
 <script>
-	export default {
-		preload() {
-			return this.fetch('b.json').then(r => r.json()).then(letter => {
-				return { letter };
-			});
-		}
-	};
-</script>
\ No newline at end of file
+	export let letter;
+</script>
+
+<h1>{letter}</h1>
\ No newline at end of file
diff --git a/test/apps/layout/src/routes/[x]/[y]/[z].html b/test/apps/layout/src/routes/[x]/[y]/[z].html
index 018f001..b51089c 100644
--- a/test/apps/layout/src/routes/[x]/[y]/[z].html
+++ b/test/apps/layout/src/routes/[x]/[y]/[z].html
@@ -1,20 +1,18 @@
-<span>z: {segment} {count}</span>
-<a href="foo/bar/qux">click me</a>
-
-<script>
+<script context="module">
 	import counts from '../_counts.js';
 
-	export default {
-		preload() {
-			return {
-				count: counts.z += 1
-			};
-		},
+	export function preload() {
+		return {
+			count: counts.z += 1
+		};
+	}
+</script>
 
-		oncreate() {
-			this.set({
-				segment: this.get().params.z
-			});
-		}
-	};
-</script>
\ No newline at end of file
+<script>
+	export let params;
+	export let count;
+	export let segment = params.z;
+</script>
+
+<span>z: {segment} {count}</span>
+<a href="foo/bar/qux">click me</a>
\ No newline at end of file
diff --git a/test/apps/layout/src/routes/[x]/[y]/_layout.html b/test/apps/layout/src/routes/[x]/[y]/_layout.html
index 7e632a3..f60dd63 100644
--- a/test/apps/layout/src/routes/[x]/[y]/_layout.html
+++ b/test/apps/layout/src/routes/[x]/[y]/_layout.html
@@ -1,22 +1,21 @@
+<script context="module">
+	import counts from '../_counts.js';
+
+	export function preload() {
+		return {
+			count: counts.y += 1
+		};
+	}
+</script>
+
+<script>
+	export let params;
+	export let count;
+	export let child;
+	export let segment = params.y;
+</script>
+
 <span>y: {segment} {count}</span>
 <svelte:component this={child.component} {...child.props}/>
 
-<span>child segment: {child.segment}</span>
-
-<script>
-	import counts from '../_counts.js';
-
-	export default {
-		preload() {
-			return {
-				count: counts.y += 1
-			};
-		},
-
-		oncreate() {
-			this.set({
-				segment: this.get().params.y
-			});
-		}
-	};
-</script>
\ No newline at end of file
+<span>child segment: {child.segment}</span>
\ No newline at end of file
diff --git a/test/apps/preloading/src/routes/_layout.html b/test/apps/preloading/src/routes/_layout.html
index 4e39097..30dc0e6 100644
--- a/test/apps/preloading/src/routes/_layout.html
+++ b/test/apps/preloading/src/routes/_layout.html
@@ -1,15 +1,19 @@
+<script context="module">
+	export function preload() {
+		return {
+			rootPreloadFunctionRan: true
+		};
+	}
+</script>
+
+<script>
+	export let preloading;
+	export let child;
+	export let rootPreloadFunctionRan;
+</script>
+
 {#if preloading}
 	<progress class='preloading-progress' value=0.5/>
 {/if}
 
-<svelte:component this={child.component} {rootPreloadFunctionRan} {...child.props}/>
-
-<script>
-	export default {
-		preload() {
-			return {
-				rootPreloadFunctionRan: true
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<svelte:component this={child.component} {rootPreloadFunctionRan} {...child.props}/>
\ No newline at end of file
diff --git a/test/apps/preloading/src/routes/preload-values/custom-class.html b/test/apps/preloading/src/routes/preload-values/custom-class.html
index 44e94cb..a4f0499 100644
--- a/test/apps/preloading/src/routes/preload-values/custom-class.html
+++ b/test/apps/preloading/src/routes/preload-values/custom-class.html
@@ -1,17 +1,19 @@
-<h1>{foo.bar()}</h1>
+<script context="module">
+	export function preload() {
+		class Foo {
+			bar() {
+				return 42;
+			}
+		}
+
+		return {
+			foo: new Foo()
+		};
+	}
+</script>
 
 <script>
-	export default {
-		preload() {
-			class Foo {
-				bar() {
-					return 42;
-				}
-			}
+	export let foo;
+</script>
 
-			return {
-				foo: new Foo()
-			};
-		}
-	};
-</script>
\ No newline at end of file
+<h1>{foo.bar()}</h1>
\ No newline at end of file
diff --git a/test/apps/preloading/src/routes/preload-values/set.html b/test/apps/preloading/src/routes/preload-values/set.html
index 43066c9..03a5b01 100644
--- a/test/apps/preloading/src/routes/preload-values/set.html
+++ b/test/apps/preloading/src/routes/preload-values/set.html
@@ -1,11 +1,13 @@
-<h1>{set.has('x')}</h1>
+<script context="module">
+	export function preload() {
+		return {
+			set: new Set(['x'])
+		};
+	}
+</script>
 
 <script>
-	export default {
-		preload() {
-			return {
-				set: new Set(['x'])
-			};
-		}
-	};
-</script>
\ No newline at end of file
+	export let set;
+</script>
+
+<h1>{set.has('x')}</h1>
\ No newline at end of file
diff --git a/test/apps/preloading/src/routes/slow-preload.html b/test/apps/preloading/src/routes/slow-preload.html
index 0dc35ca..8312e4e 100644
--- a/test/apps/preloading/src/routes/slow-preload.html
+++ b/test/apps/preloading/src/routes/slow-preload.html
@@ -1,15 +1,13 @@
-<h1>This page should never render</h1>
+<script context="module">
+	export function preload() {
+		return new Promise(fulfil => {
+			if (typeof window !== 'undefined') {
+				window.fulfil = fulfil;
+			} else {
+				fulfil({});
+			}
+		});
+	}
+</script>
 
-<script>
-	export default {
-		preload() {
-			return new Promise(fulfil => {
-				if (typeof window !== 'undefined') {
-					window.fulfil = fulfil;
-				} else {
-					fulfil({});
-				}
-			});
-		}
-	};
-</script>
\ No newline at end of file
+<h1>This page should never render</h1>
\ No newline at end of file
diff --git a/test/apps/redirects/src/routes/redirect-from.html b/test/apps/redirects/src/routes/redirect-from.html
index 8c419c5..2c07828 100644
--- a/test/apps/redirects/src/routes/redirect-from.html
+++ b/test/apps/redirects/src/routes/redirect-from.html
@@ -1,9 +1,7 @@
-<h1>unredirected</h1>
+<script context="module">
+	export function preload() {
+		this.redirect(301, 'redirect-to');
+	}
+</script>
 
-<script>
-	export default {
-		preload() {
-			this.redirect(301, 'redirect-to');
-		}
-	};
-</script>
\ No newline at end of file
+<h1>unredirected</h1>
\ No newline at end of file
diff --git a/test/apps/redirects/src/routes/redirect-to-external.html b/test/apps/redirects/src/routes/redirect-to-external.html
index fec2fee..bc713c1 100644
--- a/test/apps/redirects/src/routes/redirect-to-external.html
+++ b/test/apps/redirects/src/routes/redirect-to-external.html
@@ -1,9 +1,7 @@
-<h1>unredirected</h1>
+<script context="module">
+	export function preload() {
+		this.redirect(301, 'https://example.com');
+	}
+</script>
 
-<script>
-	export default {
-		preload() {
-			this.redirect(301, 'https://example.com');
-		}
-	};
-</script>
\ No newline at end of file
+<h1>unredirected</h1>
\ No newline at end of file
diff --git a/test/apps/redirects/src/routes/redirect-to-root.html b/test/apps/redirects/src/routes/redirect-to-root.html
index 0fa438b..63460f1 100644
--- a/test/apps/redirects/src/routes/redirect-to-root.html
+++ b/test/apps/redirects/src/routes/redirect-to-root.html
@@ -1,9 +1,7 @@
-<h1>unredirected</h1>
+<script context="module">
+	export function preload() {
+		this.redirect(301, '/');
+	}
+</script>
 
-<script>
-	export default {
-		preload() {
-			this.redirect(301, '/');
-		}
-	};
-</script>
\ No newline at end of file
+<h1>unredirected</h1>
\ No newline at end of file
diff --git a/test/apps/scroll/src/routes/tall-page.html b/test/apps/scroll/src/routes/tall-page.html
index 67db967..8c79fb7 100644
--- a/test/apps/scroll/src/routes/tall-page.html
+++ b/test/apps/scroll/src/routes/tall-page.html
@@ -1,3 +1,13 @@
+<script>
+	import { onMount } from 'svelte';
+
+	export let barLink = false;
+
+	onMount(() => {
+		barLink = true
+	});
+</script>
+
 <a href="tall-page#foo">scroll to foo</a>
 <div style="height: 9999px"></div>
 
@@ -7,18 +17,4 @@
 	{#if barLink}
 		<a href="another-tall-page#bar">link</a>
 	{/if}
-</div>
-
-<script>
-	export default {
-		data() {
-			return {
-				barLink: false
-			};
-		},
-
-		oncreate() {
-			this.set({ barLink: true })
-		}
-	}
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file