-> v0.19.0

closes #388

.travis.yml

@@ -18,4 +18,4 @@ addons:
 install:
   - export DISPLAY=':99.0'
   - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-  - npm install
+  - npm ci || npm i

CHANGELOG.md

@@ -1,5 +1,184 @@
 # sapper changelog
 
+## 0.19.0
+
+* Extract styles out of JS into .css files, for Rollup apps ([#388](https://github.com/sveltejs/sapper/issues/388))
+* Fix `prefetchRoutes` ([#380](https://github.com/sveltejs/sapper/issues/380))
+
+## 0.18.7
+
+* Support differential bundling for Rollup apps via a `--legacy` flag ([#280](https://github.com/sveltejs/sapper/issues/280))
+
+## 0.18.6
+
+* Bundle missing dependency
+
+## 0.18.5
+
+* Bugfix
+
+## 0.18.4
+
+* Handle non-Sapper responses when exporting ([#382](https://github.com/sveltejs/sapper/issues/392))
+* Add `--dev-port` flag to `sapper dev` ([#381](https://github.com/sveltejs/sapper/issues/381))
+
+## 0.18.3
+
+* Fix service worker Rollup build config
+
+## 0.18.2
+
+* Update `pkg.files`
+
+## 0.18.1
+
+* Add live reloading ([#385](https://github.com/sveltejs/sapper/issues/385))
+
+## 0.18.0
+
+* Rollup support ([#379](https://github.com/sveltejs/sapper/pull/379))
+* Fail `export` if a page times out (configurable with `--timeout`) ([#378](https://github.com/sveltejs/sapper/pull/378))
+
+## 0.17.1
+
+* Print which file is causing build errors/warnings ([#371](https://github.com/sveltejs/sapper/pull/371))
+
+## 0.17.0
+
+* Use `cheap-watch` instead of `chokidar` ([#364](https://github.com/sveltejs/sapper/issues/364))
+
+## 0.16.1
+
+* Fix file watching regression in previous version
+
+## 0.16.0
+
+* Slim down installed package ([#363](https://github.com/sveltejs/sapper/pull/363))
+
+## 0.15.8
+
+* Only set `preloading: true` on navigation, not prefetch ([#352](https://github.com/sveltejs/sapper/issues/352))
+* Provide fallback for missing preload errors ([#361](https://github.com/sveltejs/sapper/pull/361))
+
+## 0.15.7
+
+* Strip leading slash from redirects ([#291](https://github.com/sveltejs/sapper/issues/291))
+* Pass `(req, res)` to store getter ([#344](https://github.com/sveltejs/sapper/issues/344))
+
+## 0.15.6
+
+* Fix exporting with custom basepath ([#342](https://github.com/sveltejs/sapper/pull/342))
+
+## 0.15.5
+
+* Faster `export` with more explanatory output ([#335](https://github.com/sveltejs/sapper/pull/335))
+* Only blur `activeElement` if it exists ([#332](https://github.com/sveltejs/sapper/issues/332))
+* Don't emit `client_info.json` or `server_info.json` ([#318](https://github.com/sveltejs/sapper/issues/318))
+
+## 0.15.4
+
+* Add `ignore` option ([#326](https://github.com/sveltejs/sapper/pull/326))
+
+## 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))
+
+## 0.13.1
+
+* Reinstate ten-second interval between dev server heartbeats ([#276](https://github.com/sveltejs/sapper/issues/276))
+
+## 0.13.0
+
+* Expose `dev`, `build`, `export` and `find_page` APIs ([#272](https://github.com/sveltejs/sapper/issues/272))
+
+## 0.12.0
+
+* Each app has a single `<App>` component. See the [migration guide](https://sapper.svelte.technology/guide#0-11-to-0-12) for more information ([#157](https://github.com/sveltejs/sapper/issues/157))
+* Process exits with error code 1 if build/export fails ([#208](https://github.com/sveltejs/sapper/issues/208))
+
+## 0.11.1
+
+* Limit routes with leading dots to `.well-known` URIs ([#252](https://github.com/sveltejs/sapper/issues/252))
+* Allow server routes to sit in front of pages ([#236](https://github.com/sveltejs/sapper/pull/236))
+
+## 0.11.0
+
+* Create launcher file ([#240](https://github.com/sveltejs/sapper/issues/240))
+* Only keep necessary parts of webpack stats ([#251](https://github.com/sveltejs/sapper/pull/251))
+* Allow `NODE_ENV` to be overridden when building ([#241](https://github.com/sveltejs/sapper/issues/241))
+
+## 0.10.7
+
+* Allow routes to have a leading `.` ([#243](https://github.com/sveltejs/sapper/pull/243))
+* Only encode necessary characters in routes ([#234](https://github.com/sveltejs/sapper/pull/234))
+* Preserve existing `process.env` when exporting ([#245](https://github.com/sveltejs/sapper/pull/245))
+
+## 0.10.6
+
+* Fix error reporting in `sapper start`
+
+## 0.10.5
+
+* Fix missing service worker ([#231](https://github.com/sveltejs/sapper/pull/231))
+
+## 0.10.4
+
+* Upgrade chokidar, this time with a fix ([#227](https://github.com/sveltejs/sapper/pull/227))
+
 ## 0.10.3
 
 * Downgrade chokidar ([#212](https://github.com/sveltejs/sapper/issues/212))

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
 

api.js

@@ -0,0 +1 @@
+module.exports = require('./dist/api.js');

appveyor.yml

@@ -10,11 +10,11 @@ build: off
 environment:
   matrix:
     # node.js
-    - nodejs_version: stable
+    - nodejs_version: 10.5
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install
+  - npm ci
 
 test_script:
   - node --version && npm --version

components/default-layout.html

@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>

config/rollup.js

@@ -0,0 +1 @@
+module.exports = require('../dist/rollup.js');

config/webpack.js

@@ -0,0 +1 @@
+module.exports = require('../dist/webpack.js');

mocha.opts

@@ -1,4 +1,5 @@
 --require source-map-support/register
+--require ts-node/register
 --recursive
-test/unit/**/*.js
+test/unit/*/*.ts
 test/common/test.js

package.json

@@ -1,76 +1,79 @@
 {
   "name": "sapper",
-  "version": "0.10.3",
+  "version": "0.19.0",
   "description": "Military-grade apps, engineered by Svelte",
-  "main": "dist/middleware.ts.js",
+  "main": "dist/middleware.js",
   "bin": {
     "sapper": "./sapper"
   },
   "files": [
     "*.js",
-    "*.ts.js",
     "runtime",
     "webpack",
+    "config",
     "sapper",
+    "components",
     "dist"
   ],
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "cheerio": "^1.0.0-rc.2",
-    "chokidar": "^1.7.0",
-    "clorox": "^1.0.3",
+    "html-minifier": "^3.5.16",
+    "shimport": "^0.0.10",
+    "source-map-support": "^0.5.6",
+    "sourcemap-codec": "^1.4.1",
+    "string-hash": "^1.1.3",
+    "tslib": "^1.9.1"
+  },
+  "devDependencies": {
+    "@types/glob": "^5.0.34",
+    "@types/mkdirp": "^0.5.2",
+    "@types/mocha": "^5.2.5",
+    "@types/node": "^10.7.1",
+    "@types/rimraf": "^2.0.2",
+    "cheap-watch": "^0.3.0",
+    "compression": "^1.7.1",
     "cookie": "^0.3.1",
-    "devalue": "^1.0.1",
-    "glob": "^7.1.2",
-    "html-minifier": "^3.5.11",
+    "devalue": "^1.0.4",
+    "eslint": "^4.13.1",
+    "eslint-plugin-import": "^2.12.0",
+    "express": "^4.16.3",
+    "kleur": "^2.0.1",
     "mkdirp": "^0.5.1",
+    "mocha": "^5.2.0",
+    "nightmare": "^3.0.0",
     "node-fetch": "^2.1.1",
-    "port-authority": "^1.0.2",
-    "pretty-bytes": "^4.0.2",
+    "npm-run-all": "^4.1.3",
+    "polka": "^0.4.0",
+    "port-authority": "^1.0.5",
+    "pretty-bytes": "^5.0.0",
     "pretty-ms": "^3.1.0",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
-    "sade": "^1.4.0",
-    "sander": "^0.6.0",
-    "source-map-support": "^0.5.4",
-    "tslib": "^1.9.0",
-    "url-parse": "^1.2.0",
-    "webpack-format-messages": "^1.0.2"
-  },
-  "devDependencies": {
-    "@std/esm": "^0.25.3",
-    "@types/glob": "^5.0.34",
-    "@types/mkdirp": "^0.5.2",
-    "@types/rimraf": "^2.0.2",
-    "compression": "^1.7.1",
-    "eslint": "^4.13.1",
-    "eslint-plugin-import": "^2.8.0",
-    "express": "^4.16.3",
-    "get-port": "^3.2.0",
-    "mocha": "^5.0.4",
-    "nightmare": "^3.0.0",
-    "npm-run-all": "^4.1.2",
-    "polka": "^0.3.4",
-    "rollup": "^0.57.0",
-    "rollup-plugin-commonjs": "^9.1.0",
-    "rollup-plugin-json": "^2.3.0",
+    "rollup": "^0.65.0",
+    "rollup-plugin-commonjs": "^9.1.3",
+    "rollup-plugin-json": "^3.0.0",
+    "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-typescript": "^0.8.1",
+    "sade": "^1.4.1",
+    "sander": "^0.6.0",
     "serve-static": "^1.13.2",
-    "svelte": "^1.57.4",
-    "svelte-loader": "^2.5.1",
-    "ts-node": "^5.0.1",
-    "typescript": "^2.6.2",
+    "svelte": "^2.6.3",
+    "svelte-loader": "^2.9.0",
+    "tiny-glob": "^0.2.2",
+    "ts-node": "^7.0.1",
+    "typescript": "^2.8.3",
     "walk-sync": "^0.3.2",
-    "webpack": "^4.1.0"
+    "webpack": "^4.8.3",
+    "webpack-format-messages": "^2.0.1"
   },
   "scripts": {
     "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"

rollup.config.js

@@ -1,6 +1,7 @@
 import typescript from 'rollup-plugin-typescript';
 import string from 'rollup-plugin-string';
 import json from 'rollup-plugin-json';
+import resolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';
 
@@ -19,13 +20,21 @@ export default [
 		},
 		plugins: [
 			typescript({
-				typescript: require('typescript')
+				typescript: require('typescript'),
+				target: "ES2017"
 			})
 		]
 	},
 
 	{
-		input: [`src/cli.ts`, `src/core.ts`, `src/middleware.ts`, `src/webpack.ts`],
+		input: [
+			`src/api.ts`,
+			`src/cli.ts`,
+			`src/core.ts`,
+			`src/middleware.ts`,
+			`src/rollup.ts`,
+			`src/webpack.ts`
+		],
 		output: {
 			dir: 'dist',
 			format: 'cjs',
@@ -37,12 +46,12 @@ export default [
 				include: '**/*.md'
 			}),
 			json(),
+			resolve(),
 			commonjs(),
 			typescript({
 				typescript: require('typescript')
 			})
 		],
-		experimentalCodeSplitting: true,
-		experimentalDynamicImport: true
+		experimentalCodeSplitting: true
 	}
 ];

sapper

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./dist/cli.ts.js');
+require('./dist/cli.js');

sapper-dev-client.js

@@ -1,6 +1,8 @@
 let source;
 
 function check() {
+	if (typeof module === 'undefined') return;
+
 	if (module.hot.status() === 'idle') {
 		module.hot.check(true).then(modules => {
 			console.log(`[SAPPER] applied HMR update`);

src/api.ts

@@ -0,0 +1,6 @@
+import { dev } from './api/dev';
+import { build } from './api/build';
+import { exporter } from './api/export';
+import { find_page } from './api/find_page';
+
+export { dev, build, exporter, find_page };

src/api/build.ts

@@ -0,0 +1,112 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import mkdirp from 'mkdirp';
+import rimraf from 'rimraf';
+import { EventEmitter } from 'events';
+import * as codec from 'sourcemap-codec';
+import hash from 'string-hash';
+import minify_html from './utils/minify_html';
+import { create_compilers, create_main_manifests, create_manifest_data, create_serviceworker_manifest } from '../core';
+import * as events from './interfaces';
+import { copy_shimport } from './utils/copy_shimport';
+import { Dirs, PageComponent } from '../interfaces';
+import { CompileResult } from '../core/create_compilers/interfaces';
+
+type Opts = {
+	legacy: boolean;
+	bundler: string;
+};
+
+export function build(opts: Opts, dirs: Dirs) {
+	const emitter = new EventEmitter();
+
+	execute(emitter, opts, dirs).then(
+		() => {
+			emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
+		},
+		error => {
+			emitter.emit('error', <events.ErrorEvent>{
+				error
+			});
+		}
+	);
+
+	return emitter;
+}
+
+async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
+	rimraf.sync(path.join(dirs.dest, '**/*'));
+	mkdirp.sync(`${dirs.dest}/client`);
+	copy_shimport(dirs.dest);
+
+	// minify app/template.html
+	// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
+	const template = fs.readFileSync(`${dirs.app}/template.html`, 'utf-8');
+
+	// remove this in a future version
+	if (template.indexOf('%sapper.base%') === -1) {
+		const error = new Error(`As of Sapper v0.10, your template.html file must include %sapper.base% in the <head>`);
+		error.code = `missing-sapper-base`;
+		throw error;
+	}
+
+	fs.writeFileSync(`${dirs.dest}/template.html`, minify_html(template));
+
+	const manifest_data = create_manifest_data();
+
+	// create app/manifest/client.js and app/manifest/server.js
+	create_main_manifests({ bundler: opts.bundler, manifest_data });
+
+	const { client, server, serviceworker } = create_compilers(opts.bundler, dirs);
+
+	const client_result = await client.compile();
+	emitter.emit('build', <events.BuildEvent>{
+		type: 'client',
+		// TODO duration/warnings
+		result: client_result
+	});
+
+	const build_info = client_result.to_json(manifest_data, dirs);
+
+	if (opts.legacy) {
+		process.env.SAPPER_LEGACY_BUILD = 'true';
+		const { client } = create_compilers(opts.bundler, dirs);
+
+		const client_result = await client.compile();
+
+		emitter.emit('build', <events.BuildEvent>{
+			type: 'client (legacy)',
+			// TODO duration/warnings
+			result: client_result
+		});
+
+		build_info.legacy_assets = client_result.assets;
+		delete process.env.SAPPER_LEGACY_BUILD;
+	}
+
+	fs.writeFileSync(path.join(dirs.dest, 'build.json'), JSON.stringify(build_info));
+
+	const server_stats = await server.compile();
+	emitter.emit('build', <events.BuildEvent>{
+		type: 'server',
+		// TODO duration/warnings
+		result: server_stats
+	});
+
+	let serviceworker_stats;
+
+	if (serviceworker) {
+		create_serviceworker_manifest({
+			manifest_data,
+			client_files: client_result.chunks.map(chunk => `client/${chunk.file}`)
+		});
+
+		serviceworker_stats = await serviceworker.compile();
+
+		emitter.emit('build', <events.BuildEvent>{
+			type: 'serviceworker',
+			// TODO duration/warnings
+			result: serviceworker_stats
+		});
+	}
+}

src/api/dev.ts

@@ -0,0 +1,469 @@
+import * as path from 'path';
+import * as fs from 'fs';
+import * as http from 'http';
+import * as child_process from 'child_process';
+import * as ports from 'port-authority';
+import mkdirp from 'mkdirp';
+import rimraf from 'rimraf';
+import { locations } from '../config';
+import { EventEmitter } from 'events';
+import { create_manifest_data, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
+import { Compiler, Compilers } from '../core/create_compilers';
+import { CompileResult, CompileError } from '../core/create_compilers/interfaces';
+import Deferred from './utils/Deferred';
+import * as events from './interfaces';
+import validate_bundler from '../cli/utils/validate_bundler';
+import { copy_shimport } from './utils/copy_shimport';
+import { ManifestData } from '../interfaces';
+
+export function dev(opts) {
+	return new Watcher(opts);
+}
+
+class Watcher extends EventEmitter {
+	bundler: string;
+	dirs: {
+		app: string;
+		dest: string;
+		routes: string;
+		rollup: string;
+		webpack: string;
+	}
+	port: number;
+	closed: boolean;
+
+	dev_port: number;
+	live: boolean;
+	hot: boolean;
+
+	dev_server: DevServer;
+	proc: child_process.ChildProcess;
+	filewatchers: Array<{ close: () => void }>;
+	deferred: Deferred;
+
+	crashed: boolean;
+	restarting: boolean;
+	current_build: {
+		changed: Set<string>;
+		rebuilding: Set<string>;
+		unique_warnings: Set<string>;
+		unique_errors: Set<string>;
+	}
+
+	constructor({
+		app = locations.app(),
+		dest = locations.dest(),
+		routes = locations.routes(),
+		'dev-port': dev_port,
+		live,
+		hot,
+		bundler,
+		webpack = 'webpack',
+		rollup = 'rollup',
+		port = +process.env.PORT
+	}: {
+		app: string,
+		dest: string,
+		routes: string,
+		'dev-port': number,
+		live: boolean,
+		hot: boolean,
+		bundler?: string,
+		webpack: string,
+		rollup: string,
+		port: number
+	}) {
+		super();
+
+		this.bundler = validate_bundler(bundler);
+		this.dirs = { app, dest, routes, webpack, rollup };
+		this.port = port;
+		this.closed = false;
+
+		this.dev_port = dev_port;
+		this.live = live;
+		this.hot = hot;
+
+		this.filewatchers = [];
+
+		this.current_build = {
+			changed: new Set(),
+			rebuilding: new Set(),
+			unique_errors: new Set(),
+			unique_warnings: new Set()
+		};
+
+		// remove this in a future version
+		const template = fs.readFileSync(path.join(app, 'template.html'), 'utf-8');
+		if (template.indexOf('%sapper.base%') === -1) {
+			const error = new Error(`As of Sapper v0.10, your template.html file must include %sapper.base% in the <head>`);
+			error.code = `missing-sapper-base`;
+			throw error;
+		}
+
+		process.env.NODE_ENV = 'development';
+
+		process.on('exit', () => {
+			this.close();
+		});
+
+		this.init();
+	}
+
+	async init() {
+		if (this.port) {
+			if (!await ports.check(this.port)) {
+				this.emit('fatal', <events.FatalEvent>{
+					message: `Port ${this.port} is unavailable`
+				});
+				return;
+			}
+		} else {
+			this.port = await ports.find(3000);
+		}
+
+		const { dest } = this.dirs;
+		rimraf.sync(dest);
+		mkdirp.sync(`${dest}/client`);
+		if (this.bundler === 'rollup') copy_shimport(dest);
+
+		if (!this.dev_port) this.dev_port = await ports.find(10000);
+
+		let manifest_data: ManifestData;
+
+		try {
+			manifest_data = create_manifest_data();
+			create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
+		} catch (err) {
+			this.emit('fatal', <events.FatalEvent>{
+				message: err.message
+			});
+			return;
+		}
+
+		this.dev_server = new DevServer(this.dev_port);
+
+		this.filewatchers.push(
+			watch_dir(
+				locations.routes(),
+				({ path: file, stats }) => {
+					if (stats.isDirectory()) {
+						return path.basename(file)[0] !== '_';
+					}
+					return true;
+				},
+				() => {
+					try {
+						const new_manifest_data = create_manifest_data();
+						create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
+
+						manifest_data = new_manifest_data;
+					} catch (err) {
+						this.emit('error', <events.ErrorEvent>{
+							message: err.message
+						});
+					}
+				}
+			),
+
+			fs.watch(`${locations.app()}/template.html`, () => {
+				this.dev_server.send({
+					action: 'reload'
+				});
+			})
+		);
+
+		let deferred = new Deferred();
+
+		// TODO watch the configs themselves?
+		const compilers: Compilers = create_compilers(this.bundler, this.dirs);
+
+		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',
+
+			invalid: filename => {
+				this.restart(filename, 'server');
+			},
+
+			handle_result: (result: CompileResult) => {
+				deferred.promise.then(() => {
+					const restart = () => {
+						log = '';
+						this.crashed = false;
+
+						ports.wait(this.port)
+							.then((() => {
+								this.emit('ready', <events.ReadyEvent>{
+									port: this.port,
+									process: this.proc
+								});
+
+								if (this.hot && this.bundler === 'webpack') {
+									this.dev_server.send({
+										status: 'completed'
+									});
+								} else {
+									this.dev_server.send({
+										action: 'reload'
+									});
+								}
+							}))
+							.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 {
+						restart();
+					}
+
+					this.proc = child_process.fork(`${dest}/server.js`, [], {
+						cwd: process.cwd(),
+						env: Object.assign({
+							PORT: this.port
+						}, process.env),
+						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', {
+								basepath: message.basepath
+							});
+						}
+					});
+
+					this.proc.on('exit', emitFatal);
+				});
+			}
+		});
+
+		this.watch(compilers.client, {
+			name: 'client',
+
+			invalid: filename => {
+				this.restart(filename, 'client');
+				deferred = new Deferred();
+
+				// TODO we should delete old assets. due to a webpack bug
+				// i don't even begin to comprehend, this is apparently
+				// quite difficult
+			},
+
+			handle_result: (result: CompileResult) => {
+				fs.writeFileSync(
+					path.join(dest, 'build.json'),
+
+					// TODO should be more explicit that to_json has effects
+					JSON.stringify(result.to_json(manifest_data, this.dirs), null, '  ')
+				);
+
+				const client_files = result.chunks.map(chunk => `client/${chunk.file}`);
+
+				create_serviceworker_manifest({
+					manifest_data,
+					client_files
+				});
+
+				deferred.fulfil();
+
+				// we need to wait a beat before watching the service
+				// worker, because of some webpack nonsense
+				setTimeout(watch_serviceworker, 100);
+			}
+		});
+
+		let watch_serviceworker = compilers.serviceworker
+			? () => {
+				watch_serviceworker = noop;
+
+				this.watch(compilers.serviceworker, {
+					name: 'service worker'
+				});
+			}
+			: noop;
+	}
+
+	close() {
+		if (this.closed) return;
+		this.closed = true;
+
+		if (this.dev_server) this.dev_server.close();
+
+		if (this.proc) this.proc.kill();
+		this.filewatchers.forEach(watcher => {
+			watcher.close();
+		});
+	}
+
+	restart(filename: string, type: string) {
+		if (this.restarting) {
+			this.current_build.changed.add(filename);
+			this.current_build.rebuilding.add(type);
+		} else {
+			this.restarting = true;
+
+			this.current_build = {
+				changed: new Set([filename]),
+				rebuilding: new Set([type]),
+				unique_warnings: new Set(),
+				unique_errors: new Set()
+			};
+
+			process.nextTick(() => {
+				this.emit('invalid', <events.InvalidEvent>{
+					changed: Array.from(this.current_build.changed),
+					invalid: {
+						server: this.current_build.rebuilding.has('server'),
+						client: this.current_build.rebuilding.has('client'),
+						serviceworker: this.current_build.rebuilding.has('serviceworker'),
+					}
+				});
+
+				this.restarting = false;
+			});
+		}
+	}
+
+	watch(compiler: Compiler, { name, invalid = noop, handle_result = noop }: {
+		name: string,
+		invalid?: (filename: string) => void;
+		handle_result?: (result: CompileResult) => void;
+	}) {
+		compiler.oninvalid(invalid);
+
+		compiler.watch((err?: Error, result?: CompileResult) => {
+			if (err) {
+				this.emit('error', <events.ErrorEvent>{
+					type: name,
+					message: err.message
+				});
+			} else {
+				this.emit('build', {
+					type: name,
+
+					duration: result.duration,
+					errors: result.errors,
+					warnings: result.warnings
+				});
+
+				handle_result(result);
+			}
+		});
+	}
+}
+
+const INTERVAL = 10000;
+
+class DevServer {
+	clients: Set<http.ServerResponse>;
+	interval: NodeJS.Timer;
+	_: http.Server;
+
+	constructor(port: number, interval = 10000) {
+		this.clients = new Set();
+
+		this._ = http.createServer((req, res) => {
+			if (req.url !== '/__sapper__') return;
+
+			req.socket.setKeepAlive(true);
+			res.writeHead(200, {
+				'Access-Control-Allow-Origin': '*',
+				'Access-Control-Allow-Headers': 'Cache-Control',
+				'Content-Type': 'text/event-stream;charset=utf-8',
+				'Cache-Control': 'no-cache, no-transform',
+				'Connection': 'keep-alive',
+				// While behind nginx, event stream should not be buffered:
+				// http://nginx.org/docs/http/ngx_http_proxy_module.html#proxy_buffering
+				'X-Accel-Buffering': 'no'
+			});
+
+			res.write('\n');
+
+			this.clients.add(res);
+			req.on('close', () => {
+				this.clients.delete(res);
+			});
+		});
+
+		this._.listen(port);
+
+		this.interval = setInterval(() => {
+			this.send(null);
+		}, INTERVAL);
+	}
+
+	close() {
+		this._.close();
+		clearInterval(this.interval);
+	}
+
+	send(data: any) {
+		this.clients.forEach(client => {
+			client.write(`data: ${JSON.stringify(data)}\n\n`);
+		});
+	}
+}
+
+function noop() {}
+
+function watch_dir(
+	dir: string,
+	filter: ({ path, stats }: { path: string, stats: fs.Stats }) => boolean,
+	callback: () => void
+) {
+	let watch;
+	let closed = false;
+
+	import('cheap-watch').then(CheapWatch => {
+		if (closed) return;
+
+		watch = new CheapWatch({ dir, filter, debounce: 50 });
+
+		watch.on('+', ({ isNew }) => {
+			if (isNew) callback();
+		});
+
+		watch.on('-', callback);
+
+		watch.init();
+	});
+
+	return {
+		close: () => {
+			if (watch) watch.close();
+			closed = true;
+		}
+	};
+}

src/api/export.ts

@@ -0,0 +1,193 @@
+import * as child_process from 'child_process';
+import * as path from 'path';
+import * as sander from 'sander';
+import * as url from 'url';
+import fetch from 'node-fetch';
+import * as ports from 'port-authority';
+import { EventEmitter } from 'events';
+import clean_html from './utils/clean_html';
+import minify_html from './utils/minify_html';
+import Deferred from './utils/Deferred';
+import * as events from './interfaces';
+
+type Opts = {
+	build: string,
+	dest: string,
+	basepath?: string,
+	timeout: number | false
+};
+
+export function exporter(opts: Opts) {
+	const emitter = new EventEmitter();
+
+	execute(emitter, opts).then(
+		() => {
+			emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
+		},
+		error => {
+			emitter.emit('error', <events.ErrorEvent>{
+				error
+			});
+		}
+	);
+
+	return emitter;
+}
+
+function resolve(from: string, to: string) {
+	return url.parse(url.resolve(from, to));
+}
+
+type URL = url.UrlWithStringQuery;
+
+async function execute(emitter: EventEmitter, opts: Opts) {
+	const export_dir = path.join(opts.dest, opts.basepath);
+
+	// Prep output directory
+	sander.rimrafSync(export_dir);
+
+	sander.copydirSync('assets').to(export_dir);
+	sander.copydirSync(opts.build, 'client').to(export_dir, 'client');
+
+	if (sander.existsSync(opts.build, 'service-worker.js')) {
+		sander.copyFileSync(opts.build, 'service-worker.js').to(export_dir, 'service-worker.js');
+	}
+
+	if (sander.existsSync(opts.build, 'service-worker.js.map')) {
+		sander.copyFileSync(opts.build, 'service-worker.js.map').to(export_dir, 'service-worker.js.map');
+	}
+
+	const port = await ports.find(3000);
+
+	const protocol = 'http:';
+	const host = `localhost:${port}`;
+	const origin = `${protocol}//${host}`;
+
+	const root = resolve(origin, opts.basepath || '');
+	if (!root.href.endsWith('/')) root.href += '/';
+
+	emitter.emit('info', {
+		message: `Crawling ${root.href}`
+	});
+
+	const proc = child_process.fork(path.resolve(`${opts.build}/server.js`), [], {
+		cwd: process.cwd(),
+		env: Object.assign({
+			PORT: port,
+			NODE_ENV: 'production',
+			SAPPER_DEST: opts.build,
+			SAPPER_EXPORT: 'true'
+		}, process.env)
+	});
+
+	const seen = new Set();
+	const saved = new Set();
+
+	function save(path: string, status: number, type: string, body: string) {
+		const { pathname } = resolve(origin, path);
+		let file = pathname.slice(1);
+
+		if (saved.has(file)) return;
+		saved.add(file);
+
+		const is_html = type === 'text/html';
+
+		if (is_html) {
+			file = file === '' ? 'index.html' : `${file}/index.html`;
+			body = minify_html(body);
+		}
+
+		emitter.emit('file', <events.FileEvent>{
+			file,
+			size: body.length,
+			status
+		});
+
+		sander.writeFileSync(export_dir, file, body);
+	}
+
+	proc.on('message', message => {
+		if (!message.__sapper__ || message.event !== 'file') return;
+		save(message.url, message.status, message.type, message.body);
+	});
+
+	async function handle(url: URL) {
+		const pathname = (url.pathname.replace(root.pathname, '') || '/');
+
+		if (seen.has(pathname)) return;
+		seen.add(pathname);
+
+		const timeout_deferred = new Deferred();
+		const timeout = setTimeout(() => {
+			timeout_deferred.reject(new Error(`Timed out waiting for ${url.href}`));
+		}, opts.timeout);
+
+		const r = await Promise.race([
+			fetch(url.href, {
+				redirect: 'manual'
+			}),
+			timeout_deferred.promise
+		]);
+
+		clearTimeout(timeout); // prevent it hanging at the end
+
+		let type = r.headers.get('Content-Type');
+		let body = await r.text();
+
+		const range = ~~(r.status / 100);
+
+		if (range === 2) {
+			if (type === 'text/html') {
+				const urls: URL[] = [];
+
+				const cleaned = clean_html(body);
+
+				const base_match = /<base ([\s\S]+?)>/m.exec(cleaned);
+				const base_href = base_match && get_href(base_match[1]);
+				const base = resolve(url.href, base_href);
+
+				let match;
+				let pattern = /<a ([\s\S]+?)>/gm;
+
+				while (match = pattern.exec(cleaned)) {
+					const attrs = match[1];
+					const href = get_href(attrs);
+
+					if (href) {
+						const url = resolve(base.href, href);
+
+						if (url.protocol === protocol && url.host === host) {
+							urls.push(url);
+						}
+					}
+				}
+
+				await Promise.all(urls.map(handle));
+			}
+		}
+
+		if (range === 3) {
+			const location = r.headers.get('Location');
+
+			type = 'text/html';
+			body = `<script>window.location.href = "${location}"</script>`;
+
+			await handle(resolve(root.href, location));
+		}
+
+		save(pathname, r.status, type, body);
+	}
+
+	return ports.wait(port)
+		.then(() => handle(root))
+		.then(() => proc.kill())
+		.catch(err => {
+			proc.kill();
+			throw err;
+		});
+}
+
+function get_href(attrs: string) {
+	const match = /href\s*=\s*(?:"(.+?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
+	return match[1] || match[2] || match[3];
+}

src/api/find_page.ts

@@ -0,0 +1,14 @@
+import { locations } from '../config';
+import { create_manifest_data } from '../core';
+
+export function find_page(pathname: string, cwd = locations.routes()) {
+	const { pages } = create_manifest_data(cwd);
+
+	for (let i = 0; i < pages.length; i += 1) {
+		const page = pages[i];
+
+		if (page.pattern.test(pathname)) {
+			return page.parts[page.parts.length - 1].component.file;
+		}
+	}
+}

src/api/interfaces.ts

@@ -0,0 +1,45 @@
+import * as child_process from 'child_process';
+import { CompileResult } from '../core/create_compilers';
+
+export type ReadyEvent = {
+	port: number;
+	process: child_process.ChildProcess;
+};
+
+export type ErrorEvent = {
+	type: string;
+	message: string;
+};
+
+export type FatalEvent = {
+	message: string;
+	log?: string;
+};
+
+export type InvalidEvent = {
+	changed: string[];
+	invalid: {
+		client: boolean;
+		server: boolean;
+		serviceworker: boolean;
+	}
+};
+
+export type BuildEvent = {
+	type: string;
+	errors: Array<{ file: string, message: string, duplicate: boolean }>;
+	warnings: Array<{ file: string, message: string, duplicate: boolean }>;
+	duration: number;
+	result: CompileResult;
+}
+
+export type FileEvent = {
+	file: string;
+	size: number;
+}
+
+export type FailureEvent = {
+
+}
+
+export type DoneEvent = {};

src/api/utils/Deferred.ts

@@ -0,0 +1,12 @@
+export default class Deferred {
+	promise: Promise<any>;
+	fulfil: (value?: any) => void;
+	reject: (error: Error) => void;
+
+	constructor() {
+		this.promise = new Promise((fulfil, reject) => {
+			this.fulfil = fulfil;
+			this.reject = reject;
+		});
+	}
+}

src/api/utils/clean_html.ts

@@ -0,0 +1,7 @@
+export default function clean_html(html: string) {
+	return html
+		.replace(/<!\[CDATA\[[\s\S]*?\]\]>/gm, '')
+		.replace(/(<script[\s\S]*?>)[\s\S]*?<\/script>/gm, '$1</' + 'script>')
+		.replace(/(<style[\s\S]*?>)[\s\S]*?<\/style>/gm, '$1</' + 'style>')
+		.replace(/<!--[\s\S]*?-->/gm, '');
+}

src/api/utils/copy_shimport.ts

@@ -0,0 +1,9 @@
+import * as fs from 'fs';
+
+export function copy_shimport(dest: string) {
+	const shimport_version = require('shimport/package.json').version;
+	fs.writeFileSync(
+		`${dest}/client/shimport@${shimport_version}.js`,
+		fs.readFileSync(require.resolve('shimport/index.js'))
+	);
+}

src/api/utils/minify_html.ts

@@ -1,6 +1,6 @@
 import { minify } from 'html-minifier';
 
-export function minify_html(html: string) {
+export default function minify_html(html: string) {
 	return minify(html, {
 		collapseBooleanAttributes: true,
 		collapseWhitespace: true,
@@ -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,

src/cli.ts

@@ -1,11 +1,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as child_process from 'child_process';
 import sade from 'sade';
-import * as clorox from 'clorox';
+import colors from 'kleur';
 import prettyMs from 'pretty-ms';
-// import upgrade from './cli/upgrade';
-import * as ports from 'port-authority';
 import * as pkg from '../package.json';
 
 const prog = sade('sapper').version(pkg.version);
@@ -14,27 +11,60 @@ prog.command('dev')
 	.describe('Start a development server')
 	.option('-p, --port', 'Specify a port')
 	.option('-o, --open', 'Open a browser window')
-	.action(async (opts: { port: number, open: boolean }) => {
+	.option('--dev-port', 'Specify a port for development server')
+	.option('--hot', 'Use hot module replacement (requires webpack)', true)
+	.option('--live', 'Reload on changes if not using --hot', true)
+	.option('--bundler', 'Specify a bundler (rollup or webpack)')
+	.action(async (opts: {
+		port: number,
+		open: boolean,
+		'dev-port': number,
+		live: boolean,
+		hot: boolean,
+		bundler?: string
+	}) => {
 		const { dev } = await import('./cli/dev');
 		dev(opts);
 	});
 
 prog.command('build [dest]')
 	.describe('Create a production-ready version of your app')
-	.action(async (dest = 'build') => {
+	.option('-p, --port', 'Default of process.env.PORT', '3000')
+	.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
+	.option('--legacy', 'Create separate legacy build')
+	.example(`build custom-dir -p 4567`)
+	.action(async (dest = 'build', opts: {
+		port: string,
+		legacy: boolean,
+		bundler?: string
+	}) => {
 		console.log(`> Building...`);
 
-		process.env.NODE_ENV = 'production';
+		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 		process.env.SAPPER_DEST = dest;
 
 		const start = Date.now();
 
 		try {
 			const { build } = await import('./cli/build');
-			await build();
-			console.error(`\n> Finished in ${elapsed(start)}. Type ${clorox.bold.cyan(dest === 'build' ? 'npx sapper start' : `npx sapper start ${dest}`)} to run the app.`);
+			await build(opts);
+
+			const launcher = path.resolve(dest, 'index.js');
+
+			fs.writeFileSync(launcher, `
+				// generated by sapper build at ${new Date().toISOString()}
+				process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+				process.env.SAPPER_DEST = __dirname;
+				process.env.PORT = process.env.PORT || ${opts.port || 3000};
+
+				console.log('Starting server on port ' + process.env.PORT);
+				require('./server.js');
+			`.replace(/^\t+/gm, '').trim());
+
+			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);
 		} catch (err) {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+			console.log(`${colors.bold.red(`> ${err.message}`)}`);
+			process.exit(1);
 		}
 	});
 
@@ -49,25 +79,39 @@ prog.command('start [dir]')
 
 prog.command('export [dest]')
 	.describe('Export your app as static files (if possible)')
+	.option('--build', '(Re)build app before exporting', true)
+	.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
 	.option('--basepath', 'Specify a base path')
-	.action(async (dest = 'export', opts: { basepath?: string }) => {
-		console.log(`> Building...`);
-
+	.option('--timeout', 'Milliseconds to wait for a page (--no-timeout to disable)', 5000)
+	.option('--legacy', 'Create separate legacy build')
+	.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
+	.action(async (dest = 'export', opts: {
+		build: boolean,
+		legacy: boolean,
+		bundler?: string,
+		'build-dir': string,
+		basepath?: string,
+		timeout: number | false
+	}) => {
 		process.env.NODE_ENV = 'production';
-		process.env.SAPPER_DEST = '.sapper/.export';
+		process.env.SAPPER_DEST = opts['build-dir'];
 
 		const start = Date.now();
 
 		try {
-			const { build } = await import('./cli/build');
-			await build();
-			console.error(`\n> Built in ${elapsed(start)}. Crawling site...`);
+			if (opts.build) {
+				console.log(`> Building...`);
+				const { build } = await import('./cli/build');
+				await build(opts);
+				console.error(`\n> Built in ${elapsed(start)}`);
+			}
 
 			const { exporter } = await import('./cli/export');
 			await exporter(dest, opts);
-			console.error(`\n> Finished in ${elapsed(start)}. Type ${clorox.bold.cyan(`npx serve ${dest}`)} to run the app.`);
+			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`npx serve ${dest}`)} to run the app.`);
 		} catch (err) {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+			console.error(colors.bold.red(`> ${err.message}`));
+			process.exit(1);
 		}
 	});
 
@@ -77,4 +121,4 @@ prog.parse(process.argv);
 
 function elapsed(start: number) {
 	return prettyMs(Date.now() - start);
-}
+}

src/cli/build.ts

@@ -1,76 +1,56 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as clorox from 'clorox';
-import mkdirp from 'mkdirp';
-import rimraf from 'rimraf';
-import { minify_html } from './utils/minify_html';
-import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core'
+import { build as _build } from '../api/build';
+import colors from 'kleur';
 import { locations } from '../config';
+import validate_bundler from './utils/validate_bundler';
+import { repeat } from '../utils';
 
-export async function build() {
-	const output = locations.dest();
+export function build(opts: { bundler?: string, legacy?: boolean }) {
+	const bundler = validate_bundler(opts.bundler);
 
-	mkdirp.sync(output);
-	rimraf.sync(path.join(output, '**/*'));
-
-	// minify app/template.html
-	// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
-	const template = fs.readFileSync(`${locations.app()}/template.html`, 'utf-8');
-
-	// remove this in a future version
-	if (template.indexOf('%sapper.base%') === -1) {
-		console.log(`${clorox.bold.red(`> As of Sapper v0.10, your template.html file must include %sapper.base% in the <head>`)}`);
-		process.exit(1);
+	if (opts.legacy && bundler === 'webpack') {
+		throw new Error(`Legacy builds are not supported for projects using webpack`);
 	}
 
-	fs.writeFileSync(`${output}/template.html`, minify_html(template));
-
-	const routes = create_routes();
-
-	// create app/manifest/client.js and app/manifest/server.js
-	create_main_manifests({ routes });
-
-	const { client, server, serviceworker } = create_compilers();
-
-	const client_stats = await compile(client);
-	console.log(`${clorox.inverse(`\nbuilt client`)}`);
-	console.log(client_stats.toString({ colors: true }));
-	fs.writeFileSync(path.join(output, 'client_info.json'), JSON.stringify(client_stats.toJson()));
-
-	const server_stats = await compile(server);
-	console.log(`${clorox.inverse(`\nbuilt server`)}`);
-	console.log(server_stats.toString({ colors: true }));
-
-	let serviceworker_stats;
-
-	if (serviceworker) {
-		create_serviceworker_manifest({
-			routes,
-			client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `client/${chunk.name}`)
-		});
-
-		serviceworker_stats = await compile(serviceworker);
-		console.log(`${clorox.inverse(`\nbuilt service worker`)}`);
-		console.log(serviceworker_stats.toString({ colors: true }));
-	}
-}
-
-function compile(compiler: any) {
 	return new Promise((fulfil, reject) => {
-		compiler.run((err: Error, stats: any) => {
-			if (err) {
-				reject(err);
-				process.exit(1);
-			}
+		try {
+			const emitter = _build({
+				legacy: opts.legacy,
+				bundler
+			}, {
+				dest: locations.dest(),
+				app: locations.app(),
+				routes: locations.routes(),
+				webpack: 'webpack',
+				rollup: 'rollup'
+			});
 
-			if (stats.hasErrors()) {
-				console.error(stats.toString({ colors: true }));
-				reject(new Error(`Encountered errors while building app`));
-			}
+			emitter.on('build', event => {
+				let banner = `built ${event.type}`;
+				let c = colors.cyan;
 
-			else {
-				fulfil(stats);
-			}
-		});
+				const { warnings } = event.result;
+				if (warnings.length > 0) {
+					banner += ` with ${warnings.length} ${warnings.length === 1 ? 'warning' : 'warnings'}`;
+					c = colors.yellow;
+				}
+
+				console.log();
+				console.log(c(`┌─${repeat('─', banner.length)}─┐`));
+				console.log(c(`│ ${colors.bold(banner)       } │`));
+				console.log(c(`└─${repeat('─', banner.length)}─┘`));
+
+				console.log(event.result.print());
+			});
+
+			emitter.on('error', event => {
+				reject(event.error);
+			});
+
+			emitter.on('done', event => {
+				fulfil();
+			});
+		} catch (err) {
+			reject(err);
+		}
 	});
-}
+}

src/cli/dev.ts

@@ -1,320 +1,80 @@
-import * as fs from 'fs';
 import * as path from 'path';
-import * as net from 'net';
-import * as clorox from 'clorox';
+import colors from 'kleur';
 import * as child_process from 'child_process';
-import * as http from 'http';
-import mkdirp from 'mkdirp';
-import rimraf from 'rimraf';
-import format_messages from 'webpack-format-messages';
 import prettyMs from 'pretty-ms';
-import * as ports from 'port-authority';
-import { locations } from '../config';
-import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core';
+import { dev as _dev } from '../api/dev';
+import * as events from '../api/interfaces';
 
-type Deferred = {
-	promise?: Promise<any>;
-	fulfil?: (value?: any) => void;
-	reject?: (err: Error) => void;
-}
+export function dev(opts: { port: number, open: boolean, bundler?: string }) {
+	try {
+		const watcher = _dev(opts);
 
-function deferred() {
-	const d: Deferred = {};
+		let first = true;
 
-	d.promise = new Promise((fulfil, reject) => {
-		d.fulfil = fulfil;
-		d.reject = reject;
-	});
+		watcher.on('ready', (event: events.ReadyEvent) => {
+			if (first) {
+				console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
+				if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
+				first = false;
+			}
 
-	return d;
-}
+			// TODO clear screen?
 
-function create_hot_update_server(port: number, interval = 10000) {
-	const clients = new Set();
+			event.process.stdout.on('data', data => {
+				process.stdout.write(data);
+			});
 
-	const server = http.createServer((req, res) => {
-		if (req.url !== '/__sapper__') return;
-
-		req.socket.setKeepAlive(true);
-		res.writeHead(200, {
-			'Access-Control-Allow-Origin': '*',
-			'Access-Control-Allow-Headers': 'Cache-Control',
-			'Content-Type': 'text/event-stream;charset=utf-8',
-			'Cache-Control': 'no-cache, no-transform',
-			'Connection': 'keep-alive',
-			// While behind nginx, event stream should not be buffered:
-			// http://nginx.org/docs/http/ngx_http_proxy_module.html#proxy_buffering
-			'X-Accel-Buffering': 'no'
+			event.process.stderr.on('data', data => {
+				process.stderr.write(data);
+			});
 		});
 
-		res.write('\n');
-
-		clients.add(res);
-		req.on('close', () => {
-			clients.delete(res);
-		});
-	});
-
-	server.listen(port);
-
-	function send(data: any) {
-		clients.forEach(client => {
-			client.write(`data: ${JSON.stringify(data)}\n\n`);
-		});
-	}
-
-	setInterval(() => {
-		send(null)
-	}, interval);
-
-	return { send };
-}
-
-export async function dev(opts: { port: number, open: boolean }) {
-	// remove this in a future version
-	const template = fs.readFileSync(path.join(locations.app(), 'template.html'), 'utf-8');
-	if (template.indexOf('%sapper.base%') === -1) {
-		console.log(`${clorox.bold.red(`> As of Sapper v0.10, your template.html file must include %sapper.base% in the <head>`)}`);
-		process.exit(1);
-	}
-
-	process.env.NODE_ENV = 'development';
-
-	let port = opts.port || +process.env.PORT;
-
-	if (port) {
-		if (!await ports.check(port)) {
-			console.log(`${clorox.bold.red(`> Port ${port} is unavailable`)}`);
-			return;
-		}
-	} else {
-		port = await ports.find(3000);
-	}
-
-	const dir = locations.dest();
-	rimraf.sync(dir);
-	mkdirp.sync(dir);
-
-	const dev_port = await ports.find(10000);
-
-	const routes = create_routes();
-	create_main_manifests({ routes, dev_port });
-
-	const hot_update_server = create_hot_update_server(dev_port);
-
-	watch_files(`${locations.routes()}/**/*`, ['add', 'unlink'], () => {
-		const routes = create_routes();
-		create_main_manifests({ routes, dev_port });
-	});
-
-	watch_files(`${locations.app()}/template.html`, ['change'], () => {
-		hot_update_server.send({
-			action: 'reload'
-		});
-	});
-
-	let proc: child_process.ChildProcess;
-
-	process.on('exit', () => {
-		// sometimes webpack crashes, so we need to kill our children
-		if (proc) proc.kill();
-	});
-
-	const deferreds = {
-		server: deferred(),
-		client: deferred()
-	};
-
-	let restarting = false;
-	let build = {
-		unique_warnings: new Set(),
-		unique_errors: new Set()
-	};
-
-	function restart_build(filename: string) {
-		if (restarting) return;
-
-		restarting = true;
-		build = {
-			unique_warnings: new Set(),
-			unique_errors: new Set()
-		};
-
-		process.nextTick(() => {
-			restarting = false;
+		watcher.on('invalid', (event: events.InvalidEvent) => {
+			const changed = event.changed.map(filename => path.relative(process.cwd(), filename)).join(', ');
+			console.log(`\n${colors.bold.cyan(changed)} changed. rebuilding...`);
 		});
 
-		console.log(`\n${clorox.bold.cyan(path.relative(process.cwd(), filename))} changed. rebuilding...`);
-	}
-
-	// TODO watch the configs themselves?
-	const compilers = create_compilers();
-
-	function watch(compiler: any, { name, invalid = noop, error = noop, result }: {
-		name: string,
-		invalid?: (filename: string) => void;
-		error?: (error: Error) => void;
-		result: (stats: any) => void;
-	}) {
-		compiler.hooks.invalid.tap('sapper', (filename: string) => {
-			invalid(filename);
+		watcher.on('error', (event: events.ErrorEvent) => {
+			console.log(colors.red(`✗ ${event.type}`));
+			console.log(colors.red(event.message));
 		});
 
-		compiler.watch({}, (err: Error, stats: any) => {
-			if (err) {
-				console.log(`${clorox.red(`✗ ${name}`)}`);
-				console.log(`${clorox.red(err.message)}`);
-				error(err);
-			} else {
-				const messages = format_messages(stats);
-				const info = stats.toJson();
+		watcher.on('fatal', (event: events.FatalEvent) => {
+			console.log(colors.bold.red(`> ${event.message}`));
+			if (event.log) console.log(event.log);
+		});
 
-				if (messages.errors.length > 0) {
-					console.log(`${clorox.bold.red(`✗ ${name}`)}`);
+		watcher.on('build', (event: events.BuildEvent) => {
+			if (event.errors.length) {
+				console.log(colors.bold.red(`✗ ${event.type}`));
 
-					const filtered = messages.errors.filter((message: string) => {
-						return !build.unique_errors.has(message);
-					});
+				event.errors.filter(e => !e.duplicate).forEach(error => {
+					if (error.file) console.log(colors.bold(error.file));
+					console.log(error.message);
+				});
 
-					filtered.forEach((message: string) => {
-						build.unique_errors.add(message);
-						console.log(message);
-					});
-
-					const hidden = messages.errors.length - filtered.length;
-					if (hidden > 0) {
-						console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
-					}
-				} else {
-					if (messages.warnings.length > 0) {
-						console.log(`${clorox.bold.yellow(`• ${name}`)}`);
-
-						const filtered = messages.warnings.filter((message: string) => {
-							return !build.unique_warnings.has(message);
-						});
-
-						filtered.forEach((message: string) => {
-							build.unique_warnings.add(message);
-							console.log(`${message}\n`);
-						});
-
-						const hidden = messages.warnings.length - filtered.length;
-						if (hidden > 0) {
-							console.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
-						}
-					} else {
-						console.log(`${clorox.bold.green(`✔ ${name}`)} ${clorox.gray(`(${prettyMs(info.time)})`)}`);
-					}
-
-					result(info);
+				const hidden = event.errors.filter(e => e.duplicate).length;
+				if (hidden > 0) {
+					console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
 				}
+			} else if (event.warnings.length) {
+				console.log(colors.bold.yellow(`• ${event.type}`));
+
+				event.warnings.filter(e => !e.duplicate).forEach(warning => {
+					if (warning.file) console.log(colors.bold(warning.file));
+					console.log(warning.message);
+				});
+
+				const hidden = event.warnings.filter(e => e.duplicate).length;
+				if (hidden > 0) {
+					console.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
+				}
+			} else {
+				console.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${prettyMs(event.duration)})`)}`);
 			}
 		});
+	} catch (err) {
+		console.log(colors.bold.red(`> ${err.message}`));
+		process.exit(1);
 	}
-
-	watch(compilers.server, {
-		name: 'server',
-
-		invalid: filename => {
-			restart_build(filename);
-			// TODO print message
-			deferreds.server = deferred();
-		},
-
-		result: info => {
-			// TODO log compile errors/warnings
-
-			fs.writeFileSync(path.join(dir, 'server_info.json'), JSON.stringify(info, null, '  '));
-
-			deferreds.client.promise.then(() => {
-				function restart() {
-					ports.wait(port).then(deferreds.server.fulfil);
-				}
-
-				if (proc) {
-					proc.kill();
-					proc.on('exit', restart);
-				} else {
-					restart();
-				}
-
-				proc = child_process.fork(`${dir}/server.js`, [], {
-					cwd: process.cwd(),
-					env: Object.assign({
-						PORT: port
-					}, process.env)
-				});
-			});
-		}
-	});
-
-	let first = true;
-
-	watch(compilers.client, {
-		name: 'client',
-
-		invalid: filename => {
-			restart_build(filename);
-			deferreds.client = deferred();
-
-			// TODO we should delete old assets. due to a webpack bug
-			// i don't even begin to comprehend, this is apparently
-			// quite difficult
-		},
-
-		result: info => {
-			fs.writeFileSync(path.join(dir, 'client_info.json'), JSON.stringify(info, null, '  '));
-			deferreds.client.fulfil();
-
-			const client_files = info.assets.map((chunk: { name: string }) => `client/${chunk.name}`);
-
-			deferreds.server.promise.then(() => {
-				hot_update_server.send({
-					status: 'completed'
-				});
-
-				if (first) {
-					first = false;
-					console.log(`${clorox.bold.cyan(`> Listening on http://localhost:${port}`)}`);
-					if (opts.open) child_process.exec(`open http://localhost:${port}`);
-				}
-			});
-
-			create_serviceworker_manifest({
-				routes: create_routes(),
-				client_files
-			});
-
-			watch_serviceworker();
-		}
-	});
-
-	let watch_serviceworker = compilers.serviceworker
-		? function() {
-			watch_serviceworker = noop;
-
-			watch(compilers.serviceworker, {
-				name: 'service worker',
-
-				result: info => {
-					fs.writeFileSync(path.join(dir, 'serviceworker_info.json'), JSON.stringify(info, null, '  '));
-				}
-			});
-		}
-		: noop;
-}
-
-function noop() {}
-
-function watch_files(pattern: string, events: string[], callback: () => void) {
-	const chokidar = require('chokidar');
-
-	const watcher = chokidar.watch(pattern, {
-		persistent: true,
-		ignoreInitial: true
-	});
-
-	events.forEach(event => {
-		watcher.on(event, callback);
-	});
-}
+}

src/cli/export.ts

@@ -1,106 +1,50 @@
-import * as child_process from 'child_process';
-import * as path from 'path';
-import * as sander from 'sander';
-import * as clorox from 'clorox';
-import cheerio from 'cheerio';
-import URL from 'url-parse';
-import fetch from 'node-fetch';
-import * as ports from 'port-authority';
-import prettyBytes from 'pretty-bytes';
-import { minify_html } from './utils/minify_html';
+import { exporter as _exporter } from '../api/export';
+import colors from 'kleur';
+import pb from 'pretty-bytes';
 import { locations } from '../config';
+import { left_pad } from '../utils';
 
-export async function exporter(export_dir: string, { basepath = '' }) {
-	const build_dir = locations.dest();
+export function exporter(export_dir: string, {
+	basepath = '',
+	timeout
+}: {
+	basepath: string,
+	timeout: number | false
+}) {
+	return new Promise((fulfil, reject) => {
+		try {
+			const emitter = _exporter({
+				build: locations.dest(),
+				dest: export_dir,
+				basepath,
+				timeout
+			});
 
-	export_dir = path.join(export_dir, basepath);
+			emitter.on('file', event => {
+				const size_color = event.size > 150000 ? colors.bold.red : event.size > 50000 ? colors.bold.yellow : colors.bold.gray;
+				const size_label = size_color(left_pad(pb(event.size), 10));
 
-	// Prep output directory
-	sander.rimrafSync(export_dir);
+				const file_label = event.status === 200
+					? event.file
+					: colors.bold[event.status >= 400 ? 'red' : 'yellow'](`(${event.status}) ${event.file}`);
 
-	sander.copydirSync('assets').to(export_dir);
-	sander.copydirSync(build_dir, 'client').to(export_dir, 'client');
+				console.log(`${size_label}   ${file_label}`);
+			});
 
-	if (sander.existsSync(build_dir, 'service-worker.js')) {
-		sander.copyFileSync(build_dir, 'service-worker.js').to(export_dir, 'service-worker.js');
-	}
+			emitter.on('info', event => {
+				console.log(colors.bold.cyan(`> ${event.message}`));
+			});
 
-	if (sander.existsSync(build_dir, 'service-worker.js.map')) {
-		sander.copyFileSync(build_dir, 'service-worker.js.map').to(export_dir, 'service-worker.js.map');
-	}
+			emitter.on('error', event => {
+				reject(event.error);
+			});
 
-	const port = await ports.find(3000);
-
-	const origin = `http://localhost:${port}`;
-
-	const proc = child_process.fork(path.resolve(`${build_dir}/server.js`), [], {
-		cwd: process.cwd(),
-		env: {
-			PORT: port,
-			NODE_ENV: 'production',
-			SAPPER_DEST: build_dir,
-			SAPPER_EXPORT: 'true'
+			emitter.on('done', event => {
+				fulfil();
+			});
+		} catch (err) {
+			console.log(`${colors.bold.red(`> ${err.message}`)}`);
+			process.exit(1);
 		}
 	});
-
-	const seen = new Set();
-	const saved = new Set();
-
-	proc.on('message', message => {
-		if (!message.__sapper__) return;
-
-		let file = new URL(message.url, origin).pathname.slice(1);
-		let { body } = message;
-
-		if (saved.has(file)) return;
-		saved.add(file);
-
-		const is_html = message.type === 'text/html';
-
-		if (is_html) {
-			file = file === '' ? 'index.html' : `${file}/index.html`;
-			body = minify_html(body);
-		}
-
-		console.log(`${clorox.bold.cyan(file)} ${clorox.gray(`(${prettyBytes(body.length)})`)}`);
-
-		sander.writeFileSync(export_dir, file, body);
-	});
-
-	async function handle(url: URL) {
-		const r = await fetch(url.href);
-		const range = ~~(r.status / 100);
-
-		if (range >= 4) {
-			console.log(`${clorox.red(`> Received ${r.status} response when fetching ${url.pathname}`)}`);
-			return;
-		}
-
-		if (range === 2) {
-			if (r.headers.get('Content-Type') === 'text/html') {
-				const body = await r.text();
-				const $ = cheerio.load(body);
-				const urls: URL[] = [];
-
-				const base = new URL($('base').attr('href') || '/', url.href);
-
-				$('a[href]').each((i: number, $a) => {
-					const url = new URL($a.attribs.href, base.href);
-
-					if (url.origin === origin && !seen.has(url.pathname)) {
-						seen.add(url.pathname);
-						urls.push(url);
-					}
-				});
-
-				for (const url of urls) {
-					await handle(url);
-				}
-			}
-		}
-	}
-
-	return ports.wait(port)
-		.then(() => handle(new URL(`/${basepath}`, origin))) // TODO all static routes
-		.then(() => proc.kill());
 }

src/cli/start.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as child_process from 'child_process';
-import * as clorox from 'clorox';
+import colors from 'kleur';
 import * as ports from 'port-authority';
 
 export async function start(dir: string, opts: { port: number, open: boolean }) {
@@ -11,13 +11,13 @@ export async function start(dir: string, opts: { port: number, open: boolean })
 	const server = path.resolve(dir, 'server.js');
 
 	if (!fs.existsSync(server)) {
-		console.log(clorox.bold.red(`> ${dir}/server.js does not exist — type ${clorox.bold.cyan(dir === 'build' ? `npx sapper build` : `npx sapper build ${dir}`)} to create it`));
+		console.log(`${colors.bold.red(`> ${dir}/server.js does not exist — type ${colors.bold.cyan(dir === 'build' ? `npx sapper build` : `npx sapper build ${dir}`)} to create it`)}`);
 		return;
 	}
 
 	if (port) {
 		if (!await ports.check(port)) {
-			console.log(clorox.bold.red(`> Port ${port} is unavailable`));
+			console.log(`${colors.bold.red(`> Port ${port} is unavailable`)}`);
 			return;
 		}
 	} else {
@@ -34,6 +34,6 @@ export async function start(dir: string, opts: { port: number, open: boolean })
 	});
 
 	await ports.wait(port);
-	console.log(`${clorox.bold.cyan(`> Listening on http://localhost:${port}`)}`);
+	console.log(`${colors.bold.cyan(`> Listening on http://localhost:${port}`)}`);
 	if (opts.open) child_process.exec(`open http://localhost:${port}`);
-}
+}

src/cli/upgrade.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as clorox from 'clorox';
+import colors from 'kleur';
 
 export default async function upgrade() {
 	const upgraded = [
@@ -27,10 +27,10 @@ async function upgrade_sapper_main() {
 
 		if (/\%sapper\.main\%/.test(template)) {
 			if (!pattern.test(template)) {
-				console.log(`${clorox.red(`Could not replace %sapper.main% in ${file}`)}`);
+				console.log(`${colors.red(`Could not replace %sapper.main% in ${file}`)}`);
 			} else {
 				write(file, template.replace(pattern, `%sapper.scripts%`));
-				console.log(`${clorox.green(`Replaced %sapper.main% in ${file}`)}`);
+				console.log(`${colors.green(`Replaced %sapper.main% in ${file}`)}`);
 				replaced = true;
 			}
 		}

src/cli/utils/validate_bundler.ts

@@ -0,0 +1,21 @@
+import * as fs from 'fs';
+
+export default function validate_bundler(bundler?: string) {
+	if (!bundler) {
+		bundler = (
+			fs.existsSync('rollup') ? 'rollup' :
+			fs.existsSync('webpack') ? 'webpack' :
+			null
+		);
+
+		if (!bundler) {
+			throw new Error(`Could not find a 'rollup' or 'webpack' directory`);
+		}
+	}
+
+	if (bundler !== 'rollup' && bundler !== 'webpack') {
+		throw new Error(`'${bundler}' is not a valid option for --bundler — must be either 'rollup' or 'webpack'`);
+	}
+
+	return bundler;
+}

src/config.ts

@@ -6,5 +6,5 @@ export const locations = {
 	base:   () => path.resolve(process.env.SAPPER_BASE || ''),
 	app:    () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_APP    || 'app'),
 	routes: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_ROUTES || 'routes'),
-	dest:   () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST   || '.sapper')
+	dest:   () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST   || `.sapper/${dev() ? 'dev' : 'prod'}`)
 };

src/core.ts

@@ -1,3 +1,3 @@
 export * from './core/create_manifests';
-export { default as create_compilers } from './core/create_compilers';
-export { default as create_routes } from './core/create_routes';
+export { default as create_compilers } from './core/create_compilers/index';
+export { default as create_manifest_data } from './core/create_manifest_data';

src/core/create_compilers.ts

@@ -1,29 +0,0 @@
-import * as path from 'path';
-import relative from 'require-relative';
-
-export default function create_compilers() {
-	const webpack = relative('webpack', process.cwd());
-
-	const serviceworker_config = try_require(path.resolve('webpack/service-worker.config.js'));
-
-	return {
-		client: webpack(
-			require(path.resolve('webpack/client.config.js'))
-		),
-
-		server: webpack(
-			require(path.resolve('webpack/server.config.js'))
-		),
-
-		serviceworker: serviceworker_config && webpack(serviceworker_config)
-	};
-}
-
-function try_require(specifier: string) {
-	try {
-		return require(specifier);
-	} catch (err) {
-		if (err.code === 'MODULE_NOT_FOUND') return null;
-		throw err;
-	}
-}

src/core/create_compilers/RollupCompiler.ts

@@ -0,0 +1,160 @@
+import * as path from 'path';
+import relative from 'require-relative';
+import { CompileResult } from './interfaces';
+import RollupResult from './RollupResult';
+
+let rollup: any;
+
+export default class RollupCompiler {
+	_: Promise<any>;
+	_oninvalid: (filename: string) => void;
+	_start: number;
+	input: string;
+	warnings: any[];
+	errors: any[];
+	chunks: any[];
+	css_files: Array<{ id: string, code: string }>;
+
+	constructor(config: string) {
+		this._ = this.get_config(path.resolve(config));
+		this.input = null;
+		this.warnings = [];
+		this.errors = [];
+		this.chunks = [];
+		this.css_files = [];
+	}
+
+	async get_config(input: string) {
+		if (!rollup) rollup = relative('rollup', process.cwd());
+
+		const bundle = await rollup.rollup({
+			input,
+			external: (id: string) => {
+				return (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json';
+			}
+		});
+
+		const { code } = await bundle.generate({ format: 'cjs' });
+
+		// temporarily override require
+		const defaultLoader = require.extensions['.js'];
+		require.extensions['.js'] = (module: any, filename: string) => {
+			if (filename === input) {
+				module._compile(code, filename);
+			} else {
+				defaultLoader(module, filename);
+			}
+		};
+
+		const mod: any = require(input);
+		delete require.cache[input];
+
+		(mod.plugins || (mod.plugins = [])).push({
+			name: 'sapper-internal',
+			options: (opts: any) => {
+				this.input = opts.input;
+			},
+			renderChunk: (code: string, chunk: any) => {
+				this.chunks.push(chunk);
+			},
+			transform: (code: string, id: string) => {
+				if (/\.css$/.test(id)) {
+					this.css_files.push({ id, code });
+					return ``;
+				}
+			}
+		});
+
+		const onwarn = mod.onwarn || ((warning: any, handler: (warning: any) => void) => {
+			handler(warning);
+		});
+
+		mod.onwarn = (warning: any) => {
+			onwarn(warning, (warning: any) => {
+				this.warnings.push(warning);
+			});
+		};
+
+		return mod;
+	}
+
+	oninvalid(cb: (filename: string) => void) {
+		this._oninvalid = cb;
+	}
+
+	async compile(): Promise<CompileResult> {
+		const config = await this._;
+
+		const start = Date.now();
+
+		try {
+			const bundle = await rollup.rollup(config);
+			await bundle.write(config.output);
+
+			return new RollupResult(Date.now() - start, this);
+		} catch (err) {
+			if (err.filename) {
+				// TODO this is a bit messy. Also, can
+				// Rollup emit other kinds of error?
+				err.message = [
+					`Failed to build — error in ${err.filename}: ${err.message}`,
+					err.frame
+				].filter(Boolean).join('\n');
+			}
+
+			throw err;
+		}
+	}
+
+	async watch(cb: (err?: Error, stats?: any) => void) {
+		const config = await this._;
+
+		const watcher = rollup.watch(config);
+
+		watcher.on('change', (id: string) => {
+			this.chunks = [];
+			this.warnings = [];
+			this.errors = [];
+			this._oninvalid(id);
+		});
+
+		watcher.on('event', (event: any) => {
+			switch (event.code) {
+				case 'FATAL':
+					// TODO kill the process?
+					if (event.error.filename) {
+						// TODO this is a bit messy. Also, can
+						// Rollup emit other kinds of error?
+						event.error.message = [
+							`Failed to build — error in ${event.error.filename}: ${event.error.message}`,
+							event.error.frame
+						].filter(Boolean).join('\n');
+					}
+
+					cb(event.error);
+					break;
+
+				case 'ERROR':
+					this.errors.push(event.error);
+					cb(null, new RollupResult(Date.now() - this._start, this));
+					break;
+
+				case 'START':
+				case 'END':
+					// TODO is there anything to do with this info?
+					break;
+
+				case 'BUNDLE_START':
+					this._start = Date.now();
+					break;
+
+				case 'BUNDLE_END':
+					cb(null, new RollupResult(Date.now() - this._start, this));
+					break;
+
+				default:
+					console.log(`Unexpected event ${event.code}`);
+			}
+		});
+	}
+}

src/core/create_compilers/RollupResult.ts

@@ -0,0 +1,111 @@
+import * as path from 'path';
+import colors from 'kleur';
+import pb from 'pretty-bytes';
+import RollupCompiler from './RollupCompiler';
+import extract_css from './extract_css';
+import { left_pad } from '../../utils';
+import { CompileResult, BuildInfo, CompileError, Chunk, CssFile } from './interfaces';
+import { ManifestData, Dirs, PageComponent } from '../../interfaces';
+
+export default class RollupResult implements CompileResult {
+	duration: number;
+	errors: CompileError[];
+	warnings: CompileError[];
+	chunks: Chunk[];
+	assets: Record<string, string>;
+	css_files: CssFile[];
+	css: {
+		main: string,
+		chunks: Record<string, string[]>
+	};
+	summary: string;
+
+	constructor(duration: number, compiler: RollupCompiler) {
+		this.duration = duration;
+
+		this.errors = compiler.errors.map(munge_warning_or_error);
+		this.warnings = compiler.warnings.map(munge_warning_or_error); // TODO emit this as they happen
+
+		this.chunks = compiler.chunks.map(chunk => ({
+			file: chunk.fileName,
+			imports: chunk.imports.filter(Boolean),
+			modules: Object.keys(chunk.modules)
+		}));
+
+		this.css_files = compiler.css_files;
+
+		// TODO populate this properly. We don't have named chunks, as in
+		// webpack, but we can have a route -> [chunk] map or something
+		this.assets = {};
+
+		compiler.chunks.forEach(chunk => {
+			if (compiler.input in chunk.modules) {
+				this.assets.main = chunk.fileName;
+			}
+		});
+
+		this.summary = compiler.chunks.map(chunk => {
+			const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white;
+			const size_label = left_pad(pb(chunk.code.length), 10);
+
+			const lines = [size_color(`${size_label} ${chunk.fileName}`)];
+
+			const deps = Object.keys(chunk.modules)
+				.map(file => {
+					return {
+						file: path.relative(process.cwd(), file),
+						size: chunk.modules[file].renderedLength
+					};
+				})
+				.filter(dep => dep.size > 0)
+				.sort((a, b) => b.size - a.size);
+
+			const total_unminified = deps.reduce((t, d) => t + d.size, 0);
+
+			deps.forEach((dep, i) => {
+				const c = i === deps.length - 1 ? '└' : '│';
+				let line = `           ${c} ${dep.file}`;
+
+				if (deps.length > 1) {
+					const p = (100 * dep.size / total_unminified).toFixed(1);
+					line += ` (${p}%)`;
+				}
+
+				lines.push(colors.gray(line));
+			});
+
+			return lines.join('\n');
+		}).join('\n');
+	}
+
+	to_json(manifest_data: ManifestData, dirs: Dirs): BuildInfo {
+		// TODO extract_css has side-effects that don't belong
+		// in a method called to_json
+		return {
+			bundler: 'rollup',
+			shimport: require('shimport/package.json').version,
+			assets: this.assets,
+			css: extract_css(this, manifest_data.components, dirs)
+		};
+	}
+
+	print() {
+		const blocks: string[] = this.warnings.map(warning => {
+			return warning.file
+				? `> ${colors.bold(warning.file)}\n${warning.message}`
+				: `> ${warning.message}`;
+		});
+
+		blocks.push(this.summary);
+
+		return blocks.join('\n\n');
+	}
+}
+
+function munge_warning_or_error(warning_or_error: any) {
+	return {
+		file: warning_or_error.filename,
+		message: [warning_or_error.message, warning_or_error.frame].filter(Boolean).join('\n')
+	};
+}
+

src/core/create_compilers/WebpackCompiler.ts

@@ -0,0 +1,48 @@
+import * as path from 'path';
+import relative from 'require-relative';
+import { CompileResult } from './interfaces';
+import WebpackResult from './WebpackResult';
+
+let webpack: any;
+
+export class WebpackCompiler {
+	_: any;
+
+	constructor(config: string) {
+		if (!webpack) webpack = relative('webpack', process.cwd());
+		this._ = webpack(require(path.resolve(config)));
+	}
+
+	oninvalid(cb: (filename: string) => void) {
+		this._.hooks.invalid.tap('sapper', cb);
+	}
+
+	compile(): Promise<CompileResult> {
+		return new Promise((fulfil, reject) => {
+			this._.run((err: Error, stats: any) => {
+				if (err) {
+					reject(err);
+					process.exit(1);
+				}
+
+				const result = new WebpackResult(stats);
+
+				if (result.errors.length) {
+					// TODO print errors
+					// console.error(stats.toString({ colors: true }));
+					reject(new Error(`Encountered errors while building app`));
+				}
+
+				else {
+					fulfil(result);
+				}
+			});
+		});
+	}
+
+	watch(cb: (err?: Error, stats?: any) => void) {
+		this._.watch({}, (err?: Error, stats?: any) => {
+			cb(err, stats && new WebpackResult(stats));
+		});
+	}
+}

src/core/create_compilers/WebpackResult.ts

@@ -0,0 +1,73 @@
+import format_messages from 'webpack-format-messages';
+import { CompileResult, BuildInfo, CompileError, Chunk, CssFile } from './interfaces';
+import { ManifestData, Dirs } from '../../interfaces';
+
+const locPattern = /\((\d+):(\d+)\)$/;
+
+function munge_warning_or_error(message: string) {
+	// TODO this is all a bit rube goldberg...
+	const lines = message.split('\n');
+
+	const file = lines.shift()
+		.replace('', '') // careful — there is a special character at the beginning of this string
+		.replace('', '')
+		.replace('./', '');
+
+	let line = null;
+	let column = null;
+
+	const match = locPattern.exec(lines[0]);
+	if (match) {
+		lines[0] = lines[0].replace(locPattern, '');
+		line = +match[1];
+		column = +match[2];
+	}
+
+	return {
+		file,
+		message: lines.join('\n')
+	};
+}
+
+export default class WebpackResult implements CompileResult {
+	duration: number;
+	errors: CompileError[];
+	warnings: CompileError[];
+	chunks: Chunk[];
+	assets: Record<string, string>;
+	css_files: CssFile[];
+	stats: any;
+
+	constructor(stats: any) {
+		this.stats = stats;
+
+		const info = stats.toJson();
+
+		const messages = format_messages(stats);
+
+		this.errors = messages.errors.map(munge_warning_or_error);
+		this.warnings = messages.warnings.map(munge_warning_or_error);
+
+		this.duration = info.time;
+
+		this.chunks = info.assets.map((chunk: { name: string }) => ({ file: chunk.name }));
+		this.assets = info.assetsByChunkName;
+	}
+
+	to_json(manifest_data: ManifestData, dirs: Dirs): BuildInfo {
+		return {
+			bundler: 'webpack',
+			shimport: null, // webpack has its own loader
+			assets: this.assets,
+			css: {
+				// TODO
+				main: null,
+				chunks: {}
+			}
+		};
+	}
+
+	print() {
+		return this.stats.toString({ colors: true });
+	}
+}

src/core/create_compilers/extract_css.ts

@@ -0,0 +1,230 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import hash from 'string-hash';
+import * as codec from 'sourcemap-codec';
+import { PageComponent, Dirs } from '../../interfaces';
+import { CompileResult } from './interfaces';
+
+const inline_sourcemap_header = 'data:application/json;charset=utf-8;base64,';
+
+function extract_sourcemap(raw: string, id: string) {
+	let raw_map: string;
+	let map = null;
+
+	const code = raw.replace(/\/\*#\s+sourceMappingURL=(.+)\s+\*\//g, (m, url) => {
+		if (raw_map) {
+			// TODO should not happen!
+			throw new Error(`Found multiple sourcemaps in single CSS file (${id})`);
+		}
+
+		raw_map = url;
+		return '';
+	}).trim();
+
+	if (raw_map) {
+		if (raw_map.startsWith(inline_sourcemap_header)) {
+			const json = Buffer.from(raw_map.slice(inline_sourcemap_header.length), 'base64').toString();
+			map = JSON.parse(json);
+		} else {
+			// TODO do we want to handle non-inline sourcemaps? could be a rabbit hole
+		}
+	}
+
+	return {
+		code,
+		map
+	};
+}
+
+type SourceMap = {
+	version: 3;
+	file: string;
+	sources: string[];
+	sourcesContent: string[];
+	names: string[];
+	mappings: string;
+};
+
+export default function extract_css(client_result: CompileResult, components: PageComponent[], dirs: Dirs) {
+	const result: {
+		main: string | null;
+		chunks: Record<string, string[]>
+	} = {
+		main: null,
+		chunks: {}
+	};
+
+	if (!client_result.css_files) return; // Rollup-only for now
+
+	const unaccounted_for = new Set();
+
+	const css_map = new Map();
+	client_result.css_files.forEach(css => {
+		unaccounted_for.add(css.id);
+		css_map.set(css.id, css.code);
+	});
+
+	const chunk_map = new Map();
+	client_result.chunks.forEach(chunk => {
+		chunk_map.set(chunk.file, chunk);
+	});
+
+	const chunks_with_css = new Set();
+
+	// figure out which chunks belong to which components...
+	const component_owners = new Map();
+	client_result.chunks.forEach(chunk => {
+		chunk.modules.forEach(module => {
+			const component = path.relative(dirs.routes, module);
+			component_owners.set(component, chunk);
+		});
+	});
+
+	const chunks_depended_upon_by_component = new Map();
+
+	// ...so we can figure out which chunks don't belong
+	components.forEach(component => {
+		const chunk = component_owners.get(component.file);
+		if (!chunk) {
+			// this should never happen!
+			throw new Error(`Could not find chunk that owns ${component.file}`);
+		}
+
+		const chunks = new Set([chunk]);
+		chunks.forEach(chunk => {
+			chunk.imports.forEach((file: string) => {
+				const chunk = chunk_map.get(file);
+				if (chunk) chunks.add(chunk);
+			});
+		});
+
+		chunks.forEach(chunk => {
+			chunk.modules.forEach((module: string) => {
+				unaccounted_for.delete(module);
+			});
+		});
+
+		chunks_depended_upon_by_component.set(
+			component,
+			chunks
+		);
+	});
+
+	function get_css_from_modules(modules: string[]) {
+		const parts: string[] = [];
+		const mappings: number[][][] = [];
+
+		const combined_map: SourceMap = {
+			version: 3,
+			file: null,
+			sources: [],
+			sourcesContent: [],
+			names: [],
+			mappings: null
+		};
+
+		modules.forEach(module => {
+			if (!/\.css$/.test(module)) return;
+
+			const css = css_map.get(module);
+
+			const { code, map } = extract_sourcemap(css, module);
+
+			parts.push(code);
+
+			if (map) {
+				const lines = codec.decode(map.mappings);
+
+				if (combined_map.sources.length > 0 || combined_map.names.length > 0) {
+					lines.forEach(line => {
+						line.forEach(segment => {
+							// adjust source index
+							segment[1] += combined_map.sources.length;
+
+							// adjust name index
+							if (segment[4]) segment[4] += combined_map.names.length;
+						});
+					});
+				}
+
+				combined_map.sources.push(...map.sources);
+				combined_map.sourcesContent.push(...map.sourcesContent);
+				combined_map.names.push(...map.names);
+
+				mappings.push(...lines);
+			}
+		});
+
+		if (parts.length > 0) {
+			combined_map.mappings = codec.encode(mappings);
+
+			combined_map.sources = combined_map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
+
+			return {
+				code: parts.join('\n'),
+				map: combined_map
+			};
+		}
+
+		return null;
+	}
+
+	const main = client_result.assets.main;
+	const entry = fs.readFileSync(`${dirs.dest}/client/${main}`, 'utf-8');
+
+	const replacements = new Map();
+
+	chunks_depended_upon_by_component.forEach((chunks, component) => {
+		const chunks_with_css = Array.from(chunks).filter(chunk => {
+			const css = get_css_from_modules(chunk.modules);
+
+			if (css) {
+				const { code, map } = css;
+
+				const output_file_name = chunk.file.replace(/\.js$/, '.css');
+
+				map.file = output_file_name;
+				map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
+
+				fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`);
+				fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, '  '));
+
+				return true;
+			}
+		});
+
+		const files = chunks_with_css.map(chunk => chunk.file.replace(/\.js$/, '.css'));
+
+		replacements.set(
+			component.file,
+			files
+		);
+
+		result.chunks[component.file] = files;
+	});
+
+	const replaced = entry.replace(/["']__SAPPER_CSS_PLACEHOLDER:(.+?)__["']/g, (m, route) => {
+		return JSON.stringify(replacements.get(route));
+	});
+
+	fs.writeFileSync(`${dirs.dest}/client/${main}`, replaced);
+
+	const leftover = get_css_from_modules(Array.from(unaccounted_for));
+	if (leftover) {
+		const { code, map } = leftover;
+
+		const main_hash = hash(code);
+
+		const output_file_name = `main.${main_hash}.css`;
+
+		map.file = output_file_name;
+		map.sources = map.sources.map(source => path.relative(`${dirs.dest}/client`, source));
+
+		fs.writeFileSync(`${dirs.dest}/client/${output_file_name}`, `${code}\n/* sourceMappingURL=client/${output_file_name}.map */`);
+		fs.writeFileSync(`${dirs.dest}/client/${output_file_name}.map`, JSON.stringify(map, null, '  '));
+
+		result.main = output_file_name;
+	}
+
+	return result;
+}

src/core/create_compilers/index.ts

@@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import { Dirs } from '../../interfaces';
+import RollupCompiler from './RollupCompiler';
+import { WebpackCompiler } from './WebpackCompiler';
+
+export type Compiler = RollupCompiler | WebpackCompiler;
+
+export type Compilers = {
+	client: Compiler;
+	server: Compiler;
+	serviceworker?: Compiler;
+}
+
+export default function create_compilers(bundler: string, dirs: Dirs): Compilers {
+	if (bundler === 'rollup') {
+		const sw = `${dirs.rollup}/service-worker.config.js`;
+
+		return {
+			client: new RollupCompiler(`${dirs.rollup}/client.config.js`),
+			server: new RollupCompiler(`${dirs.rollup}/server.config.js`),
+			serviceworker: fs.existsSync(sw) && new RollupCompiler(sw)
+		};
+	}
+
+	if (bundler === 'webpack') {
+		const sw = `${dirs.webpack}/service-worker.config.js`;
+
+		return {
+			client: new WebpackCompiler(`${dirs.webpack}/client.config.js`),
+			server: new WebpackCompiler(`${dirs.webpack}/server.config.js`),
+			serviceworker: fs.existsSync(sw) && new WebpackCompiler(sw)
+		};
+	}
+
+	// this shouldn't be possible...
+	throw new Error(`Invalid bundler option '${bundler}'`);
+}

src/core/create_compilers/interfaces.ts

@@ -0,0 +1,39 @@
+import { ManifestData, Dirs } from '../../interfaces';
+
+export type Chunk = {
+	file: string;
+	imports: string[];
+	modules: string[];
+}
+
+export type CssFile = {
+	id: string;
+	code: string;
+};
+
+export class CompileError {
+	file: string;
+	message: string;
+}
+
+export interface CompileResult {
+	duration: number;
+	errors: CompileError[];
+	warnings: CompileError[];
+	chunks: Chunk[];
+	assets: Record<string, string>;
+	css_files: CssFile[];
+
+	to_json: (manifest_data: ManifestData, dirs: Dirs) => BuildInfo
+}
+
+export type BuildInfo = {
+	bundler: string;
+	shimport: string;
+	assets: Record<string, string>;
+	legacy_assets?: Record<string, string>;
+	css: {
+		main: string | null,
+		chunks: Record<string, string[]>
+	}
+}

src/core/create_manifest_data.ts

@@ -0,0 +1,295 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { locations } from '../config';
+import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
+import { posixify } from './utils';
+
+export default function create_manifest_data(cwd = locations.routes()): ManifestData {
+	const components: PageComponent[] = [];
+	const pages: Page[] = [];
+	const server_routes: ServerRoute[] = [];
+
+	const default_layout: PageComponent = {
+		default: true,
+		name: '_default_layout',
+		file: null
+	};
+
+	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 segment = is_dir
+					? basename
+					: basename.slice(0, -path.extname(basename).length);
+
+				const parts = get_parts(segment);
+				const is_index = is_dir ? false : basename.startsWith('index.');
+				const is_page = path.extname(basename) === '.html';
+
+				parts.forEach(part => {
+					if (/\]\[/.test(part.content)) {
+						throw new Error(`Invalid route ${file} — parameters must be separated`);
+					}
+
+					if (part.qualifier && /[\(\)\?\:]/.test(part.qualifier.slice(1, -1))) {
+						throw new Error(`Invalid route ${file} — cannot use (, ), ? or : in route qualifiers`);
+					}
+				});
+
+				return {
+					basename,
+					parts,
+					file: posixify(file),
+					is_dir,
+					is_index,
+					is_page
+				};
+			})
+			.sort(comparator);
+
+		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}`
+						};
+					}
+
+					segments[segments.length - 1] = last_segment;
+				}
+			} else {
+				segments.push(item.parts);
+			}
+
+			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, true),
+						parts
+					});
+				} else {
+					pages.push({
+						pattern: get_pattern(segments, true),
+						parts
+					});
+				}
+			}
+
+			else {
+				server_routes.push({
+					name: `route_${get_slug(item.file)}`,
+					pattern: get_pattern(segments, false),
+					file: item.file,
+					params: params
+				});
+			}
+		});
+	}
+
+	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
+	};
+}
+
+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,
+				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[][], add_trailing_slash: boolean) {
+	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('') +
+		(add_trailing_slash ? '\\\/?$' : '$')
+	);
+}

src/core/create_manifests.ts

@@ -1,29 +1,36 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as glob from 'glob';
-import create_routes from './create_routes';
+import glob from 'tiny-glob/sync.js';
 import { posixify, write_if_changed } from './utils';
 import { dev, locations } from '../config';
-import { Route } from '../interfaces';
+import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
 
-export function create_main_manifests({ routes, dev_port }: {
-	routes: Route[];
+export function create_main_manifests({ bundler, manifest_data, dev_port }: {
+	bundler: string,
+	manifest_data: ManifestData;
 	dev_port?: number;
 }) {
-	const path_to_routes = path.relative(`${locations.app()}/manifest`, locations.routes());
+	const manifest_dir = path.join(locations.app(), 'manifest');
+	if (!fs.existsSync(manifest_dir)) fs.mkdirSync(manifest_dir);
 
-	const client_manifest = generate_client(routes, path_to_routes, dev_port);
-	const server_manifest = generate_server(routes, path_to_routes);
+	const path_to_routes = path.relative(manifest_dir, locations.routes());
 
-	write_if_changed(`${locations.app()}/manifest/client.js`, client_manifest);
-	write_if_changed(`${locations.app()}/manifest/server.js`, server_manifest);
+	const client_manifest = generate_client(manifest_data, path_to_routes, bundler, dev_port);
+	const server_manifest = generate_server(manifest_data, path_to_routes);
+
+	write_if_changed(
+		`${manifest_dir}/default-layout.html`,
+		`<svelte:component this={child.component} {...child.props}/>`
+	);
+	write_if_changed(`${manifest_dir}/client.js`, client_manifest);
+	write_if_changed(`${manifest_dir}/server.js`, server_manifest);
 }
 
-export function create_serviceworker_manifest({ routes, client_files }: {
-	routes: Route[];
+export function create_serviceworker_manifest({ manifest_data, client_files }: {
+	manifest_data: ManifestData;
 	client_files: string[];
 }) {
-	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
+	const assets = glob('**', { cwd: 'assets', filesOnly: true });
 
 	let code = `
 		// This file is generated by Sapper — do not edit it!
@@ -33,36 +40,71 @@ 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${manifest_data.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 generate_client(
+	manifest_data: ManifestData,
+	path_to_routes: string,
+	bundler: string,
+	dev_port?: number
+) {
+	const page_ids = new Set(manifest_data.pages.map(page =>
+		page.pattern.toString()));
+
+	const server_routes_to_ignore = manifest_data.server_routes.filter(route =>
+		!page_ids.has(route.pattern.toString()));
+
 	let code = `
 		// This file is generated by Sapper — do not edit it!
-		export const routes = [
-			${routes
-				.map(route => {
-					if (route.type !== 'page') {
-						return `{ pattern: ${route.pattern}, ignore: true }`;
-					}
+		import root from '${get_file(path_to_routes, manifest_data.root)}';
+		import error from '${posixify(`${path_to_routes}/_error.html`)}';
 
-					const file = posixify(`${path_to_routes}/${route.file}`);
+		${manifest_data.components.map(component => {
+			const annotation = bundler === 'webpack'
+				? `/* webpackChunkName: "${component.name}" */ `
+				: '';
 
-					if (route.id === '_4xx' || route.id === '_5xx') {
-						return `{ error: '${route.id.slice(1)}', load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
-					}
+			const source = get_file(path_to_routes, component);
 
-					const params = route.params.length === 0
-						? '{}'
-						: `{ ${route.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`;
+			return `const ${component.name} = {
+			js: () => import(${annotation}'${source}'),
+			css: "__SAPPER_CSS_PLACEHOLDER:${component.file}__"
+		};`;
+		}).join('\n')}
 
-					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();
+		export const manifest = {
+			ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
+
+			pages: [
+				${manifest_data.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 (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 `{ 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(
@@ -71,46 +113,83 @@ function generate_client(routes: Route[], path_to_routes: string, dev_port?: num
 
 		code += `
 
-			if (module.hot) {
-				import('${sapper_dev_client}').then(client => {
-					client.connect(${dev_port});
-				});
-			}`.replace(/^\t{3}/gm, '');
+			import('${sapper_dev_client}').then(client => {
+				client.connect(${dev_port});
+			});`.replace(/^\t{3}/gm, '');
 	}
 
 	return code;
 }
 
-function generate_server(routes: Route[], path_to_routes: string) {
+function generate_server(
+	manifest_data: ManifestData,
+	path_to_routes: string
+) {
+	const imports = [].concat(
+		manifest_data.server_routes.map(route =>
+			`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
+		manifest_data.components.map(component =>
+			`import ${component.name} from '${get_file(path_to_routes, component)}';`),
+		`import root from '${get_file(path_to_routes, manifest_data.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 => {
-				const file = posixify(`${path_to_routes}/${route.file}`);
-				return route.type === 'page'
-					? `import ${route.id} from '${file}';`
-					: `import * as ${route.id} from '${file}';`;
-			})
-			.join('\n')}
+		${imports.join('\n')}
 
-		export const routes = [
-			${routes
-				.map(route => {
-					const file = posixify(`../../${route.file}`);
+		export const manifest = {
+			server_routes: [
+				${manifest_data.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')}
+			],
 
-					if (route.id === '_4xx' || route.id === '_5xx') {
-						return `{ error: '${route.id.slice(1)}', module: ${route.id} }`;
-					}
+			pages: [
+				${manifest_data.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(', ')} }`;
+							const props = [
+								`name: "${part.component.name}"`,
+								`file: "${part.component.file}"`,
+								`component: ${part.component.name}`
+							];
 
-					return `{ id: '${route.id}', type: '${route.type}', pattern: ${route.pattern}, params: ${route.params.length > 0 ? `match` : `()`} => (${params}), module: ${route.id} }`;
-				})
-				.join(',\n\t')
-			}
-		];`.replace(/^\t\t/gm, '').trim();
+							if (part.params.length > 0) {
+								const params = part.params.map((param, i) => `${param}: match[${i + 1}]`);
+								props.push(`params: match => ({ ${params.join(', ')} })`);
+							}
+
+							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}`);
 }

src/core/create_routes.ts

@@ -1,129 +0,0 @@
-import * as path from 'path';
-import glob from 'glob';
-import { locations } from '../config';
-import { Route } from '../interfaces';
-
-export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), nodir: true }) }) {
-	const routes: Route[] = files
-		.map((file: string) => {
-			if (/(^|\/|\\)_/.test(file)) return;
-
-			if (/]\[/.test(file)) {
-				throw new Error(`Invalid route ${file} — parameters must be separated`);
-			}
-
-			const base = file.replace(/\.[^/.]+$/, '');
-			const parts = base.split('/'); // glob output is always posix-style
-			if (parts[parts.length - 1] === 'index') parts.pop();
-
-			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 = encodeURIComponent(parts[i].normalize()).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 {
-				id,
-				type: path.extname(file) === '.html' ? 'page' : 'route',
-				file,
-				pattern,
-				test,
-				exec,
-				parts,
-				params
-			};
-		})
-		.filter(Boolean)
-		.sort((a: Route, b: Route) => {
-			if (a.file === '4xx.html' || a.file === '5xx.html') return -1;
-			if (b.file === '4xx.html' || b.file === '5xx.html') return 1;
-
-			const max = Math.max(a.parts.length, b.parts.length);
-
-			for (let i = 0; i < max; i += 1) {
-				const a_part = a.parts[i];
-				const b_part = b.parts[i];
-
-				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;
-					}
-
-					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)
-						);
-					}
-				}
-			}
-
-			throw new Error(`The ${a.file} and ${b.file} routes clash`);
-		});
-
-	return routes;
-}
-
-function get_sub_parts(part: string) {
-	return part.split(/[\[\]]/)
-		.map((content, i) => {
-			if (!content) return null;
-			return {
-				content,
-				dynamic: i % 2 === 1
-			};
-		})
-		.filter(Boolean);
-}

src/core/utils.ts

@@ -1,11 +1,11 @@
-import * as sander from 'sander';
+import * as fs from 'fs';
 
 const previous_contents = new Map();
 
 export function write_if_changed(file: string, code: string) {
 	if (code !== previous_contents.get(file)) {
 		previous_contents.set(file, code);
-		sander.writeFileSync(file, code);
+		fs.writeFileSync(file, code);
 		fudge_mtime(file);
 	}
 }
@@ -16,8 +16,8 @@ export function posixify(file: string) {
 
 export function fudge_mtime(file: string) {
 	// need to fudge the mtime so that webpack doesn't go doolally
-	const { atime, mtime } = sander.statSync(file);
-	sander.utimesSync(
+	const { atime, mtime } = fs.statSync(file);
+	fs.utimesSync(
 		file,
 		new Date(atime.getTime() - 999999),
 		new Date(mtime.getTime() - 999999)

src/interfaces.ts

@@ -1,7 +1,9 @@
 export type Route = {
 	id: string;
-	type: 'page' | 'route';
-	file: string;
+	handlers: {
+		type: 'page' | 'route';
+		file: string;
+	}[];
 	pattern: RegExp;
 	test: (url: string) => boolean;
 	exec: (url: string) => Record<string, string>;
@@ -16,4 +18,40 @@ 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[];
+};
+
+export type Dirs = {
+	dest: string,
+	app: string,
+	routes: string,
+	webpack: string,
+	rollup: string
+};
+
+export type ManifestData = {
+	root: PageComponent;
+	components: PageComponent[];
+	pages: Page[];
+	server_routes: ServerRoute[];
 };

src/middleware.ts

@@ -1,34 +1,36 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { resolve, URL } from 'url';
+import { URL } from 'url';
 import { ClientRequest, ServerResponse } from 'http';
 import cookie from 'cookie';
-import mkdirp from 'mkdirp';
-import rimraf from 'rimraf';
 import devalue from 'devalue';
 import fetch from 'node-fetch';
 import { lookup } from './middleware/mime';
-import { create_routes, create_compilers } from './core';
 import { locations, dev } from './config';
-import { Route, Template } from './interfaces';
 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: {
-		render: (data: any, opts: { store: Store }) => {
-			head: string;
-			css: { code: string, map: any };
-			html: string
-		},
-		preload: (data: any) => any | Promise<any>
-	};
-	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;
@@ -37,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;
@@ -44,25 +60,73 @@ interface Req extends ClientRequest {
 	method: string;
 	path: string;
 	params: Record<string, string>;
+	query: Record<string, string>;
 	headers: Record<string, string>;
 }
 
-export default function middleware({ routes, store }: {
-	routes: RouteObject[],
-	store: (req: Req) => Store
+interface Component {
+	render: (data: any, opts: { store: Store }) => {
+		head: string;
+		css: { code: string, map: any };
+		html: string
+	},
+	preload: (data: any) => any | Promise<any>
+}
+
+const IGNORE = '__SAPPER__IGNORE__';
+function toIgnore(uri: string, val: any) {
+	if (Array.isArray(val)) return val.some(x => toIgnore(uri, x));
+	if (val instanceof RegExp) return val.test(uri);
+	if (typeof val === 'function') return val(uri);
+	return uri.startsWith(val.charCodeAt(0) === 47 ? val : `/${val}`);
+}
+
+export default function middleware(opts: {
+	manifest: Manifest,
+	store: (req: Req, res: ServerResponse) => Store,
+	ignore?: any,
+	routes?: any // legacy
 }) {
+	if (opts.routes) {
+		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
+	}
+
 	const output = locations.dest();
 
-	const client_info = JSON.parse(fs.readFileSync(path.join(output, 'client_info.json'), 'utf-8'));
+	const { manifest, store, ignore } = opts;
+
+	let emitted_basepath = false;
 
 	const middleware = compose_handlers([
+		ignore && ((req: Req, res: ServerResponse, next: () => void) => {
+			req[IGNORE] = toIgnore(req.path, ignore);
+			next();
+		}),
+
 		(req: Req, res: ServerResponse, next: () => void) => {
+			if (req[IGNORE]) return next();
+
 			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)
 					: '';
 			}
 
+			if (!emitted_basepath && process.send) {
+				process.send({
+					__sapper__: true,
+					event: 'basepath',
+					basepath: req.baseUrl
+				});
+
+				emitted_basepath = true;
+			}
+
 			if (req.path === undefined) {
 				req.path = req.url.replace(/\?.*/, '');
 			}
@@ -87,10 +151,11 @@ export default function middleware({ routes, store }: {
 
 		serve({
 			prefix: '/client/',
-			cache_control: 'max-age=31536000'
+			cache_control: dev() ? 'no-cache' : 'max-age=31536000'
 		}),
 
-		get_route_handler(client_info.assetsByChunkName, routes, store)
+		get_server_route_handler(manifest.server_routes),
+		get_page_handler(manifest, store)
 	].filter(Boolean));
 
 	return middleware;
@@ -114,6 +179,8 @@ function serve({ prefix, pathname, cache_control }: {
 		: (file: string) => (cache.has(file) ? cache : cache.set(file, fs.readFileSync(path.resolve(output, file)))).get(file)
 
 	return (req: Req, res: ServerResponse, next: () => void) => {
+		if (req[IGNORE]) return next();
+
 		if (filter(req)) {
 			const type = lookup(req.path);
 
@@ -133,255 +200,362 @@ function serve({ prefix, pathname, cache_control }: {
 	};
 }
 
-const resolved = Promise.resolve();
+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 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> = {};
+
+				// intercept data so that it can be exported
+				res.write = function(chunk: any) {
+					chunks.push(Buffer.from(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(Buffer.from(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_next = (err?: Error) => {
+				if (err) {
+					res.statusCode = 500;
+					res.end(err.message);
+				} else {
+					process.nextTick(next);
+				}
+			};
+
+			try {
+				handle_method(req, res, handle_next);
+			} catch (err) {
+				handle_next(err);
+			}
+		} else {
+			// no matching handler for method
+			process.nextTick(next);
+		}
+	}
+
+	return function find_route(req: Req, res: ServerResponse, next: () => void) {
+		if (req[IGNORE]) return next();
+
+		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, res: ServerResponse) => Store
+) {
+	const output = locations.dest();
+
+	const get_build_info = dev()
+		? () => JSON.parse(fs.readFileSync(path.join(output, 'build.json'), 'utf-8'))
+		: (assets => () => assets)(JSON.parse(fs.readFileSync(path.join(output, 'build.json'), 'utf-8')));
 
-function get_route_handler(chunks: Record<string, string>, 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) {
-		req.params = route.params(route.pattern.exec(req.path));
+	const { server_routes, pages } = manifest;
+	const error_route = manifest.error;
 
-		const mod = route.module;
+	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 || new Error('Unknown error in preload function'));
+	}
 
-		if (route.type === 'page') {
-			res.setHeader('Content-Type', 'text/html');
+	function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
+		const build_info: {
+			bundler: 'rollup' | 'webpack',
+			shimport: string | null,
+			assets: Record<string, string | string[]>,
+			legacy_assets?: Record<string, string>
+		 } = get_build_info();
 
-			// 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('Content-Type', 'text/html');
 
-			res.setHeader('Link', link);
+		// preload main.js and current route
+		// TODO detect other stuff we can preload? images, CSS, fonts?
+		let preloaded_chunks = Array.isArray(build_info.assets.main) ? build_info.assets.main : [build_info.assets.main];
+		if (!error) {
+			page.parts.forEach(part => {
+				if (!part) return;
 
-			const store = store_getter ? store_getter(req) : null;
-			const data = { params: req.params, query: req.query };
-
-			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(data, preloaded);
-
-				const { html, head, css } = mod.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__={${[
-					`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) {
-					`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,
-						url: req.url,
-						method: req.method,
-						status: 200,
-						type: 'text/html',
-						body: page
-					});
-				}
+				// using concat because it could be a string or an array. thanks webpack!
+				preloaded_chunks = preloaded_chunks.concat(build_info.assets[part.name]);
 			});
 		}
 
-		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 handler = mod[method_export];
-			if (handler) {
-				if (process.env.SAPPER_EXPORT) {
-					const { write, end, setHeader } = res;
-					const chunks: any[] = [];
-					const headers: Record<string, string> = {};
+		const link = preloaded_chunks
+			.filter(file => file && !file.match(/\.map$/))
+			.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
+			.join(', ');
 
-					// intercept data so that it can be exported
-					res.write = function(chunk: any) {
-						chunks.push(new Buffer(chunk));
-						write.apply(res, arguments);
-					};
+		res.setHeader('Link', link);
 
-					res.setHeader = function(name: string, value: string) {
-						headers[name.toLowerCase()] = value;
-						setHeader.apply(res, arguments);
-					};
+		const store = store_getter ? store_getter(req, res) : null;
 
-					res.end = function(chunk?: any) {
-						if (chunk) chunks.push(new Buffer(chunk));
-						end.apply(res, arguments);
+		let redirect: { statusCode: number, location: string };
+		let preload_error: { statusCode: number, message: Error | string };
 
-						process.send({
-							__sapper__: true,
-							url: req.url,
-							method: req.method,
-							status: res.statusCode,
-							type: headers['content-type'],
-							body: Buffer.concat(chunks).toString()
-						});
-					};
+		const preload_context = {
+			redirect: (statusCode: number, location: string) => {
+				if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
+					throw new Error(`Conflicting redirects`);
+				}
+				location = location.replace(/^\//g, ''); // leading slash (only)
+				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) {
+						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;
+					}
 				}
 
-				const handle_bad_result = (err?: Error) => {
-					if (err) {
-						console.error(err.stack);
-						res.statusCode = 500;
-						res.end(err.message);
-					} else {
-						handle_error(req, res, 404, 'Not found');
-					}
-				};
+				return fetch(parsed.href, opts);
+			},
+			store
+		};
 
-				try {
-					handler(req, res, handle_bad_result);
-				} catch (err) {
-					handle_bad_result(err);
+		const root_preloaded = manifest.root.preload
+			? manifest.root.preload.call(preload_context, {
+				path: req.path,
+				query: req.query,
+				params: {}
+			})
+			: {};
+
+		const match = error ? null : page.pattern.exec(req.path);
+
+		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) {
+				const location = `${req.baseUrl}/${redirect.location}`;
+
+				res.statusCode = redirect.statusCode;
+				res.setHeader('Location', location);
+				res.end();
+
+				return;
+			}
+
+			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 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) {
+				script += `if('serviceWorker' in navigator)navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
+			}
+
+			const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
+			const main = `${req.baseUrl}/client/${file}`;
+
+			if (build_info.bundler === 'rollup') {
+				if (build_info.legacy_assets) {
+					const legacy_main = `${req.baseUrl}/client/legacy/${build_info.legacy_assets.main}`;
+					script += `(function(){try{eval("async function x(){}");var main="${main}"}catch(e){main="${legacy_main}"};try{new Function("import('"+main+"')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main",main);document.head.appendChild(s);}}());`;
+				} else {
+					script += `try{new Function("import('${main}')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main","${main}");document.head.appendChild(s);}`;
 				}
 			} else {
-				// no matching handler for method — 404
-				handle_error(req, res, 404, 'Not found');
-			}
-		}
-	}
-
-	const not_found_route = routes.find((route: RouteObject) => route.error === '4xx');
-	const error_route = routes.find((route: RouteObject) => route.error === '5xx');
-
-	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);
-
-		const not_found = statusCode >= 400 && statusCode < 500;
-
-		const route = not_found
-			? not_found_route
-			: error_route;
-
-		const title: string = not_found
-			? 'Not found'
-			: `Internal server error: ${error.message}`;
-
-		const rendered = route ? route.module.render({
-			status: statusCode,
-			error
-		}, {
-			store: store_getter && store_getter(req)
-		}) : { head: '', css: null, html: title };
-
-		const { head, css, html } = rendered;
-
-		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);
-	}
-
-	return function find_route(req: Req, res: ServerResponse) {
-		try {
-			for (const route of routes) {
-				if (!route.error && route.pattern.test(req.path)) return handle_route(route, req, res);
+				script += `</script><script src="${main}">`;
 			}
 
-			handle_error(req, res, 404, 'Not found');
-		} catch (error) {
-			handle_error(req, res, 500, error);
+			let styles: string;
+
+			// TODO make this consistent across apps
+			if (build_info.css && build_info.css.main) {
+				const css_chunks = new Set();
+				if (build_info.css.main) css_chunks.add(build_info.css.main);
+				page.parts.forEach(part => {
+					if (!part) return;
+					const css_chunks_for_part = build_info.css.chunks[part.file];
+
+					if (css_chunks_for_part) {
+						css_chunks_for_part.forEach(file => {
+							css_chunks.add(file);
+						});
+					}
+				});
+
+				styles = Array.from(css_chunks)
+					.map(href => `<link rel="stylesheet" href="client/${href}">`)
+					.join('')
+			} else {
+				styles = (css && css.code ? `<style>${css.code}</style>` : '');
+			}
+
+			const body = template()
+				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
+				.replace('%sapper.scripts%', () => `<script>${script}</script>`)
+				.replace('%sapper.html%', () => html)
+				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
+				.replace('%sapper.styles%', () => styles);
+
+			res.statusCode = status;
+			res.end(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, next: () => void) {
+		if (req[IGNORE]) return next();
+
+		if (!server_routes.some(route => route.pattern.test(req.path))) {
+			for (const page of pages) {
+				if (page.pattern.test(req.path)) {
+					handle_page(page, req, res);
+					return;
+				}
+			}
 		}
+
+		handle_error(req, res, 404, 'Not found');
 	};
 }
 
@@ -405,10 +579,6 @@ function compose_handlers(handlers: Handler[]) {
 	};
 }
 
-function read_json(file: string) {
-	return JSON.parse(fs.readFileSync(file, 'utf-8'));
-}
-
 function try_serialize(data: any) {
 	try {
 		return devalue(data);
@@ -416,3 +586,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]};`);
+}

src/rollup.ts

@@ -0,0 +1,50 @@
+import { locations, dev } from './config';
+
+export default {
+	dev: dev(),
+
+	client: {
+		input: () => {
+			return `${locations.app()}/client.js`
+		},
+
+		output: () => {
+			let dir = `${locations.dest()}/client`;
+			if (process.env.SAPPER_LEGACY_BUILD) dir += `/legacy`;
+
+			return {
+				dir,
+				entryFileNames: '[name].[hash].js',
+				chunkFileNames: '[name].[hash].js',
+				format: 'esm',
+				sourcemap: dev()
+			};
+		}
+	},
+
+	server: {
+		input: () => {
+			return `${locations.app()}/server.js`
+		},
+
+		output: () => {
+			return {
+				dir: locations.dest(),
+				format: 'cjs'
+			};
+		}
+	},
+
+	serviceworker: {
+		input: () => {
+			return `${locations.app()}/service-worker.js`;
+		},
+
+		output: () => {
+			return {
+				file: `${locations.dest()}/service-worker.js`,
+				format: 'iife'
+			}
+		}
+	}
+};

src/runtime/index.ts

@@ -1,13 +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, ComponentLoader } from './interfaces';
 
-const manifest = typeof window !== 'undefined' && window.__SAPPER__;
+const initial_data = typeof window !== 'undefined' && window.__SAPPER__;
 
-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) => {},
@@ -25,36 +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 pathname = 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(pathname);
+	// 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, data: { params, query } };
+			return { url, path, page, match, query };
 		}
 	}
 }
 
 let current_token: {};
 
-function render(Component: ComponentConstructor, data: any, scroll: ScrollPosition, token: {}) {
+function render(data: any, nullable_depth: number, scroll: ScrollPosition, token: {}) {
 	if (current_token !== token) return;
 
-	if (component) {
-		component.destroy();
+	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;
+		}
+
+		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');
@@ -65,62 +105,194 @@ function render(Component: ComponentConstructor, data: any, scroll: ScrollPositi
 			detach(start);
 			detach(end);
 		}
-	}
 
-	component = new Component({
-		target,
-		data,
-		store,
-		hydrate: !component
-	});
+		Object.assign(data, root_data);
+
+		root = new manifest.root({
+			target,
+			data,
+			store,
+			hydrate: true
+		});
+	}
 
 	if (scroll) {
 		window.scrollTo(scroll.x, scroll.y);
 	}
+
+	Object.assign(root_props, data);
+	ready = true;
 }
 
-function prepare_route(Component: ComponentConstructor, data: 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 load_css(chunk: string) {
+	const href = `${initial_data.baseUrl}client/${chunk}`;
+	if (document.querySelector(`link[href="${href}"]`)) return;
+
+	return new Promise((fulfil, reject) => {
+		const link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.href = href;
+
+		link.onload = () => fulfil();
+		link.onerror = reject;
+
+		document.head.appendChild(link);
+	});
+}
+
+function load_component(component: ComponentLoader): Promise<ComponentConstructor> {
+	// TODO this is temporary — once placeholders are
+	// always rewritten, scratch the ternary
+	const promises: Array<Promise<any>> = (typeof component.css === 'string' ? [] : component.css.map(load_css));
+	promises.unshift(component.js());
+	return Promise.all(promises).then(values => values[0].default);
+}
+
+function prepare_page(target: Target): Promise<{
+	redirect?: Redirect;
+	data?: any;
+	nullable_depth?: number;
+}> {
+	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 (!Component.preload) {
-		return { Component, data, redirect, error };
-	}
-
-	if (!component && manifest.preloaded) {
-		return { Component, data: Object.assign(data, manifest.preloaded), redirect, error };
-	}
-
-	return Promise.resolve(Component.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 };
 		}
-	}, data)).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: Component }: { default: ComponentConstructor }) => {
-				const err = error.message instanceof Error ? error.message : new Error(error.message);
-				Object.assign(data, { status: error.statusCode, error: err });
-				return { Component, data, 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 Component = await load_component(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(data, preloaded)
-		return { Component, data, 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;
@@ -134,21 +306,24 @@ function navigate(target: Target, id: number) {
 
 	cid = id;
 
+	if (root) {
+		root.set({ preloading: true });
+	}
 	const loaded = prefetching && prefetching.href === target.url.href ?
 		prefetching.promise :
-		target.route.load().then(mod => prepare_route(mod.default, target.data));
+		prepare_page(target);
 
 	prefetching = null;
 
 	const token = current_token = {};
+	const { redirect, data, nullable_depth } = await loaded;
 
-	return loaded.then(({ Component, data, redirect }) => {
-		if (redirect) {
-			return goto(redirect.location, { replaceState: true });
-		}
-
-		render(Component, data, scroll_history[id], token);
-	});
+	if (redirect) {
+		await goto(redirect.location, { replaceState: true });
+	} else {
+		render(data, nullable_depth, scroll_history[id], token);
+		if (document.activeElement) document.activeElement.blur();
+	}
 }
 
 function handle_click(event: MouseEvent) {
@@ -198,7 +373,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;
@@ -208,21 +387,30 @@ function handle_popstate(event: PopStateEvent) {
 
 let prefetching: {
 	href: string;
-	promise: Promise<{ Component: ComponentConstructor, data: 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) {
+	if (target && (!prefetching || href !== prefetching.href)) {
 		prefetching = {
 			href,
-			promise: selected.route.load().then(mod => prepare_route(mod.default, selected.data))
+			promise: prepare_page(target)
 		};
 	}
 }
 
-function handle_touchstart_mouseover(event: MouseEvent | TouchEvent) {
+let mousemove_timeout: NodeJS.Timer;
+
+function handle_mousemove(event: MouseEvent) {
+	clearTimeout(mousemove_timeout);
+	mousemove_timeout = setTimeout(() => {
+		trigger_prefetch(event);
+	}, 20);
+}
+
+function trigger_prefetch(event: MouseEvent | TouchEvent) {
 	const a: HTMLAnchorElement = <HTMLAnchorElement>findAnchor(<Node>event.target);
 	if (!a || a.rel !== 'prefetch') return;
 
@@ -230,17 +418,28 @@ function handle_touchstart_mouseover(event: MouseEvent | TouchEvent) {
 }
 
 let inited: boolean;
+let ready = false;
 
-export function init(_target: Node, _routes: Route[], opts?: { store?: (data: any) => Store }) {
-	target = _target;
-	routes = _routes.filter(r => !r.error);
-	errors = {
-		'4xx': _routes.find(r => r.error === '4xx'),
-		'5xx': _routes.find(r => r.error === '5xx')
-	};
+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`);
+	}
+
+	if (opts.routes) {
+		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
+	}
+
+	target = opts.target;
+	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
@@ -248,8 +447,8 @@ export function init(_target: Node, _routes: Route[], opts?: { store?: (data: an
 		window.addEventListener('popstate', handle_popstate);
 
 		// prefetch
-		window.addEventListener('touchstart', handle_touchstart_mouseover);
-		window.addEventListener('mouseover', handle_touchstart_mouseover);
+		window.addEventListener('touchstart', trigger_prefetch);
+		window.addEventListener('mousemove', handle_mousemove);
 
 		inited = true;
 	}
@@ -264,37 +463,39 @@ export function init(_target: Node, _routes: Route[], opts?: { store?: (data: an
 
 		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);
-		}, Promise.resolve());
+		.reduce((promise: Promise<any>, route) => promise.then(() => {
+			return Promise.all(route.parts.map(part => part && load_component(part.component)));
+		}), Promise.resolve());
 }
 
 // remove this in 0.9

src/runtime/interfaces.ts

@@ -3,23 +3,36 @@ import { Store } from '../interfaces';
 export { Store };
 export type Params = Record<string, string>;
 export type Query = Record<string, string | true>;
-export type RouteData = { params: Params, query: Query };
+export type RouteData = { params: Params, query: Query, path: string };
 
 export interface ComponentConstructor {
 	new (options: { target: Node, data: any, store: Store, hydrate: boolean }): Component;
-	preload: (data: { params: Params, query: Query }) => Promise<any>;
+	preload: (props: { params: Params, query: Query }) => Promise<any>;
 };
 
 export interface Component {
+	set: (data: any) => void;
 	destroy: () => void;
 }
 
-export type Route = {
+export type ComponentLoader = {
+	js: () => Promise<{ default: ComponentConstructor }>,
+	css: string[]
+};
+
+export type Page = {
 	pattern: RegExp;
-	load: () => Promise<{ default: ComponentConstructor }>;
-	error?: string;
-	params?: (match: RegExpExecArray) => Record<string, string>;
-	ignore?: boolean;
+	parts: Array<{
+		component: ComponentLoader;
+		params?: (match: RegExpExecArray) => Record<string, string>;
+	}>;
+};
+
+export type Manifest = {
+	ignore: RegExp[];
+	root: ComponentConstructor;
+	error: () => Promise<{ default: ComponentConstructor }>;
+	pages: Page[]
 };
 
 export type ScrollPosition = {
@@ -29,6 +42,13 @@ export type ScrollPosition = {
 
 export type Target = {
 	url: URL;
-	route: Route;
-	data: RouteData;
+	path: string;
+	page: Page;
+	match: RegExpExecArray;
+	query: Record<string, string | true>;
+};
+
+export type Redirect = {
+	statusCode: number;
+	location: string;
 };

src/utils.ts

@@ -0,0 +1,10 @@
+export function left_pad(str: string, len: number) {
+	while (str.length < len) str = ` ${str}`;
+	return str;
+}
+
+export function repeat(str: string, i: number) {
+	let result = '';
+	while (i--) result += str;
+	return result;
+}

test/app/app/client.js

@@ -1,9 +1,11 @@
 import { init, prefetchRoutes } from '../../../runtime.js';
 import { Store } from 'svelte/store.js';
-import { routes } from './manifest/client.js';
+import { manifest } from './manifest/client.js';
 
 window.init = () => {
-	return init(document.querySelector('#sapper'), routes, {
+	return init({
+		target: document.querySelector('#sapper'),
+		manifest,
 		store: data => new Store(data)
 	});
 };

test/app/app/server.js

@@ -2,9 +2,9 @@ import fs from 'fs';
 import { resolve } from 'url';
 import express from 'express';
 import serve from 'serve-static';
-import sapper from '../../../dist/middleware.ts.js';
+import sapper from '../../../dist/middleware.js';
 import { Store } from 'svelte/store.js';
-import { routes } from './manifest/server.js';
+import { manifest } from './manifest/server.js';
 
 let pending;
 let ended;
@@ -85,20 +85,44 @@ const middlewares = [
 		next();
 	},
 
+	// set up some values for the store
+	(req, res, next) => {
+		req.hello = 'hello';
+		res.locals = { name: 'world' };
+		next();
+	},
+
 	sapper({
-		routes,
-		store: () => {
+		manifest,
+		store: (req, res) => {
 			return new Store({
-				title: 'Stored title'
+				title: `${req.hello} ${res.locals.name}`
 			});
-		}
-	})
+		},
+		ignore: [
+			/foobar/i,
+			'/buzz',
+			'fizz',
+			x => x === '/hello'
+		]
+	}),
 ];
 
+app.get(`${BASEPATH}/non-sapper-redirect-from`, (req, res) => {
+	res.writeHead(301, {
+		Location: `${BASEPATH}/non-sapper-redirect-to`
+	});
+	res.end();
+});
+
 if (BASEPATH) {
 	app.use(BASEPATH, ...middlewares);
 } else {
 	app.use(...middlewares);
 }
 
-app.listen(PORT);
+['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => {
+	app.get('/'+uri, (req, res) => res.end(uri));
+});
+
+app.listen(PORT);

test/app/routes/4xx.html

@@ -1,6 +0,0 @@
-<:Head>
-	<title>{{status}}</title>
-</:Head>
-
-<h1>Not found</h1>
-<p>{{error.message}}</p>

test/app/routes/5xx.html

@@ -1,6 +0,0 @@
-<:Head>
-	<title>Internal server error</title>
-</:Head>
-
-<h1>Internal server error</h1>
-<p>{{error.message}}</p>

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>

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>

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

test/app/routes/_error.html

@@ -0,0 +1,6 @@
+<svelte:head>
+	<title>{status}</title>
+</svelte:head>
+
+<h1>{status}</h1>
+<p>{error.message}</p>

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>

test/app/routes/about.html

@@ -1,20 +1,26 @@
-<:Head>
+<svelte:head>
 	<title>About</title>
-</:Head>
+</svelte:head>
 
 <h1>About this site</h1>
 
 <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
 		}
 	};

test/app/routes/blog/[slug].html

@@ -1,11 +1,11 @@
-<:Head>
-	<title>{{post.title}}</title>
-</:Head>
+<svelte:head>
+	<title>{post.title}</title>
+</svelte:head>
 
-<h1>{{post.title}}</h1>
+<h1>{post.title}</h1>
 
 <div class='content'>
-	{{{post.html}}}
+	{@html post.html}
 </div>
 
 <script>

test/app/routes/blog/index.html

@@ -1,17 +1,17 @@
-<:Head>
+<svelte:head>
 	<title>Blog</title>
-</:Head>
+</svelte:head>
 
 <h1>Recent posts</h1>
 
 <ul>
-	{{#each posts as post}}
+	{#each posts as post}
 		<!-- we're using the non-standard `rel=prefetch` attribute to
 				tell Sapper to load the data for the page as soon as
 				the user hovers over the link or taps it, instead of
 				waiting for the 'click' event -->
-		<li><a rel='prefetch' href='blog/{{post.slug}}'>{{post.title}}</a></li>
-	{{/each}}
+		<li><a rel='prefetch' href='blog/{post.slug}'>{post.title}</a></li>
+	{/each}
 </ul>
 
 <script>

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 {

test/app/routes/credentials/index.html

@@ -1,4 +1,4 @@
-<h1>{{message}}</h1>
+<h1>{message}</h1>
 
 <script>
 	export default {

test/app/routes/index.html

@@ -1,17 +1,19 @@
-<:Head>
+<svelte:head>
 	<title>Sapper project template</title>
-</:Head>
+</svelte:head>
 
 <h1>Great success!</h1>
 
 <a href='.'>home</a>
 <a href='about'>about</a>
 <a href='slow-preload'>slow preload</a>
+<a href='non-sapper-redirect-from'>redirect</a>
 <a href='redirect-from'>redirect</a>
+<a href='redirect-root'>redirect (root)</a>
 <a href='blog/nope'>broken link</a>
 <a href='blog/throw-an-error'>error link</a>
 <a href='credentials?creds=include'>credentials</a>
-<a rel=prefetch class='{{page === "blog"  ? "selected" : ""}}' href='blog'>blog</a>
+<a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
 
 <div class='hydrate-test'></div>
 

test/app/routes/missing-index/ok.html

@@ -0,0 +1 @@
+<h1>it works</h1>

test/app/routes/non-sapper-redirect-to.html

@@ -0,0 +1 @@
+<h1>redirected</h1>

test/app/routes/preload-root/index.html

@@ -0,0 +1 @@
+<h1>root preload function ran: {rootPreloadFunctionRan}</h1>

test/app/routes/preload-values/custom-class.html

@@ -1,4 +1,4 @@
-<h1>{{foo.bar()}}</h1>
+<h1>{foo.bar()}</h1>
 
 <script>
 	export default {

test/app/routes/preload-values/index.html

@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>

test/app/routes/preload-values/set.html

@@ -1,4 +1,4 @@
-<h1>{{set.has('x')}}</h1>
+<h1>{set.has('x')}</h1>
 
 <script>
 	export default {

test/app/routes/redirect-root.html

@@ -0,0 +1,7 @@
+<script>
+	export default {
+		preload() {
+			this.redirect(301, '/');
+		}
+	};
+</script>

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>

test/app/routes/store.html

@@ -1 +1 @@
-<h1>{{$title}}</h1>
+<h1>{$title}</h1>

test/app/routes/unsafe-replacement.html

@@ -0,0 +1,9 @@
+$&
+
+<script>
+	export default {
+		preload() {
+			return '$&';
+		}
+	};
+</script>

test/app/webpack/client.config.js

@@ -1,4 +1,4 @@
-const config = require('../../../webpack/config.js');
+const config = require('../../../config/webpack.js');
 const webpack = require('webpack');
 
 const mode = process.env.NODE_ENV;

test/app/webpack/server.config.js

@@ -1,4 +1,4 @@
-const config = require('../../../webpack/config.js');
+const config = require('../../../config/webpack.js');
 const sapper_pkg = require('../../../package.json');
 
 module.exports = {

test/app/webpack/service-worker.config.js

@@ -1,4 +1,4 @@
-const config = require('../../../webpack/config.js');
+const config = require('../../../config/webpack.js');
 
 module.exports = {
 	entry: config.serviceworker.entry(),

test/common/test.js

@@ -1,9 +1,8 @@
+const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 const Nightmare = require('nightmare');
-const serve = require('serve-static');
 const walkSync = require('walk-sync');
-const fetch = require('node-fetch');
 const rimraf = require('rimraf');
 const ports = require('port-authority');
 
@@ -31,6 +30,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'));
 
@@ -38,8 +39,9 @@ describe('sapper', function() {
 	rimraf.sync('export');
 	rimraf.sync('build');
 	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({
@@ -55,9 +57,19 @@ describe('sapper', function() {
 		basepath: '/custom-basepath'
 	});
 
-	describe('export', () => {
+	testExport({});
+
+	testExport({ basepath: '/custom-basepath' });
+});
+
+function testExport({ basepath = '' }) {
+	describe(basepath ? `export --basepath ${basepath}` : 'export', () => {
 		before(() => {
-			return exec(`node ${cli} export`);
+			if (basepath) {
+				process.env.BASEPATH = basepath;
+			}
+
+			return exec(`node ${cli} export ${basepath ? `--basepath ${basepath}` : ''}`);
 		});
 
 		it('export all pages', () => {
@@ -69,6 +81,11 @@ describe('sapper', function() {
 				'about/index.html',
 				'slow-preload/index.html',
 
+				'redirect-from/index.html',
+				'redirect-to/index.html',
+				'non-sapper-redirect-from/index.html',
+				'non-sapper-redirect-to/index.html',
+
 				'blog/index.html',
 				'blog/a-very-long-post/index.html',
 				'blog/how-can-i-get-involved/index.html',
@@ -92,16 +109,18 @@ describe('sapper', function() {
 				'service-worker.js',
 				'svelte-logo-192.png',
 				'svelte-logo-512.png',
-			];
+			].map(file => {
+				return basepath ? `${basepath.replace(/^[\/\\]/, '')}/${file}` : file;
+			});
+
 			// 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);
 
@@ -123,7 +142,7 @@ describe('sapper', function() {
 			});
 		});
 	});
-});
+}
 
 function run({ mode, basepath = '' }) {
 	describe(`mode=${mode}`, function () {
@@ -131,6 +150,7 @@ function run({ mode, basepath = '' }) {
 		let capture;
 
 		let base;
+		let captured_basepath;
 
 		const nightmare = new Nightmare();
 
@@ -148,7 +168,7 @@ function run({ mode, basepath = '' }) {
 
 		before(() => {
 			const promise = mode === 'production'
-				? exec(`node ${cli} build`).then(() => ports.find(3000))
+				? exec(`node ${cli} build -l`).then(() => ports.find(3000))
 				: ports.find(3000).then(port => {
 					exec(`node ${cli} dev`);
 					return ports.wait(port).then(() => port);
@@ -160,6 +180,10 @@ function run({ mode, basepath = '' }) {
 
 				const dir = mode === 'production' ? 'build' : '.sapper';
 
+				if (mode === 'production') {
+					assert.ok(fs.existsSync('build/index.js'));
+				}
+
 				proc = require('child_process').fork(`${dir}/server.js`, {
 					cwd: process.cwd(),
 					env: {
@@ -173,7 +197,13 @@ function run({ mode, basepath = '' }) {
 				let handler;
 
 				proc.on('message', message => {
-					if (message.__sapper__) return;
+					if (message.__sapper__) {
+						if (message.event === 'basepath') {
+							captured_basepath = basepath;
+						}
+						return;
+					}
+
 					if (handler) handler(message);
 				});
 
@@ -253,8 +283,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();
@@ -268,9 +299,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?');
@@ -301,14 +330,17 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
-			it('reuses prefetch promise', () => {
+			it.skip('reuses prefetch promise', () => {
 				return nightmare
 					.goto(`${base}/blog`)
 					.init()
 					.then(() => {
 						return capture(() => {
 							return nightmare
-								.mouseover('[href="blog/what-is-sapper"]')
+								.evaluate(() => {
+									const a = document.querySelector('[href="blog/what-is-sapper"]');
+									a.dispatchEvent(new MouseEvent('mousemove'));
+								})
 								.wait(200);
 						});
 					})
@@ -353,16 +385,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`)
@@ -417,6 +439,33 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
+			it('redirects on server (root)', () => {
+				return nightmare.goto(`${base}/redirect-root`)
+					.path()
+					.then(path => {
+						assert.equal(path, `${basepath}/`);
+					})
+					.then(() => nightmare.page.title())
+					.then(title => {
+						assert.equal(title, 'Great success!');
+					});
+			});
+
+			it('redirects in client (root)', () => {
+				return nightmare.goto(base)
+					.wait('[href="redirect-root"]')
+					.click('[href="redirect-root"]')
+					.wait(200)
+					.path()
+					.then(path => {
+						assert.equal(path, `${basepath}/`);
+					})
+					.then(() => nightmare.page.title())
+					.then(title => {
+						assert.equal(title, 'Great success!');
+					});
+			});
+
 			it('handles 4xx error on server', () => {
 				return nightmare.goto(`${base}/blog/nope`)
 					.path()
@@ -425,7 +474,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Not found')
+						assert.equal(title, '404')
 					});
 			});
 
@@ -440,7 +489,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Not found');
+						assert.equal(title, '404');
 					});
 			});
 
@@ -452,7 +501,7 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Internal server error')
+						assert.equal(title, '500')
 					});
 			});
 
@@ -467,10 +516,46 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(() => nightmare.page.title())
 					.then(title => {
-						assert.equal(title, 'Internal server error');
+						assert.equal(title, '500');
 					});
 			});
 
+			// Ignores are meant for top-level escape.
+			// ~> Sapper **should** own the entire {basepath} when designated.
+			if (!basepath) {
+				it('respects `options.ignore` values (RegExp)', () => {
+					return nightmare.goto(`${base}/foobar`)
+						.evaluate(() => document.documentElement.textContent)
+						.then(text => {
+							assert.equal(text, 'foobar');
+						});
+				});
+
+				it('respects `options.ignore` values (String #1)', () => {
+					return nightmare.goto(`${base}/buzz`)
+						.evaluate(() => document.documentElement.textContent)
+						.then(text => {
+							assert.equal(text, 'buzz');
+						});
+				});
+
+				it('respects `options.ignore` values (String #2)', () => {
+					return nightmare.goto(`${base}/fizzer`)
+						.evaluate(() => document.documentElement.textContent)
+						.then(text => {
+							assert.equal(text, 'fizzer');
+						});
+				});
+
+				it('respects `options.ignore` values (Function)', () => {
+					return nightmare.goto(`${base}/hello`)
+						.evaluate(() => document.documentElement.textContent)
+						.then(text => {
+							assert.equal(text, 'hello');
+						});
+				});
+			}
+
 			it('does not attempt client-side navigation to server routes', () => {
 				return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`)
 					.init()
@@ -526,11 +611,11 @@ function run({ mode, basepath = '' }) {
 				return nightmare.goto(`${base}/store`)
 					.page.title()
 					.then(title => {
-						assert.equal(title, 'Stored title');
+						assert.equal(title, 'hello world');
 						return nightmare.init().page.title();
 					})
 					.then(title => {
-						assert.equal(title, 'Stored title');
+						assert.equal(title, 'hello world');
 					});
 			});
 
@@ -559,6 +644,105 @@ function run({ mode, basepath = '' }) {
 						assert.equal(title, 'woohoo!');
 					});
 			});
+
+			it('includes service worker', () => {
+				return nightmare.goto(base).page.html().then(html => {
+					assert.ok(html.indexOf('service-worker.js') !== -1);
+				});
+			});
+
+			it('sets preloading true when appropriate', () => {
+				return nightmare
+					.goto(base)
+					.init()
+					.click('a[href="slow-preload"]')
+					.wait(100)
+					.evaluate(() => {
+						const progress = document.querySelector('progress');
+						return !!progress;
+					})
+					.then(hasProgressIndicator => {
+						assert.ok(hasProgressIndicator);
+					})
+					.then(() => nightmare.evaluate(() => window.fulfil()))
+					.then(() => nightmare.evaluate(() => {
+						const progress = document.querySelector('progress');
+						return !!progress;
+					}))
+					.then(hasProgressIndicator => {
+						assert.ok(!hasProgressIndicator);
+					});
+			});
+
+			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', () => {
@@ -571,7 +755,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"`;
 						})

test/unit/clean_html/index.ts

@@ -0,0 +1,26 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as assert from 'assert';
+import clean_html from '../../../src/api/utils/clean_html';
+
+describe('clean_html', () => {
+	const samples = path.join(__dirname, 'samples');
+
+	fs.readdirSync(samples).forEach(dir => {
+		if (dir[0] === '.') return;
+
+		it(dir, () => {
+			const input = fs.readFileSync(`${samples}/${dir}/input.html`, 'utf-8');
+			const expected = fs.readFileSync(`${samples}/${dir}/output.html`, 'utf-8');
+
+			const actual = clean_html(input);
+
+			fs.writeFileSync(`${samples}/${dir}/.actual.html`, actual);
+
+			assert.equal(
+				actual.replace(/\s+$/gm, ''),
+				expected.replace(/\s+$/gm, '')
+			);
+		});
+	});
+});

test/unit/clean_html/samples/removes-cdata/.actual.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<math>
+		<ms></ms>
+		<mo>+</mo>
+		<mn>3</mn>
+		<mo>=</mo>
+		<ms></ms>
+	</math>
+</body>
+</html>

test/unit/clean_html/samples/removes-cdata/input.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<math>
+		<ms><![CDATA[x<y]]></ms>
+		<mo>+</mo>
+		<mn>3</mn>
+		<mo>=</mo>
+		<ms><![CDATA[x<y3]]></ms>
+	</math>
+</body>
+</html>

test/unit/clean_html/samples/removes-cdata/output.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<math>
+		<ms></ms>
+		<mo>+</mo>
+		<mn>3</mn>
+		<mo>=</mo>
+		<ms></ms>
+	</math>
+</body>
+</html>

test/unit/clean_html/samples/removes-comments/.actual.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<a href="keep-me">keep me</a>
+	
+</body>
+</html>

test/unit/clean_html/samples/removes-comments/input.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<a href="keep-me">keep me</a>
+	<!-- <a href="delete-me">delete me</a> -->
+</body>
+</html>

test/unit/clean_html/samples/removes-comments/output.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<a href="keep-me">keep me</a>
+
+</body>
+</html>

test/unit/clean_html/samples/removes-script-contents/.actual.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<script></script>
+
+	<script></script>
+
+	<script src="attributes-are-preserved.js"></script>
+</body>
+</html>

test/unit/clean_html/samples/removes-script-contents/input.html

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<script>
+		console.log('this should be deleted');
+	</script>
+
+	<script>
+		console.log('so should this');
+	</script>
+
+	<script src="attributes-are-preserved.js"></script>
+</body>
+</html>

test/unit/clean_html/samples/removes-script-contents/output.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+<head>
+</head>
+<body>
+	<script></script>
+
+	<script></script>
+
+	<script src="attributes-are-preserved.js"></script>
+</body>
+</html>

test/unit/create_manifest_data/index.ts

@@ -0,0 +1,157 @@
+import * as path from 'path';
+import * as assert from 'assert';
+import manifest_data from '../../../src/core/create_manifest_data';
+
+describe('manifest_data', () => {
+	it('creates routes', () => {
+		const { components, pages, server_routes } = manifest_data(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 } = manifest_data(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 } = manifest_data(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 } = manifest_data(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 } = manifest_data(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 } = manifest_data(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 } = manifest_data(path.join(__dirname, 'samples/clash-pages'));
+		}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
+
+		assert.throws(() => {
+			const { server_routes } = manifest_data(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(() => {
+			manifest_data(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(() => {
+			manifest_data(path.join(__dirname, 'samples/invalid-qualifier'));
+		}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
+	});
+});