-> v0.26.0

start adding site to main repo

.gitignore

@@ -12,4 +12,5 @@ sapper
 runtime.js
 dist
 !rollup.config.js
-templates/*.js
+/runtime/app.mjs
+/runtime/server.mjs

.netlify/state.json

@@ -0,0 +1,3 @@
+{
+	"siteId": "a6a3cfed-c34e-42f7-9616-07ad2eedb15f"
+}

.travis.yml

@@ -3,8 +3,7 @@ sudo: false
 language: node_js
 
 node_js:
-  - "6"
-  - "stable"
+  - "11"
 
 env:
   global:

CHANGELOG.md

@@ -1,5 +1,34 @@
 # sapper changelog
 
+## 0.26.0
+
+* Update to Svelte 3
+* Slot-based nested routes ([#573](https://github.com/sveltejs/sapper/issues/573))
+* Make `page`, `preloading` and `session` stores available to components ([#642](https://github.com/sveltejs/sapper/pull/642))
+* Handle missing/empty refs when exporting ([#602](https://github.com/sveltejs/sapper/issues/602))
+* Prevent race condition when exporting ([#585](https://github.com/sveltejs/sapper/pull/585))
+* Fix redirects with base path ([#589](https://github.com/sveltejs/sapper/issues/589))
+* Add `<link rel="preload">` to exported HTML ([#568](https://github.com/sveltejs/sapper/pull/568))
+* Handle deep links that are invalid selectors on initial load ([#516](https://github.com/sveltejs/sapper/issues/516))
+* Use shared queue for exporting ([#604](https://github.com/sveltejs/sapper/issues/604))
+* Handle `+` character in query string ([#618](https://github.com/sveltejs/sapper/issues/618))
+* Spread routes ([#545](https://github.com/sveltejs/sapper/issues/545))
+* Fix navigation from `/a/[id]` to `/b/[id]` ([#610](https://github.com/sveltejs/sapper/pull/610))
+* Allow `preload` functions to return falsy values ([#587](https://github.com/sveltejs/sapper/issues/587))
+* Mount error pages correctly ([#620](https://github.com/sveltejs/sapper/pull/620))
+
+## 0.25.0
+
+* Force refresh on `goto(current_url)` ([#484](https://github.com/sveltejs/sapper/pull/484))
+* Fix preloading navigation bug ([#532](https://github.com/sveltejs/sapper/issues/532))
+* Don't mutate opts.headers ([#528](https://github.com/sveltejs/sapper/issues/528))
+* Don't crawl hundreds of pages simultaneously ([#369](https://github.com/sveltejs/sapper/pull/369))
+
+## 0.24.3
+
+* Add service-worker-index.html shell file for offline support ([#422](https://github.com/sveltejs/sapper/issues/422))
+* Don't cache .map files ([#534](https://github.com/sveltejs/sapper/issues/534))
+
 ## 0.24.2
 
 * Support Rollup 1.0 ([#541](https://github.com/sveltejs/sapper/pull/541))

README.md

@@ -11,9 +11,11 @@ Sapper is a framework for building high-performance universal web apps. [Read th
 ## Get started
 
 Clone the [starter project template](https://github.com/sveltejs/sapper-template) with [degit](https://github.com/rich-harris/degit)...
+When cloning you have to choose between rollup or webpack:
 
 ```bash
-npx degit sveltejs/sapper-template my-app
+npx degit "sveltejs/sapper-template#rollup" my-app
+# or: npx degit "sveltejs/sapper-template#webpack" my-app
 ```
 
 ...then install dependencies and start the dev server...

appveyor.yml

@@ -10,7 +10,7 @@ build: off
 environment:
   matrix:
     # node.js
-    - nodejs_version: 10.5
+    - nodejs_version: 11
 
 install:
   - ps: Install-Product node $env:nodejs_version

mocha.opts

@@ -1,5 +1,5 @@
 --require source-map-support/register
---require ts-node/register
+--require sucrase/register
 --recursive
-test/unit/*/*.ts
-test/apps/*/test.ts
+test/unit/*/test.ts
+test/apps/*/test.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.24.2",
+  "version": "0.26.0",
   "description": "Military-grade apps, engineered by Svelte",
   "bin": {
     "sapper": "./sapper"
@@ -11,59 +11,57 @@
     "config",
     "sapper",
     "dist/*.js",
-    "templates/*.js"
+    "runtime/*.mjs",
+    "runtime/internal"
   ],
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "html-minifier": "^3.5.20",
-    "shimport": "0.0.11",
-    "source-map-support": "^0.5.9",
-    "sourcemap-codec": "^1.4.3",
-    "string-hash": "^1.1.3",
-    "tslib": "^1.9.3"
+    "html-minifier": "^3.5.21",
+    "http-link-header": "^1.0.2",
+    "shimport": "^1.0.0",
+    "sourcemap-codec": "^1.4.4",
+    "string-hash": "^1.1.3"
   },
   "devDependencies": {
-    "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.0",
-    "@types/puppeteer": "^1.9.0",
-    "@types/rimraf": "^2.0.2",
+    "@types/node": "^10.12.21",
+    "@types/puppeteer": "^1.11.3",
     "agadoo": "^1.0.1",
-    "cheap-watch": "^1.0.0",
+    "cheap-watch": "^1.0.2",
     "cookie": "^0.3.1",
-    "devalue": "^1.0.4",
-    "eslint": "^5.7.0",
-    "eslint-plugin-import": "^2.14.0",
-    "kleur": "^2.0.2",
-    "mkdirp": "^0.5.1",
+    "devalue": "^1.1.0",
+    "eslint": "^5.12.1",
+    "eslint-plugin-import": "^2.16.0",
+    "kleur": "^3.0.1",
     "mocha": "^5.2.0",
-    "node-fetch": "^2.2.0",
+    "node-fetch": "^2.3.0",
     "npm-run-all": "^4.1.5",
     "polka": "^0.5.1",
     "port-authority": "^1.0.5",
     "pretty-bytes": "^5.1.0",
-    "puppeteer": "^1.9.0",
+    "puppeteer": "^1.12.0",
     "require-relative": "^0.8.7",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.66.6",
+    "rollup": "^1.1.2",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-string": "^2.0.2",
-    "rollup-plugin-svelte": "^4.3.2",
-    "rollup-plugin-typescript": "^1.0.0",
-    "sade": "^1.4.1",
-    "sander": "^0.6.0",
+    "rollup-plugin-sucrase": "^2.1.0",
+    "rollup-plugin-svelte": "^5.0.3",
+    "sade": "^1.4.2",
     "sirv": "^0.2.2",
-    "svelte": "^2.13.5",
-    "svelte-loader": "^2.11.0",
-    "ts-node": "^7.0.1",
-    "typescript": "^3.1.3",
-    "webpack": "^4.20.2",
-    "webpack-format-messages": "^2.0.3"
+    "sucrase": "^3.9.5",
+    "svelte": "^3.0.0-beta.11",
+    "svelte-loader": "^2.13.3",
+    "webpack": "^4.29.0",
+    "webpack-format-messages": "^2.0.5",
+    "yootils": "0.0.15"
+  },
+  "peerDependencies": {
+    "svelte": "^3.0.0"
   },
   "scripts": {
     "test": "mocha --opts mocha.opts",
@@ -72,7 +70,7 @@
     "prepare": "npm run build",
     "dev": "rollup -cw",
     "prepublishOnly": "npm test",
-    "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > templates/src/server/middleware/mime-types.md"
+    "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > runtime/src/server/middleware/mime-types.md"
   },
   "repository": "https://github.com/sveltejs/sapper",
   "keywords": [

rollup.config.js

@@ -1,4 +1,4 @@
-import typescript from 'rollup-plugin-typescript';
+import sucrase from 'rollup-plugin-sucrase';
 import string from 'rollup-plugin-string';
 import json from 'rollup-plugin-json';
 import resolve from 'rollup-plugin-node-resolve';
@@ -9,34 +9,37 @@ import { builtinModules } from 'module';
 const external = [].concat(
 	Object.keys(pkg.dependencies),
 	Object.keys(process.binding('natives')),
-	'sapper/core.js'
+	'sapper/core.js',
+	'svelte/compiler'
 );
 
-function template(kind, external, target) {
+function template(kind, external) {
 	return {
-		input: `templates/src/${kind}/index.ts`,
+		input: `runtime/src/${kind}/index.ts`,
 		output: {
-			file: `templates/${kind}.js`,
-			format: 'es'
+			file: `runtime/${kind}.mjs`,
+			format: 'es',
+			paths: id => id.replace('@sapper', '.')
 		},
 		external,
 		plugins: [
-			resolve(),
+			resolve({
+				extensions: ['.mjs', '.js', '.ts']
+			}),
 			commonjs(),
 			string({
 				include: '**/*.md'
 			}),
-			typescript({
-				typescript: require('typescript'),
-				target
+			sucrase({
+				transforms: ['typescript']
 			})
 		]
 	};
 }
 
 export default [
-	template('client', ['__ROOT__', '__ERROR__'], 'ES2017'),
-	template('server', builtinModules, 'ES2015'),
+	template('app', id => /^(svelte\/?|@sapper\/)/.test(id)),
+	template('server', id => /^(svelte\/?|@sapper\/)/.test(id) || builtinModules.includes(id)),
 
 	{
 		input: [
@@ -54,12 +57,13 @@ export default [
 		external,
 		plugins: [
 			json(),
-			resolve(),
+			resolve({
+				extensions: ['.mjs', '.js', '.ts']
+			}),
 			commonjs(),
-			typescript({
-				typescript: require('typescript')
+			sucrase({
+				transforms: ['typescript']
 			})
-		],
-		experimentalCodeSplitting: true
+		]
 	}
-];
+];

runtime/internal/error.svelte

@@ -0,0 +1,7 @@
+<h1>{status}</h1>
+
+<p>{error.message}</p>
+
+{#if process.env.NODE_ENV === 'development'}
+	<pre>{error.stack}</pre>
+{/if}

runtime/internal/layout.svelte

@@ -0,0 +1 @@
+<slot></slot>

runtime/internal/shared.mjs

@@ -0,0 +1,5 @@
+import { writable } from 'svelte/store';
+
+export const CONTEXT_KEY = {};
+
+export const preload = () => ({});

runtime/src/app/app.ts

@@ -0,0 +1,355 @@
+import { writable } from 'svelte/store.mjs';
+import App from '@sapper/internal/App.svelte';
+import { root_preload, ErrorComponent, ignore, components, routes } from '@sapper/internal/manifest-client';
+import {
+	Target,
+	ScrollPosition,
+	Component,
+	Redirect,
+	ComponentLoader,
+	ComponentConstructor,
+	Route,
+	Query,
+	Page
+} from './types';
+import goto from './goto';
+
+declare const __SAPPER__;
+export const initial_data = typeof __SAPPER__ !== 'undefined' && __SAPPER__;
+
+let ready = false;
+let root_component: Component;
+let current_token: {};
+let root_preloaded: Promise<any>;
+let current_branch = [];
+
+const stores = {
+	page: writable({}),
+	preloading: writable(null),
+	session: writable(initial_data && initial_data.session)
+};
+
+let $session;
+let session_dirty: boolean;
+
+stores.session.subscribe(async value => {
+	$session = value;
+
+	if (!ready) return;
+	session_dirty = true;
+
+	const target = select_target(new URL(location.href));
+
+	const token = current_token = {};
+	const { redirect, props, branch } = await hydrate_target(target);
+	if (token !== current_token) return; // a secondary navigation happened while we were loading
+
+	await render(redirect, branch, props, target.page);
+});
+
+export let prefetching: {
+	href: string;
+	promise: Promise<{ redirect?: Redirect, data?: any }>;
+} = null;
+export function set_prefetching(href, promise) {
+	prefetching = { href, promise };
+}
+
+export let store;
+export function set_store(fn) {
+	store = fn(initial_data.store);
+}
+
+export let target: Node;
+export function set_target(element) {
+	target = element;
+}
+
+export let uid = 1;
+export function set_uid(n) {
+	uid = n;
+}
+
+export let cid: number;
+export function set_cid(n) {
+	cid = n;
+}
+
+const _history = typeof history !== 'undefined' ? history : {
+	pushState: (state: any, title: string, href: string) => {},
+	replaceState: (state: any, title: string, href: string) => {},
+	scrollRestoration: ''
+};
+export { _history as history };
+
+export const scroll_history: Record<string, ScrollPosition> = {};
+
+export function extract_query(search: string) {
+	const query = Object.create(null);
+	if (search.length > 0) {
+		search.slice(1).split('&').forEach(searchParam => {
+			let [, key, value = ''] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam.replace(/\+/g, ' ')));
+			if (typeof query[key] === 'string') query[key] = [<string>query[key]];
+			if (typeof query[key] === 'object') (query[key] as string[]).push(value);
+			else query[key] = value;
+		});
+	}
+	return query;
+}
+
+export function select_target(url: URL): Target {
+	if (url.origin !== location.origin) return null;
+	if (!url.pathname.startsWith(initial_data.baseUrl)) return null;
+
+	const path = url.pathname.slice(initial_data.baseUrl.length);
+
+	// avoid accidental clashes between server routes and page routes
+	if (ignore.some(pattern => pattern.test(path))) return;
+
+	for (let i = 0; i < routes.length; i += 1) {
+		const route = routes[i];
+
+		const match = route.pattern.exec(path);
+
+		if (match) {
+			const query: Query = extract_query(url.search);
+			const part = route.parts[route.parts.length - 1];
+			const params = part.params ? part.params(match) : {};
+
+			const page = { path, query, params };
+
+			return { href: url.href, route, match, page };
+		}
+	}
+}
+
+export function handle_error(url: URL) {
+	const { pathname, search } = location;
+	const { session, preloaded, status, error } = initial_data;
+
+	if (!root_preloaded) {
+		root_preloaded = preloaded && preloaded[0]
+	}
+
+	const props = {
+		error,
+		status,
+		session,
+		level0: {
+			props: root_preloaded
+		},
+		level1: {
+			props: {
+				status,
+				error
+			},
+			component: ErrorComponent
+		},
+		segments: preloaded
+
+	}
+	const query = extract_query(search);
+	render(null, [], props, { path: pathname, query, params: {} });
+}
+
+export function scroll_state() {
+	return {
+		x: pageXOffset,
+		y: pageYOffset
+	};
+}
+
+export async function navigate(target: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
+	if (id) {
+		// popstate or initial navigation
+		cid = id;
+	} else {
+		const current_scroll = scroll_state();
+
+		// clicked on a link. preserve scroll state
+		scroll_history[cid] = current_scroll;
+
+		id = cid = ++uid;
+		scroll_history[cid] = noscroll ? current_scroll : { x: 0, y: 0 };
+	}
+
+	cid = id;
+
+	if (root_component) stores.preloading.set(true);
+
+	const loaded = prefetching && prefetching.href === target.href ?
+		prefetching.promise :
+		hydrate_target(target);
+
+	prefetching = null;
+
+	const token = current_token = {};
+	const { redirect, props, branch } = await loaded;
+	if (token !== current_token) return; // a secondary navigation happened while we were loading
+
+	await render(redirect, branch, props, target.page);
+	if (document.activeElement) document.activeElement.blur();
+
+	if (!noscroll) {
+		let scroll = scroll_history[id];
+
+		if (hash) {
+			// scroll is an element id (from a hash), we need to compute y.
+			const deep_linked = document.getElementById(hash.slice(1));
+
+			if (deep_linked) {
+				scroll = {
+					x: 0,
+					y: deep_linked.getBoundingClientRect().top
+				};
+			}
+		}
+
+		scroll_history[cid] = scroll;
+		if (scroll) scrollTo(scroll.x, scroll.y);
+	}
+}
+
+async function render(redirect: Redirect, branch: any[], props: any, page: Page) {
+	if (redirect) return goto(redirect.location, { replaceState: true });
+
+	stores.page.set(page);
+	stores.preloading.set(false);
+
+	if (root_component) {
+		root_component.$set(props);
+	} else {
+		props.stores = {
+			page: { subscribe: stores.page.subscribe },
+			preloading: { subscribe: stores.preloading.subscribe },
+			session: stores.session
+		};
+		props.level0 = {
+			props: await root_preloaded
+		};
+
+		// first load — remove SSR'd <head> contents
+		const start = document.querySelector('#sapper-head-start');
+		const end = document.querySelector('#sapper-head-end');
+
+		if (start && end) {
+			while (start.nextSibling !== end) detach(start.nextSibling);
+			detach(start);
+			detach(end);
+		}
+
+		root_component = new App({
+			target,
+			props,
+			hydrate: true
+		});
+	}
+
+	current_branch = branch;
+	ready = true;
+	session_dirty = false;
+}
+
+export async function hydrate_target(target: Target): Promise<{
+	redirect?: Redirect;
+	props?: any;
+	branch?: Array<{ Component: ComponentConstructor, preload: (page) => Promise<any>, segment: string }>;
+}> {
+	const { route, page } = target;
+	const segments = page.path.split('/').filter(Boolean);
+
+	let redirect: Redirect = null;
+
+	const props = { error: null, status: 200, segments: [segments[0]] };
+
+	const preload_context = {
+		fetch: (url: string, opts?: any) => fetch(url, opts),
+		redirect: (statusCode: number, location: string) => {
+			if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
+				throw new Error(`Conflicting redirects`);
+			}
+			redirect = { statusCode, location };
+		},
+		error: (status: number, error: Error | string) => {
+			props.error = typeof error === 'string' ? new Error(error) : error;
+			props.status = status;
+		}
+	};
+
+	if (!root_preloaded) {
+		root_preloaded = initial_data.preloaded[0] || root_preload.call(preload_context, {
+			path: page.path,
+			query: page.query,
+			params: {}
+		}, $session);
+	}
+
+	let branch;
+	let l = 1;
+
+	try {
+		branch = await Promise.all(route.parts.map(async (part, i) => {
+			props.segments[l] = segments[i + 1]; // TODO make this less confusing
+			if (!part) return null;
+
+			const j = l++;
+
+			const segment = segments[i];
+			if (!session_dirty && current_branch[i] && current_branch[i].segment === segment && current_branch[i].part === part.i) return current_branch[i];
+
+			const { default: component, preload } = await load_component(components[part.i]);
+
+			let preloaded;
+			if (ready || !initial_data.preloaded[i + 1]) {
+				preloaded = preload
+					? await preload.call(preload_context, {
+						path: page.path,
+						query: page.query,
+						params: part.params ? part.params(target.match) : {}
+					}, $session)
+					: {};
+			} else {
+				preloaded = initial_data.preloaded[i + 1];
+			}
+
+			return (props[`level${j}`] = { component, props: preloaded, segment, part: part.i });
+		}));
+	} catch (error) {
+		props.error = error;
+		props.status = 500;
+		branch = [];
+	}
+
+	return { redirect, props, branch };
+}
+
+function load_css(chunk: string) {
+	const href = `client/${chunk}`;
+	if (document.querySelector(`link[href="${href}"]`)) return;
+
+	return new Promise((fulfil, reject) => {
+		const link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.href = href;
+
+		link.onload = () => fulfil();
+		link.onerror = reject;
+
+		document.head.appendChild(link);
+	});
+}
+
+export function load_component(component: ComponentLoader): Promise<{
+	default: ComponentConstructor,
+	preload?: (input: any) => any
+}> {
+	// TODO this is temporary — once placeholders are
+	// always rewritten, scratch the ternary
+	const promises: Array<Promise<any>> = (typeof component.css === 'string' ? [] : component.css.map(load_css));
+	promises.unshift(component.js());
+	return Promise.all(promises).then(values => values[0]);
+}
+
+function detach(node: Node) {
+	node.parentNode.removeChild(node);
+}

