Support Svelte 3

fixes #546, #551, #552, #554

test/apps/preloading/src/client.js

@@ -1,4 +1,4 @@
-import * as sapper from '../__sapper__/client.js';
+import * as sapper from '@sapper/app';
 
 window.start = () => sapper.start({
 	target: document.querySelector('#sapper')

test/apps/preloading/src/routes/_layout.html

@@ -1,15 +1,20 @@
-{#if preloading}
+<script context="module">
+	export function preload() {
+		return {
+			rootPreloadFunctionRan: true
+		};
+	}
+</script>
+
+<script>
+	import { preloading } from '@sapper/app';
+
+	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>
+<svelte:component this={child.component} {rootPreloadFunctionRan} {...child.props}/>

test/apps/preloading/src/routes/prefetch/[slug]/index.html

@@ -1 +1,5 @@
-<h1>{params.slug}</h1>
+<script>
+	import { page } from '@sapper/app';
+</script>
+
+<h1>{$page.params.slug}</h1>

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>
+<h1>{foo.bar()}</h1>

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>
+	export let set;
+</script>
+
+<h1>{set.has('x')}</h1>

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>
+<h1>This page should never render</h1>

test/apps/preloading/src/server.js

@@ -1,5 +1,5 @@
 import polka from 'polka';
-import * as sapper from '../__sapper__/server.js';
+import * as sapper from '@sapper/server';
 
 const { PORT } = process.env;
 

test/apps/preloading/src/service-worker.js

@@ -1,10 +1,10 @@
-import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js';
+import * as sapper from '@sapper/service-worker';
 
-const ASSETS = `cache${timestamp}`;
+const ASSETS = `cache${sapper.timestamp}`;
 
 // `shell` is an array of all the files generated by webpack,
 // `files` is an array of everything in the `static` directory
-const to_cache = shell.concat(ASSETS);
+const to_cache = sapper.shell.concat(sapper.files);
 const cached = new Set(to_cache);
 
 self.addEventListener('install', event => {
@@ -65,7 +65,7 @@ self.addEventListener('fetch', event => {
 	// might prefer a cache-first approach to a network-first one.)
 	event.respondWith(
 		caches
-			.open(`offline${timestamp}`)
+			.open(`offline${sapper.timestamp}`)
 			.then(async cache => {
 				try {
 					const response = await fetch(event.request);