-> v0.15.3

Merge pull request #329 from sveltejs/parallel-exports
parallelize exports
2026-01-13 11:35:28 +00:00 · 2018-07-31 15:06:47 -04:00 · 2018-07-31 15:05:38 -04:00 · 2018-07-31 14:59:57 -04:00 · 2018-07-31 14:59:27 -04:00 · 2018-07-31 14:56:29 -04:00
78 changed files with 6490 additions and 930 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,59 @@
 # sapper changelog

+## 0.15.3
+
+* Crawl pages in parallel when exporting ([#329](https://github.com/sveltejs/sapper/pull/329))
+* Don't minify inline JS when exporting ([#328](https://github.com/sveltejs/sapper/pull/328))
+
+## 0.15.2
+
+* Collapse component chains where no intermediate layout component is specified ([#312](https://github.com/sveltejs/sapper/issues/312))
+
+## 0.15.1
+
+* Prevent confusing error when no root layout is specified
+
+## 0.15.0
+
+* Nested routes (consult [migration guide](https://sapper.svelte.technology/guide#0-14-to-0-15) and docs on [layouts](https://sapper.svelte.technology/guide#layouts)) ([#262](https://github.com/sveltejs/sapper/issues/262))
+
+## 0.14.2
+
+* Prevent unsafe replacements ([#307](https://github.com/sveltejs/sapper/pull/307))
+
+## 0.14.1
+
+* Route parameters can be qualified with regex characters ([#283](https://github.com/sveltejs/sapper/pull/283))
+
+## 0.14.0
+
+* `4xx.html` and `5xx.html` are replaced with `_error.html` ([#209](https://github.com/sveltejs/sapper/issues/209))
+* Treat `foo/index.json.js` and `foo.json.js` as equivalents ([#297](https://github.com/sveltejs/sapper/issues/297))
+* Return a promise from `goto` ([#270](https://github.com/sveltejs/sapper/issues/270))
+* Use store when rendering error pages ([#293](https://github.com/sveltejs/sapper/issues/293))
+* Prevent console errors when visiting an error page ([#279](https://github.com/sveltejs/sapper/issues/279))
+
+## 0.13.6
+
+* Fix `baseUrl` synthesis ([#296](https://github.com/sveltejs/sapper/issues/296))
+
+## 0.13.5
+
+* Fix handling of fatal errors ([#289](https://github.com/sveltejs/sapper/issues/289))
+
+## 0.13.4
+
+* Focus `<body>` after navigation ([#287](https://github.com/sveltejs/sapper/issues/287))
+* Fix timing of hot reload updates
+* Emit `fatal` event if server crashes ([#285](https://github.com/sveltejs/sapper/pull/285))
+* Emit `stdout` and `stderr` events on dev watcher ([#285](https://github.com/sveltejs/sapper/pull/285))
+* Always refresh client assets in dev ([#286](https://github.com/sveltejs/sapper/pull/286))
+* Correctly initialise rebuild stats
+
+## 0.13.3
+
+* Make `fatal` events clonable for IPC purposes
+
 ## 0.13.2

 * Emit a `basepath` event ([#284](https://github.com/sveltejs/sapper/pull/284))
--- a/README.md
+++ b/README.md
@@ -31,6 +31,44 @@ npm run build
 npm start
 ```

+## Development
+
+Pull requests are encouraged and always welcome. [Pick an issue](https://github.com/sveltejs/sapper/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and help us out!
+
+To install and work on Sapper locally:
+
+```bash
+git clone git@github.com:sveltejs/sapper.git
+cd sapper
+npm install
+npm run dev
+```
+
+### Linking to a Live Project
+
+You can make changes locally to Sapper and test it against a local Sapper project. For a quick project that takes almost no setup, use the default [sapper-template](https://github.com/sveltejs/sapper-template) project. Instruction on setup are found in that project repository.
+
+To link Sapper to your project, from the root of your local Sapper git checkout:
+
+```bash
+cd sapper
+npm link
+```
+
+Then, to link from `sapper-template` (or any other given project):
+
+```bash
+cd sapper-template
+npm link sapper
+```
+
+You should be good to test changes locally.
+
+### Running Tests
+
+```bash
+npm run test
+```

 ## License

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ build: off
 environment:
  matrix:
    # node.js
-    - nodejs_version: stable
+    - nodejs_version: 10.5

 install:
  - ps: Install-Product node $env:nodejs_version
--- a/components/default-layout.html
+++ b/components/default-layout.html
@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>
--- a/mocha.opts
+++ b/mocha.opts
@@ -1,4 +1,4 @@
 --require source-map-support/register
 --recursive
-test/unit/**/*.js
+test/unit/*/*.js
 test/common/test.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.13.2",
+  "version": "0.15.3",
  "description": "Military-grade apps, engineered by Svelte",
  "main": "dist/middleware.ts.js",
  "bin": {
@@ -12,6 +12,7 @@
    "runtime",
    "webpack",
    "sapper",
+    "components",
    "dist"
  ],
  "directories": {
@@ -22,7 +23,7 @@
    "cheerio": "^1.0.0-rc.2",
    "chokidar": "^2.0.3",
    "cookie": "^0.3.1",
-    "devalue": "^1.0.1",
+    "devalue": "^1.0.4",
    "glob": "^7.1.2",
    "html-minifier": "^3.5.16",
    "mkdirp": "^0.5.1",
@@ -67,7 +68,7 @@
    "cy:open": "cypress open",
    "test": "mocha --opts mocha.opts",
    "pretest": "npm run build",
-    "build": "rollup -c",
+    "build": "rm -rf dist && rollup -c",
    "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 \"^[^#]\" > src/middleware/mime-types.md"
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -19,7 +19,8 @@ export default [
 		},
 		plugins: [
 			typescript({
-				typescript: require('typescript')
+				typescript: require('typescript'),
+				target: "ES2017"
 			})
 		]
 	},
--- a/src/api/dev.ts
+++ b/src/api/dev.ts
@@ -33,6 +33,7 @@ class Watcher extends EventEmitter {
 		server: Deferred;
 	};

+	crashed: boolean;
 	restarting: boolean;
 	current_build: {
 		changed: Set<string>;
@@ -90,7 +91,7 @@ class Watcher extends EventEmitter {
 		if (this.port) {
 			if (!await ports.check(this.port)) {
 				this.emit('fatal', <events.FatalEvent>{
-					error: new Error(`Port ${this.port} is unavailable`)
+					message: `Port ${this.port} is unavailable`
 				});
 				return;
 			}
@@ -104,8 +105,15 @@ class Watcher extends EventEmitter {

 		const dev_port = await ports.find(10000);

-		const routes = create_routes();
-		create_main_manifests({ routes, dev_port });
+		try {
+			const routes = create_routes();
+			create_main_manifests({ routes, dev_port });
+		} catch (err) {
+			this.emit('fatal', <events.FatalEvent>{
+				message: err.message
+			});
+			return;
+		}

 		this.dev_server = new DevServer(dev_port);

@@ -113,6 +121,15 @@ class Watcher extends EventEmitter {
 			watch_files(locations.routes(), ['add', 'unlink'], () => {
 				const routes = create_routes();
 				create_main_manifests({ routes, dev_port });
+
+				try {
+					const routes = create_routes();
+					create_main_manifests({ routes, dev_port });
+				} catch (err) {
+					this.emit('error', <events.ErrorEvent>{
+						message: err.message
+					});
+				}
 			}),

 			watch_files(`${locations.app()}/template.html`, ['change'], () => {
@@ -130,6 +147,18 @@ class Watcher extends EventEmitter {
 		// TODO watch the configs themselves?
 		const compilers = create_compilers({ webpack: this.dirs.webpack });

+		let log = '';
+
+		const emitFatal = () => {
+			this.emit('fatal', <events.FatalEvent>{
+				message: `Server crashed`,
+				log
+			});
+
+			this.crashed = true;
+			this.proc = null;
+		};
+
 		this.watch(compilers.server, {
 			name: 'server',

@@ -142,22 +171,35 @@ class Watcher extends EventEmitter {
 				fs.writeFileSync(path.join(dest, 'server_info.json'), JSON.stringify(info, null, '  '));

 				this.deferreds.client.promise.then(() => {
-					this.dev_server.send({
-						status: 'completed'
-					});
-
 					const restart = () => {
-						ports.wait(this.port).then((() => {
-							this.emit('ready', <events.ReadyEvent>{
-								port: this.port,
-								process: this.proc
-							});
+						log = '';
+						this.crashed = false;

-							this.deferreds.server.fulfil();
-						}));
+						ports.wait(this.port)
+							.then((() => {
+								this.emit('ready', <events.ReadyEvent>{
+									port: this.port,
+									process: this.proc
+								});
+
+								this.deferreds.server.fulfil();
+
+								this.dev_server.send({
+									status: 'completed'
+								});
+							}))
+							.catch(err => {
+								if (this.crashed) return;
+
+								this.emit('fatal', <events.FatalEvent>{
+									message: `Server is not listening on port ${this.port}`,
+									log
+								});
+							});
 					};

 					if (this.proc) {
+						this.proc.removeListener('exit', emitFatal);
 						this.proc.kill();
 						this.proc.on('exit', restart);
 					} else {
@@ -172,6 +214,16 @@ class Watcher extends EventEmitter {
 						stdio: ['ipc']
 					});

+					this.proc.stdout.on('data', chunk => {
+						log += chunk;
+						this.emit('stdout', chunk);
+					});
+
+					this.proc.stderr.on('data', chunk => {
+						log += chunk;
+						this.emit('stderr', chunk);
+					});
+
 					this.proc.on('message', message => {
 						if (message.__sapper__ && message.event === 'basepath') {
 							this.emit('basepath', {
@@ -179,6 +231,8 @@ class Watcher extends EventEmitter {
 							});
 						}
 					});
+
+					this.proc.on('exit', emitFatal);
 				});
 			}
 		});
@@ -234,7 +288,7 @@ class Watcher extends EventEmitter {
 		if (this.closed) return;
 		this.closed = true;

-		this.dev_server.close();
+		if (this.dev_server) this.dev_server.close();

 		if (this.proc) this.proc.kill();
 		this.filewatchers.forEach(watcher => {
@@ -250,8 +304,8 @@ class Watcher extends EventEmitter {
 			this.restarting = true;

 			this.current_build = {
-				changed: new Set(),
-				rebuilding: new Set(),
+				changed: new Set([filename]),
+				rebuilding: new Set([type]),
 				unique_warnings: new Set(),
 				unique_errors: new Set()
 			};
@@ -284,7 +338,7 @@ class Watcher extends EventEmitter {
 			if (err) {
 				this.emit('error', <events.ErrorEvent>{
 					type: name,
-					error: err
+					message: err.message
 				});
 			} else {
 				const messages = format_messages(stats);
--- a/src/api/export.ts
+++ b/src/api/export.ts
@@ -118,9 +118,7 @@ async function execute(emitter: EventEmitter, {
 					}
 				});

-				for (const url of urls) {
-					await handle(url);
-				}
+				await Promise.all(urls.map(handle));
 			}
 		}
 	}
--- a/src/api/find_page.ts
+++ b/src/api/find_page.ts
@@ -2,15 +2,14 @@ import * as glob from 'glob';
 import { locations } from '../config';
 import { create_routes } from '../core';

-export function find_page(pathname: string, files: string[] = glob.sync('**/*.*', { cwd: locations.routes(), dot: true, nodir: true })) {
-	const routes = create_routes({ files });
+export function find_page(pathname: string, cwd = locations.routes()) {
+	const { pages } = create_routes(cwd);

-	for (let i = 0; i < routes.length; i += 1) {
-		const route = routes[i];
+	for (let i = 0; i < pages.length; i += 1) {
+		const page = pages[i];

-		if (route.pattern.test(pathname)) {
-			const page = route.handlers.find(handler => handler.type === 'page');
-			if (page) return page.file;
+		if (page.pattern.test(pathname)) {
+			return page.parts[page.parts.length - 1].component.file;
 		}
 	}
 }
--- a/src/api/interfaces.ts
+++ b/src/api/interfaces.ts
@@ -7,11 +7,12 @@ export type ReadyEvent = {

 export type ErrorEvent = {
 	type: string;
-	error: Error;
+	message: string;
 };

 export type FatalEvent = {
-	error: Error;
+	message: string;
+	log?: string;
 };

 export type InvalidEvent = {
--- a/src/api/utils/minify_html.ts
+++ b/src/api/utils/minify_html.ts
@@ -8,7 +8,7 @@ export function minify_html(html: string) {
 		decodeEntities: true,
 		html5: true,
 		minifyCSS: true,
-		minifyJS: true,
+		minifyJS: false,
 		removeAttributeQuotes: true,
 		removeComments: true,
 		removeOptionalTags: true,
--- a/src/cli/dev.ts
+++ b/src/cli/dev.ts
@@ -36,11 +36,12 @@ export function dev(opts: { port: number, open: boolean }) {

 		watcher.on('error', (event: events.ErrorEvent) => {
 			console.log(`${colors.red(`✗ ${event.type}`)}`);
-			console.log(`${colors.red(event.error.message)}`);
+			console.log(`${colors.red(event.message)}`);
 		});

 		watcher.on('fatal', (event: events.FatalEvent) => {
-			console.log(`${colors.bold.red(`> ${event.error.message}`)}`);
+			console.log(`${colors.bold.red(`> ${event.message}`)}`);
+			if (event.log) console.log(event.log);
 		});

 		watcher.on('build', (event: events.BuildEvent) => {
--- a/src/core/create_manifests.ts
+++ b/src/core/create_manifests.ts
@@ -3,10 +3,10 @@ import * as path from 'path';
 import * as glob from 'glob';
 import { posixify, write_if_changed } from './utils';
 import { dev, locations } from '../config';
-import { Route } from '../interfaces';
+import { Page, PageComponent, ServerRoute } from '../interfaces';

 export function create_main_manifests({ routes, dev_port }: {
-	routes: Route[];
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	dev_port?: number;
 }) {
 	const path_to_routes = path.relative(`${locations.app()}/manifest`, locations.routes());
@@ -14,12 +14,16 @@ export function create_main_manifests({ routes, dev_port }: {
 	const client_manifest = generate_client(routes, path_to_routes, dev_port);
 	const server_manifest = generate_server(routes, path_to_routes);

+	write_if_changed(
+		`${locations.app()}/manifest/default-layout.html`,
+		`<svelte:component this={child.component} {...child.props}/>`
+	);
 	write_if_changed(`${locations.app()}/manifest/client.js`, client_manifest);
 	write_if_changed(`${locations.app()}/manifest/server.js`, server_manifest);
 }

 export function create_serviceworker_manifest({ routes, client_files }: {
-	routes: Route[];
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	client_files: string[];
 }) {
 	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
@@ -32,38 +36,69 @@ export function create_serviceworker_manifest({ routes, client_files }: {

 		export const shell = [\n\t${client_files.map((x: string) => `"${x}"`).join(',\n\t')}\n];

-		export const routes = [\n\t${routes.filter((r: Route) => r.type === 'page' && !/^_[45]xx$/.test(r.id)).map((r: Route) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
+		export const routes = [\n\t${routes.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
 	`.replace(/^\t\t/gm, '').trim();

 	write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
 }

-function generate_client(routes: Route[], path_to_routes: string, dev_port?: number) {
+function right_pad(str: string, len: number) {
+	while (str.length < len) str += ' ';
+	return str;
+}
+
+function generate_client(
+	routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
+	path_to_routes: string,
+	dev_port?: number
+) {
+	const page_ids = new Set(routes.pages.map(page =>
+		page.pattern.toString()));
+
+	const server_routes_to_ignore = routes.server_routes.filter(route =>
+		!page_ids.has(route.pattern.toString()));
+
+	const len = Math.max(...routes.components.map(c => c.name.length));
+
 	let code = `
 		// This file is generated by Sapper — do not edit it!
-		export const routes = [
-			${routes
-				.map(route => {
-					const page = route.handlers.find(({ type }) => type === 'page');
+		import root from '${get_file(path_to_routes, routes.root)}';
+		import error from '${posixify(`${path_to_routes}/_error.html`)}';

-					if (!page) {
-						return `{ pattern: ${route.pattern}, ignore: true }`;
-					}
+		${routes.components.map(component =>
+		`const ${component.name} = () =>
+			import(/* webpackChunkName: "${component.name}" */ '${get_file(path_to_routes, component)}');`)
+		.join('\n')}

-					const file = posixify(`${path_to_routes}/${page.file}`);
+		export const manifest = {
+			ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],

-					if (route.id === '_4xx' || route.id === '_5xx') {
-						return `{ error: '${route.id.slice(1)}', load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
-					}
+			pages: [
+				${routes.pages.map(page => `{
+					// ${page.parts[page.parts.length - 1].component.file}
+					pattern: ${page.pattern},
+					parts: [
+						${page.parts.map(part => {
+							if (part === null) return 'null';

-					const params = route.params.length === 0
-						? '{}'
-						: `{ ${route.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`;
+							if (part.params.length > 0) {
+								const props = part.params.map((param, i) => `${param}: match[${i + 1}]`);
+								return `{ component: ${part.component.name}, params: match => ({ ${props.join(', ')} }) }`;
+							}

-					return `{ pattern: ${route.pattern}, params: ${route.params.length > 0 ? `match` : `()`} => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
-				})
-				.join(',\n\t')}
-		];`.replace(/^\t\t/gm, '').trim();
+							return `{ component: ${part.component.name} }`;
+						}).join(',\n\t\t\t\t\t\t')}
+					]
+				}`).join(',\n\n\t\t\t\t')}
+			],
+
+			root,
+
+			error
+		};
+
+		// this is included for legacy reasons
+		export const routes = {};`.replace(/^\t\t/gm, '').trim();

 	if (dev()) {
 		const sapper_dev_client = posixify(
@@ -82,44 +117,74 @@ function generate_client(routes: Route[], path_to_routes: string, dev_port?: num
 	return code;
 }

-function generate_server(routes: Route[], path_to_routes: string) {
+function generate_server(
+	routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
+	path_to_routes: string
+) {
+	const imports = [].concat(
+		routes.server_routes.map(route =>
+			`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
+		routes.components.map(component =>
+			`import ${component.name} from '${get_file(path_to_routes, component)}';`),
+		`import root from '${get_file(path_to_routes, routes.root)}';`,
+		`import error from '${posixify(`${path_to_routes}/_error.html`)}';`
+	);
+
 	let code = `
 		// This file is generated by Sapper — do not edit it!
-		${routes
-			.map(route =>
-				route.handlers
-					.map(({ type, file }, index) => {
-						const module = posixify(`${path_to_routes}/${file}`);
+		${imports.join('\n')}

-						return type === 'page'
-							? `import ${route.id}${index} from '${module}';`
-							: `import * as ${route.id}${index} from '${module}';`;
-					})
-					.join('\n')
-			)
-			.join('\n')}
+		export const manifest = {
+			server_routes: [
+				${routes.server_routes.map(route => `{
+					// ${route.file}
+					pattern: ${route.pattern},
+					handlers: ${route.name},
+					params: ${route.params.length > 0
+						? `match => ({ ${route.params.map((param, i) => `${param}: match[${i + 1}]`).join(', ')} })`
+						: `() => ({})`}
+				}`).join(',\n\n\t\t\t\t')}
+			],

-		export const routes = [
-			${routes
-				.map(route => {
-					const handlers = route.handlers
-						.map(({ type }, index) =>
-							`{ type: '${type}', module: ${route.id}${index} }`)
-						.join(', ');
+			pages: [
+				${routes.pages.map(page => `{
+					// ${page.parts[page.parts.length - 1].component.file}
+					pattern: ${page.pattern},
+					parts: [
+						${page.parts.map(part => {
+							if (part === null) return 'null';

-					if (route.id === '_4xx' || route.id === '_5xx') {
-						return `{ error: '${route.id.slice(1)}', handlers: [${handlers}] }`;
-					}
+							const props = [
+								`name: "${part.component.name}"`,
+								`component: ${part.component.name}`
+							];

-					const params = route.params.length === 0
-						? '{}'
-						: `{ ${route.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`;
+							if (part.params.length > 0) {
+								const params = part.params.map((param, i) => `${param}: match[${i + 1}]`);
+								props.push(`params: match => ({ ${params.join(', ')} })`);
+							}

-					return `{ id: '${route.id}', pattern: ${route.pattern}, params: ${route.params.length > 0 ? `match` : `()`} => (${params}), handlers: [${handlers}] }`;
-				})
-				.join(',\n\t')
-			}
-		];`.replace(/^\t\t/gm, '').trim();
+							return `{ ${props.join(', ')} }`;
+						}).join(',\n\t\t\t\t\t\t')}
+					]
+				}`).join(',\n\n\t\t\t\t')}
+			],
+
+			root,
+
+			error
+		};
+
+		// this is included for legacy reasons
+		export const routes = {};`.replace(/^\t\t/gm, '').trim();

 	return code;
+}
+
+function get_file(path_to_routes: string, component: PageComponent) {
+	if (component.default) {
+		return `./default-layout.html`;
+	}
+
+	return posixify(`${path_to_routes}/${component.file}`);
 }
--- a/src/core/create_routes.ts
+++ b/src/core/create_routes.ts
@@ -1,154 +1,300 @@
+import * as fs from 'fs';
 import * as path from 'path';
-import glob from 'glob';
 import { locations } from '../config';
-import { Route } from '../interfaces';
+import { Page, PageComponent, ServerRoute } from '../interfaces';
+import { posixify } from './utils';

-export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), dot: true, nodir: true }) }) {
-	const routes: Route[] = files
-		.filter((file: string) => !/(^|\/|\\)_/.test(file))
-		.map((file: string) => {
-			if (/(^|\/|\\)(_|\.(?!well-known))/.test(file)) return;
+const default_layout_file = posixify(path.resolve(
+	__dirname,
+	'../components/default-layout.html'
+));

-			if (/]\[/.test(file)) {
-				throw new Error(`Invalid route ${file} — parameters must be separated`);
-			}
+export default function create_routes(cwd = locations.routes()) {
+	const components: PageComponent[] = [];
+	const pages: Page[] = [];
+	const server_routes: ServerRoute[] = [];

-			const base = file.replace(/\.[^/.]+$/, '');
-			const parts = base.split('/'); // glob output is always posix-style
-			if (parts[parts.length - 1] === 'index') parts.pop();
+	const default_layout: PageComponent = {
+		default: true,
+		name: '_default_layout',
+		file: null
+	};

-			return {
-				files: [file],
-				base,
-				parts
-			};
-		})
-		.filter(Boolean)
-		.filter((a, index, array) => {
-			const found = array.slice(index + 1).find(b => a.base === b.base);
-			if (found) found.files.push(...a.files);
-			return !found;
-		})
-		.sort((a, b) => {
-			if (a.parts[0] === '4xx' || a.parts[0] === '5xx') return -1;
-			if (b.parts[0] === '4xx' || b.parts[0] === '5xx') return 1;
+	function walk(
+		dir: string,
+		parent_segments: Part[][],
+		parent_params: string[],
+		stack: Array<{
+			component: PageComponent,
+			params: string[]
+		}>
+	) {
+		const items = fs.readdirSync(dir)
+			.map(basename => {
+				const resolved = path.join(dir, basename);
+				const file = path.relative(cwd, resolved);
+				const is_dir = fs.statSync(resolved).isDirectory();

-			const max = Math.max(a.parts.length, b.parts.length);
+				const segment = is_dir
+					? basename
+					: basename.slice(0, -path.extname(basename).length);

-			for (let i = 0; i < max; i += 1) {
-				const a_part = a.parts[i];
-				const b_part = b.parts[i];
+				const parts = get_parts(segment);
+				const is_index = is_dir ? false : basename.startsWith('index.');
+				const is_page = path.extname(basename) === '.html';

-				if (!a_part) return -1;
-				if (!b_part) return 1;
-
-				const a_sub_parts = get_sub_parts(a_part);
-				const b_sub_parts = get_sub_parts(b_part);
-				const max = Math.max(a_sub_parts.length, b_sub_parts.length);
-
-				for (let i = 0; i < max; i += 1) {
-					const a_sub_part = a_sub_parts[i];
-					const b_sub_part = b_sub_parts[i];
-
-					if (!a_sub_part) return 1; // b is more specific, so goes first
-					if (!b_sub_part) return -1;
-
-					if (a_sub_part.dynamic !== b_sub_part.dynamic) {
-						return a_sub_part.dynamic ? 1 : -1;
+				parts.forEach(part => {
+					if (/\]\[/.test(part.content)) {
+						throw new Error(`Invalid route ${file} — parameters must be separated`);
 					}

-					if (!a_sub_part.dynamic && a_sub_part.content !== b_sub_part.content) {
-						return (
-							(b_sub_part.content.length - a_sub_part.content.length) ||
-							(a_sub_part.content < b_sub_part.content ? -1 : 1)
-						);
+					if (part.qualifier && /[\(\)\?\:]/.test(part.qualifier.slice(1, -1))) {
+						throw new Error(`Invalid route ${file} — cannot use (, ), ? or : in route qualifiers`);
 					}
-				}
-			}
-
-			throw new Error(`The ${a.base} and ${b.base} routes clash`);
-		})
-		.map(({ files, base, parts }) => {
-			const id = (
-				parts.join('_').replace(/[[\]]/g, '$').replace(/^\d/, '_$&').replace(/[^a-zA-Z0-9_$]/g, '_')
-			 ) || '_';
-
-			const params: string[] = [];
-			const param_pattern = /\[([^\]]+)\]/g;
-			let match;
-			while (match = param_pattern.exec(base)) {
-				params.push(match[1]);
-			}
-
-			// TODO can we do all this with sub-parts? or does
-			// nesting make that impossible?
-			let pattern_string = '';
-			let i = parts.length;
-			let nested = true;
-			while (i--) {
-				const part = encodeURI(parts[i].normalize()).replace(/\?/g, '%3F').replace(/#/g, '%23').replace(/%5B/g, '[').replace(/%5D/g, ']');
-				const dynamic = ~part.indexOf('[');
-
-				if (dynamic) {
-					const matcher = part.replace(param_pattern, `([^\/]+?)`);
-					pattern_string = nested ? `(?:\\/${matcher}${pattern_string})?` : `\\/${matcher}${pattern_string}`;
-				} else {
-					nested = false;
-					pattern_string = `\\/${part}${pattern_string}`;
-				}
-			}
-
-			const pattern = new RegExp(`^${pattern_string}\\/?$`);
-
-			const test = (url: string) => pattern.test(url);
-
-			const exec = (url: string) => {
-				const match = pattern.exec(url);
-				if (!match) return;
-
-				const result: Record<string, string> = {};
-				params.forEach((param, i) => {
-					result[param] = match[i + 1];
 				});

-				return result;
-			};
+				return {
+					basename,
+					parts,
+					file: posixify(file),
+					is_dir,
+					is_index,
+					is_page
+				};
+			})
+			.sort(comparator);

-			return {
-				id,
-				handlers: files.map(file => ({
-					type: path.extname(file) === '.html' ? 'page' : 'route',
-					file
-				})).sort((a, b) => {
-					if (a.type === 'page' && b.type === 'route') {
-						return 1;
+		items.forEach(item => {
+			if (item.basename[0] === '_') return;
+
+			if (item.basename[0] === '.') {
+				if (item.file !== '.well-known') return;
+			}
+
+			const segments = parent_segments.slice();
+
+			if (item.is_index && segments.length > 0) {
+				const last_segment = segments[segments.length - 1].slice();
+				const suffix = item.basename
+					.slice(0, -path.extname(item.basename).length).
+					replace('index', '');
+
+				if (suffix) {
+					const last_part = last_segment[last_segment.length - 1];
+					if (last_part.dynamic) {
+						last_segment.push({ dynamic: false, content: suffix });
+					} else {
+						last_segment[last_segment.length - 1] = {
+							dynamic: false,
+							content: `${last_part.content}${suffix}`
+						};
 					}

-					if (a.type === 'route' && b.type === 'page') {
-						return -1;
-					}
+					segments[segments.length - 1] = last_segment;
+				}
+			} else {
+				segments.push(item.parts);
+			}

-					return 0;
-				}),
-				pattern,
-				test,
-				exec,
-				parts,
-				params
-			};
+			const params = parent_params.slice();
+			params.push(...item.parts.filter(p => p.dynamic).map(p => p.content));
+
+			if (item.is_dir) {
+				const index = path.join(dir, item.basename, '_layout.html');
+
+				const component = fs.existsSync(index) && {
+					name: `${get_slug(item.file)}__layout`,
+					file: `${item.file}/_layout.html`
+				};
+
+				if (component) components.push(component);
+
+				walk(
+					path.join(dir, item.basename),
+					segments,
+					params,
+					component
+						? stack.concat({ component, params })
+						: stack.concat(null)
+				);
+			}
+
+			else if (item.is_page) {
+				const component = {
+					name: get_slug(item.file),
+					file: item.file
+				};
+
+				const parts = stack.concat({
+					component,
+					params
+				});
+
+				components.push(component);
+				if (item.basename === 'index.html') {
+					pages.push({
+						pattern: get_pattern(parent_segments),
+						parts
+					});
+				} else {
+					pages.push({
+						pattern: get_pattern(segments),
+						parts
+					});
+				}
+			}
+
+			else {
+				server_routes.push({
+					name: `route_${get_slug(item.file)}`,
+					pattern: get_pattern(segments),
+					file: item.file,
+					params: params
+				});
+			}
 		});
+	}

-	return routes;
+	const root_file = path.join(cwd, '_layout.html');
+	const root = fs.existsSync(root_file)
+		? {
+			name: 'main',
+			file: '_layout.html'
+		}
+		: default_layout;
+
+	walk(cwd, [], [], []);
+
+	// check for clashes
+	const seen_pages: Map<string, Page> = new Map();
+	pages.forEach(page => {
+		const pattern = page.pattern.toString();
+		if (seen_pages.has(pattern)) {
+			const file = page.parts.pop().component.file;
+			const other_page = seen_pages.get(pattern);
+			const other_file = other_page.parts.pop().component.file;
+
+			throw new Error(`The ${other_file} and ${file} pages clash`);
+		}
+
+		seen_pages.set(pattern, page);
+	});
+
+	const seen_routes: Map<string, ServerRoute> = new Map();
+	server_routes.forEach(route => {
+		const pattern = route.pattern.toString();
+		if (seen_routes.has(pattern)) {
+			const other_route = seen_routes.get(pattern);
+			throw new Error(`The ${other_route.file} and ${route.file} routes clash`);
+		}
+
+		seen_routes.set(pattern, route);
+	});
+
+	return {
+		root,
+		components,
+		pages,
+		server_routes
+	};
 }

-function get_sub_parts(part: string) {
-	return part.split(/[\[\]]/)
-		.map((content, i) => {
-			if (!content) return null;
+type Part = {
+	content: string;
+	dynamic: boolean;
+	qualifier?: string;
+};
+
+function comparator(
+	a: { basename: string, parts: Part[], file: string, is_index: boolean },
+	b: { basename: string, parts: Part[], file: string, is_index: boolean }
+) {
+	if (a.is_index !== b.is_index) return a.is_index ? -1 : 1;
+
+	const max = Math.max(a.parts.length, b.parts.length);
+
+	for (let i = 0; i < max; i += 1) {
+		const a_sub_part = a.parts[i];
+		const b_sub_part = b.parts[i];
+
+		if (!a_sub_part) return 1; // b is more specific, so goes first
+		if (!b_sub_part) return -1;
+
+		if (a_sub_part.dynamic !== b_sub_part.dynamic) {
+			return a_sub_part.dynamic ? 1 : -1;
+		}
+
+		if (!a_sub_part.dynamic && a_sub_part.content !== b_sub_part.content) {
+			return (
+				(b_sub_part.content.length - a_sub_part.content.length) ||
+				(a_sub_part.content < b_sub_part.content ? -1 : 1)
+			);
+		}
+
+		// If both parts dynamic, check for regexp patterns
+		if (a_sub_part.dynamic && b_sub_part.dynamic) {
+			const regexp_pattern = /\((.*?)\)/;
+			const a_match = regexp_pattern.exec(a_sub_part.content);
+			const b_match = regexp_pattern.exec(b_sub_part.content);
+
+			if (!a_match && b_match) {
+				return 1; // No regexp, so less specific than b
+			}
+			if (!b_match && a_match) {
+				return -1;
+			}
+			if (a_match && b_match && a_match[1] !== b_match[1]) {
+				return b_match[1].length - a_match[1].length;
+			}
+		}
+	}
+}
+
+function get_parts(part: string): Part[] {
+	return part.split(/\[(.+)\]/)
+		.map((str, i) => {
+			if (!str) return null;
+			const dynamic = i % 2 === 1;
+
+			const [, content, qualifier] = dynamic
+				? /([^(]+)(\(.+\))?$/.exec(str)
+				: [, str, null];
+
 			return {
 				content,
-				dynamic: i % 2 === 1
+				dynamic,
+				qualifier
 			};
 		})
 		.filter(Boolean);
+}
+
+function get_slug(file: string) {
+	return file
+		.replace(/[\\\/]index/, '')
+		.replace(/_default([\/\\index])?\.html$/, 'index')
+		.replace(/[\/\\]/g, '_')
+		.replace(/\.\w+$/, '')
+		.replace(/\[([^(]+)(?:\([^(]+\))?\]/, '$$$1')
+		.replace(/[^a-zA-Z0-9_$]/g, c => {
+			return c === '.' ? '_' : `$${c.charCodeAt(0)}`
+		});
+}
+
+function get_pattern(segments: Part[][]) {
+	return new RegExp(
+		`^` +
+		segments.map(segment => {
+			return '\\/' + segment.map(part => {
+				return part.dynamic
+					? part.qualifier || '([^\\/]+?)'
+					: encodeURI(part.content.normalize())
+						.replace(/\?/g, '%3F')
+						.replace(/#/g, '%23')
+						.replace(/%5B/g, '[')
+						.replace(/%5D/g, ']');
+			}).join('');
+		}).join('') +
+		'\\\/?$'
+	);
 }
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -18,4 +18,25 @@ export type Template = {

 export type Store = {
 	get: () => any;
+};
+
+export type PageComponent = {
+	default?: boolean;
+	name: string;
+	file: string;
+};
+
+export type Page = {
+	pattern: RegExp;
+	parts: Array<{
+		component: PageComponent;
+		params: string[];
+	}>
+};
+
+export type ServerRoute = {
+	name: string;
+	pattern: RegExp;
+	file: string;
+	params: string[];
 };
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -11,13 +11,26 @@ import sourceMapSupport from 'source-map-support';

 sourceMapSupport.install();

-type RouteObject = {
-	id: string;
-	type: 'page' | 'route';
+type ServerRoute = {
 	pattern: RegExp;
+	handlers: Record<string, Handler>;
 	params: (match: RegExpMatchArray) => Record<string, string>;
-	module: Component;
-	error?: string;
+};
+
+type Page = {
+	pattern: RegExp;
+	parts: Array<{
+		name: string;
+		component: Component;
+		params?: (match: RegExpMatchArray) => Record<string, string>;
+	}>
+};
+
+type Manifest = {
+	server_routes: ServerRoute[];
+	pages: Page[];
+	root: Component;
+	error: Component;
 }

 type Handler = (req: Req, res: ServerResponse, next: () => void) => void;
@@ -26,6 +39,20 @@ type Store = {
 	get: () => any
 };

+type Props = {
+	path: string;
+	query: Record<string, string>;
+	params: Record<string, string>;
+	error?: { message: string };
+	status?: number;
+	child: {
+		segment: string;
+		component: Component;
+		props: Props;
+	};
+	[key: string]: any;
+};
+
 interface Req extends ClientRequest {
 	url: string;
 	baseUrl: string;
@@ -33,6 +60,7 @@ interface Req extends ClientRequest {
 	method: string;
 	path: string;
 	params: Record<string, string>;
+	query: Record<string, string>;
 	headers: Record<string, string>;
 }

@@ -45,26 +73,31 @@ interface Component {
 	preload: (data: any) => any | Promise<any>
 }

-export default function middleware({ App, routes, store }: {
-	App: Component,
-	routes: RouteObject[],
-	store: (req: Req) => Store
+export default function middleware(opts: {
+	manifest: Manifest,
+	store: (req: Req) => Store,
+	routes?: any // legacy
 }) {
-	if (!App) {
-		throw new Error(`As of 0.12, you must supply an App component to Sapper — see https://sapper.svelte.technology/guide#0-11-to-0-12 for more information`);
+	if (opts.routes) {
+		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
 	}

 	const output = locations.dest();

-	const client_assets = JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8'));
+	const { manifest, store } = opts;

 	let emitted_basepath = false;

 	const middleware = compose_handlers([
 		(req: Req, res: ServerResponse, next: () => void) => {
 			if (req.baseUrl === undefined) {
-				req.baseUrl = req.originalUrl
-					? req.originalUrl.slice(0, -req.url.length)
+				let { originalUrl } = req;
+				if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
+					originalUrl += '/';
+				}
+
+				req.baseUrl = originalUrl
+					? originalUrl.slice(0, -req.url.length)
 					: '';
 			}

@@ -105,7 +138,8 @@ export default function middleware({ App, routes, store }: {
 			cache_control: 'max-age=31536000'
 		}),

-		get_route_handler(client_assets, App, routes, store)
+		get_server_route_handler(manifest.server_routes),
+		get_page_handler(manifest, store)
 	].filter(Boolean));

 	return middleware;
@@ -148,292 +182,326 @@ function serve({ prefix, pathname, cache_control }: {
 	};
 }

-function get_route_handler(chunks: Record<string, string>, App: Component, routes: RouteObject[], store_getter: (req: Req) => Store) {
-	const template = dev()
-		? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
-		: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
-
-	function handle_route(route: RouteObject, req: Req, res: ServerResponse) {
+function get_server_route_handler(routes: ServerRoute[]) {
+	function handle_route(route: ServerRoute, req: Req, res: ServerResponse, next: () => void) {
 		req.params = route.params(route.pattern.exec(req.path));

-		const handlers = route.handlers[Symbol.iterator]();
+		const method = req.method.toLowerCase();
+		// 'delete' cannot be exported from a module because it is a keyword,
+		// so check for 'del' instead
+		const method_export = method === 'delete' ? 'del' : method;
+		const handle_method = route.handlers[method_export];
+		if (handle_method) {
+			if (process.env.SAPPER_EXPORT) {
+				const { write, end, setHeader } = res;
+				const chunks: any[] = [];
+				const headers: Record<string, string> = {};

-		function next() {
-			try {
-				const { value: handler, done } = handlers.next();
+				// intercept data so that it can be exported
+				res.write = function(chunk: any) {
+					chunks.push(new Buffer(chunk));
+					write.apply(res, arguments);
+				};

-				if (done) {
-					handle_error(req, res, 404, 'Not found');
-					return;
-				}
+				res.setHeader = function(name: string, value: string) {
+					headers[name.toLowerCase()] = value;
+					setHeader.apply(res, arguments);
+				};

-				const mod = handler.module;
+				res.end = function(chunk?: any) {
+					if (chunk) chunks.push(new Buffer(chunk));
+					end.apply(res, arguments);

-				if (handler.type === 'page') {
-					res.setHeader('Content-Type', 'text/html');
-
-					// preload main.js and current route
-					// TODO detect other stuff we can preload? images, CSS, fonts?
-					const link = []
-						.concat(chunks.main, chunks[route.id])
-						.filter(file => !file.match(/\.map$/))
-						.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
-						.join(', ');
-
-					res.setHeader('Link', link);
-
-					const store = store_getter ? store_getter(req) : null;
-					const props = { params: req.params, query: req.query, path: req.path };
-
-					let redirect: { statusCode: number, location: string };
-					let error: { statusCode: number, message: Error | string };
-
-					Promise.resolve(
-						mod.preload ? mod.preload.call({
-							redirect: (statusCode: number, location: string) => {
-								redirect = { statusCode, location };
-							},
-							error: (statusCode: number, message: Error | string) => {
-								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 + '/'  :''}`);
-
-								if (opts) {
-									opts = Object.assign({}, opts);
-
-									const include_cookies = (
-										opts.credentials === 'include' ||
-										opts.credentials === 'same-origin' && parsed.origin === `http://127.0.0.1:${process.env.PORT}`
-									);
-
-									if (include_cookies) {
-										const cookies: Record<string, string> = {};
-										if (!opts.headers) opts.headers = {};
-
-										const str = []
-											.concat(
-												cookie.parse(req.headers.cookie || ''),
-												cookie.parse(opts.headers.cookie || ''),
-												cookie.parse(res.getHeader('Set-Cookie') || '')
-											)
-											.map(cookie => {
-												return Object.keys(cookie)
-													.map(name => `${name}=${encodeURIComponent(cookie[name])}`)
-													.join('; ');
-											})
-											.filter(Boolean)
-											.join(', ');
-
-										opts.headers.cookie = str;
-									}
-								}
-
-								return fetch(parsed.href, opts);
-							},
-						store
-						}, req) : {}
-					).catch(err => {
-						error = { statusCode: 500, message: err };
-					}).then(preloaded => {
-						if (redirect) {
-							res.statusCode = redirect.statusCode;
-							res.setHeader('Location', `${req.baseUrl}/${redirect.location}`);
-							res.end();
-
-							return;
-						}
-
-						if (error) {
-							handle_error(req, res, error.statusCode, error.message);
-							return;
-						}
-
-						const serialized = {
-							preloaded: mod.preload && try_serialize(preloaded),
-							store: store && try_serialize(store.get())
-						};
-						Object.assign(props, preloaded);
-
-						const { html, head, css } = App.render({ Page: mod, props }, {
-							store
-						});
-
-						let scripts = []
-							.concat(chunks.main) // chunks main might be an array. it might not! thanks, webpack
-							.filter(file => !file.match(/\.map$/))
-							.map(file => `<script src='${req.baseUrl}/client/${file}'></script>`)
-							.join('');
-
-						let inline_script = `__SAPPER__={${[
-							`baseUrl: "${req.baseUrl}"`,
-							serialized.preloaded && `preloaded: ${serialized.preloaded}`,
-							serialized.store && `store: ${serialized.store}`
-						].filter(Boolean).join(',')}};`;
-
-						const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
-						if (has_service_worker) {
-							inline_script += `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
-						}
-
-						const page = template()
-							.replace('%sapper.base%', `<base href="${req.baseUrl}/">`)
-							.replace('%sapper.scripts%', `<script>${inline_script}</script>${scripts}`)
-							.replace('%sapper.html%', html)
-							.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
-							.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));
-
-						res.end(page);
-
-						if (process.send) {
-							process.send({
-								__sapper__: true,
-								event: 'file',
-								url: req.url,
-								method: req.method,
-								status: 200,
-								type: 'text/html',
-								body: page
-							});
-						}
+					process.send({
+						__sapper__: true,
+						event: 'file',
+						url: req.url,
+						method: req.method,
+						status: res.statusCode,
+						type: headers['content-type'],
+						body: Buffer.concat(chunks).toString()
 					});
+				};
+			}
+
+			const handle_next = (err?: Error) => {
+				if (err) {
+					res.statusCode = 500;
+					res.end(err.message);
+				} else {
+					process.nextTick(next);
 				}
+			};

-				else {
-					const method = req.method.toLowerCase();
-					// 'delete' cannot be exported from a module because it is a keyword,
-					// so check for 'del' instead
-					const method_export = method === 'delete' ? 'del' : method;
-					const handle_method = mod[method_export];
-					if (handle_method) {
-						if (process.env.SAPPER_EXPORT) {
-							const { write, end, setHeader } = res;
-							const chunks: any[] = [];
-							const headers: Record<string, string> = {};
+			try {
+				handle_method(req, res, handle_next);
+			} catch (err) {
+				handle_next(err);
+			}
+		} else {
+			// no matching handler for method
+			process.nextTick(next);
+		}
+	}

-							// intercept data so that it can be exported
-							res.write = function(chunk: any) {
-								chunks.push(new Buffer(chunk));
-								write.apply(res, arguments);
-							};
-
-							res.setHeader = function(name: string, value: string) {
-								headers[name.toLowerCase()] = value;
-								setHeader.apply(res, arguments);
-							};
-
-							res.end = function(chunk?: any) {
-								if (chunk) chunks.push(new Buffer(chunk));
-								end.apply(res, arguments);
-
-								process.send({
-									__sapper__: true,
-									event: 'file',
-									url: req.url,
-									method: req.method,
-									status: res.statusCode,
-									type: headers['content-type'],
-									body: Buffer.concat(chunks).toString()
-								});
-							};
-						}
-
-						const handle_bad_result = (err?: Error) => {
-							if (err) {
-								console.error(err.stack);
-								res.statusCode = 500;
-								res.end(err.message);
-							} else {
-								process.nextTick(next);
-							}
-						};
-
-						try {
-							handle_method(req, res, handle_bad_result);
-						} catch (err) {
-							handle_bad_result(err);
-						}
-					} else {
-						// no matching handler for method
-						process.nextTick(next);
-					}
-				}
-			} catch (error) {
-				handle_error(req, res, 500, error);
+	return function find_route(req: Req, res: ServerResponse, next: () => void) {
+		for (const route of routes) {
+			if (route.pattern.test(req.path)) {
+				handle_route(route, req, res, next);
+				return;
 			}
 		}

 		next();
+	};
+}
+
+function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store) {
+	const output = locations.dest();
+
+	const get_chunks = dev()
+		? () => JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8'))
+		: (assets => () => assets)(JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8')));
+
+	const template = dev()
+		? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
+		: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
+
+	const { server_routes, pages } = manifest;
+	const error_route = manifest.error;
+
+	function handle_error(req: Req, res: ServerResponse, statusCode: number, error: Error | string) {
+		handle_page({
+			pattern: null,
+			parts: [
+				{ name: null, component: error_route }
+			]
+		}, req, res, statusCode, error);
 	}

-	const not_found_route = routes.find((route: RouteObject) => route.error === '4xx');
-	const error_route = routes.find((route: RouteObject) => route.error === '5xx');
+	function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
+		const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
+		const match = error ? null : page.pattern.exec(req.path);
+
+		const chunks: Record<string, string | string[]> = get_chunks();

-	function handle_error(req: Req, res: ServerResponse, statusCode: number, message: Error | string) {
-		res.statusCode = statusCode;
 		res.setHeader('Content-Type', 'text/html');

-		const error = message instanceof Error ? message : new Error(message);
+		// preload main.js and current route
+		// TODO detect other stuff we can preload? images, CSS, fonts?
+		let preloaded_chunks = Array.isArray(chunks.main) ? chunks.main : [chunks.main];
+		if (!error) {
+			page.parts.forEach(part => {
+				if (!part) return;

-		const not_found = statusCode >= 400 && statusCode < 500;
-
-		const route = not_found
-			? not_found_route
-			: error_route;
-
-		function render_page({ head, css, html }) {
-			const page = template()
-				.replace('%sapper.base%', `<base href="${req.baseUrl}/">`)
-				.replace('%sapper.scripts%', `<script>__SAPPER__={baseUrl: "${req.baseUrl}"}</script><script src='${req.baseUrl}/client/${chunks.main}'></script>`)
-				.replace('%sapper.html%', html)
-				.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
-				.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));
-
-			res.end(page);
+				// using concat because it could be a string or an array. thanks webpack!
+				preloaded_chunks = preloaded_chunks.concat(chunks[part.name]);
+			});
 		}

-		function handle_notfound() {
-			const title: string = not_found
-				? 'Not found'
-				: `Internal server error: ${error.message}`;
+		const link = preloaded_chunks
+			.filter(file => !file.match(/\.map$/))
+			.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
+			.join(', ');

-			render_page({ head: '', css: null, html: title });
-		}
+		res.setHeader('Link', link);

-		if (route) {
-			const handlers = route.handlers[Symbol.iterator]();
+		const store = store_getter ? store_getter(req) : null;

-			function next() {
-				const { value: handler, done } = handlers.next();
+		let redirect: { statusCode: number, location: string };
+		let preload_error: { statusCode: number, message: Error | string };

-				if (done) {
-					handle_notfound();
-				} else if (handler.type === 'page') {
-					render_page(handler.module.render({
-						status: statusCode,
-						error
-					}, {
-						store: store_getter && store_getter(req)
-					}));
-				} else {
-					const handle_method = mod[method_export];
-					if (handle_method) {
-						handle_method(req, res, next);
-					} else {
-						next();
+		const preload_context = {
+			redirect: (statusCode: number, location: string) => {
+				if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
+					throw new Error(`Conflicting redirects`);
+				}
+				redirect = { statusCode, location };
+			},
+			error: (statusCode: number, message: Error | string) => {
+				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 + '/' :''}`);
+
+				if (opts) {
+					opts = Object.assign({}, opts);
+
+					const include_cookies = (
+						opts.credentials === 'include' ||
+						opts.credentials === 'same-origin' && parsed.origin === `http://127.0.0.1:${process.env.PORT}`
+					);
+
+					if (include_cookies) {
+						const cookies: Record<string, string> = {};
+						if (!opts.headers) opts.headers = {};
+
+						const str = []
+							.concat(
+								cookie.parse(req.headers.cookie || ''),
+								cookie.parse(opts.headers.cookie || ''),
+								cookie.parse(res.getHeader('Set-Cookie') || '')
+							)
+							.map(cookie => {
+								return Object.keys(cookie)
+									.map(name => `${name}=${encodeURIComponent(cookie[name])}`)
+									.join('; ');
+							})
+							.filter(Boolean)
+							.join(', ');
+
+						opts.headers.cookie = str;
 					}
 				}
+
+				return fetch(parsed.href, opts);
+			},
+			store
+		};
+
+		const root_preloaded = manifest.root.preload
+			? manifest.root.preload.call(preload_context, {
+				path: req.path,
+				query: req.query,
+				params: {}
+			})
+			: {};
+
+		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) : {}
+				})
+				: {};
+		}))).catch(err => {
+			preload_error = { statusCode: 500, message: err };
+			return []; // appease TypeScript
+		}).then(preloaded => {
+			if (redirect) {
+				res.statusCode = redirect.statusCode;
+				res.setHeader('Location', `${req.baseUrl}/${redirect.location}`);
+				res.end();
+
+				return;
 			}

-			next();
-		} else {
-			handle_notfound();
-		}
+			if (preload_error) {
+				handle_error(req, res, preload_error.statusCode, preload_error.message);
+				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
+			};
+
+			if (error) {
+				props.error = error instanceof Error ? error : { message: error };
+				props.status = status;
+			}
+
+			const data = Object.assign({}, props, preloaded[0], {
+				params: {},
+				child: {
+					segment: segments[0]
+				}
+			});
+
+			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
+			});
+
+			let scripts = []
+				.concat(chunks.main) // chunks main might be an array. it might not! thanks, webpack
+				.filter(file => !file.match(/\.map$/))
+				.map(file => `<script src='${req.baseUrl}/client/${file}'></script>`)
+				.join('');
+
+			let inline_script = `__SAPPER__={${[
+				error && `error:1`,
+				`baseUrl:"${req.baseUrl}"`,
+				serialized.preloaded && `preloaded:${serialized.preloaded}`,
+				serialized.store && `store:${serialized.store}`
+			].filter(Boolean).join(',')}};`;
+
+			const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
+			if (has_service_worker) {
+				inline_script += `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
+			}
+
+			const body = template()
+				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
+				.replace('%sapper.scripts%', () => `<script>${inline_script}</script>${scripts}`)
+				.replace('%sapper.html%', () => html)
+				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
+				.replace('%sapper.styles%', () => (css && css.code ? `<style>${css.code}</style>` : ''));
+
+			res.statusCode = status;
+			res.end(body);
+
+			if (process.send) {
+				process.send({
+					__sapper__: true,
+					event: 'file',
+					url: req.url,
+					method: req.method,
+					status: 200,
+					type: 'text/html',
+					body
+				});
+			}
+		}).catch(err => {
+			if (error) {
+				// we encountered an error while rendering the error page — oops
+				res.statusCode = 500;
+				res.end(`<pre>${escape_html(err.message)}</pre>`);
+			} else {
+				handle_error(req, res, 500, err);
+			}
+		});
 	}

 	return function find_route(req: Req, res: ServerResponse) {
-		for (const route of routes) {
-			if (!route.error && route.pattern.test(req.path)) return handle_route(route, req, res);
+		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;
+				}
+			}
 		}

 		handle_error(req, res, 404, 'Not found');
@@ -467,3 +535,15 @@ function try_serialize(data: any) {
 		return null;
 	}
 }
+
+function escape_html(html: string) {
+	const chars: Record<string, string> = {
+		'"' : 'quot',
+		"'": '#39',
+		'&': 'amp',
+		'<' : 'lt',
+		'>' : 'gt'
+	};
+
+	return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
+}
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -1,14 +1,39 @@
 import { detach, findAnchor, scroll_state, which } from './utils';
-import { Component, ComponentConstructor, Params, Query, Route, RouteData, ScrollPosition, Store, Target } from './interfaces';
+import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target } from './interfaces';

-const manifest = typeof window !== 'undefined' && window.__SAPPER__;
+const initial_data = typeof window !== 'undefined' && window.__SAPPER__;

-export let App: ComponentConstructor;
-export let component: Component;
+export let root: Component;
 let target: Node;
 let store: Store;
-let routes: Route[];
-let errors: { '4xx': Route, '5xx': Route };
+let manifest: Manifest;
+let segments: string[] = [];
+
+type RootProps = {
+	path: string;
+	params: Record<string, string>;
+	query: Record<string, string>;
+	child: Child;
+};
+
+type Child = {
+	segment?: string;
+	props?: any;
+	component?: Component;
+};
+
+const root_props: RootProps = {
+	path: null,
+	params: null,
+	query: null,
+	child: {
+		segment: null,
+		component: null,
+		props: {}
+	}
+};
+
+export { root as component }; // legacy reasons — drop in a future version

 const history = typeof window !== 'undefined' ? window.history : {
 	pushState: (state: any, title: string, href: string) => {},
@@ -26,42 +51,50 @@ if ('scrollRestoration' in history) {

 function select_route(url: URL): Target {
 	if (url.origin !== window.location.origin) return null;
-	if (!url.pathname.startsWith(manifest.baseUrl)) return null;
+	if (!url.pathname.startsWith(initial_data.baseUrl)) return null;

-	const path = url.pathname.slice(manifest.baseUrl.length);
+	const path = url.pathname.slice(initial_data.baseUrl.length);

-	for (const route of routes) {
-		const match = route.pattern.exec(path);
+	// avoid accidental clashes between server routes and pages
+	if (manifest.ignore.some(pattern => pattern.test(path))) return;
+
+	for (let i = 0; i < manifest.pages.length; i += 1) {
+		const page = manifest.pages[i];
+
+		const match = page.pattern.exec(path);
 		if (match) {
-			if (route.ignore) return null;
-
-			const params = route.params(match);
-
 			const query: Record<string, string | true> = {};
 			if (url.search.length > 0) {
 				url.search.slice(1).split('&').forEach(searchParam => {
 					const [, key, value] = /([^=]+)=(.*)/.exec(searchParam);
 					query[key] = value || true;
-				})
+				});
 			}
-			return { url, route, props: { params, query, path } };
+			return { url, path, page, match, query };
 		}
 	}
 }

 let current_token: {};

-function render(Page: ComponentConstructor, props: any, scroll: ScrollPosition, token: {}) {
+function render(data: any, nullable_depth: number, scroll: ScrollPosition, token: {}) {
 	if (current_token !== token) return;

-	const data = {
-		Page,
-		props,
-		preloading: false
-	};
+	if (root) {
+		// first, clear out highest-level root component
+		let level = data.child;
+		for (let i = 0; i < nullable_depth; i += 1) {
+			if (i === nullable_depth) break;
+			level = level.props.child;
+		}

-	if (component) {
-		component.set(data);
+		const { component } = level;
+		level.component = null;
+		root.set({ child: data.child });
+
+		// then render new stuff
+		level.component = component;
+		root.set(data);
 	} else {
 		// first load — remove SSR'd <head> contents
 		const start = document.querySelector('#sapper-head-start');
@@ -73,7 +106,9 @@ function render(Page: ComponentConstructor, props: any, scroll: ScrollPosition,
 			detach(end);
 		}

-		component = new App({
+		Object.assign(data, root_data);
+
+		root = new manifest.root({
 			target,
 			data,
 			store,
@@ -84,56 +119,159 @@ function render(Page: ComponentConstructor, props: any, scroll: ScrollPosition,
 	if (scroll) {
 		window.scrollTo(scroll.x, scroll.y);
 	}
+
+	Object.assign(root_props, data);
+	ready = true;
 }

-function prepare_route(Page: ComponentConstructor, props: RouteData) {
-	let redirect: { statusCode: number, location: string } = null;
+function changed(a: Record<string, string | true>, b: Record<string, string | true>) {
+	return JSON.stringify(a) !== JSON.stringify(b);
+}
+
+let root_preload: Promise<any>;
+let root_data: any;
+
+function prepare_page(target: Target): Promise<{
+	redirect?: Redirect;
+	data?: any;
+	nullable_depth?: number;
+}> {
+	if (root) {
+		root.set({ preloading: true });
+	}
+
+	const { page, path, query } = target;
+	const new_segments = path.split('/').filter(Boolean);
+	let changed_from = 0;
+
+	while (
+		segments[changed_from] &&
+		new_segments[changed_from] &&
+		segments[changed_from] === new_segments[changed_from]
+	) changed_from += 1;
+
+	let redirect: Redirect = null;
 	let error: { statusCode: number, message: Error | string } = null;

-	if (!Page.preload) {
-		return { Page, props, redirect, error };
-	}
-
-	if (!component && manifest.preloaded) {
-		return { Page, props: Object.assign(props, manifest.preloaded), redirect, error };
-	}
-
-	if (component) {
-		component.set({
-			preloading: true
-		});
-	}
-
-	return Promise.resolve(Page.preload.call({
+	const preload_context = {
 		store,
 		fetch: (url: string, opts?: any) => window.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: (statusCode: number, message: Error | string) => {
 			error = { statusCode, message };
 		}
-	}, props)).catch(err => {
-		error = { statusCode: 500, message: err };
-	}).then(preloaded => {
-		if (error) {
-			const route = error.statusCode >= 400 && error.statusCode < 500
-				? errors['4xx']
-				: errors['5xx'];
+	};

-			return route.load().then(({ default: Page }: { default: ComponentConstructor }) => {
-				const err = error.message instanceof Error ? error.message : new Error(error.message);
-				Object.assign(props, { status: error.statusCode, error: err });
-				return { Page, props, redirect: null };
-			});
+	if (!root_preload) {
+		root_preload = manifest.root.preload
+			? initial_data.preloaded[0] || manifest.root.preload.call(preload_context, {
+				path,
+				query,
+				params: {}
+			})
+			: {};
+	}
+
+	return Promise.all(page.parts.map(async (part, i) => {
+		if (i < changed_from) return null;
+		if (!part) return null;
+
+		const { default: Component } = await part.component();
+		const req = {
+			path,
+			query,
+			params: part.params ? part.params(target.match) : {}
+		};
+
+		const preloaded = ready || !initial_data.preloaded[i + 1]
+			? Component.preload ? await Component.preload.call(preload_context, req) : {}
+			: initial_data.preloaded[i + 1];
+
+		return { Component, preloaded };
+	})).catch(err => {
+		error = { statusCode: 500, message: err };
+		return [];
+	}).then(async results => {
+		if (!root_data) root_data = await root_preload;
+
+		if (redirect) {
+			return { redirect };
 		}

-		Object.assign(props, preloaded)
-		return { Page, props, redirect };
+		segments = new_segments;
+
+		const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
+		const params = get_params(target.match);
+
+		if (error) {
+			const props = {
+				path,
+				query,
+				params,
+				error: typeof error.message === 'string' ? new Error(error.message) : error.message,
+				status: error.statusCode
+			};
+
+			return {
+				data: Object.assign({}, props, {
+					preloading: false,
+					child: {
+						component: manifest.error,
+						props
+					}
+				})
+			};
+		}
+
+		const props = { path, query };
+		const data = {
+			path,
+			preloading: false,
+			child: Object.assign({}, root_props.child, {
+				segment: segments[0]
+			})
+		};
+		if (changed(query, root_props.query)) data.query = query;
+		if (changed(params, root_props.params)) data.params = params;
+
+		let level = data.child;
+		let nullable_depth = 0;
+
+		for (let i = 0; i < page.parts.length; i += 1) {
+			const part = page.parts[i];
+			if (!part) continue;
+
+			const get_params = part.params || (() => ({}));
+
+			if (i < changed_from) {
+				level.props.path = path;
+				level.props.query = query;
+				level.props.child = Object.assign({}, level.props.child);
+
+				nullable_depth += 1;
+			} else {
+				level.component = results[i].Component;
+				level.props = Object.assign({}, level.props, props, {
+					params: get_params(target.match),
+				}, results[i].preloaded);
+
+				level.props.child = {};
+			}
+
+			level = level.props.child;
+			level.segment = segments[i + 1];
+		}
+
+		return { data, nullable_depth };
 	});
 }

-function navigate(target: Target, id: number) {
+async function navigate(target: Target, id: number): Promise<any> {
 	if (id) {
 		// popstate or initial navigation
 		cid = id;
@@ -149,19 +287,19 @@ function navigate(target: Target, id: number) {

 	const loaded = prefetching && prefetching.href === target.url.href ?
 		prefetching.promise :
-		target.route.load().then(mod => prepare_route(mod.default, target.props));
+		prepare_page(target);

 	prefetching = null;

 	const token = current_token = {};
+	const { redirect, data, nullable_depth } = await loaded;

-	return loaded.then(({ Page, props, redirect }) => {
-		if (redirect) {
-			return goto(redirect.location, { replaceState: true });
-		}
-
-		render(Page, props, scroll_history[id], token);
-	});
+	if (redirect) {
+		await goto(redirect.location, { replaceState: true });
+	} else {
+		render(data, nullable_depth, scroll_history[id], token);
+		document.activeElement.blur();
+	}
 }

 function handle_click(event: MouseEvent) {
@@ -211,7 +349,11 @@ function handle_popstate(event: PopStateEvent) {
 	if (event.state) {
 		const url = new URL(window.location.href);
 		const target = select_route(url);
-		navigate(target, event.state.id);
+		if (target) {
+			navigate(target, event.state.id);
+		} else {
+			window.location.href = window.location.href;
+		}
 	} else {
 		// hashchange
 		cid = ++uid;
@@ -221,16 +363,16 @@ function handle_popstate(event: PopStateEvent) {

 let prefetching: {
 	href: string;
-	promise: Promise<{ Page: ComponentConstructor, props: any }>;
+	promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number }>;
 } = null;

 export function prefetch(href: string) {
-	const selected = select_route(new URL(href, document.baseURI));
+	const target: Target = select_route(new URL(href, document.baseURI));

-	if (selected && (!prefetching || href !== prefetching.href)) {
+	if (target && (!prefetching || href !== prefetching.href)) {
 		prefetching = {
 			href,
-			promise: selected.route.load().then(mod => prepare_route(mod.default, selected.props))
+			promise: prepare_page(target)
 		};
 	}
 }
@@ -252,22 +394,28 @@ function trigger_prefetch(event: MouseEvent | TouchEvent) {
 }

 let inited: boolean;
+let ready = false;

-export function init(opts: { App: ComponentConstructor, target: Node, routes: Route[], store?: (data: any) => Store }) {
+export function init(opts: {
+	App: ComponentConstructor,
+	target: Node,
+	manifest: Manifest,
+	store?: (data: any) => Store,
+	routes?: any // legacy
+}) {
 	if (opts instanceof HTMLElement) {
 		throw new Error(`The signature of init(...) has changed — see https://sapper.svelte.technology/guide#0-11-to-0-12 for more information`);
 	}

-	App = opts.App;
+	if (opts.routes) {
+		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
+	}
+
 	target = opts.target;
-	routes = opts.routes.filter(r => !r.error);
-	errors = {
-		'4xx': opts.routes.find(r => r.error === '4xx'),
-		'5xx': opts.routes.find(r => r.error === '5xx')
-	};
+	manifest = opts.manifest;

 	if (opts && opts.store) {
-		store = opts.store(manifest.store);
+		store = opts.store(initial_data.store);
 	}

 	if (!inited) { // this check makes HMR possible
@@ -291,33 +439,35 @@ export function init(opts: { App: ComponentConstructor, target: Node, routes: Ro

 		history.replaceState({ id: uid }, '', href);

-		const target = select_route(new URL(window.location.href));
-		return navigate(target, uid);
+		if (!initial_data.error) {
+			const target = select_route(new URL(window.location.href));
+			if (target) return navigate(target, uid);
+		}
 	});
 }

 export function goto(href: string, opts = { replaceState: false }) {
 	const target = select_route(new URL(href, document.baseURI));
+	let promise;

 	if (target) {
-		navigate(target, null);
+		promise = navigate(target, null);
 		if (history) history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href);
 	} else {
 		window.location.href = href;
+		promise = new Promise(f => {}); // never resolves
 	}
+
+	return promise;
 }

 export function prefetchRoutes(pathnames: string[]) {
-	if (!routes) throw new Error(`You must call init() first`);
+	if (!manifest) throw new Error(`You must call init() first`);

-	return routes
+	return manifest.pages
 		.filter(route => {
 			if (!pathnames) return true;
-			return pathnames.some(pathname => {
-				return route.error
-					? route.error === pathname
-					: route.pattern.test(pathname)
-			});
+			return pathnames.some(pathname => route.pattern.test(pathname));
 		})
 		.reduce((promise: Promise<any>, route) => {
 			return promise.then(route.load);
--- a/src/runtime/interfaces.ts
+++ b/src/runtime/interfaces.ts
@@ -11,15 +11,23 @@ export interface ComponentConstructor {
 };

 export interface Component {
+	set: (data: any) => void;
 	destroy: () => void;
 }

-export type Route = {
+export type Page = {
 	pattern: RegExp;
-	load: () => Promise<{ default: ComponentConstructor }>;
-	error?: string;
-	params?: (match: RegExpExecArray) => Record<string, string>;
-	ignore?: boolean;
+	parts: Array<{
+		component: () => Promise<{ default: ComponentConstructor }>;
+		params?: (match: RegExpExecArray) => Record<string, string>;
+	}>;
+};
+
+export type Manifest = {
+	ignore: RegExp[];
+	root: ComponentConstructor;
+	error: () => Promise<{ default: ComponentConstructor }>;
+	pages: Page[]
 };

 export type ScrollPosition = {
@@ -29,6 +37,13 @@ export type ScrollPosition = {

 export type Target = {
 	url: URL;
-	route: Route;
-	props: RouteData;
+	path: string;
+	page: Page;
+	match: RegExpExecArray;
+	query: Record<string, string | true>;
+};
+
+export type Redirect = {
+	statusCode: number;
+	location: string;
 };
--- a/test/app/app/App.html
+++ b/test/app/app/App.html
@@ -1,6 +0,0 @@
-{#if preloading}
-	<progress class='preloading-progress' value=0.5/>
-{/if}
-
-<svelte:component this={Page} {...props}/>
-
--- a/test/app/app/client.js
+++ b/test/app/app/client.js
@@ -1,13 +1,11 @@
 import { init, prefetchRoutes } from '../../../runtime.js';
 import { Store } from 'svelte/store.js';
-import { routes } from './manifest/client.js';
-import App from './App.html';
+import { manifest } from './manifest/client.js';

 window.init = () => {
 	return init({
 		target: document.querySelector('#sapper'),
-		App,
-		routes,
+		manifest,
 		store: data => new Store(data)
 	});
 };
--- a/test/app/app/server.js
+++ b/test/app/app/server.js
@@ -4,8 +4,7 @@ import express from 'express';
 import serve from 'serve-static';
 import sapper from '../../../dist/middleware.ts.js';
 import { Store } from 'svelte/store.js';
-import { routes } from './manifest/server.js';
-import App from './App.html'
+import { manifest } from './manifest/server.js';

 let pending;
 let ended;
@@ -87,8 +86,7 @@ const middlewares = [
 	},

 	sapper({
-		App,
-		routes,
+		manifest,
 		store: () => {
 			return new Store({
 				title: 'Stored title'
--- a/test/app/routes/5xx.html
+++ b/test/app/routes/5xx.html
@@ -1,6 +0,0 @@
-<svelte:head>
-	<title>Internal server error</title>
-</svelte:head>
-
-<h1>Internal server error</h1>
-<p>{error.message}</p>
--- a/test/app/routes/[x]/[y]/[z].html
+++ b/test/app/routes/[x]/[y]/[z].html
@@ -0,0 +1,20 @@
+<span>z: {segment} {count}</span>
+<a href="foo/bar/qux"></a>
+
+<script>
+	import counts from '../_counts.js';
+
+	export default {
+		preload() {
+			return {
+				count: counts.z += 1
+			};
+		},
+
+		oncreate() {
+			this.set({
+				segment: this.get().params.z
+			});
+		}
+	};
+</script>
--- a/test/app/routes/[x]/[y]/_layout.html
+++ b/test/app/routes/[x]/[y]/_layout.html
@@ -0,0 +1,22 @@
+<span>y: {segment} {count}</span>
+<svelte:component this={child.component} {...child.props}/>
+
+<span>child segment: {child.segment}</span>
+
+<script>
+	import counts from '../_counts.js';
+
+	export default {
+		preload() {
+			return {
+				count: counts.y += 1
+			};
+		},
+
+		oncreate() {
+			this.set({
+				segment: this.get().params.y
+			});
+		}
+	};
+</script>
--- a/test/app/routes/[x]/_counts.js
+++ b/test/app/routes/[x]/_counts.js
@@ -0,0 +1,5 @@
+export default {
+	x: process.browser ? 1 : 0,
+	y: process.browser ? 1 : 0,
+	z: process.browser ? 1 : 0
+};
--- a/test/app/routes/_error.html
+++ b/test/app/routes/_error.html
@@ -2,5 +2,5 @@
 	<title>{status}</title>
 </svelte:head>

-<h1>Not found</h1>
+<h1>{status}</h1>
 <p>{error.message}</p>
--- a/test/app/routes/_layout.html
+++ b/test/app/routes/_layout.html
@@ -0,0 +1,15 @@
+{#if preloading}
+	<progress class='preloading-progress' value=0.5/>
+{/if}
+
+<svelte:component this={child.component} {rootPreloadFunctionRan} {...child.props}/>
+
+<script>
+	export default {
+		preload() {
+			return {
+				rootPreloadFunctionRan: true
+			};
+		}
+	};
+</script>
--- a/test/app/routes/about.html
+++ b/test/app/routes/about.html
@@ -6,15 +6,21 @@

 <p>This is the 'about' page. There's not much here.</p>

-<button class='goto' on:click='goto("blog/what-is-sapper")'>What is Sapper?</button>
 <button class='prefetch' on:click='prefetch("blog/why-the-name")'>Why the name?</button>

 <script>
 	import { goto, prefetch } from '../../../runtime.js';

 	export default {
+		oncreate() {
+			window.goto = goto;
+		},
+
+		ondestroy() {
+			window.goto = null;
+		},
+
 		methods: {
-			goto,
 			prefetch
 		}
 	};
--- a/test/app/routes/blog/index.json.js
+++ b/test/app/routes/blog/index.json.js
@@ -1,4 +1,4 @@
-import posts from './blog/_posts.js';
+import posts from './_posts.js';

 const contents = JSON.stringify(posts.map(post => {
 	return {
--- a/test/app/routes/missing-index/ok.html
+++ b/test/app/routes/missing-index/ok.html
@@ -0,0 +1 @@
+<h1>it works</h1>
--- a/test/app/routes/preload-root/index.html
+++ b/test/app/routes/preload-root/index.html
@@ -0,0 +1 @@
+<h1>root preload function ran: {rootPreloadFunctionRan}</h1>
--- a/test/app/routes/preload-values/index.html
+++ b/test/app/routes/preload-values/index.html
@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>
--- a/test/app/routes/show-url.html
+++ b/test/app/routes/show-url.html
@@ -1,9 +0,0 @@
-<p>URL is {url}</p>
-
-<script>
-	export default {
-		preload({ url }) {
-			if (url) return { url };
-		}
-	};
-</script>
--- a/test/app/routes/unsafe-replacement.html
+++ b/test/app/routes/unsafe-replacement.html
@@ -0,0 +1,9 @@
+$&
+
+<script>
+	export default {
+		preload() {
+			return '$&';
+		}
+	};
+</script>
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -32,6 +32,8 @@ Nightmare.action('prefetchRoutes', function(done) {

 const cli = path.resolve(__dirname, '../../sapper');

+const wait = ms => new Promise(f => setTimeout(f, ms));
+
 describe('sapper', function() {
 	process.chdir(path.resolve(__dirname, '../app'));

@@ -41,7 +43,7 @@ describe('sapper', function() {
 	rimraf.sync('.sapper');
 	rimraf.sync('start.js');

-	this.timeout(process.env.CI ? 30000 : 10000);
+	this.timeout(process.env.CI ? 30000 : 15000);

 	// TODO reinstate dev tests
 	// run({
@@ -97,13 +99,12 @@ describe('sapper', function() {
 			];
 			// Client scripts that should show up in the extraction directory.
 			const expectedClientRegexes = [
-				/client\/[^/]+\/_(\.\d+)?\.js/,
-				/client\/[^/]+\/about(\.\d+)?\.js/,
-				/client\/[^/]+\/blog_\$slug\$(\.\d+)?\.js/,
-				/client\/[^/]+\/blog(\.\d+)?\.js/,
 				/client\/[^/]+\/main(\.\d+)?\.js/,
-				/client\/[^/]+\/show_url(\.\d+)?\.js/,
-				/client\/[^/]+\/slow_preload(\.\d+)?\.js/,
+				/client\/[^/]+\/index(\.\d+)?\.js/,
+				/client\/[^/]+\/about(\.\d+)?\.js/,
+				/client\/[^/]+\/blog_\$slug(\.\d+)?\.js/,
+				/client\/[^/]+\/blog(\.\d+)?\.js/,
+				/client\/[^/]+\/slow\$45preload(\.\d+)?\.js/,
 			];
 			const allPages = walkSync(dest);

@@ -266,8 +267,9 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(requests => {
 						assert.deepEqual(requests.map(r => r.url), []);
-						return nightmare.path();
 					})
+					.then(() => wait(100))
+					.then(() => nightmare.path())
 					.then(path => {
 						assert.equal(path, `${basepath}/about`);
 						return nightmare.title();
@@ -281,9 +283,7 @@ function run({ mode, basepath = '' }) {
 				return nightmare
 					.goto(`${base}/about`)
 					.init()
-					.click('.goto')
-					.wait(url => window.location.pathname === url, `${basepath}/blog/what-is-sapper`)
-					.wait(100)
+					.evaluate(() => window.goto('blog/what-is-sapper'))
 					.title()
 					.then(title => {
 						assert.equal(title, 'What is Sapper?');
@@ -369,16 +369,6 @@ function run({ mode, basepath = '' }) {
 					});
 			});

-			it('passes entire request object to preload', () => {
-				return nightmare
-					.goto(`${base}/show-url`)
-					.init()
-					.evaluate(() => document.querySelector('p').innerHTML)
-					.then(html => {
-						assert.equal(html, `URL is /show-url`);
-					});
-			});
-
 			it('calls a delete handler', () => {
 				return nightmare
 					.goto(`${base}/delete-test`)
@@ -441,7 +431,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Not found')
+						assert.equal(title, '404')
 					});
 			});

@@ -456,7 +446,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Not found');
+						assert.equal(title, '404');
 					});
 			});

@@ -468,7 +458,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Internal server error')
+						assert.equal(title, '500')
 					});
 			});

@@ -483,7 +473,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Internal server error');
+						assert.equal(title, '500');
 					});
 			});

@@ -608,6 +598,72 @@ function run({ mode, basepath = '' }) {
 			it('emits a basepath', () => {
 				assert.equal(captured_basepath, basepath);
 			});
+
+			// skipped because Nightmare doesn't seem to focus the <a> correctly
+			it.skip('resets the active element after navigation', () => {
+				return nightmare
+					.goto(base)
+					.init()
+					.click('a[href="about"]')
+					.wait(100)
+					.evaluate(() => document.activeElement.nodeName)
+					.then(name => {
+						assert.equal(name, 'BODY');
+					});
+			});
+
+			it('replaces %sapper.xxx% tags safely', () => {
+				return nightmare
+					.goto(`${base}/unsafe-replacement`)
+					.init()
+					.page.html()
+					.then(html => {
+						assert.equal(html.indexOf('%sapper'), -1);
+					});
+			});
+
+			it('only recreates components when necessary', () => {
+				return nightmare
+					.goto(`${base}/foo/bar/baz`)
+					.init()
+					.evaluate(() => document.querySelector('#sapper').textContent)
+					.then(text => {
+						assert.deepEqual(text.split('\n').filter(Boolean), [
+							'y: bar 1',
+							'z: baz 1',
+							'child segment: baz'
+						]);
+
+						return nightmare.click(`a`)
+							.then(() => wait(100))
+							.then(() => {
+								return nightmare.evaluate(() => document.querySelector('#sapper').textContent);
+							});
+					})
+					.then(text => {
+						assert.deepEqual(text.split('\n').filter(Boolean), [
+							'y: bar 1',
+							'z: qux 2',
+							'child segment: qux'
+						]);
+					});
+			});
+
+			it('uses a fallback index component if none is provided', () => {
+				return nightmare.goto(`${base}/missing-index/ok`)
+					.page.title()
+					.then(title => {
+						assert.equal(title, 'it works');
+					});
+			});
+
+			it('runs preload in root component', () => {
+				return nightmare.goto(`${base}/preload-root`)
+					.page.title()
+					.then(title => {
+						assert.equal(title, 'root preload function ran: true');
+					});
+			});
 		});

 		describe('headers', () => {
@@ -620,7 +676,7 @@ function run({ mode, basepath = '' }) {
 						'text/html'
 					);

-					const str = ['main', '_\\.\\d+']
+					const str = ['main', '.+?\\.\\d+']
 						.map(file => {
 							return `<${basepath}/client/[^/]+/${file}\\.js>;rel="preload";as="script"`;
 						})
--- a/test/unit/create_routes.test.js
+++ b/test/unit/create_routes.test.js
@@ -1,287 +0,0 @@
-const assert = require('assert');
-const { create_routes } = require('../../dist/core.ts.js');
-
-describe('create_routes', () => {
-	it('sorts handlers correctly', () => {
-		const routes = create_routes({
-			files: ['foo.html', 'foo.js']
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers),
-			[
-				[
-					{
-						type: 'route',
-						file: 'foo.js'
-					},
-					{
-						type: 'page',
-						file: 'foo.html'
-					}
-				]
-			]
-		)
-	});
-
-	it('encodes characters not allowed in path', () => {
-		const routes = create_routes({
-			files: [
-				'"',
-				'#',
-				'?'
-			]
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.pattern),
-			[
-				/^\/%22\/?$/,
-				/^\/%23\/?$/,
-				/^\/%3F\/?$/
-			]
-		);
-	});
-
-	it('sorts routes correctly', () => {
-		const routes = create_routes({
-			files: ['index.html', 'about.html', 'post/f[xx].html', '[wildcard].html', 'post/foo.html', 'post/[id].html', 'post/bar.html', 'post/[id].json.js']
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			[
-				'index.html',
-				'about.html',
-				'post/bar.html',
-				'post/foo.html',
-				'post/f[xx].html',
-				'post/[id].json.js',
-				'post/[id].html',
-				'[wildcard].html'
-			]
-		);
-	});
-
-	it('prefers index page to nested route', () => {
-		let routes = create_routes({
-			files: [
-				'api/examples/[slug].js',
-				'api/examples/index.js',
-				'blog/[slug].html',
-				'api/gists/[id].js',
-				'api/gists/index.js',
-				'4xx.html',
-				'5xx.html',
-				'blog/index.html',
-				'blog/rss.xml.js',
-				'guide/index.html',
-				'index.html'
-			]
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			[
-				'4xx.html',
-				'5xx.html',
-				'index.html',
-				'guide/index.html',
-				'blog/index.html',
-				'blog/rss.xml.js',
-				'blog/[slug].html',
-				'api/examples/index.js',
-				'api/examples/[slug].js',
-				'api/gists/index.js',
-				'api/gists/[id].js',
-			]
-		);
-
-		routes = create_routes({
-			files: [
-				'4xx.html',
-				'5xx.html',
-				'api/blog/[slug].js',
-				'api/blog/index.js',
-				'api/guide/contents.js',
-				'api/guide/index.js',
-				'blog/[slug].html',
-				'blog/index.html',
-				'blog/rss.xml.js',
-				'gist/[id].js',
-				'gist/create.js',
-				'guide/index.html',
-				'index.html',
-				'repl/index.html'
-			]
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			[
-				'4xx.html',
-				'5xx.html',
-				'index.html',
-				'guide/index.html',
-				'blog/index.html',
-				'blog/rss.xml.js',
-				'blog/[slug].html',
-				'gist/create.js',
-				'gist/[id].js',
-				'repl/index.html',
-				'api/guide/index.js',
-				'api/guide/contents.js',
-				'api/blog/index.js',
-				'api/blog/[slug].js',
-			]
-		);
-	});
-
-	it('generates params', () => {
-		const routes = create_routes({
-			files: ['index.html', 'about.html', '[wildcard].html', 'post/[id].html']
-		});
-
-		let file;
-		let params;
-		for (let i = 0; i < routes.length; i += 1) {
-			const route = routes[i];
-			if (params = route.exec('/post/123')) {
-				file = route.handlers[0].file;
-				break;
-			}
-		}
-
-		assert.equal(file, 'post/[id].html');
-		assert.deepEqual(params, {
-			id: '123'
-		});
-	});
-
-	it('ignores files and directories with leading underscores', () => {
-		const routes = create_routes({
-			files: ['index.html', '_foo.html', 'a/_b/c/d.html', 'e/f/g/h.html', 'i/_j.html']
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			[
-				'index.html',
-				'e/f/g/h.html'
-			]
-		);
-	});
-
-	it('ignores files and directories with leading dots except .well-known', () => {
-		const routes = create_routes({
-			files: ['.well-known', '.unknown']
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			['.well-known']
-		);
-	});
-
-	it('matches /foo/:bar before /:baz/qux', () => {
-		const a = create_routes({
-			files: ['foo/[bar].html', '[baz]/qux.html']
-		});
-		const b = create_routes({
-			files: ['[baz]/qux.html', 'foo/[bar].html']
-		});
-
-		assert.deepEqual(
-			a.map(r => r.handlers[0].file),
-			['foo/[bar].html', '[baz]/qux.html']
-		);
-
-		assert.deepEqual(
-			b.map(r => r.handlers[0].file),
-			['foo/[bar].html', '[baz]/qux.html']
-		);
-	});
-
-	it('fails if routes are indistinguishable', () => {
-		assert.throws(() => {
-			create_routes({
-				files: ['[foo].html', '[bar]/index.html']
-			});
-		}, /The \[foo\] and \[bar\]\/index routes clash/);
-	});
-
-	it('matches nested routes', () => {
-		const route = create_routes({
-			files: ['settings/[submenu].html']
-		})[0];
-
-		assert.deepEqual(route.exec('/settings/foo'), {
-			submenu: 'foo'
-		});
-
-		assert.deepEqual(route.exec('/settings'), {
-			submenu: null
-		});
-	});
-
-	it('prefers index routes to nested routes', () => {
-		const routes = create_routes({
-			files: ['settings/[submenu].html', 'settings.html']
-		});
-
-		assert.deepEqual(
-			routes.map(r => r.handlers[0].file),
-			['settings.html', 'settings/[submenu].html']
-		);
-	});
-
-	it('matches deeply nested routes', () => {
-		const route = create_routes({
-			files: ['settings/[a]/[b]/index.html']
-		})[0];
-
-		assert.deepEqual(route.exec('/settings/foo/bar'), {
-			a: 'foo',
-			b: 'bar'
-		});
-
-		assert.deepEqual(route.exec('/settings/foo'), {
-			a: 'foo',
-			b: null
-		});
-
-		assert.deepEqual(route.exec('/settings'), {
-			a: null,
-			b: null
-		});
-	});
-
-	it('matches a dynamic part within a part', () => {
-		const route = create_routes({
-			files: ['things/[slug].json.js']
-		})[0];
-
-		assert.deepEqual(route.exec('/things/foo.json'), {
-			slug: 'foo'
-		});
-	});
-
-	it('matches multiple dynamic parts within a part', () => {
-		const route = create_routes({
-			files: ['things/[id]_[slug].json.js']
-		})[0];
-
-		assert.deepEqual(route.exec('/things/someid_someslug.json'), {
-			id: 'someid',
-			slug: 'someslug'
-		});
-	});
-
-	it('fails if dynamic params are not separated', () => {
-		assert.throws(() => {
-			create_routes({
-				files: ['[foo][bar].js']
-			});
-		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
-	});
-});
--- a/test/unit/create_routes/index.js
+++ b/test/unit/create_routes/index.js
@@ -0,0 +1,157 @@
+const path = require('path');
+const assert = require('assert');
+const { create_routes } = require('../../../dist/core.ts.js');
+
+describe('create_routes', () => {
+	it('creates routes', () => {
+		const { components, pages, server_routes } = create_routes(path.join(__dirname, 'samples/basic'));
+
+		const index = { name: 'index', file: 'index.html' };
+		const about = { name: 'about', file: 'about.html' };
+		const blog = { name: 'blog', file: 'blog/index.html' };
+		const blog_$slug = { name: 'blog_$slug', file: 'blog/[slug].html' };
+
+		assert.deepEqual(components, [
+			index,
+			about,
+			blog,
+			blog_$slug
+		]);
+
+		assert.deepEqual(pages, [
+			{
+				pattern: /^\/?$/,
+				parts: [
+					{ component: index, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/about\/?$/,
+				parts: [
+					{ component: about, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/blog\/?$/,
+				parts: [
+					null,
+					{ component: blog, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/blog\/([^\/]+?)\/?$/,
+				parts: [
+					null,
+					{ component: blog_$slug, params: ['slug'] }
+				]
+			}
+		]);
+
+		assert.deepEqual(server_routes, [
+			{
+				name: 'route_blog_json',
+				pattern: /^\/blog.json\/?$/,
+				file: 'blog/index.json.js',
+				params: []
+			},
+
+			{
+				name: 'route_blog_$slug_json',
+				pattern: /^\/blog\/([^\/]+?).json\/?$/,
+				file: 'blog/[slug].json.js',
+				params: ['slug']
+			}
+		]);
+	});
+
+	it('encodes invalid characters', () => {
+		const { components, pages } = create_routes(path.join(__dirname, 'samples/encoding'));
+
+		// had to remove ? and " because windows
+
+		// const quote = { name: '$34', file: '".html' };
+		const hash = { name: '$35', file: '#.html' };
+		// const question_mark = { name: '$63', file: '?.html' };
+
+		assert.deepEqual(components, [
+			// quote,
+			hash,
+			// question_mark
+		]);
+
+		assert.deepEqual(pages.map(p => p.pattern), [
+			// /^\/%22\/?$/,
+			/^\/%23\/?$/,
+			// /^\/%3F\/?$/
+		]);
+	});
+
+	it('allows regex qualifiers', () => {
+		const { pages } = create_routes(path.join(__dirname, 'samples/qualifiers'));
+
+		assert.deepEqual(pages.map(p => p.pattern), [
+			/^\/([0-9-a-z]{3,})\/?$/,
+			/^\/([a-z]{2})\/?$/,
+			/^\/([^\/]+?)\/?$/
+		]);
+	});
+
+	it('sorts routes correctly', () => {
+		const { pages } = create_routes(path.join(__dirname, 'samples/sorting'));
+
+		assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
+			['index.html'],
+			['about.html'],
+			[null, 'post/index.html'],
+			[null, 'post/bar.html'],
+			[null, 'post/foo.html'],
+			[null, 'post/f[xx].html'],
+			[null, 'post/[id([0-9-a-z]{3,})].html'],
+			[null, 'post/[id].html'],
+			['[wildcard].html']
+		]);
+	});
+
+	it('ignores files and directories with leading underscores', () => {
+		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-underscore'));
+
+		assert.deepEqual(server_routes.map(r => r.file), [
+			'index.js',
+			'e/f/g/h.js'
+		]);
+	});
+
+	it('ignores files and directories with leading dots except .well-known', () => {
+		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-dot'));
+
+		assert.deepEqual(server_routes.map(r => r.file), [
+			'.well-known/dnt-policy.txt.js'
+		]);
+	});
+
+	it('fails on clashes', () => {
+		assert.throws(() => {
+			const { pages } = create_routes(path.join(__dirname, 'samples/clash-pages'));
+		}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
+
+		assert.throws(() => {
+			const { server_routes } = create_routes(path.join(__dirname, 'samples/clash-routes'));
+			console.log(server_routes);
+		}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
+	});
+
+	it('fails if dynamic params are not separated', () => {
+		assert.throws(() => {
+			create_routes(path.join(__dirname, 'samples/invalid-params'));
+		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
+	});
+
+	it('errors when trying to use reserved characters in route regexp', () => {
+		assert.throws(() => {
+			create_routes(path.join(__dirname, 'samples/invalid-qualifier'));
+		}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
+	});
+});
--- a/test/unit/create_routes/samples/basic/about.html
+++ b/test/unit/create_routes/samples/basic/about.html
--- a/test/unit/create_routes/samples/basic/blog/[slug].html
+++ b/test/unit/create_routes/samples/basic/blog/[slug].html
--- a/test/unit/create_routes/samples/basic/blog/[slug].json.js
+++ b/test/unit/create_routes/samples/basic/blog/[slug].json.js
--- a/test/unit/create_routes/samples/basic/blog/_default.html
+++ b/test/unit/create_routes/samples/basic/blog/_default.html
--- a/test/unit/create_routes/samples/basic/blog/index.html
+++ b/test/unit/create_routes/samples/basic/blog/index.html
--- a/test/unit/create_routes/samples/basic/blog/index.json.js
+++ b/test/unit/create_routes/samples/basic/blog/index.json.js
--- a/test/unit/create_routes/samples/basic/index.html
+++ b/test/unit/create_routes/samples/basic/index.html
--- a/test/unit/create_routes/samples/clash-pages/[bar]/index.html
+++ b/test/unit/create_routes/samples/clash-pages/[bar]/index.html
--- a/test/unit/create_routes/samples/clash-pages/[foo].html
+++ b/test/unit/create_routes/samples/clash-pages/[foo].html
--- a/test/unit/create_routes/samples/clash-pages/index.html
+++ b/test/unit/create_routes/samples/clash-pages/index.html
--- a/test/unit/create_routes/samples/clash-routes/[bar]/index.js
+++ b/test/unit/create_routes/samples/clash-routes/[bar]/index.js
--- a/test/unit/create_routes/samples/clash-routes/[foo].js
+++ b/test/unit/create_routes/samples/clash-routes/[foo].js
--- a/test/unit/create_routes/samples/clash-routes/index.html
+++ b/test/unit/create_routes/samples/clash-routes/index.html
--- a/test/unit/create_routes/samples/encoding/#.html
+++ b/test/unit/create_routes/samples/encoding/#.html
--- a/test/unit/create_routes/samples/hidden-dot/.unknown/foo.txt.js
+++ b/test/unit/create_routes/samples/hidden-dot/.unknown/foo.txt.js
--- a/test/unit/create_routes/samples/hidden-dot/.well-known/dnt-policy.txt.js
+++ b/test/unit/create_routes/samples/hidden-dot/.well-known/dnt-policy.txt.js
--- a/test/unit/create_routes/samples/hidden-underscore/_foo.js
+++ b/test/unit/create_routes/samples/hidden-underscore/_foo.js
--- a/test/unit/create_routes/samples/hidden-underscore/a/_b/c/d.js
+++ b/test/unit/create_routes/samples/hidden-underscore/a/_b/c/d.js
--- a/test/unit/create_routes/samples/hidden-underscore/e/f/g/h.js
+++ b/test/unit/create_routes/samples/hidden-underscore/e/f/g/h.js
--- a/test/unit/create_routes/samples/hidden-underscore/i/_j.js
+++ b/test/unit/create_routes/samples/hidden-underscore/i/_j.js
--- a/test/unit/create_routes/samples/hidden-underscore/index.html
+++ b/test/unit/create_routes/samples/hidden-underscore/index.html
--- a/test/unit/create_routes/samples/hidden-underscore/index.js
+++ b/test/unit/create_routes/samples/hidden-underscore/index.js
--- a/test/unit/create_routes/samples/invalid-params/[foo][bar].js
+++ b/test/unit/create_routes/samples/invalid-params/[foo][bar].js
--- a/test/unit/create_routes/samples/invalid-qualifier/[foo([a-z]([0-9]))].js
+++ b/test/unit/create_routes/samples/invalid-qualifier/[foo([a-z]([0-9]))].js
--- a/test/unit/create_routes/samples/qualifiers/[slug([0-9-a-z]{3,})].html
+++ b/test/unit/create_routes/samples/qualifiers/[slug([0-9-a-z]{3,})].html
--- a/test/unit/create_routes/samples/qualifiers/[slug([a-z]{2})].html
+++ b/test/unit/create_routes/samples/qualifiers/[slug([a-z]{2})].html
--- a/test/unit/create_routes/samples/qualifiers/[slug].html
+++ b/test/unit/create_routes/samples/qualifiers/[slug].html
--- a/test/unit/create_routes/samples/sorting/[wildcard].html
+++ b/test/unit/create_routes/samples/sorting/[wildcard].html
--- a/test/unit/create_routes/samples/sorting/_layout.html
+++ b/test/unit/create_routes/samples/sorting/_layout.html
--- a/test/unit/create_routes/samples/sorting/about.html
+++ b/test/unit/create_routes/samples/sorting/about.html
--- a/test/unit/create_routes/samples/sorting/index.html
+++ b/test/unit/create_routes/samples/sorting/index.html
--- a/test/unit/create_routes/samples/sorting/post/[id([0-9-a-z]{3,})].html
+++ b/test/unit/create_routes/samples/sorting/post/[id([0-9-a-z]{3,})].html
--- a/test/unit/create_routes/samples/sorting/post/[id].html
+++ b/test/unit/create_routes/samples/sorting/post/[id].html
--- a/test/unit/create_routes/samples/sorting/post/_default.html
+++ b/test/unit/create_routes/samples/sorting/post/_default.html
--- a/test/unit/create_routes/samples/sorting/post/bar.html
+++ b/test/unit/create_routes/samples/sorting/post/bar.html
--- a/test/unit/create_routes/samples/sorting/post/f[xx].html
+++ b/test/unit/create_routes/samples/sorting/post/f[xx].html
--- a/test/unit/create_routes/samples/sorting/post/foo.html
+++ b/test/unit/create_routes/samples/sorting/post/foo.html
--- a/test/unit/create_routes/samples/sorting/post/index.html
+++ b/test/unit/create_routes/samples/sorting/post/index.html
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,9 +6,9 @@
        "noEmitOnError": true,
        "allowJs": true,
        "lib": ["es5", "es6", "dom"],
-        "importHelpers": true
+        "importHelpers": true,
+        "target": "ES5"
    },
-    "target": "ES5",
    "include": [
        "src"
    ],
Author	SHA1	Message	Date
Rich Harris	fc855f30f8	-> v0.15.3	2018-07-31 15:06:47 -04:00
Rich Harris	4a75fff4ec	Merge pull request #329 from sveltejs/parallel-exports parallelize exports	2018-07-31 15:05:38 -04:00
Rich Harris	7b7b695938	Merge pull request #320 from sveltejs/gh-319 Some dev documentation	2018-07-31 14:59:57 -04:00
Rich Harris	2fca2e295f	Merge pull request #328 from sveltejs/export-no-minify-js don't minify JS when minifying HTML	2018-07-31 14:59:27 -04:00
Rich Harris	eae991d369	parallelize exports	2018-07-31 14:56:29 -04:00
Rich Harris	c2b393d3fd	dont minify JS when minifying HTML	2018-07-31 14:43:58 -04:00
Robert Hall	1d611be83e	Using npm	2018-07-25 15:50:56 -06:00
Robert Hall	1782904994	Some dev documentation	2018-07-25 10:10:22 -06:00
Rich Harris	e3ddbfc181	Merge pull request #314 from sveltejs/fix-child-segment fix child.segment bug	2018-07-23 17:08:25 -04:00
Rich Harris	8e3830b646	fix child.segment bug	2018-07-23 17:02:35 -04:00
Rich Harris	b28cdff233	-> v0.15.2	2018-07-23 16:38:49 -04:00
Rich Harris	7f586ff1a3	Merge pull request #313 from sveltejs/gh-312 Skip layout components where none is provided	2018-07-23 16:37:30 -04:00
Rich Harris	731d4f535c	skip layout components where none is provided - fixes #312	2018-07-23 16:31:00 -04:00
Rich Harris	f8c731ca21	failing tests for #312	2018-07-23 14:31:11 -04:00
Rich Harris	39eb3be01e	-> v0.15.1	2018-07-22 21:25:33 -04:00
Rich Harris	d0bb728e25	-> v0.15.0	2018-07-22 21:04:03 -04:00
Rich Harris	58de0f9c99	Nested routes Fixes #262	2018-07-22 21:00:37 -04:00
Rich Harris	b75ae7ba96	-> v0.14.2	2018-07-14 21:05:39 -04:00
Rich Harris	091e38082e	Merge pull request #307 from sveltejs/unsafe-replacements prevent unsafe replacements of preloaded data etc	2018-07-15 02:05:20 +01:00
Rich Harris	74acf93c7a	prevent unsafe replacements of preloaded data etc	2018-07-14 20:56:05 -04:00
Rich Harris	0e3775397f	Merge pull request #306 from sveltejs/refactor-route-generation Refactor route generation	2018-07-05 08:25:59 -04:00
Rich Harris	8dc52a04e4	split pages and server routes into separate arrays	2018-07-05 08:14:07 -04:00
Rich Harris	008b607c01	generate pages and server routes separately	2018-07-04 10:53:41 -04:00
Rich Harris	d01a407137	-> v0.14.1	2018-07-02 10:24:54 -04:00
Rich Harris	c0c717d9ec	Merge pull request #283 from elcobvg/feature/route-regexp Feature: use regexp in routes	2018-07-02 10:23:30 -04:00
Elco Brouwer von Gonzenbach	4f011bfc37	Convert whitespace to tabs. Add some unit tests for create routes	2018-07-02 11:52:17 +07:00
Elco Brouwer von Gonzenbach	6c4ab32cf0	Sync update to sapper 0.14.0	2018-06-29 06:57:01 +07:00
Rich Harris	09b4dc1b9a	-> v0.14.0	2018-06-28 13:35:21 -04:00
Rich Harris	bdd5a54527	Merge pull request #301 from sveltejs/gh-297 treat foo/index.json.js as foo.json.js	2018-06-28 13:27:57 -04:00
Rich Harris	b7bb4db8c1	treat foo/index.json.js as foo.json.js - fixes #297	2018-06-28 13:20:41 -04:00
Rich Harris	5b5f33d3cf	error on 4xx.html and 5xx.html	2018-06-28 12:57:59 -04:00
Rich Harris	9611656b76	Merge pull request #300 from sveltejs/gh-293 [WIP] simplify rendering of error pages	2018-06-28 12:52:41 -04:00
Rich Harris	e9a71774d5	Merge pull request #299 from sveltejs/gh-270 return a Promise from goto	2018-06-28 12:18:32 -04:00
Rich Harris	2205b8aec5	oops	2018-06-28 12:03:27 -04:00
Rich Harris	5c4e4d5d36	only navigate if route is found - fixes #279	2018-06-28 11:45:38 -04:00
Rich Harris	e87247493f	replace 4xx.html and 5xx.html with _error.html	2018-06-28 11:38:21 -04:00
Rich Harris	0aeb63a05b	simplify rendering of error pages	2018-06-27 18:35:41 -04:00
Rich Harris	57eeb5659a	return a Promise from goto - fixes #270	2018-06-27 17:32:20 -04:00
Rich Harris	f821c19528	-> v0.13.6	2018-06-27 17:20:45 -04:00
Rich Harris	b9a120164a	Merge pull request #298 from sveltejs/gh-296 fix req.baseUrl synthesis	2018-06-27 17:19:55 -04:00
Rich Harris	087356f781	fix req.baseUrl synthesis	2018-06-27 16:57:04 -04:00
Rich Harris	31110a5326	-> v0.13.5	2018-06-26 18:30:46 -04:00
Rich Harris	667a68768c	Merge pull request #294 from sveltejs/gh-289 fix handling of fatal errors	2018-06-26 18:29:56 -04:00
Rich Harris	5075981a90	fix handling of fatal errors - fixes #289	2018-06-26 13:49:11 -04:00
Rich Harris	611dc4f6be	-> v0.13.4	2018-06-18 22:45:51 -04:00
Rich Harris	0b43eaa992	blur active element on navigation - fixes #287	2018-06-18 22:44:55 -04:00
Rich Harris	47cdc1c4c8	wait until server restarts before emitting hot reload update	2018-06-18 22:31:10 -04:00
Rich Harris	31c071ad72	Merge branch 'master' of github.com:sveltejs/sapper	2018-06-18 12:22:42 -04:00
Rich Harris	e91edaee12	Merge pull request #286 from sveltejs/invalidate-client-assets always refresh client_assets in dev	2018-06-18 12:22:37 -04:00
Rich Harris	34c1fee5db	Merge branch 'master' of github.com:sveltejs/sapper	2018-06-17 13:02:13 -04:00
Rich Harris	5375422633	Merge pull request #285 from sveltejs/event-on-exit emit a fatal event if server crashes	2018-06-17 13:02:03 -04:00
Rich Harris	1dafe934b0	initialise rebuild stats	2018-06-17 13:01:51 -04:00
Rich Harris	e1a33c6a9b	always refresh client_assets in dev	2018-06-17 13:00:27 -04:00
Rich Harris	0800fa016b	emit a fatal event if server crashes	2018-06-16 20:18:32 -04:00
Rich Harris	8f3454c3b1	-> v0.13.3	2018-06-16 13:49:44 -04:00
Rich Harris	f0d7a1aaab	change fatal events to be clonable, for IPC purposes	2018-06-16 13:49:19 -04:00
Elco Brouwer von Gonzenbach	0e2c2ca101	Correct errors in param pattern and matching patterns	2018-06-13 10:00:39 +07:00
Elco Brouwer von Gonzenbach	8015be8069	Correct spacing	2018-06-12 09:15:54 +07:00
Elco Brouwer von Gonzenbach	e39ad59589	Add regexp option to routes	2018-06-12 09:11:54 +07:00
				`@@ -0,0 +1 @@`
				`<svelte:component this={child.component} {...child.props}/>`
				`@@ -0,0 +1 @@`
				`<h1>root preload function ran: {rootPreloadFunctionRan}</h1>`