runtime/src/app/goto/index.ts

@@ -1,7 +1,7 @@
-import { history, select_route, navigate, cid } from '../app';
+import { history, select_target, navigate, cid } from '../app';
 
 export default function goto(href: string, opts = { replaceState: false }) {
-	const target = select_route(new URL(href, document.baseURI));
+	const target = select_target(new URL(href, document.baseURI));
 
 	if (target) {
 		history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href);

runtime/src/app/index.ts

@@ -1,3 +1,8 @@
+import { getContext } from 'svelte';
+import { CONTEXT_KEY } from '@sapper/internal/shared';
+
+export const stores = () => getContext(CONTEXT_KEY);
+
 export { default as start } from './start/index';
 export { default as goto } from './goto/index';
 export { default as prefetch } from './prefetch/index';

runtime/src/app/prefetch/index.ts

@@ -0,0 +1,14 @@
+import { select_target, prefetching, set_prefetching, hydrate_target } from '../app';
+import { Target } from '../types';
+
+export default function prefetch(href: string) {
+	const target: Target = select_target(new URL(href, document.baseURI));
+
+	if (target) {
+		if (!prefetching || href !== prefetching.href) {
+			set_prefetching(href, hydrate_target(target));
+		}
+
+		return prefetching.promise;
+	}
+}

runtime/src/app/prefetchRoutes/index.ts

@@ -1,11 +1,12 @@
-import { components, pages, load_component } from "../app";
+import { components, routes } from '@sapper/internal/manifest-client';
+import { load_component } from '../app';
 
 export default function prefetchRoutes(pathnames: string[]) {
-	return pages
-		.filter(route => {
-			if (!pathnames) return true;
-			return pathnames.some(pathname => route.pattern.test(pathname));
-		})
+	return routes
+		.filter(pathnames
+			? route => pathnames.some(pathname => route.pattern.test(pathname))
+			: () => true
+		)
 		.reduce((promise: Promise<any>, route) => promise.then(() => {
 			return Promise.all(route.parts.map(part => part && load_component(components[part.i])));
 		}), Promise.resolve());

runtime/src/app/start/index.ts

@@ -5,26 +5,23 @@ import {
 	navigate,
 	scroll_history,
 	scroll_state,
-	select_route,
-	set_store,
+	select_target,
+	handle_error,
 	set_target,
 	uid,
 	set_uid,
 	set_cid
 } from '../app';
 import prefetch from '../prefetch/index';
-import { Store, ScrollPosition } from '../types';
 
 export default function start(opts: {
-	target: Node,
-	store?: (data: any) => Store
+	target: Node
 }) {
 	if ('scrollRestoration' in history) {
 		history.scrollRestoration = 'manual';
 	}
 
 	set_target(opts.target);
-	if (opts.store) set_store(opts.store);
 
 	addEventListener('click', handle_click);
 	addEventListener('popstate', handle_popstate);
@@ -38,10 +35,12 @@ export default function start(opts: {
 
 		history.replaceState({ id: uid }, '', href);
 
-		if (!initial_data.error) {
-			const target = select_route(new URL(location.href));
-			if (target) return navigate(target, uid, false, hash);
-		}
+		const url = new URL(location.href);
+
+		if (initial_data.error) return handle_error(url);
+
+		const target = select_target(url);
+		if (target) return navigate(target, uid, false, hash);
 	});
 }
 
@@ -96,7 +95,7 @@ function handle_click(event: MouseEvent) {
 	// Don't handle hash changes
 	if (url.pathname === location.pathname && url.search === location.search) return;
 
-	const target = select_route(url);
+	const target = select_target(url);
 	if (target) {
 		const noscroll = a.hasAttribute('sapper-noscroll');
 		navigate(target, null, noscroll, url.hash);
@@ -119,7 +118,7 @@ function handle_popstate(event: PopStateEvent) {
 
 	if (event.state) {
 		const url = new URL(location.href);
-		const target = select_route(url);
+		const target = select_target(url);
 		if (target) {
 			navigate(target, event.state.id);
 		} else {
@@ -131,4 +130,4 @@ function handle_popstate(event: PopStateEvent) {
 		set_cid(uid);
 		history.replaceState({ id: cid }, '', location.href);
 	}
-}
+}

runtime/src/app/types.ts

@@ -8,21 +8,14 @@ type Child = {
 	component?: Component;
 };
 
-export type RootProps = {
-	path: string;
-	params: Record<string, string>;
-	query: Record<string, string>;
-	child: Child;
-};
-
 export interface ComponentConstructor {
-	new (options: { target: Node, data: any, store: Store, hydrate: boolean }): Component;
+	new (options: { target: Node, props: any, hydrate: boolean }): Component;
 	preload: (props: { params: Params, query: Query }) => Promise<any>;
 };
 
 export interface Component {
-	set: (data: any) => void;
-	destroy: () => void;
+	$set: (data: any) => void;
+	$destroy: () => void;
 }
 
 export type ComponentLoader = {
@@ -30,7 +23,7 @@ export type ComponentLoader = {
 	css: string[]
 };
 
-export type Page = {
+export type Route = {
 	pattern: RegExp;
 	parts: Array<{
 		i: number;
@@ -42,7 +35,7 @@ export type Manifest = {
 	ignore: RegExp[];
 	root: ComponentConstructor;
 	error: () => Promise<{ default: ComponentConstructor }>;
-	pages: Page[]
+	pages: Route[]
 };
 
 export type ScrollPosition = {
@@ -51,11 +44,10 @@ export type ScrollPosition = {
 };
 
 export type Target = {
-	url: URL;
-	path: string;
-	page: Page;
+	href: string;
+	route: Route;
 	match: RegExpExecArray;
-	query: Record<string, string | string[]>;
+	page: Page;
 };
 
 export type Redirect = {
@@ -63,6 +55,8 @@ export type Redirect = {
 	location: string;
 };
 
-export type Store = {
-	get: () => any;
-}
+export type Page = {
+	path: string;
+	params: Record<string, string>;
+	query: Record<string, string | string[]>;
+};

runtime/src/server/constants.js

@@ -0,0 +1 @@
+export const IGNORE = '__SAPPER__IGNORE__';

runtime/src/server/middleware/get_page_handler.ts

@@ -1,15 +1,19 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { writable } from 'svelte/store.mjs';
+import fs from 'fs';
+import path from 'path';
 import cookie from 'cookie';
 import devalue from 'devalue';
 import fetch from 'node-fetch';
-import { URL, resolve } from 'url';
-import { build_dir, dev, src_dir, IGNORE } from '../placeholders';
-import { Manifest, Page, Props, Req, Res, Store } from './types';
+import URL from 'url';
+import { IGNORE } from '../constants';
+import { Manifest, Page, Props, Req, Res } from './types';
+import { build_dir, dev, src_dir } from '@sapper/internal/manifest-server';
+import { stores } from '@sapper/internal/shared';
+import App from '@sapper/internal/App.svelte';
 
 export function get_page_handler(
 	manifest: Manifest,
-	store_getter: (req: Req, res: Res) => Store
+	session_getter: (req: Req, res: Res) => any
 ) {
 	const get_build_info = dev
 		? () => JSON.parse(fs.readFileSync(path.join(build_dir, 'build.json'), 'utf-8'))
@@ -34,6 +38,7 @@ export function get_page_handler(
 	}
 
 	async function handle_page(page: Page, req: Req, res: Res, status = 200, error: Error | string = null) {
+		const is_service_worker_index = req.path === '/service-worker-index.html';
 		const build_info: {
 			bundler: 'rollup' | 'webpack',
 			shimport: string | null,
@@ -47,7 +52,7 @@ export function get_page_handler(
 		// preload main.js and current route
 		// TODO detect other stuff we can preload? images, CSS, fonts?
 		let preloaded_chunks = Array.isArray(build_info.assets.main) ? build_info.assets.main : [build_info.assets.main];
-		if (!error) {
+		if (!error && !is_service_worker_index) {
 			page.parts.forEach(part => {
 				if (!part) return;
 
@@ -76,7 +81,7 @@ export function get_page_handler(
 			res.setHeader('Link', link);
 		}
 
-		const store = store_getter ? store_getter(req, res) : null;
+		const session = session_getter(req, res);
 
 		let redirect: { statusCode: number, location: string };
 		let preload_error: { statusCode: number, message: Error | string };
@@ -93,7 +98,7 @@ export function get_page_handler(
 				preload_error = { statusCode, message };
 			},
 			fetch: (url: string, opts?: any) => {
-				const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`);
+				const parsed = new URL.URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`);
 
 				if (opts) {
 					opts = Object.assign({}, opts);
@@ -104,7 +109,7 @@ export function get_page_handler(
 					);
 
 					if (include_cookies) {
-						if (!opts.headers) opts.headers = {};
+						opts.headers = Object.assign({}, opts.headers);
 
 						const cookies = Object.assign(
 							{},
@@ -127,35 +132,44 @@ export function get_page_handler(
 				}
 
 				return fetch(parsed.href, opts);
-			},
-			store
+			}
 		};
 
 		let preloaded;
 		let match;
+		let params;
 
 		try {
-			const root_preloaded = manifest.root.preload
-				? manifest.root.preload.call(preload_context, {
+			const root_preloaded = manifest.root_preload
+				? manifest.root_preload.call(preload_context, {
 					path: req.path,
 					query: req.query,
 					params: {}
-				})
+				}, session)
 				: {};
 
 			match = error ? null : page.pattern.exec(req.path);
 
-			preloaded = await Promise.all([root_preloaded].concat(page.parts.map(part => {
-				if (!part) return null;
 
-				return part.component.preload
-					? part.component.preload.call(preload_context, {
-						path: req.path,
-						query: req.query,
-						params: part.params ? part.params(match) : {}
-					})
-					: {};
-			})));
+			let toPreload = [root_preloaded];
+			if (!is_service_worker_index) {
+				toPreload = toPreload.concat(page.parts.map(part => {
+					if (!part) return null;
+
+					// the deepest level is used below, to initialise the store
+					params = part.params ? part.params(match) : {};
+
+					return part.preload
+						? part.preload.call(preload_context, {
+							path: req.path,
+							query: req.query,
+							params
+						}, session)
+						: {};
+				}))
+			}
+
+			preloaded = await Promise.all(toPreload);
 		} catch (err) {
 			preload_error = { statusCode: 500, message: err };
 			preloaded = []; // appease TypeScript
@@ -163,7 +177,7 @@ export function get_page_handler(
 
 		try {
 			if (redirect) {
-				const location = resolve(req.baseUrl || '/', redirect.location);
+				const location = URL.resolve((req.baseUrl || '') + '/', redirect.location);
 
 				res.statusCode = redirect.statusCode;
 				res.setHeader('Location', location);
@@ -177,61 +191,73 @@ export function get_page_handler(
 				return;
 			}
 
-			const serialized = {
-				preloaded: `[${preloaded.map(data => try_serialize(data)).join(',')}]`,
-				store: store && try_serialize(store.get())
-			};
-
 			const segments = req.path.split('/').filter(Boolean);
 
-			const props: Props = {
-				path: req.path,
-				query: req.query,
-				params: {},
-				child: null
+			// TODO make this less confusing
+			const layout_segments = [segments[0]];
+			let l = 1;
+
+			page.parts.forEach((part, i) => {
+				layout_segments[l] = segments[i + 1];
+				if (!part) return null;
+				l++;
+			});
+
+			const props = {
+				stores: {
+					page: {
+						subscribe: writable({
+							path: req.path,
+							query: req.query,
+							params
+						}).subscribe
+					},
+					preloading: {
+						subscribe: writable(null).subscribe
+					},
+					session: writable(session)
+				},
+				segments: layout_segments,
+				status: error ? status : 200,
+				error: error ? error instanceof Error ? error : { message: error } : null,
+				level0: {
+					props: preloaded[0]
+				},
+				level1: {
+					segment: segments[0],
+					props: {}
+				}
 			};
 
-			if (error) {
-				props.error = error instanceof Error ? error : { message: error };
-				props.status = status;
-			}
+			if (!is_service_worker_index) {
+				let l = 1;
+				for (let i = 0; i < page.parts.length; i += 1) {
+					const part = page.parts[i];
+					if (!part) continue;
 
-			const data = Object.assign({}, props, preloaded[0], {
-				params: {},
-				child: {
-					segment: segments[0]
+					props[`level${l++}`] = {
+						component: part.component,
+						props: preloaded[i + 1] || {},
+						segment: segments[i]
+					};
 				}
-			});
-
-			let level = data.child;
-			for (let i = 0; i < page.parts.length; i += 1) {
-				const part = page.parts[i];
-				if (!part) continue;
-
-				const get_params = part.params || (() => ({}));
-
-				Object.assign(level, {
-					component: part.component,
-					props: Object.assign({}, props, {
-						params: get_params(match)
-					}, preloaded[i + 1])
-				});
-
-				level.props.child = <Props["child"]>{
-					segment: segments[i + 1]
-				};
-				level = level.props.child;
 			}
 
-			const { html, head, css } = manifest.root.render(data, {
-				store
-			});
+			const { html, head, css } = App.render(props);
+
+			const serialized = {
+				preloaded: `[${preloaded.map(data => try_serialize(data)).join(',')}]`,
+				session: session && try_serialize(session, err => {
+					throw new Error(`Failed to serialize session data: ${err.message}`);
+				}),
+				error: error && try_serialize(props.error)
+			};
 
 			let script = `__SAPPER__={${[
-				error && `error:1`,
+				error && `error:${serialized.error},status:${status}`,
 				`baseUrl:"${req.baseUrl}"`,
 				serialized.preloaded && `preloaded:${serialized.preloaded}`,
-				serialized.store && `store:${serialized.store}`
+				serialized.session && `session:${serialized.session}`
 			].filter(Boolean).join(',')}};`;
 
 			if (has_service_worker) {
@@ -290,6 +316,7 @@ export function get_page_handler(
 			res.statusCode = status;
 			res.end(body);
 		} catch(err) {
+			console.log(err);
 			if (error) {
 				// we encountered an error while rendering the error page — oops
 				res.statusCode = 500;
@@ -303,12 +330,16 @@ export function get_page_handler(
 	return function find_route(req: Req, res: Res, next: () => void) {
 		if (req[IGNORE]) return next();
 
-		if (!server_routes.some(route => route.pattern.test(req.path))) {
-			for (const page of pages) {
-				if (page.pattern.test(req.path)) {
-					handle_page(page, req, res);
-					return;
-				}
+		if (req.path === '/service-worker-index.html') {
+			const homePage = pages.find(page => page.pattern.test('/'));
+			handle_page(homePage, req, res);
+			return;
+		}
+
+		for (const page of pages) {
+			if (page.pattern.test(req.path)) {
+				handle_page(page, req, res);
+				return;
 			}
 		}
 
@@ -320,10 +351,11 @@ function read_template(dir = build_dir) {
 	return fs.readFileSync(`${dir}/template.html`, 'utf-8');
 }
 
-function try_serialize(data: any) {
+function try_serialize(data: any, fail?: (err) => void) {
 	try {
 		return devalue(data);
 	} catch (err) {
+		if (fail) fail(err);
 		return null;
 	}
 }

runtime/src/server/middleware/get_server_route_handler.ts

@@ -1,4 +1,4 @@
-import { IGNORE } from '../placeholders';
+import { IGNORE } from '../constants';
 import { Req, Res, ServerRoute } from './types';
 
 export function get_server_route_handler(routes: ServerRoute[]) {

runtime/src/server/middleware/index.ts

@@ -1,16 +1,17 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { build_dir, dev, manifest, IGNORE } from '../placeholders';
-import { Handler, Req, Res, Store } from './types';
+import fs from 'fs';
+import path from 'path';
+import { build_dir, dev, manifest } from '@sapper/internal/manifest-server';
+import { Handler, Req, Res } from './types';
 import { get_server_route_handler } from './get_server_route_handler';
 import { get_page_handler } from './get_page_handler';
 import { lookup } from './mime';
+import { IGNORE } from '../constants';
 
 export default function middleware(opts: {
-	store?: (req: Req, res: Res) => Store,
+	session?: (req: Req, res: Res) => any,
 	ignore?: any
 } = {}) {
-	const { store, ignore } = opts;
+	const { session, ignore } = opts;
 
 	let emitted_basepath = false;
 
@@ -51,11 +52,6 @@ export default function middleware(opts: {
 			next();
 		},
 
-		fs.existsSync(path.join(build_dir, 'index.html')) && serve({
-			pathname: '/index.html',
-			cache_control: dev ? 'no-cache' : 'max-age=600'
-		}),
-
 		fs.existsSync(path.join(build_dir, 'service-worker.js')) && serve({
 			pathname: '/service-worker.js',
 			cache_control: 'no-cache, no-store, must-revalidate'
@@ -73,7 +69,7 @@ export default function middleware(opts: {
 
 		get_server_route_handler(manifest.server_routes),
 
-		get_page_handler(manifest, store)
+		get_page_handler(manifest, session || noop)
 	].filter(Boolean));
 }
 
@@ -140,4 +136,6 @@ export function serve({ prefix, pathname, cache_control }: {
 			next();
 		}
 	};
-}
+}
+
+function noop(){}

runtime/src/server/middleware/types.ts

@@ -12,6 +12,7 @@ export type Page = {
 		name: string;
 		component: Component;
 		params?: (match: RegExpMatchArray) => Record<string, string>;
+		preload?: (data: any) => any | Promise<any>;
 	}>
 };
 
@@ -19,19 +20,13 @@ export type Manifest = {
 	server_routes: ServerRoute[];
 	pages: Page[];
 	root: Component;
+	root_preload?: (data: any) => any | Promise<any>;
 	error: Component;
 }
 
 export type Handler = (req: Req, res: Res, next: () => void) => void;
 
-export type Store = {
-	get: () => any
-};
-
 export type Props = {
-	path: string;
-	query: Record<string, string>;
-	params: Record<string, string>;
 	error?: { message: string };
 	status?: number;
 	child: {
@@ -60,10 +55,9 @@ export interface Res extends ServerResponse {
 export { ServerResponse };
 
 interface Component {
-	render: (data: any, opts: { store: Store }) => {
+	render: (data: any) => {
 		head: string;
 		css: { code: string, map: any };
 		html: string
-	},
-	preload: (data: any) => any | Promise<any>
+	}
 }

site/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+node_modules
+yarn-error.log
+/cypress/screenshots/
+/__sapper__/

site/README.md

@@ -0,0 +1,88 @@
+# sapper-template
+
+The default [Sapper](https://github.com/sveltejs/sapper) template, with branches for Rollup and webpack. To clone it and get started:
+
+```bash
+# for Rollup
+npx degit sveltejs/sapper-template#rollup my-app
+# for webpack
+npx degit sveltejs/sapper-template#webpack my-app
+cd my-app
+npm install # or yarn!
+npm run dev
+```
+
+Open up [localhost:3000](http://localhost:3000) and start clicking around.
+
+Consult [sapper.svelte.technology](https://sapper.svelte.technology) for help getting started.
+
+
+## Structure
+
+Sapper expects to find two directories in the root of your project —  `src` and `static`.
+
+
+### src
+
+The [src](src) directory contains the entry points for your app — `client.js`, `server.js` and (optionally) a `service-worker.js` — along with a `template.html` file and a `routes` directory.
+
+
+#### src/routes
+
+This is the heart of your Sapper app. There are two kinds of routes — *pages*, and *server routes*.
+
+**Pages** are Svelte components written in `.html` files. When a user first visits the application, they will be served a server-rendered version of the route in question, plus some JavaScript that 'hydrates' the page and initialises a client-side router. From that point forward, navigating to other pages is handled entirely on the client for a fast, app-like feel. (Sapper will preload and cache the code for these subsequent pages, so that navigation is instantaneous.)
+
+**Server routes** are modules written in `.js` files, that export functions corresponding to HTTP methods. Each function receives Express `request` and `response` objects as arguments, plus a `next` function. This is useful for creating a JSON API, for example.
+
+There are three simple rules for naming the files that define your routes:
+
+* A file called `src/routes/about.html` corresponds to the `/about` route. A file called `src/routes/blog/[slug].html` corresponds to the `/blog/:slug` route, in which case `params.slug` is available to the route
+* The file `src/routes/index.html` (or `src/routes/index.js`) corresponds to the root of your app. `src/routes/about/index.html` is treated the same as `src/routes/about.html`.
+* Files and directories with a leading underscore do *not* create routes. This allows you to colocate helper modules and components with the routes that depend on them — for example you could have a file called `src/routes/_helpers/datetime.js` and it would *not* create a `/_helpers/datetime` route
+
+
+### static
+
+The [static](static) directory contains any static assets that should be available. These are served using [sirv](https://github.com/lukeed/sirv).
+
+In your [service-worker.js](app/service-worker.js) file, you can import these as `files` from the generated manifest...
+
+```js
+import { files } from '../__sapper__/service-worker.js';
+```
+
+...so that you can cache them (though you can choose not to, for example if you don't want to cache very large files).
+
+
+## Bundler config
+
+Sapper uses Rollup or webpack to provide code-splitting and dynamic imports, as well as compiling your Svelte components. With webpack, it also provides hot module reloading. As long as you don't do anything daft, you can edit the configuration files to add whatever plugins you'd like.
+
+
+## Production mode and deployment
+
+To start a production version of your app, run `npm run build && npm start`. This will disable live reloading, and activate the appropriate bundler plugins.
+
+You can deploy your application to any environment that supports Node 8 or above. As an example, to deploy to [Now](https://zeit.co/now), run these commands:
+
+```bash
+npm install -g now
+now
+```
+
+
+## Using external components with webpack
+
+When using Svelte components installed from npm, such as [@sveltejs/svelte-virtual-list](https://github.com/sveltejs/svelte-virtual-list), Svelte needs the original component source (rather than any precompiled JavaScript that ships with the component). This allows the component to be rendered server-side, and also keeps your client-side app smaller.
+
+Because of that, it's essential that webpack doesn't treat the package as an *external dependency*. You can either modify the `externals` option in [webpack/server.config.js](webpack/server.config.js), or simply install the package to `devDependencies` rather than `dependencies`, which will cause it to get bundled (and therefore compiled) with your app:
+
+```bash
+yarn add -D @sveltejs/svelte-virtual-list
+```
+
+
+## Bugs and feedback
+
+Sapper is in early development, and may have the odd rough edge here and there. Please be vocal over on the [Sapper issue tracker](https://github.com/sveltejs/sapper/issues).

site/appveyor.yml

@@ -0,0 +1,18 @@
+version: "{build}"
+
+shallow_clone: true
+
+init:
+  - git config --global core.autocrlf false
+
+build: off
+
+environment:
+  matrix:
+    # node.js
+    - nodejs_version: stable
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install cypress
+  - npm install

site/config.js

@@ -0,0 +1,3 @@
+export const SLUG_PRESERVE_UNICODE = false;
+export const SLUG_SEPARATOR = '_';
+export const SLUG_LANG = 'en';

site/content/docs/00-introduction.md

@@ -0,0 +1,52 @@
+---
+title: Introduction
+---
+
+### Before we begin
+
+> Sapper is in early development, and some things may change before we hit version 1.0. This document is a work-in-progress. If you get stuck, reach out for help in the [Discord chatroom](https://discord.gg/yy75DKs).
+>
+> See the [migration guides](migrating) for help upgrading from older versions.
+
+### What is Sapper?
+
+Sapper is a framework for building extremely high-performance web apps. You're looking at one right now! There are two basic concepts:
+
+* Each page of your app is a [Svelte](https://svelte.dev) component
+* You create pages by adding files to the `src/routes` directory of your project. These will be server-rendered so that a user's first visit to your app is as fast as possible, then a client-side app takes over
+
+Building an app with all the modern best practices — code-splitting, offline support, server-rendered views with client-side hydration — is fiendishly complicated. Sapper does all the boring stuff for you so that you can get on with the creative part.
+
+You don't need to know Svelte to understand the rest of this guide, but it will help. In short, it's a UI framework that compiles your components to highly optimized vanilla JavaScript. Read the [introductory blog post](https://svelte.dev/blog/svelte-3-rethinking-reactivity) and the [tutorial](https://svelte.dev/tutorial) to learn more.
+
+
+### Why the name?
+
+In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as *sappers*.
+
+For web developers, the stakes are generally lower than for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for <b>S</b>velte <b>app</b> mak<b>er</b>, is your courageous and dutiful ally.
+
+
+### Comparison with Next.js
+
+[Next.js](https://github.com/zeit/next.js) is a React framework from [Zeit](https://zeit.co), and is the inspiration for Sapper. There are a few notable differences, however:
+
+* Sapper is powered by Svelte instead of React, so it's faster and your apps are smaller
+* Instead of route masking, we encode route parameters in filenames (see the [routing](docs#routing) section below)
+* As well as *pages*, you can create *server routes* in your `src/routes` directory. This makes it very easy to, for example, add a JSON API such as the one powering this very page (try visiting [/docs.json](/docs.json))
+* Links are just `<a>` elements, rather than framework-specific `<Link>` components. That means, for example, that [this link right here](/), despite being inside a blob of markdown, works with the router as you'd expect
+
+
+### Getting started
+
+The easiest way to start building a Sapper app is to clone the [sapper-template](https://github.com/sveltejs/sapper-template) repo with [degit](https://github.com/Rich-Harris/degit):
+
+```bash
+npx degit sveltejs/sapper-template#rollup my-app
+# or: npx degit sveltejs/sapper-template#webpack my-app
+cd my-app
+npm install
+npm run dev
+```
+
+This will scaffold a new project in the `my-app` directory, install its dependencies, and start a server on [localhost:3000](http://localhost:3000). Try editing the files to get a feel for how everything works – you may not need to bother reading the rest of this guide!

site/content/docs/01-structure.md

@@ -0,0 +1,112 @@
+---
+title: Sapper app structure
+---
+
+This section is a reference for the curious. We recommend you play around with the project template first, and come back here when you've got a feel for how things fit together.
+
+If you take a look inside the [sapper-template](https://github.com/sveltejs/sapper-template) repo, you'll see some files that Sapper expects to find:
+
+```bash
+├ package.json
+├ src
+│ ├ routes
+│ │ ├ # your routes here
+│ │ ├ _error.svelte
+│ │ └ index.svelte
+│ ├ client.js
+│ ├ server.js
+│ ├ service-worker.js
+│ └ template.html
+├ static
+│ ├ # your files here
+└ rollup.config.js / webpack.config.js
+```
+
+When you first run Sapper, it will create an additional `__sapper__` directory containing generated files.
+
+You'll notice a few extra files and a `cypress` directory which relates to [testing](docs#testing) — we don't need to worry about those right now.
+
+> You *can* create these files from scratch, but it's much better to use the template. See [getting started](docs#getting-started) for instructions on how to easily clone it
+
+
+### package.json
+
+Your package.json contains your app's dependencies and defines a number of scripts:
+
+* `npm run dev` — start the app in development mode, and watch source files for changes
+* `npm run build` — build the app in production mode
+* `npm run export` — bake out a static version, if applicable (see [exporting](docs#exporting))
+* `npm start` — start the app in production mode after you've built it
+* `npm test` — run the tests (see [testing](docs#testing))
+
+
+### src
+
+This contains the three *entry points* for your app — `src/client.js`, `src/server.js` and (optionally) `src/service-worker.js` — along with a `src/template.html` file.
+
+#### src/client.js
+
+This *must* import, and call, the `start` function from the generated `@sapper/app` module:
+
+```js
+import * as sapper from '@sapper/app';
+
+sapper.start({
+	target: document.querySelector('#sapper')
+});
+```
+
+In many cases, that's the entirety of your entry module, though you can do as much or as little here as you wish. See the [client API](docs#client-api) section for more information on functions you can import.
+
+
+#### src/server.js
+
+This is a normal Express (or [Polka](https://github.com/lukeed/polka), etc) app, with three requirements:
+
+* it should serve the contents of the `static` folder, using for example [sirv](https://github.com/lukeed/sirv)
+* it should call `app.use(sapper.middleware())` at the end, where `sapper` is imported from `@sapper/server`
+* it must listen on `process.env.PORT`
+
+Beyond that, you can write the server however you like.
+
+
+#### src/service-worker.js
+
+Service workers act as proxy servers that give you fine-grained control over how to respond to network requests. For example, when the browser requests `/goats.jpg`, the service worker can respond with a file it previously cached, or it can pass the request on to the server, or it could even respond with something completely different, such as a picture of llamas.
+
+Among other things, this makes it possible to build applications that work offline.
+
+Because every app needs a slightly different service worker (sometimes it's appropriate to always serve from the cache, sometimes that should only be a last resort in case of no connectivity), Sapper doesn't attempt to control the service worker. Instead, you write the logic in `service-worker.js`. You can import any of the following from `@sapper/service-worker`:
+
+* `files` — an array of files found in the `static` directory
+* `shell` — the client-side JavaScript generated by the bundler (Rollup or webpack)
+* `routes` — an array of `{ pattern: RegExp }` objects you can use to determine whether a Sapper-controlled page is being requested
+* `timestamp` — the time the service worker was generated (useful for generating unique cache names)
+
+
+#### src/template.html
+
+This file is a template for responses from the server. Sapper will inject content that replaces the following tags:
+
+* `%sapper.base%` — a `<base>` element (see [base URLs](docs#base-urls))
+* `%sapper.styles%` — critical CSS for the page being requested
+* `%sapper.head%` — HTML representing page-specific `<head>` contents, like `<title>`
+* `%sapper.html%` — HTML representing the body of the page being rendered
+* `%sapper.scripts%` — script tags for the client-side app
+
+
+### src/routes
+
+This is the meat of your app — the pages and server routes. See the section on [routing](docs#routing) for the juicy details.
+
+
+### static
+
+This is a place to put any files that your app uses — fonts, images and so on. For example `static/favicon.png` will be served as `/favicon.png`.
+
+Sapper doesn't serve these files — you'd typically use [sirv](https://github.com/lukeed/sirv) or [serve-static](https://github.com/expressjs/serve-static) for that — but it will read the contents of the `static` folder so that you can easily generate a cache manifest for offline support (see [service-worker.js](docs#templates-service-worker-js)).
+
+
+### rollup.config.js / webpack.config.js
+
+Sapper can use [Rollup](https://rollupjs.org/) or [webpack](https://webpack.js.org/) to bundle your app. You probably won't need to change the config, but if you want to (for example to add new loaders or plugins), you can.

site/content/docs/02-routing.md

@@ -0,0 +1,127 @@
+---
+title: Routing
+---
+
+As we've seen, there are two types of route in Sapper — pages, and server routes.
+
+
+### Pages
+
+Pages are Svelte components written in `.svelte` files. When a user first visits the application, they will be served a server-rendered version of the route in question, plus some JavaScript that 'hydrates' the page and initialises a client-side router. From that point forward, navigating to other pages is handled entirely on the client for a fast, app-like feel.
+
+The filename determines the route. For example, `src/routes/index.svelte` is the root of your site:
+
+```html
+<!-- src/routes/index.svelte -->
+<svelte:head>
+	<title>Welcome</title>
+</svelte:head>
+
+<h1>Hello and welcome to my site!</h1>
+```
+
+A file called either `src/routes/about.svelte` or `src/routes/about/index.svelte` would correspond to the `/about` route:
+
+```html
+<!-- src/routes/about.svelte -->
+<svelte:head>
+	<title>About</title>
+</svelte:head>
+
+<h1>About this site</h1>
+<p>TODO...</p>
+```
+
+Dynamic parameters are encoded using `[brackets]`. For example, here's how you could create a page that renders a blog post:
+
+```html
+<!-- src/routes/blog/[slug].svelte -->
+<script context="module">
+	// the (optional) preload function takes a
+	// `{ path, params, query }` object and turns it into
+	// the data we need to render the page
+	export async function preload(page, session) {
+		// the `slug` parameter is available because this file
+		// is called [slug].svelte
+		const { slug } = page.params;
+
+		// `this.fetch` is a wrapper around `fetch` that allows
+		// you to make credentialled requests on both
+		// server and client
+		const res = await this.fetch(`blog/${slug}.json`);
+		const article = await res.json();
+
+		return { article };
+	}
+</script>
+
+<script>
+	export let article;
+</script>
+
+<svelte:head>
+	<title>{article.title}</title>
+</svelte:head>
+
+<h1>{article.title}</h1>
+
+<div class='content'>
+	{@html article.html}
+</div>
+```
+
+> See the section on [preloading](docs#preloading) for more info about `preload` and `this.fetch`
+
+
+### Server routes
+
+Server routes are modules written in `.js` files that export functions corresponding to HTTP methods. Each function receives HTTP `request` and `response` objects as arguments, plus a `next` function. This is useful for creating a JSON API. For example, here's how you could create an endpoint that served the blog page above:
+
+```js
+// routes/blog/[slug].json.js
+import db from './_database.js'; // the underscore tells Sapper this isn't a route
+
+export async function get(req, res, next) {
+	// the `slug` parameter is available because this file
+	// is called [slug].json.js
+	const { slug } = req.params;
+
+	const article = await db.get(slug);
+
+	if (article !== null) {
+		res.setHeader('Content-Type', 'application/json');
+		res.end(JSON.stringify(article));
+	} else {
+		next();
+	}
+}
+```
+
+> `delete` is a reserved word in JavaScript. To handle DELETE requests, export a function called `del` instead.
+
+
+### File naming rules
+
+There are three simple rules for naming the files that define your routes:
+
+* A file called `src/routes/about.svelte` corresponds to the `/about` route. A file called `src/routes/blog/[slug].svelte` corresponds to the `/blog/:slug` route, in which case `params.slug` is available to `preload`
+* The file `src/routes/index.svelte` corresponds to the root of your app. `src/routes/about/index.svelte` is treated the same as `src/routes/about.svelte`.
+* Files and directories with a leading underscore do *not* create routes. This allows you to colocate helper modules and components with the routes that depend on them — for example you could have a file called `src/routes/_helpers/datetime.js` and it would *not* create a `/_helpers/datetime` route
+
+
+
+### Error page
+
+In addition to regular pages, there is a 'special' page that Sapper expects to find — `src/routes/_error.svelte`. This will be shown when an error occurs while rendering a page.
+
+The `error` object is made available to the template along with the HTTP `status` code.
+
+
+
+### Regexes in routes
+
+You can use a subset of regular expressions to qualify route parameters, by placing them in parentheses after the parameter name.
+
+For example, `src/routes/items/[id([0-9]+)].svelte` would only match numeric IDs — `/items/123` would match, but `/items/xyz` would not.
+
+Because of technical limitations, the following characters cannot be used: `/`, `\`, `?`, `:`, `(` and `)`.

site/content/docs/03-client-api.md

@@ -0,0 +1,47 @@
+---
+title: Client API
+---
+
+The `@sapper/app` module, which is generated by Sapper based on the shape of your app, contains functions for controlling Sapper programmatically and responding to events.
+
+
+### start({ target })
+
+* `target` — an element to render pages to
+
+This configures the router and starts the application — listens for clicks on `<a>` elements, interacts with the `history` API, and renders and updates your Svelte components.
+
+Returns a `Promise` that resolves when the initial page has been hydrated.
+
+```js
+import * as sapper from '@sapper/app';
+
+sapper.start({
+	target: document.querySelector('#sapper')
+}).then(() => {
+	console.log('client-side app has started');
+});
+```
+
+
+### goto(href, options?)
+
+* `href` — the page to go to
+* `options` — can include a `replaceState` property, which determines whether to use `history.pushState` (the default) or `history.replaceState`). Not required
+
+Programmatically navigates to the given `href`. If the destination is a Sapper route, Sapper will handle the navigation, otherwise the page will be reloaded with the new `href`. (In other words, the behaviour is as though the user clicked on a link with this `href`.)
+
+
+### prefetch(href)
+
+* `href` — the page to prefetch
+
+Programmatically prefetches the given page, which means a) ensuring that the code for the page is loaded, and b) calling the page's `preload` method with the appropriate options. This is the same behaviour that Sapper triggers when the user taps or mouses over an `<a>` element with [rel=prefetch](docs#prefetching).
+
+
+
+### prefetchRoutes(routes?)
+
+* `routes` — an optional array of strings representing routes to prefetch
+
+Programmatically prefetches the code for routes that haven't yet been fetched. Typically, you might call this after `sapper.start()` is complete, to speed up subsequent navigation (this is the 'L' of the [PRPL pattern](https://developers.google.com/web/fundamentals/performance/prpl-pattern/)). Omitting arguments will cause all routes to be fetched, or you can specify routes by any matching pathname such as `/about` (to match `src/routes/about.svelte`) or `/blog/*` (to match `src/routes/blog/[slug].svelte`). Unlike `prefetch`, this won't call `preload` for individual pages.

site/content/docs/04-preloading.md

@@ -0,0 +1,114 @@
+---
+title: Preloading
+---
+
+As seen in the [routing](docs#routing) section, page components can have an optional `preload` function that will load some data that the page depends on. This is similar to `getInitialProps` in Next.js or `asyncData` in Nuxt.js.
+
+```html
+<script context="module">
+	export async function preload(page, session) {
+		const { slug } = page.params;
+
+		const res = await this.fetch(`blog/${slug}.json`);
+		const article = await res.json();
+
+		return { article };
+	}
+</script>
+```
+
+It lives in a `context="module"` script — see the [tutorial](https://svelte.dev/tutorial/module-exports) — because it's not part of the component instance itself; instead, it runs *before* the component is created, allowing you to avoid flashes while data is fetched.
+
+### Argument
+
+The `preload` function receives two arguments — `page` and `session`.
+
+`page` is a `{ path, params, query }` object where `path` is the URL's pathname, `params` is derived from `path` and the route filename, and `query` is an object of values in the query string.
+
+So if the example above was `src/routes/blog/[slug].svelte` and the URL was `/blog/some-post?foo=bar&baz`, the following would be true:
+
+* `page.path === '/blog/some-post'`
+* `page.params.slug === 'some-post'`
+* `page.query.foo === 'bar'`
+* `page.query.baz === true`
+
+`session` is generated on the server by the `session` option passed to `sapper.middleware` (TODO this needs further documentation. Perhaps a server API section?)
+
+
+### Return value
+
+If you return a Promise from `preload`, the page will delay rendering until the promise resolves. You can also return a plain object.
+
+When Sapper renders a page on the server, it will attempt to serialize the resolved value (using [devalue](https://github.com/Rich-Harris/devalue)) and include it on the page, so that the client doesn't also need to call `preload` upon initialization. Serialization will fail if the value includes functions or custom classes (cyclical and repeated references are fine, as are built-ins like `Date`, `Map`, `Set` and `RegExp`).
+
+### Context
+
+Inside `preload`, you have access to three methods:
+
+* `this.fetch(url, options)`
+* `this.error(statusCode, error)`
+* `this.redirect(statusCode, location)`
+
+
+#### this.fetch
+
+In browsers, you can use `fetch` to make AJAX requests, for getting data from your server routes (among other things). On the server it's a little trickier — you can make HTTP requests, but you must specify an origin, and you don't have access to cookies. This means that it's impossible to request data based on the user's session, such as data that requires you to be logged in.
+
+To fix this, Sapper provides `this.fetch`, which works on the server as well as in the client:
+
+```html
+<script context="module">
+	export async function preload() {
+		const res = await this.fetch(`secret-data.json`, {
+			credentials: 'include'
+		});
+
+		// ...
+	}
+</script>
+```
+
+Note that you will need to use session middleware such as [express-session](https://github.com/expressjs/session) in your `app/server.js` in order to maintain user sessions or do anything involving authentication.
+
+
+#### this.error
+
+If the user navigated to `/blog/some-invalid-slug`, we would want to render a 404 Not Found page. We can do that with `this.error`:
+
+```html
+<script context="module">
+	export async function preload({ params, query }) {
+		const { slug } = params;
+
+		const res = await this.fetch(`blog/${slug}.json`);
+
+		if (res.status === 200) {
+			const article = await res.json();
+			return { article };
+		}
+
+		this.error(404, 'Not found');
+	}
+</script>
+```
+
+The same applies to other error codes you might encounter.
+
+
+#### this.redirect
+
+You can abort rendering and redirect to a different location with `this.redirect`:
+
+```html
+<script context="module">
+	export async function preload(page, session) {
+		const { user } = session;
+
+		if (!user) {
+			return this.redirect(302, 'login');
+		}
+
+		return { user };
+	}
+</script>
+```

site/content/docs/05-layouts.md

@@ -0,0 +1,86 @@
+---
+title: Layouts
+---
+
+So far, we've treated pages as entirely standalone components — upon navigation, the existing component will be destroyed, and a new one will take its place.
+
+But in many apps, there are elements that should be visible on *every* page, such as top-level navigation or a footer. Instead of repeating them in every page, we can use *layout* components.
+
+To create a layout component that applies to every page, make a file called `src/routes/_layout.svelte`. The default layout component (the one that Sapper uses if you don't bring your own) looks like this...
+
+```html
+<slot></slot>
+```
+
+...but we can add whatever markup, styles and behaviour we want. For example, let's add a nav bar:
+
+```html
+<!-- src/routes/_layout.svelte -->
+<nav>
+	<a href=".">Home</a>
+	<a href="about">About</a>
+	<a href="settings">Settings</a>
+</nav>
+
+<slot></slot>
+```
+
+If we create pages for `/`, `/about` and `/settings`...
+
+```html
+<!-- src/routes/index.svelte -->
+<h1>Home</h1>
+```
+
+```html
+<!-- src/routes/about.svelte -->
+<h1>About</h1>
+```
+
+```html
+<!-- src/routes/settings.svelte -->
+<h1>Settings</h1>
+```
+
+...the nav will always be visible, and clicking between the three pages will only result in the `<h1>` being replaced.
+
+
+### Nested routes
+
+Suppose we don't just have a single `/settings` page, but instead have nested pages like `/settings/profile` and `/settings/notifications` with a shared submenu (for an real-life example, see [github.com/settings](https://github.com/settings)).
+
+We can create a layout that only applies to pages below `/settings` (while inheriting the root layout with the top-level nav):
+
+```html
+<!-- src/routes/settings/_layout.svelte -->
+<h1>Settings</h1>
+
+<div class="submenu">
+	<a href="settings/profile">Profile</a>
+	<a href="settings/notifications">Notifications</a>
+</div>
+
+<slot></slot>
+```
+
+Layout components receive a `segment` property which is useful for things like styling:
+
+```diff
++<script>
++	export let segment;
++</script>
++
+<div class="submenu">
+-	<a href="settings/profile">Profile</a>
+-	<a href="settings/notifications">Notifications</a>
++	<a
++		class:selected={segment === "profile"}
++		href="settings/profile"
++	>Profile</a>
++
++	<a
++		class:selected={segment === "notifications"}
++		href="settings/notifications"
++	>Notifications</a>
+</div>
+```

site/content/docs/06-server-side-rendering.md

@@ -0,0 +1,32 @@
+---
+title: Server-side rendering
+---
+
+Sapper, by default, renders server-side first (SSR), and then re-mounts any dynamic elements on the client. Svelte provides [excellent support for this](https://svelte.dev/docs#server-side-rendering). This has benefits in performance and search engine indexing, among others, but comes with its own set of complexities.
+
+### Making a component SSR compatible
+
+Sapper works well with most third-party libraries you are likely to come across. However, sometimes, a third-party library comes bundled in a way which allows it to work with multiple different module loaders. Sometimes, this code creates a dependency on `window`, such as checking for the existence of `window.global` might do.
+
+Since there is no `window` in a server-side environment like Sapper's, the action of simply importing such a module can cause the import to fail, and terminate the Sapper's server with an error such as:
+
+```bash
+ReferenceError: window is not defined
+```
+
+The way to get around this is to use a dynamic import for your component, from within the `onMount` function (which is only called on the client), so that your import code is never called on the server.
+
+```html
+<script>
+	import { onMount } from 'svelte';
+
+	let MyComponent;
+
+	onMount(async () => {
+		const module = await import('my-non-ssr-component');
+		MyComponent = module.default;
+	});
+</script>
+
+<svelte:component this={MyComponent} foo="bar"/>
+```

site/content/docs/07-state-management.md

@@ -0,0 +1,40 @@
+---
+title: Stores
+---
+
+The `page` and `session` values passed to `preload` functions are available to components as [stores](https://svelte.dev/tutorial/writable-stores), along with `preloading`.
+
+Inside a component, get references to the stores like so:
+
+```html
+<script>
+	import { stores } from '@sapper/app';
+	const { preloading, page, session } = stores();
+</script>
+```
+
+* `preloading` contains a readonly boolean value, indicating whether or not a navigation is pending
+* `page` contains a readonly `{ path, params, query }` object, identical to that passed to `preload` functions
+* `session` contains whatever data was seeded on the server. It is a [writable store](https://svelte.dev/tutorial/writable-stores), meaning you can update it with new data (for example, after the user logs in) and your app will be refreshed
+
+
+### Seeding session data
+
+On the server, you can populate `session` by passing an option to `sapper.middleware`:
+
+```js
+// src/server.js
+express() // or Polka, or a similar framework
+	.use(
+		serve('assets'),
+		authenticationMiddleware(),
+		sapper.middleware({
+			session: (req, res) => ({
+				user: req.user
+			})
+		})
+	)
+	.listen(process.env.PORT);
+```
+
+> Session data must be serializable (using [devalue](https://github.com/Rich-Harris/devalue)) — no functions or custom classes, just built-in JavaScript data types

site/content/docs/08-prefetching.md

@@ -0,0 +1,22 @@
+---
+title: Prefetching
+---
+
+Sapper uses code splitting to break your app into small chunks (one per route), ensuring fast startup times.
+
+For *dynamic* routes, such as our `src/routes/blog/[slug].svelte` example, that's not enough. In order to render the blog post, we need to fetch the data for it, and we can't do that until we know what `slug` is. In the worst case, that could cause lag as the browser waits for the data to come back from the server.
+
+
+### rel=prefetch
+
+We can mitigate that by *prefetching* the data. Adding a `rel=prefetch` attribute to a link...
+
+```html
+<a rel=prefetch href='blog/what-is-sapper'>What is Sapper?</a>
+```
+
+...will cause Sapper to run the page's `preload` function as soon as the user hovers over the link (on a desktop) or touches it (on mobile), rather than waiting for the `click` event to trigger navigation. Typically, this buys us an extra couple of hundred milliseconds, which is the difference between a user interface that feels laggy, and one that feels snappy.
+
+> `rel=prefetch` is a Sapper idiom, not a standard attribute for `<a>` elements
+
+<!-- TODO add a function to prefetch programmatically -->

site/content/docs/09-building.md

@@ -0,0 +1,15 @@
+---
+title: Building
+---
+
+Up until now we've been using `sapper dev` to build our application and run a development server. But when it comes to production, we want to create a self-contained optimized build.
+
+### sapper build
+
+This command packages up your application into the `__sapper__/build` directory. (You can change this to a custom directory, as well as controlling various other options — do `sapper build --help` for more information.)
+
+The output is a Node app that you can run from the project root:
+
+```bash
+node __sapper__/build
+```

site/content/docs/10-exporting.md

@@ -0,0 +1,63 @@
+---
+title: Exporting
+---
+
+Many sites are effectively *static*, which is to say they don't actually need an Express server backing them. Instead, they can be hosted and served as static files, which allows them to be deployed to more hosting environments (such as [Netlify](https://www.netlify.com/) or [GitHub Pages](https://pages.github.com/)). Static sites are generally cheaper to operate and have better performance characteristics.
+
+Sapper allows you to *export* a static site with a single zero-config `sapper export` command. In fact, you're looking at an exported site right now!
+
+Static doesn't mean non-interactive — your Svelte components work exactly as they do normally, and you still get all the benefits of client-side routing and prefetching.
+
+
+### sapper export
+
+Inside your Sapper project, try this:
+
+```bash
+# npx allows you to use locally-installed dependencies
+npx sapper export
+```
+
+This will create a `__sapper__/export` folder with a production-ready build of your site. You can launch it like so:
+
+```bash
+npx serve __sapper__/export
+```
+
+Navigate to [localhost:5000](http://localhost:5000) (or whatever port `serve` picked), and verify that your site works as expected.
+
+You can also add a script to your package.json...
+
+```js
+{
+	"scripts": {
+		...
+		"export": "sapper export"
+	}
+}
+```
+
+...allowing you to `npm run export` your app.
+
+
+### How it works
+
+When you run `sapper export`, Sapper first builds a production version of your app, as though you had run `sapper build`, and copies the contents of your `assets` folder to the destination. It then starts the server, and navigates to the root of your app. From there, it follows any `<a>` elements it finds, and captures any data served by the app.
+
+Because of this, any pages you want to be included in the exported site must be reachable by `<a>` elements. Additionally, any non-page routes should be requested in `preload`, *not* in `oncreate` or elsewhere.
+
+
+### When not to export
+
+The basic rule is this: for an app to be exportable, any two users hitting the same page of your app must get the same content from the server. In other words, any app that involves user sessions or authentication is *not* a candidate for `sapper export`.
+
+Note that you can still export apps with dynamic routes, like our `src/routes/blog/[slug].svelte` example from earlier. `sapper export` will intercept `fetch` requests made inside `preload`, so the data served from `src/routes/blog/[slug].json.js` will also be captured.
+
+
+### Route conflicts
+
+Because `sapper export` writes to the filesystem, it isn't possible to have two server routes that would cause a directory and a file to have the same name. For example, `src/routes/foo/index.js` and `src/routes/foo/bar.js` would try to create `export/foo` and `export/foo/bar`, which is impossible.
+
+The solution is to rename one of the routes to avoid conflict — for example, `src/routes/foo-bar.js`. (Note that you would also need to update any code that fetches data from `/foo/bar` to reference `/foo-bar` instead.)
+
+For *pages*, we skirt around this problem by writing `export/foo/index.html` instead of `export/foo`.

site/content/docs/11-deploying.md

@@ -0,0 +1,64 @@
+---
+title: Deployment
+---
+
+Sapper apps run anywhere that supports Node 8 or higher.
+
+
+### Deploying to Now
+
+> This section relates to Now 1, not Now 2
+
+We can very easily deploy our apps to [Now][]:
+
+```bash
+npm install -g now
+now
+```
+
+This will upload the source code to Now, whereupon it will do `npm run build` and `npm start` and give you a URL for the deployed app.
+
+For other hosting environments, you may need to do `npm run build` yourself.
+
+### Deploying service workers
+
+Sapper makes the Service Worker file (`service-worker.js`) unique by including a timestamp in the source code
+(calculated using `Date.now()`).
+
+In environments where the app is deployed to multiple servers (such as [Now][]), it is advisable to use a
+consistent timestamp for all deployments. Otherwise, users may run into issues where the Service Worker
+updates unexpectedly because the app hits server 1, then server 2, and they have slightly different timestamps.
+
+To override Sapper's timestamp, you can use an environment variable (e.g. `SAPPER_TIMESTAMP`) and then modify
+the `service-worker.js`:
+
+```js
+const timestamp = process.env.SAPPER_TIMESTAMP; // instead of `import { timestamp }`
+
+const ASSETS = `cache${timestamp}`;
+
+export default {
+	/* ... */
+	plugins: [
+		/* ... */
+		replace({
+			/* ... */
+			'process.env.SAPPER_TIMESTAMP': process.env.SAPPER_TIMESTAMP || Date.now()
+		})
+	]
+}
+```
+
+Then you can set it using the environment variable, e.g.:
+
+```bash
+SAPPER_TIMESTAMP=$(date +%s%3N) npm run build
+```
+
+When deploying to [Now][], you can pass the environment variable into Now itself:
+
+```bash
+now -e SAPPER_TIMESTAMP=$(date +%s%3N)
+```
+
+[Now]: https://zeit.co/now

site/content/docs/12-security.md

@@ -0,0 +1,39 @@
+---
+title: Security
+---
+
+By default, Sapper does not add security headers to your app, but you may add them yourself using middleware such as [Helmet][].
+
+### Content Security Policy (CSP)
+
+Sapper generates inline `<script>`s, which can fail to execute if [Content Security Policy (CSP)](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) headers disallow arbitrary script execution (`unsafe-inline`).
+
+To work around this, Sapper can inject a [nonce](https://www.troyhunt.com/locking-down-your-website-scripts-with-csp-hashes-nonces-and-report-uri/) which can be configured with middleware to emit the proper CSP headers. Here is an example using [Express][] and [Helmet][]:
+
+```js
+// server.js
+import uuidv4 from 'uuid/v4';
+import helmet from 'helmet';
+
+app.use((req, res, next) => {
+	res.locals.nonce = uuidv4();
+	next();
+});
+app.use(helmet({
+	contentSecurityPolicy: {
+		directives: {
+			scriptSrc: [
+				"'self'",
+				(req, res) => `'nonce-${res.locals.nonce}'`
+			]
+		}
+	}
+}));
+app.use(sapper.middleware());
+```
+
+Using `res.locals.nonce` in this way follows the convention set by
+[Helmet's CSP docs](https://helmetjs.github.io/docs/csp/#generating-nonces).
+
+[Express]: https://expressjs.com/
+[Helmet]: https://helmetjs.github.io/

site/content/docs/13-base-urls.md

@@ -0,0 +1,28 @@
+---
+title: Base URLs
+---
+
+Ordinarily, the root of your Sapper app is served at `/`. But in some cases, your app may need to be served from a different base path — for example, if Sapper only controls part of your domain, or if you have multiple Sapper apps living side-by-side.
+
+This can be done like so:
+
+```js
+// app/server.js
+
+express() // or Polka, or a similar framework
+	.use(
+		'/my-base-path', // <!-- add this line
+		compression({ threshold: 0 }),
+		serve('assets'),
+		sapper.middleware()
+	)
+	.listen(process.env.PORT);
+```
+
+Sapper will detect the base path and configure both the server-side and client-side routers accordingly.
+
+If you're [exporting](docs#exporting) your app, you will need to tell the exporter where to begin crawling:
+
+```bash
+sapper export --basepath my-base-path
+```

site/content/docs/14-testing.md

@@ -0,0 +1,14 @@
+---
+title: Testing
+---
+
+You can use whatever testing frameworks and libraries you'd like. The default in [sapper-template](https://github.com/sveltejs/sapper-template) is [Cypress](https://cypress.io).
+
+
+### Running the tests
+
+```bash
+npm test
+```
+
+This will start the server and open Cypress. You can (and should!) add your own tests in `cypress/integration/spec.js` — consult the [docs](https://docs.cypress.io/guides/overview/why-cypress.html) for more information.

site/content/docs/15-debugging.md

@@ -0,0 +1,19 @@
+---
+title: Debugging
+---
+
+Debugging your server code is particularly easy with [ndb](https://github.com/GoogleChromeLabs/ndb). Install it globally...
+
+```bash
+npm install -g ndb
+```
+
+...then run Sapper:
+
+```bash
+ndb npm run dev
+```
+
+> This assumes that `npm run dev` runs `sapper dev`. You can also run Sapper via [npx](https://blog.npmjs.org/post/162869356040/introducing-npx-an-npm-package-runner), as in `ndb npx sapper dev`.
+
+Note that you may not see any terminal output for a few seconds while ndb starts up.

site/content/migrating/01-migrating.md

@@ -0,0 +1,367 @@
+---
+title: Migrating
+---
+
+
+Until we reach version 1.0, there may be occasional changes to the project structure Sapper expects.
+
+
+### 0.25 to 0.26
+
+The most significant change yet: Sapper is now built on Svelte 3.
+
+#### Importing Sapper
+
+Your app's runtime is now built to `src/node_modules/@sapper` — this allows you to easily import it from anywhere in your source code. Update your `server.js`...
+
+```diff
+// src/server.js
+-import * as sapper from '../__sapper__/server.js';
++import * as sapper from '@sapper/server';
+```
+
+...and client.js:
+
+```diff
+-import * as sapper from '../__sapper__/client.js';
++import * as sapper from '@sapper/app';
+
+sapper.start({
+	target: document.querySelector('#sapper')
+});
+```
+
+The same applies to imports like `goto` and `prefetchRoutes`.
+
+
+#### Webpack config
+
+If you're using webpack, you must update your configuration to recognise `.mjs` and `.svelte` files:
+
+```js
+resolve: {
+	extensions: ['.mjs', '.js', '.json', '.svelte', '.html']
+}
+```
+
+If you're using .svelte files (recommended), you'll also need to tell `svelte-loader` to expect them:
+
+```diff
+-test: /\.html$/
++test: /\.(svelte|html)$/
+```
+
+
+#### Session data
+
+Passing data from server to client is now accomplished with a `session` function passed to the middleware:
+
+```js
+// src/server.js
+sapper.middleware({
+	session: (req, res) => ({
+		// session data goes here
+	})
+})
+```
+
+This data is available in `preload` functions as the second argument:
+
+```html
+<!-- SomeComponent.svelte -->
+<script context="module">
+	export function preload(page, session) {
+		const { path, params, query } = page; // as before
+
+		if (!session.user) return this.redirect(302, 'login');
+		// ...
+	}
+</script>
+```
+
+
+#### Stores
+
+It is also available, along with `page` and `preloading`, as a store inside components:
+
+```html
+<script>
+	import * as sapper from '@sapper/app';
+	const { page, preloading, session } = sapper.stores();
+</script>
+```
+
+`page` and `preloading` are [readable stores](https://svelte.dev/tutorial/readable-stores), while `session` is [writable](https://svelte.dev/tutorial/writable-stores). Writing to the session store (for example, after the user logs in) will cause any `preload` functions that rely on session data to re-run; it will not persist anything to the server.
+
+
+#### Layouts
+
+Your layout components should now use a `<slot>` element to render nested routes, instead of `<svelte:component>`:
+
+```diff
+<main>
+-	<svelte:component this={child.component} {...child.props}/>
++	<slot></slot>
+</main>
+```
+
+The layout component itself receives a `segment` prop, which is equivalent to `child.segment` in earlier versions.
+
+
+### 0.21 to 0.22
+
+Instead of importing middleware from the `sapper` package, or importing the client runtime from `sapper/runtime.js`, the app is *compiled into* the generated files:
+
+```diff
+// src/client.js
+-import { init } from 'sapper/runtime.js';
+-import { manifest } from './manifest/client.js';
++import * as sapper from '../__sapper__/client.js';
+
+-init({
++sapper.start({
+	target: document.querySelector('#sapper'),
+-	manifest
+});
+```
+
+```diff
+// src/server.js
+import sirv from 'sirv';
+import polka from 'polka';
+import compression from 'compression';
+-import sapper from 'sapper';
+-import { manifest } from './manifest/server.js';
++import * as sapper from '../__sapper__/server.js';
+
+const { PORT, NODE_ENV } = process.env;
+const dev = NODE_ENV === 'development';
+
+polka() // You can also use Express
+	.use(
+		compression({ threshold: 0 }),
+-		sirv('assets', { dev }),
++		sirv('static', { dev }),
+-		sapper({ manifest })
++		sapper.middleware()
+	)
+	.listen(PORT, err => {
+		if (err) console.log('error', err);
+	});
+```
+
+```diff
+// src/service-worker.js
+-import { assets, shell, routes, timestamp } from './manifest/service-worker.js';
++import { files, shell, routes, timestamp } from '../__sapper__/service-worker.js';
+```
+
+In addition, the default build and export directories are now `__sapper__/build` and `__sapper__/export` respectively.
+
+
+### 0.20 to 0.21
+
+* The `app` directory is now `src`
+* The `routes` directory is now `src/routes`
+* The `assets` directory is now `static` (remember to update your `src/server.js` file to reflect this change as well)
+* Instead of having three separate config files (`webpack/client.config.js`, `webpack/server.config.js` and `webpack/service-worker.config.js`), there is a single `webpack.config.js` file that exports `client`, `server` and `serviceworker` configs.
+
+
+### 0.17 to 0.18
+
+The `sapper/webpack/config.js` file (required in the `webpack/*.config.js` files) is now `sapper/config/webpack.js`.
+
+
+### 0.14 to 0.15
+
+This release changed how routing is handled, resulting in a number of changes.
+
+Instead of a single `App.html` component, you can place `_layout.html` components in any directory under `routes`. You should move `app/App.html` to `routes/_layout.html` and modify it like so:
+
+```diff
+-<!-- app/App.html -->
++<!-- routes/_layout.html -->
+
+-<Nav path={props.path}/>
++<Nav segment={child.segment}/>
+
+-<svelte:component this={Page} {...props}/>
++<svelte:component this={child.component} {...child.props}/>
+```
+
+You will then need to remove `App` from your client and server entry points, and replace `routes` with `manifest`:
+
+```diff
+// app/client.js
+import { init } from 'sapper/runtime.js';
+-import { routes } from './manifest/client.js';
+-import App from './App.html';
++import { manifest } from './manifest/client.js';
+
+init({
+	target: document.querySelector('#sapper'),
+-	routes,
+-	App
++	manifest
+});
+```
+
+```diff
+// app/server.js
+import sirv from 'sirv';
+import polka from 'polka';
+import sapper from 'sapper';
+import compression from 'compression';
+-import { routes } from './manifest/server.js';
+-import App from './App.html';
++import { manifest } from './manifest/server.js';
+
+polka()
+	.use(
+		compression({ threshold: 0 }),
+		sirv('assets'),
+-		sapper({ routes, App })
++		sapper({ manifest })
+	)
+	.listen(process.env.PORT)
+	.catch(err => {
+		console.log('error', err);
+	});
+```
+
+`preload` functions no longer take the entire request object on the server; instead, they receive the same argument as on the client.
+
+
+
+### 0.13 to 0.14
+
+The `4xx.html` and `5xx.html` error pages have been replaced with a single page, `_error.html`. In addition to the regular `params`, `query` and `path` props, it receives `status` and `error`.
+
+
+
+
+### 0.11 to 0.12
+
+In earlier versions, each page was a completely standalone component. Upon navigation, the entire page would be torn down and a new one created. Typically, each page would import a shared `<Layout>` component to achieve visual consistency.
+
+As of 0.12, this changes: we have a single `<App>` component, defined in `app/App.html`, which controls the rendering of the rest of the app. See [sapper-template](https://github.com/sveltejs/sapper-template/blob/master/app/App.html) for an example.
+
+This component is rendered with the following values:
+
+* `Page` — a component constructor for the current page
+* `props` — an object with `params`, `query`, and any data returned from the page's `preload` function
+* `preloading` — `true` during preload, `false` otherwise. Useful for showing progress indicators
+
+Sapper needs to know about your app component. To that end, you will need to modify your `app/server.js` and `app/client.js`:
+
+```diff
+// app/server.js
+import polka from 'polka';
+import sapper from 'sapper';
+import serve from 'serve-static';
+import { routes } from './manifest/server.js';
++import App from './App.html';
+
+polka()
+	.use(
+		serve('assets'),
+-		sapper({ routes })
++		sapper({ App, routes })
+	)
+	.listen(process.env.PORT);
+```
+
+```diff
+// app/client.js
+import { init } from 'sapper/runtime.js';
+import { routes } from './manifest/client.js';
++import App from './App.html';
+
+-init(target: document.querySelector('#sapper'), routes);
++init({
++	target: document.querySelector('#sapper'),
++	routes,
++	App
++});
+```
+
+Once your `App.html` has been created and your server and client apps updated, you can remove any `<Layout>` components from your individual pages.
+
+
+### <0.9 to 0.10
+
+##### app/template.html
+
+* Your `<head>` element must contain `%sapper.base%` (see ([base URLs](docs#base-urls))
+* Remove references to your service worker; this is now handled by `%sapper.scripts%`
+
+##### Pages
+
+* Your `preload` functions should now use `this.fetch` instead of `fetch`. `this.fetch` allows you to make credentialled requests on the server, and means that you no longer need to create a `global.fetch` object in `app/server.js`.
+
+
+
+### 0.6 to 0.7
+
+Consult [sapper-template](https://github.com/sveltejs/sapper-template) for full examples of all the below points.
+
+
+##### package.json
+
+To start a dev server, use `sapper dev` rather than `node server.js`. In all likelihood, your package.json will have an `npm run dev` script that will need to be updated.
+
+##### Entry points
+
+As of version 0.7, Sapper expects to find your entry points — for client, server and service worker — in an `app` folder. Instead of using magically-injected `__variables__`, each entry point imports from its corresponding file in the `app/manifests` folder. These are automatically generated by Sapper.
+
+```js
+// app/client.js (formerly templates/main.js)
+import { init } from 'sapper/runtime.js';
+import { routes } from './manifest/client.js';
+
+init(document.querySelector('#sapper'), routes);
+
+if (module.hot) module.hot.accept(); // enable hot reloading
+```
+
+```js
+// app/server.js (formerly server.js)
+// Note that we're now using ES module syntax, because this
+// file is processed by webpack like the rest of your app
+import sapper from 'sapper';
+import { routes } from './manifest/server.js';
+// ..other imports
+
+// we now pass the `routes` object to the Sapper middleware
+app.use(sapper({
+	routes
+}));
+```
+
+```js
+// app/service-worker.js (formerly templates/service-worker.js)
+import { assets, shell, timestamp, routes } from './manifest/service-worker.js';
+
+// replace e.g. `__assets__` with `assets` in the rest of the file
+```
+
+
+##### Templates and error pages
+
+In previous versions, we had `templates/2xx.html`, `templates/4xx.html` and `templates/5xx.html`. Now, we have a single template, `app/template.html`, which should look like your old `templates/2xx.html`.
+
+For handling error states, we have a 'special' route: `routes/_error.html`.
+
+This page is just like any other, except that it will get rendered whenever an error states is reached. The component has access to `status` and `error` values.
+
+Note that you can now use `this.error(statusCode, error)` inside your `preload` functions.
+
+
+##### Webpack configs
+
+Your webpack configs now live in a `webpack` directory:
+
+* `webpack.client.config.js` is now `webpack/client.config.js`
+* `webpack.server.config.js` is now `webpack/server.config.js`
+
+If you have a service worker, you should also have a `webpack/service-worker.config.js` file. See [sapper-template](https://github.com/sveltejs/sapper-template) for an example.

site/cypress.json

@@ -0,0 +1,4 @@
+{
+	"baseUrl": "http://localhost:3000",
+	"video": false
+}

site/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

site/cypress/integration/spec.js

@@ -0,0 +1,19 @@
+describe('Sapper template app', () => {
+	beforeEach(() => {
+		cy.visit('/')
+	});
+
+	it('has the correct <h1>', () => {
+		cy.contains('h1', 'Great success!')
+	});
+
+	it('navigates to /about', () => {
+		cy.get('nav a').contains('about').click();
+		cy.url().should('include', '/about');
+	});
+
+	it('navigates to /blog', () => {
+		cy.get('nav a').contains('blog').click();
+		cy.url().should('include', '/blog');
+	});
+});

site/cypress/plugins/index.js

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

site/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This is will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

site/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

site/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "sapper.svelte.dev",
+  "description": "sapper.svelte.dev",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "sapper dev",
+    "export": "sapper export --legacy",
+    "stage": "netlify deploy --dir=__sapper__/export",
+    "deploy": "netlify deploy --dir=__sapper__/export --prod",
+    "prestage": "npm run export",
+    "predeploy": "npm run export",
+    "cy:run": "cypress run",
+    "cy:open": "cypress open",
+    "test": "run-p --race dev cy:run"
+  },
+  "dependencies": {
+    "@polka/send": "^0.4.0",
+    "compression": "^1.7.1",
+    "highlight.js": "^9.15.6",
+    "marked": "^0.6.2",
+    "polka": "^0.5.2",
+    "prismjs": "^1.16.0",
+    "sirv": "^0.2.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
+    "@sveltejs/site-kit": "^1.0.1",
+    "chokidar": "^2.0.4",
+    "npm-run-all": "^4.1.5",
+    "rollup": "^1.0.0",
+    "rollup-plugin-babel": "^4.0.2",
+    "rollup-plugin-commonjs": "^9.1.6",
+    "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-svelte": "^5.0.1",
+    "rollup-plugin-terser": "^4.0.4",
+    "sapper": "alpha",
+    "svelte": "^3.1.0"
+  }
+}

site/rollup.config.js

@@ -0,0 +1,87 @@
+import resolve from 'rollup-plugin-node-resolve';
+import replace from 'rollup-plugin-replace';
+import commonjs from 'rollup-plugin-commonjs';
+import svelte from 'rollup-plugin-svelte';
+import babel from 'rollup-plugin-babel';
+import { terser } from 'rollup-plugin-terser';
+import config from 'sapper/config/rollup.js';
+import pkg from './package.json';
+
+const mode = process.env.NODE_ENV;
+const dev = mode === 'development';
+const legacy = !!process.env.SAPPER_LEGACY_BUILD;
+
+export default {
+	client: {
+		input: config.client.input(),
+		output: config.client.output(),
+		plugins: [
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				dev,
+				hydratable: true,
+				emitCss: true
+			}),
+			resolve(),
+			commonjs(),
+
+			legacy && babel({
+				extensions: ['.js', '.mjs', '.html', '.svelte'],
+				runtimeHelpers: true,
+				exclude: ['node_modules/@babel/**'],
+				presets: [
+					['@babel/preset-env', {
+						targets: '> 0.25%, not dead'
+					}]
+				],
+				plugins: [
+					'@babel/plugin-syntax-dynamic-import',
+					['@babel/plugin-transform-runtime', {
+						useESModules: true
+					}]
+				]
+			}),
+
+			!dev && terser({
+				module: true
+			})
+		],
+	},
+
+	server: {
+		input: config.server.input(),
+		output: config.server.output(),
+		plugins: [
+			replace({
+				'process.browser': false,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				generate: 'ssr',
+				dev
+			}),
+			resolve(),
+			commonjs()
+		],
+		external: Object.keys(pkg.dependencies).concat(
+			require('module').builtinModules || Object.keys(process.binding('natives'))
+		),
+	},
+
+	serviceworker: {
+		input: config.serviceworker.input(),
+		output: config.serviceworker.output(),
+		plugins: [
+			resolve(),
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			commonjs(),
+			!dev && terser()
+		]
+	}
+};

site/src/client.js

@@ -0,0 +1,6 @@
+import '@sveltejs/site-kit/base.css';
+import * as sapper from '@sapper/app';
+
+sapper.start({
+	target: document.querySelector('#sapper')
+});

site/src/routes/_error.svelte

@@ -0,0 +1,71 @@
+<script>
+	const dev = process.env.NODE_ENV === 'development';
+
+	export let status;
+	export let error;
+
+	// we don't want to use <svelte:window bind:online> here,
+	// because we only care about the online state when
+	// the page first loads
+	let online = typeof navigator !== 'undefined'
+		? navigator.onLine
+		: true;
+</script>
+
+<style>
+	.container {
+		padding: var(--top-offset) var(--side-nav) 6rem var(--side-nav);
+	}
+
+	h1, p { margin: 0 auto }
+
+	h1 {
+		font-size: 2.8em;
+		font-weight: 300;
+		margin: 0 0 0.5em 0;
+	}
+
+	p { margin: 1em auto }
+
+	.error {
+		background-color: #da106e;
+		color: white;
+		padding: 12px 16px;
+		font: 600 16px/1.7 var(--font);
+		border-radius: 2px;
+	}
+
+	/* @media (min-width: 480px) {
+		h1 { font-size: 4em }
+	} */
+</style>
+
+<svelte:head>
+	<title>{status}</title>
+</svelte:head>
+
+<div class="container">
+	{#if online}
+		<h1>Yikes!</h1>
+
+		{#if error.message}
+			<p class="error">{status}: {error.message}</p>
+		{:else}
+			<p class="error">Encountered a {status} error</p>
+		{/if}
+
+		{#if dev && error.stack}
+			<pre>{error.stack}</pre>
+		{:else}
+			{#if status >= 500}
+				<p>Please try reloading the page.</p>
+			{/if}
+
+			<p>If the error persists, please drop by <a href="https://discord.gg/yy75DKs">Discord chatroom</a> and let us know, or raise an issue on <a href="https://github.com/sveltejs/svelte">GitHub</a>. Thanks!</p>
+		{/if}
+	{:else}
+		<h1>It looks like you're offline</h1>
+
+		<p>Reload the page once you've found the internet.</p>
+	{/if}
+</div>

site/src/routes/_layout.svelte

@@ -0,0 +1,40 @@
+<script>
+	import { page } from '@sapper/app';
+	import { Icons, Icon, Nav, NavItem } from '@sveltejs/site-kit';
+
+	export let segment;
+</script>
+
+<style>
+	:global(html) {
+		--prime: rgb(21, 151, 148) !important; /* TODO remove .theme-default from shared, so we don't need !important */
+	}
+
+	main {
+		position: relative;
+		margin: 0 auto;
+		/* padding: var(--nav-h) var(--side-nav) 0 var(--side-nav); */
+		padding: var(--nav-h) 0 0 0;
+		overflow-x: hidden;
+	}
+</style>
+
+<Icons/>
+
+<Nav {segment} {page} logo="sapper-logo-horizontal.svg">
+	<NavItem segment="docs">Docs</NavItem>
+
+	<NavItem external="https://svelte.dev">Svelte</NavItem>
+
+	<NavItem external="https://discord.gg/yy75DKs" title="Discord Chat">
+		<Icon name="message-square"/>
+	</NavItem>
+
+	<NavItem external="https://github.com/sveltejs/sapper" title="GitHub Repo">
+		<Icon name="github"/>
+	</NavItem>
+</Nav>
+
+<main>
+	<slot></slot>
+</main>

site/src/routes/docs/index.json.js

@@ -0,0 +1,14 @@
+import send from '@polka/send';
+import generate_docs from '../../utils/generate_docs.js';
+
+let json;
+
+export function get(req, res) {
+	if (!json || process.env.NODE_ENV !== 'production') {
+		json = JSON.stringify(generate_docs('docs')); // TODO it errors if I send the non-stringified value
+	}
+
+	send(res, 200, json, {
+		'Content-Type': 'application/json'
+	});
+}

site/src/routes/docs/index.svelte

@@ -0,0 +1,22 @@
+<script context="module">
+	export async function preload() {
+		const sections = await this.fetch(`docs.json`).then(r => r.json());
+		return { sections };
+	}
+</script>
+
+<script>
+	import { Docs } from '@sveltejs/site-kit'
+
+	export let sections;
+</script>
+
+<svelte:head>
+	<title>Docs • Sapper</title>
+
+	<meta name="twitter:title" content="Sapper docs">
+	<meta name="twitter:description" content="The next small thing in web development">
+	<meta name="Description" content="The next small thing in web development">
+</svelte:head>
+
+<Docs {sections}/>

site/src/routes/index.svelte

@@ -0,0 +1,61 @@
+<script>
+	import { Hero, Blurb } from '@sveltejs/site-kit';
+</script>
+
+<style>
+
+</style>
+
+<svelte:head>
+	<title>Sapper • The next small thing in web development</title>
+</svelte:head>
+
+<Hero
+	title="Sapper"
+	tagline="The next small thing in web development"
+	outline="sapper-logo-outline.svg"
+	logotype="sapper-logotype.svg"
+/>
+
+<Blurb>
+	<a href="https://svelte.dev" slot="one">
+		<h2>Powered by Svelte</h2>
+		<p>Sapper is an application framework powered by Svelte — build bigger apps with a smaller footprint</p>
+
+		<span class="learn-more">learn more</span>
+	</a>
+
+	<a href="docs" slot="two">
+		<h2>Best of both worlds</h2>
+		<p>All the SEO and progressive enhancement of a server-rendered app, with the slick navigation of an SPA</p>
+
+		<span class="learn-more">learn more</span>
+	</a>
+
+	<a href="docs" slot="three">
+		<h2>Build fast</h2>
+		<p>Hit the ground running with advanced routing, server-side rendering, code-splitting, offline support and more</p>
+
+		<span class="learn-more">learn more</span>
+	</a>
+
+	<div class="description" slot="what">
+		<p>Sapper is a framework for building web applications of all sizes, with a beautiful development experience and flexible filesystem-based routing.</p>
+
+		<p>Unlike single-page apps, Sapper doesn't compromise on SEO, progressive enhancement or the initial load experience — but unlike traditional server-rendered apps, navigation is instantaneous for that app-like feel.</p>
+
+		<p><a href="https://svelte.dev/blog/sapper-towards-the-ideal-web-app-framework">Read the introductory blog post</a> to learn more.</p>
+	</div>
+
+	<div style="grid-area: start; display: flex; flex-direction: column; min-width: 0" slot="how">
+		<pre class="language-bash" style="margin: 0 0 1em 0; min-width: 0; min-height: 0">
+npx degit sveltejs/template my-svelte-project
+cd my-svelte-project
+
+npm install
+npm run dev & open http://localhost:5000
+		</pre>
+
+		<p class="cta"><a rel="prefetch" href="docs">Learn Sapper</a></p>
+	</div>
+</Blurb>

site/src/routes/migrating/index.json.js

@@ -0,0 +1,14 @@
+import send from '@polka/send';
+import generate_docs from '../../utils/generate_docs.js';
+
+let json;
+
+export function get(req, res) {
+	if (!json || process.env.NODE_ENV !== 'production') {
+		json = JSON.stringify(generate_docs('migrating')); // TODO it errors if I send the non-stringified value
+	}
+
+	send(res, 200, json, {
+		'Content-Type': 'application/json'
+	});
+}

site/src/routes/migrating/index.svelte

@@ -0,0 +1,22 @@
+<script context="module">
+	export async function preload() {
+		const sections = await this.fetch(`migrating.json`).then(r => r.json());
+		return { sections };
+	}
+</script>
+
+<script>
+	import { Docs } from '@sveltejs/site-kit'
+
+	export let sections;
+</script>
+
+<svelte:head>
+	<title>Migration • Sapper</title>
+
+	<meta name="twitter:title" content="Sapper migration guides">
+	<meta name="twitter:description" content="The next small thing in web development">
+	<meta name="Description" content="The next small thing in web development">
+</svelte:head>
+
+<Docs {sections}/>

site/src/server.js

@@ -0,0 +1,17 @@
+import sirv from 'sirv';
+import polka from 'polka';
+import compression from 'compression';
+import * as sapper from '@sapper/server';
+
+const { PORT, NODE_ENV } = process.env;
+const dev = NODE_ENV === 'development';
+
+polka() // You can also use Express
+	.use(
+		compression({ threshold: 0 }),
+		sirv('static', { dev }),
+		sapper.middleware()
+	)
+	.listen(PORT, err => {
+		if (err) console.log('error', err);
+	});

site/src/service-worker.js

@@ -0,0 +1,82 @@
+import { timestamp, files, shell, routes } from '@sapper/service-worker';
+
+const ASSETS = `cache${timestamp}`;
+
+// `shell` is an array of all the files generated by the bundler,
+// `files` is an array of everything in the `static` directory
+const to_cache = shell.concat(files);
+const cached = new Set(to_cache);
+
+self.addEventListener('install', event => {
+	event.waitUntil(
+		caches
+			.open(ASSETS)
+			.then(cache => cache.addAll(to_cache))
+			.then(() => {
+				self.skipWaiting();
+			})
+	);
+});
+
+self.addEventListener('activate', event => {
+	event.waitUntil(
+		caches.keys().then(async keys => {
+			// delete old caches
+			for (const key of keys) {
+				if (key !== ASSETS) await caches.delete(key);
+			}
+
+			self.clients.claim();
+		})
+	);
+});
+
+self.addEventListener('fetch', event => {
+	if (event.request.method !== 'GET' || event.request.headers.has('range')) return;
+
+	const url = new URL(event.request.url);
+
+	// don't try to handle e.g. data: URIs
+	if (!url.protocol.startsWith('http')) return;
+
+	// ignore dev server requests
+	if (url.hostname === self.location.hostname && url.port !== self.location.port) return;
+
+	// always serve static files and bundler-generated assets from cache
+	if (url.host === self.location.host && cached.has(url.pathname)) {
+		event.respondWith(caches.match(event.request));
+		return;
+	}
+
+	// for pages, you might want to serve a shell `service-worker-index.html` file,
+	// 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('/service-worker-index.html'));
+		return;
+	}
+	*/
+
+	if (event.request.cache === 'only-if-cached') return;
+
+	// for everything else, try the network first, falling back to
+	// cache if the user is offline. (If the pages never change, you
+	// might prefer a cache-first approach to a network-first one.)
+	event.respondWith(
+		caches
+			.open(`offline${timestamp}`)
+			.then(async cache => {
+				try {
+					const response = await fetch(event.request);
+					cache.put(event.request, response.clone());
+					return response;
+				} catch(err) {
+					const response = await cache.match(event.request);
+					if (response) return response;
+
+					throw err;
+				}
+			})
+	);
+});

site/src/template.html

@@ -0,0 +1,52 @@
+<!doctype html>
+<html lang='en' class="theme-default typo-default">
+<head>
+	<meta charset='utf-8'>
+	<meta name='viewport' content='width=device-width;initial-scale=1.0'>
+	<meta name='theme-color' content='#ff3e00'>
+
+	%sapper.base%
+
+	<link href=prism.css rel=stylesheet>
+	<link rel='manifest' href='manifest.json'>
+	<link rel='icon' type='image/png' href='favicon.png'>
+
+	<meta name='twitter:card' content='summary_large_image'>
+	<meta name='twitter:site' content='@sveltejs'>
+	<meta name='twitter:creator' content='@sveltejs'>
+	<meta name='twitter:image' content='https://sapper.svelte.dev/images/twitter-card.png'>
+
+	<!-- Sapper generates a <style> tag containing critical CSS
+	     for the current page. CSS for the rest of the app is
+	     lazily loaded when it precaches secondary pages -->
+	%sapper.styles%
+
+	<style>
+		.hljs, .hljs-subst { color: #333; }
+		.hljs-comment { color: #999; }
+		.hljs-tag { color: #170; }
+		.hljs-keyword { color: #708; }
+		.hljs-attr { color: #333; }
+		.hljs-number { color: #164; }
+		.hljs-type, .hljs-string, .hljs-selector-id, .hljs-selector-class, .hljs-quote, .hljs-template-tag, .hljs-deletion { color: rgb(16,94,16); }
+		.hljs-title, .hljs-section { color: rgb(16,94,16); }
+		.hljs-literal { color: #170; }
+		.hljs-meta { color: #555; }
+		.hljs-meta-string { color: #555; }
+	</style>
+
+	<!-- This contains the contents of the <svelte:head> component, if
+	     the current page has one -->
+	%sapper.head%
+</head>
+<body>
+	<!-- The application will be rendered inside this element,
+	     because `app/client.js` references it -->
+	<div id='sapper'>%sapper.html%</div>
+
+	<!-- Sapper creates a <script> tag containing `app/client.js`
+	     and anything else it needs to hydrate the app and
+	     initialise the router -->
+	%sapper.scripts%
+</body>
+</html>

site/src/utils/generate_docs.js

@@ -0,0 +1,158 @@
+// TODO put this in site-kit? svelte.dev uses Prism instead of hljs
+import fs from 'fs';
+import path from 'path';
+import { SLUG_SEPARATOR, SLUG_PRESERVE_UNICODE } from '../../config';
+import { extract_frontmatter, extract_metadata, langs, link_renderer } from '@sveltejs/site-kit/utils/markdown.js';
+import { make_session_slug_processor } from '@sveltejs/site-kit/utils/slug';
+import marked from 'marked';
+import hljs from 'highlight.js';
+
+const escaped = {
+	'"': '"',
+	"'": ''',
+	'&': '&',
+	'<': '&lt;',
+	'>': '&gt;',
+};
+
+const unescaped = Object.keys(escaped).reduce(
+	(unescaped, key) => ((unescaped[escaped[key]] = key), unescaped),
+	{}
+);
+
+function unescape(str) {
+	return String(str).replace(/&.+?;/g, match => unescaped[match] || match);
+}
+
+const block_types = [
+	'blockquote',
+	'html',
+	'heading',
+	'hr',
+	'list',
+	'listitem',
+	'paragraph',
+	'table',
+	'tablerow',
+	'tablecell'
+];
+
+export default function generate_docs(dir) {
+	const make_slug = make_session_slug_processor({
+		separator: SLUG_SEPARATOR,
+		preserve_unicode: SLUG_PRESERVE_UNICODE
+	});
+
+	return fs
+		.readdirSync(`content/${dir}`)
+		.filter(file => file[0] !== '.' && path.extname(file) === '.md')
+		.map(file => {
+			const markdown = fs.readFileSync(`content/${dir}/${file}`, 'utf-8');
+
+			const { content, metadata } = extract_frontmatter(markdown);
+
+			const section_slug = make_slug(metadata.title);
+
+			const subsections = [];
+
+			const renderer = new marked.Renderer();
+
+			let block_open = false;
+
+			renderer.link = link_renderer;
+
+			renderer.hr = () => {
+				block_open = true;
+
+				return '<div class="side-by-side"><div class="copy">';
+			};
+
+			renderer.code = (source, lang) => {
+				source = source.replace(/^ +/gm, match =>
+					match.split('    ').join('\t')
+				);
+
+				const lines = source.split('\n');
+
+				const meta = extract_metadata(lines[0], lang);
+
+				let prefix = '';
+				// let class_name = 'code-block';
+				let class_name = '';
+
+				if (meta) {
+					source = lines.slice(1).join('\n');
+					const filename = meta.filename || (lang === 'html' && 'App.svelte');
+					if (filename) {
+						prefix = `<span class='filename'>${prefix} ${filename}</span>`;
+						class_name += ' named';
+					}
+				}
+
+				if (meta && meta.hidden) {
+					return '';
+				}
+
+				const plang = langs[lang];
+				const { value: highlighted } = hljs.highlight(lang, source);
+				// const highlighted = PrismJS.highlight(
+				// 	source,
+				// 	PrismJS.languages[plang],
+				// 	lang
+				// );
+
+				const html = `<div class='${class_name}'>${prefix}<pre class='language-${plang}'><code>${highlighted}</code></pre></div>`;
+
+				if (block_open) {
+					block_open = false;
+					return `</div><div class="code">${html}</div></div>`;
+				}
+
+				return html;
+			};
+
+			renderer.heading = (text, level, rawtext) => {
+				const slug = level <= 4 && make_slug(rawtext);
+
+				if (level === 3 || level === 4) {
+					const title = unescape(
+						text
+							.replace(/<\/?code>/g, '')
+							.replace(/\.(\w+)(\((.+)?\))?/, (m, $1, $2, $3) => {
+								if ($3) return `.${$1}(...)`;
+								if ($2) return `.${$1}()`;
+								return `.${$1}`;
+							})
+					);
+
+					subsections.push({ slug, title, level });
+				}
+
+				return `
+					<h${level}>
+						<span id="${slug}" class="offset-anchor" ${level > 4 ? 'data-scrollignore' : ''}></span>
+						<a href="${dir}#${slug}" class="anchor" aria-hidden="true"></a>
+						${text}
+					</h${level}>`;
+			};
+
+			block_types.forEach(type => {
+				const fn = renderer[type];
+				renderer[type] = function() {
+					return fn.apply(this, arguments);
+				};
+			});
+
+			const html = marked(content, { renderer });
+
+			const hashes = {};
+
+			return {
+				html: html.replace(/@@(\d+)/g, (m, id) => hashes[id] || m),
+				metadata,
+				subsections,
+				slug: section_slug,
+				file,
+			};
+		});
+}

site/static/icons/arrow-right.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+	<g fill="none" stroke="white" stroke-width="2">
+		<line x1='5' y1='12' x2='19' y2='12' />
+		<polyline points='12 5 19 12 12 19' />
+	</g>
+</svg>

site/static/icons/check.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+	<path style="fill: #aa1e1e" d="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
+</svg>

site/static/icons/chevron.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+	<path style="stroke: #676778; stroke-width: 2; fill: none" d="M2,8 L12,16 L22,8"/>
+</svg>

site/static/icons/collapse.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+   <path style="fill: #aa1e1e" d="M19.5,3.09L20.91,4.5L16.41,9H20V11H13V4H15V7.59L19.5,3.09M20.91,19.5L19.5,20.91L15,16.41V20H13V13H20V15H16.41L20.91,19.5M4.5,3.09L9,7.59V4H11V11H4V9H7.59L3.09,4.5L4.5,3.09M3.09,19.5L7.59,15H4V13H11V20H9V16.41L4.5,20.91L3.09,19.5Z" />
+</svg>

site/static/icons/download.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path fill="#aa1e1e" d="M5,20H19V18H5M19,9H15V3H9V9H5L12,16L19,9Z" />
+</svg>

site/static/icons/dropdown.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path fill="#999" d="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z" />
+</svg>

site/static/icons/edit.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+	<g style="fill: none; stroke: white; stroke-width: 2;">
+		<path d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34' />
+		<polygon points='18 2 22 6 12 16 8 16 8 12 18 2' />
+	</g>
+</svg>

site/static/icons/expand.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path style="fill: #aa1e1e" d="M9.5,13.09L10.91,14.5L6.41,19H10V21H3V14H5V17.59L9.5,13.09M10.91,9.5L9.5,10.91L5,6.41V10H3V3H10V5H6.41L10.91,9.5M14.5,13.09L19,17.59V14H21V21H14V19H17.59L13.09,14.5L14.5,13.09M13.09,9.5L17.59,5H14V3H21V10H19V6.41L14.5,10.91L13.09,9.5Z" />
+</svg>

site/static/icons/flip.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path fill="#aa1e1e" d="M12,5C16.97,5 21,7.69 21,11C21,12.68 19.96,14.2 18.29,15.29C19.36,14.42 20,13.32 20,12.13C20,9.29 16.42,7 12,7V10L8,6L12,2V5M12,19C7.03,19 3,16.31 3,13C3,11.32 4.04,9.8 5.71,8.71C4.64,9.58 4,10.68 4,11.88C4,14.71 7.58,17 12,17V14L16,18L12,22V19Z" />
+</svg>

site/static/icons/fork.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path fill="#aa1e1e" d="M3,4V12.5L6,9.5L9,13C10,14 10,15 10,15V21H14V14C14,14 14,13 13.47,12C12.94,11 12,10 12,10L9,6.58L11.5,4M18,4L13.54,8.47L14,9C14,9 14.93,10 15.47,11C15.68,11.4 15.8,11.79 15.87,12.13L21,7" />
+</svg>

site/static/icons/link.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+	<g fill="none" stroke="#333">
+		<path d="M9,7L6,7A2 2 0 0 0 6,17L9,17"/>
+		<path d="M15,7L18,7A2 2 0 0 1 18,17L15,17"/>
+		<path d="M7,12L17,12"/>
+	</g>
+</svg>

site/static/icons/loading.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+  <circle id="spinner" cx="12" cy="12" r="8" fill="none" stroke="white" stroke-width="3" stroke-dasharray="50.2 50" />
+  <animate href="#spinner" attributeName="stroke-dashoffset" values="52;0;52" dur="5s" repeatCount="indefinite" />
+  <animateTransform href="#spinner" attributeName="transform" type="rotate" values="0 12 12;360 12 12;0 12 12" dur="9s" repeatCount="indefinite"/>
+</svg>

site/static/icons/save.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" style="width:24px;height:24px" viewBox="0 0 24 24">
+    <path fill="#aa1e1e" d="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
+</svg>

site/static/manifest.json

@@ -0,0 +1,20 @@
+{
+	"background_color": "#ffffff",
+	"theme_color": "#ff3e00",
+	"name": "Sapper",
+	"short_name": "Sapper",
+	"display": "minimal-ui",
+	"start_url": "/",
+	"icons": [
+		{
+			"src": "images/sapper-android-chrome-192.png",
+			"sizes": "192x192",
+			"type": "image/png"
+		},
+		{
+			"src": "images/sapper-android-chrome-512.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		}
+	]
+}

site/static/prism.css

@@ -0,0 +1,96 @@
+/*
+-----------------------------------------------
+	syntax-highlighting [prism]
+-----------------------------------------------
+*/
+
+/*	colors --------------------------------- */
+pre[class*='language-'] {
+	--background: var(--back-light);
+	--base:       hsl(45, 7%, 45%);
+	--comment:    hsl(210, 25%, 60%);
+	--keyword:    hsl(204, 58%, 45%);
+	--function:   hsl(19, 67%, 45%);
+	--string:     hsl(41, 37%, 45%);
+	--number:     hsl(102, 27%, 50%);
+	--tags:       var(--function);
+	--important:  var(--string);
+}
+
+/*	type-base ------------------------------ */
+code[class*='language-'],
+pre[class*='language-'] {
+	background: none;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	word-wrap: normal;
+	font: 300 var(--code-fs)/1.7 var(--font-mono);
+	color: var(--base);
+	tab-size: 2;
+	-moz-tab-size: 2;
+	-webkit-hyphens: none;
+	hyphens: none;
+}
+
+/*	code-blocks ---------------------------- */
+pre[class*='language-'] {
+	overflow: auto;
+	padding: 1.5rem 2rem;
+	margin: .8rem 0 2.4rem;
+	/* max-width: var(--code-w); */
+	border-radius: var(--border-r);
+	box-shadow: 1px 1px 1px rgba(68, 68, 68, .12) inset;
+}
+
+:not(pre) > code[class*='language-'],
+pre[class*='language-'] {
+	background: var(--background);
+}
+
+/*	tokens --------------------------------- */
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata       { color: var(--comment) }
+
+.token.punctuation { color: var(--base) }
+
+.token.property,
+.token.tag,
+.token.constant,
+.token.symbol,
+.token.deleted      { color: var(--tags) }
+
+.token.boolean,
+.token.number       { color: var(--number) }
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted      { color: var(--string) }
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string,
+.token.variable       { color: var(--base) }
+
+.token.atrule,
+.token.attr-value,
+.token.function,
+.token.class-name     { color: var(--function) }
+
+.token.keyword        { color: var(--keyword) }
+
+.token.regex,
+.token.important      { color: var(--important) }
+
+.token.important,
+.token.bold   { font-weight: bold }
+.token.italic { font-style: italic }
+.token.entity { cursor: help }