Support Svelte 3

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

test/apps/basics/rollup.config.js

@@ -22,10 +22,7 @@ export default {
 				emitCss: true
 			}),
 			resolve()
-		],
-
-		// temporary, pending Rollup 1.0
-		experimentalCodeSplitting: true
+		]
 	},
 
 	server: {
@@ -44,10 +41,7 @@ export default {
 				preferBuiltins: true
 			})
 		],
-		external: ['sirv', 'polka'],
-
-		// temporary, pending Rollup 1.0
-		experimentalCodeSplitting: true
+		external: ['sirv', 'polka']
 	},
 
 	serviceworker: {

test/apps/basics/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/basics/src/routes/[slug].html

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

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>
+	export let letter;
+</script>
+
+<h1>{letter}</h1>

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>
+	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>

test/apps/basics/src/routes/echo-query/index.html

@@ -1 +1,5 @@
-<h1>{JSON.stringify(query)}</h1>
+<script>
+	import { page } from '@sapper/app';
+</script>
+
+<h1>{JSON.stringify($page.query)}</h1>

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>
+$&

test/apps/basics/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/basics/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);
+// `app.shell` is an array of all the files generated by webpack,
+// `app.files` is an array of everything in the `static` directory
+const to_cache = sapper.shell.concat(sapper.files);
 const cached = new Set(to_cache);
 
 self.addEventListener('install', event => {
@@ -52,7 +52,6 @@ self.addEventListener('fetch', event => {
 	// which Sapper has generated for you. It's not right for every
 	// app, but if it's right for yours then uncomment this section
 	/*
-	if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) {
 		event.respondWith(caches.match('/index.html'));
 		return;
 	}
@@ -65,7 +64,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);

test/apps/basics/test.ts

@@ -20,19 +20,18 @@ describe('basics', function() {
 	let prefetchRoutes: () => Promise<void>;
 	let prefetch: (href: string) => Promise<void>;
 	let goto: (href: string) => Promise<void>;
+	let title: () => Promise<string>;
 
 	// hooks
 	before(async () => {
 		await build({ cwd: __dirname });
 
 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
-		({ base, page, start, prefetchRoutes, prefetch, goto } = await runner.start());
+		({ base, page, start, prefetchRoutes, prefetch, goto, title } = await runner.start());
 	});
 
 	after(() => runner.end());
 
-	const title = () => page.$eval('h1', node => node.textContent);
-
 	it('serves /', async () => {
 		await page.goto(base);
 
@@ -262,7 +261,7 @@ describe('basics', function() {
 		await page.goto(`${base}/unsafe-replacement`);
 		await start();
 
-		const html = await page.evaluate(() => document.body.innerHTML);
+		const html = String(await page.evaluate(() => document.body.innerHTML));
 		assert.equal(html.indexOf('%sapper'), -1);
 	});
 });