-> v0.9.0

move built files to dist
Merge pull request #191 from sveltejs/gh-173
2026-01-13 11:35:28 +00:00 · 2018-03-10 23:24:03 -05:00 · 2018-03-10 23:20:11 -05:00 · 2018-03-10 23:14:53 -05:00 · 2018-03-10 23:09:02 -05:00 · 2018-03-10 23:00:36 -05:00
54 changed files with 2090 additions and 5649 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
 .DS_Store
 yarn.lock
+yarn-error.log
 node_modules
 cypress/screenshots
 test/app/.sapper
 test/app/app/manifest
-runtime.js
-runtime.js.map
-cli.js
-cli.js.map
-middleware.js
-middleware.js.map
-core.js
-core.js.map
-webpack/config.js
-webpack/config.js.map
+test/app/export
+test/app/build
+*.js
+*.js.map
+*.ts.js
+*.ts.js.map
+!rollup.config.js
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,3 @@ install:
  - export DISPLAY=':99.0'
  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
  - npm install
-  - (cd test/app && npm install)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,56 @@
 # sapper changelog

+## 0.9.0
+
+* Use `devalue` instead of `serialize-javascript`, allowing `preload` to return non-POJOs and cyclical/repeated references, but *not* functions ([#112](https://github.com/sveltejs/sapper/issues/112))
+* Kill child process if webpack crashes ([#177](https://github.com/sveltejs/sapper/issues/177))
+* Support HMR on remote devices ([#165](https://github.com/sveltejs/sapper/issues/165))
+* Remove hard-coded port (([#169](https://github.com/sveltejs/sapper/issues/169)))
+* Allow non-JS files, e.g. TypeScript to be used as entry points and server routes ([#57](https://github.com/sveltejs/sapper/issues/57))
+* Faster startup ([#173](https://github.com/sveltejs/sapper/issues/173))
+
+## 0.8.4
+
+* Fix route sorting ([#175](https://github.com/sveltejs/sapper/pull/175))
+
+## 0.8.3
+
+* Automatically select available port, or use `--port` flag for `dev` and `start` ([#169](https://github.com/sveltejs/sapper/issues/169))
+* Show stats after build/export ([#168](https://github.com/sveltejs/sapper/issues/168))
+* Various CLI improvements ([#170](https://github.com/sveltejs/sapper/pull/170))
+
+## 0.8.2
+
+* Rename `preloadRoutes` to `prefetchRoutes` ([#166](https://github.com/sveltejs/sapper/issues/166))
+
+## 0.8.1
+
+* Add `sapper start` command, for running an app built with `sapper build` ([#163](https://github.com/sveltejs/sapper/issues/163))
+
+## 0.8.0
+
+* Update to webpack 4
+* Add `preloadRoutes` function — secondary routes are no longer automatically preloaded ([#160](https://github.com/sveltejs/sapper/issues/160))
+* `sapper build` outputs to `build`, `sapper build custom-dir` outputs to `custom-dir` ([#150](https://github.com/sveltejs/sapper/pull/150))
+* `sapper export` outputs to `export`, `sapper export custom-dir` outputs to `custom-dir` ([#150](https://github.com/sveltejs/sapper/pull/150))
+* Improved logging ([#158](https://github.com/sveltejs/sapper/pull/158))
+* URI-encode routes ([#103](https://github.com/sveltejs/sapper/issues/103))
+* Various performance and stability improvements ([#152](https://github.com/sveltejs/sapper/pull/152))
+
+## 0.7.6
+
+* Prevent client-side navigation to server route ([#145](https://github.com/sveltejs/sapper/issues/145))
+* Don't serve error page for server route errors ([#138](https://github.com/sveltejs/sapper/issues/138))
+
+## 0.7.5
+
+* Allow dynamic parameters inside route parts ([#139](https://github.com/sveltejs/sapper/issues/139))
+
+## 0.7.4
+
+* Force `NODE_ENV='production'` when running `build` or `export` ([#141](https://github.com/sveltejs/sapper/issues/141))
+* Use source-map-support ([#134](https://github.com/sveltejs/sapper/pull/134))
+
 ## 0.7.3

 * Handle webpack assets that are arrays instead of strings ([#131](https://github.com/sveltejs/sapper/pull/131))
--- a/middleware.js
+++ b/middleware.js
@@ -0,0 +1,2 @@
+// TODO write to this file, instead of middleware.ts.js
+module.exports = require('./dist/middleware.ts.js');
--- a/package.json
+++ b/package.json
@@ -1,47 +1,40 @@
 {
  "name": "sapper",
-  "version": "0.7.3",
+  "version": "0.9.0",
  "description": "Military-grade apps, engineered by Svelte",
  "main": "middleware.js",
  "bin": {
-    "sapper": "cli.js"
+    "sapper": "./sapper"
  },
  "files": [
-    "cli.js",
-    "core.js",
-    "middleware.js",
+    "*.js",
+    "*.ts.js",
    "runtime",
-    "runtime.js",
-    "hmr-client.js",
    "webpack"
  ],
  "directories": {
    "test": "test"
  },
  "dependencies": {
-    "chalk": "^2.3.0",
    "cheerio": "^1.0.0-rc.2",
    "chokidar": "^1.7.0",
-    "code-frame": "^5.0.0",
-    "escape-html": "^1.0.3",
-    "express": "^4.16.2",
-    "get-port": "^3.2.0",
+    "clorox": "^1.0.3",
+    "devalue": "^1.0.1",
    "glob": "^7.1.2",
-    "locate-character": "^2.0.5",
-    "mime": "^2.2.0",
    "mkdirp": "^0.5.1",
-    "mri": "^1.1.0",
    "node-fetch": "^1.7.3",
-    "relative": "^3.0.2",
+    "polka": "^0.3.4",
+    "port-authority": "^1.0.0",
+    "pretty-ms": "^3.1.0",
    "require-relative": "^0.8.7",
    "rimraf": "^2.6.2",
+    "sade": "^1.4.0",
    "sander": "^0.6.0",
-    "serialize-javascript": "^1.4.0",
-    "tslib": "^1.8.1",
+    "source-map-support": "^0.5.3",
+    "tslib": "^1.9.0",
    "url-parse": "^1.2.0",
-    "wait-port": "^0.2.2",
    "walk-sync": "^0.3.2",
-    "webpack": "^3.10.0"
+    "webpack-format-messages": "^1.0.1"
  },
  "devDependencies": {
    "@std/esm": "^0.19.7",
@@ -49,23 +42,23 @@
    "@types/mkdirp": "^0.5.2",
    "@types/rimraf": "^2.0.2",
    "compression": "^1.7.1",
-    "css-loader": "^0.28.7",
-    "electron": "^1.8.2",
    "eslint": "^4.13.1",
    "eslint-plugin-import": "^2.8.0",
+    "get-port": "^3.2.0",
    "mocha": "^4.0.1",
    "nightmare": "^2.10.0",
    "npm-run-all": "^4.1.2",
-    "rollup": "^0.53.0",
+    "rollup": "^0.56.5",
+    "rollup-plugin-commonjs": "^8.3.0",
    "rollup-plugin-json": "^2.3.0",
    "rollup-plugin-string": "^2.0.2",
    "rollup-plugin-typescript": "^0.8.1",
-    "source-map-support": "^0.5.2",
-    "style-loader": "^0.19.1",
+    "serve-static": "^1.13.2",
    "svelte": "^1.49.1",
    "svelte-loader": "^2.3.2",
    "ts-node": "^4.1.0",
-    "typescript": "^2.6.2"
+    "typescript": "^2.6.2",
+    "webpack": "^4.1.0"
  },
  "scripts": {
    "cy:open": "cypress open",
@@ -73,7 +66,8 @@
    "pretest": "npm run build",
    "build": "rollup -c",
    "dev": "rollup -cw",
-    "prepublish": "npm test"
+    "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"
  },
  "repository": "https://github.com/sveltejs/sapper",
  "keywords": [
--- a/rollup.config.js
+++ b/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 commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';

 const external = [].concat(
@@ -9,35 +10,39 @@ const external = [].concat(
 	'sapper/core.js'
 );

-const paths = {
-	'sapper/core.js': './core.js'
-};
-
-const plugins = [
-	string({
-		include: '**/*.md'
-	}),
-	json(),
-	typescript({
-		typescript: require('typescript')
-	})
-];
-
 export default [
-	{ name: 'cli', banner: true },
-	{ name: 'core' },
-	{ name: 'middleware' },
-	{ name: 'runtime', format: 'es' },
-	{ name: 'webpack', file: 'webpack/config' }
-].map(obj => ({
-	input: `src/${obj.name}/index.ts`,
-	output: {
-		file: `${obj.file || obj.name}.js`,
-		format: obj.format || 'cjs',
-		banner: obj.banner && '#!/usr/bin/env node',
-		paths,
-		sourcemap: true
+	{
+		input: `src/runtime/index.ts`,
+		output: {
+			file: `runtime.js`,
+			format: 'es'
+		},
+		plugins: [
+			typescript({
+				typescript: require('typescript')
+			})
+		]
 	},
-	external,
-	plugins
-}));
+
+	{
+		input: [`src/cli.ts`, `src/core.ts`, `src/middleware.ts`, `src/webpack.ts`],
+		output: {
+			dir: 'dist',
+			format: 'cjs',
+			sourcemap: true
+		},
+		external,
+		plugins: [
+			string({
+				include: '**/*.md'
+			}),
+			json(),
+			commonjs(),
+			typescript({
+				typescript: require('typescript')
+			})
+		],
+		experimentalCodeSplitting: true,
+		experimentalDynamicImport: true
+	}
+];
--- a/runtime.js
+++ b/runtime.js
@@ -0,0 +1,271 @@
+function detach(node) {
+    node.parentNode.removeChild(node);
+}
+function findAnchor(node) {
+    while (node && node.nodeName.toUpperCase() !== 'A')
+        node = node.parentNode; // SVG <a> elements have a lowercase name
+    return node;
+}
+function which(event) {
+    return event.which === null ? event.button : event.which;
+}
+function scroll_state() {
+    return {
+        x: window.scrollX,
+        y: window.scrollY
+    };
+}
+
+var component;
+var target;
+var routes;
+var errors;
+var history = typeof window !== 'undefined' ? window.history : {
+    pushState: function (state, title, href) { },
+    replaceState: function (state, title, href) { },
+    scrollRestoration: ''
+};
+var scroll_history = {};
+var uid = 1;
+var cid;
+if ('scrollRestoration' in history) {
+    history.scrollRestoration = 'manual';
+}
+function select_route(url) {
+    if (url.origin !== window.location.origin)
+        return null;
+    var _loop_1 = function (route) {
+        var match = route.pattern.exec(url.pathname);
+        if (match) {
+            if (route.ignore)
+                return { value: null };
+            var params = route.params(match);
+            var query_1 = {};
+            if (url.search.length > 0) {
+                url.search.slice(1).split('&').forEach(function (searchParam) {
+                    var _a = /([^=]+)=(.*)/.exec(searchParam), key = _a[1], value = _a[2];
+                    query_1[key] = value || true;
+                });
+            }
+            return { value: { url: url, route: route, data: { params: params, query: query_1 } } };
+        }
+    };
+    for (var _i = 0, routes_1 = routes; _i < routes_1.length; _i++) {
+        var route = routes_1[_i];
+        var state_1 = _loop_1(route);
+        if (typeof state_1 === "object")
+            return state_1.value;
+    }
+}
+var current_token;
+function render(Component, data, scroll, token) {
+    if (current_token !== token)
+        return;
+    if (component) {
+        component.destroy();
+    }
+    else {
+        // first load — remove SSR'd <head> contents
+        var start = document.querySelector('#sapper-head-start');
+        var end = document.querySelector('#sapper-head-end');
+        if (start && end) {
+            while (start.nextSibling !== end)
+                detach(start.nextSibling);
+            detach(start);
+            detach(end);
+        }
+    }
+    component = new Component({
+        target: target,
+        data: data,
+        hydrate: !component
+    });
+    if (scroll) {
+        window.scrollTo(scroll.x, scroll.y);
+    }
+}
+function prepare_route(Component, data) {
+    var redirect = null;
+    var error = null;
+    if (!Component.preload) {
+        return { Component: Component, data: data, redirect: redirect, error: error };
+    }
+    if (!component && window.__SAPPER__ && window.__SAPPER__.preloaded) {
+        return { Component: Component, data: Object.assign(data, window.__SAPPER__.preloaded), redirect: redirect, error: error };
+    }
+    return Promise.resolve(Component.preload.call({
+        redirect: function (statusCode, location) {
+            redirect = { statusCode: statusCode, location: location };
+        },
+        error: function (statusCode, message) {
+            error = { statusCode: statusCode, message: message };
+        }
+    }, data))["catch"](function (err) {
+        error = { statusCode: 500, message: err };
+    }).then(function (preloaded) {
+        if (error) {
+            var route = error.statusCode >= 400 && error.statusCode < 500
+                ? errors['4xx']
+                : errors['5xx'];
+            return route.load().then(function (_a) {
+                var Component = _a["default"];
+                var err = error.message instanceof Error ? error.message : new Error(error.message);
+                Object.assign(data, { status: error.statusCode, error: err });
+                return { Component: Component, data: data, redirect: null };
+            });
+        }
+        Object.assign(data, preloaded);
+        return { Component: Component, data: data, redirect: redirect };
+    });
+}
+function navigate(target, id) {
+    if (id) {
+        // popstate or initial navigation
+        cid = id;
+    }
+    else {
+        // clicked on a link. preserve scroll state
+        scroll_history[cid] = scroll_state();
+        id = cid = ++uid;
+        scroll_history[cid] = { x: 0, y: 0 };
+    }
+    cid = id;
+    var loaded = prefetching && prefetching.href === target.url.href ?
+        prefetching.promise :
+        target.route.load().then(function (mod) { return prepare_route(mod["default"], target.data); });
+    prefetching = null;
+    var token = current_token = {};
+    return loaded.then(function (_a) {
+        var Component = _a.Component, data = _a.data, redirect = _a.redirect;
+        if (redirect) {
+            return goto(redirect.location, { replaceState: true });
+        }
+        render(Component, data, scroll_history[id], token);
+    });
+}
+function handle_click(event) {
+    // Adapted from https://github.com/visionmedia/page.js
+    // MIT license https://github.com/visionmedia/page.js#license
+    if (which(event) !== 1)
+        return;
+    if (event.metaKey || event.ctrlKey || event.shiftKey)
+        return;
+    if (event.defaultPrevented)
+        return;
+    var a = findAnchor(event.target);
+    if (!a)
+        return;
+    // check if link is inside an svg
+    // in this case, both href and target are always inside an object
+    var svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
+    var href = String(svg ? a.href.baseVal : a.href);
+    if (href === window.location.href) {
+        event.preventDefault();
+        return;
+    }
+    // Ignore if tag has
+    // 1. 'download' attribute
+    // 2. rel='external' attribute
+    if (a.hasAttribute('download') || a.getAttribute('rel') === 'external')
+        return;
+    // Ignore if <a> has a target
+    if (svg ? a.target.baseVal : a.target)
+        return;
+    var url = new URL(href);
+    // Don't handle hash changes
+    if (url.pathname === window.location.pathname && url.search === window.location.search)
+        return;
+    var target = select_route(url);
+    if (target) {
+        navigate(target, null);
+        event.preventDefault();
+        history.pushState({ id: cid }, '', url.href);
+    }
+}
+function handle_popstate(event) {
+    scroll_history[cid] = scroll_state();
+    if (event.state) {
+        var url = new URL(window.location.href);
+        var target_1 = select_route(url);
+        navigate(target_1, event.state.id);
+    }
+    else {
+        // hashchange
+        cid = ++uid;
+        history.replaceState({ id: cid }, '', window.location.href);
+    }
+}
+var prefetching = null;
+function prefetch(href) {
+    var selected = select_route(new URL(href));
+    if (selected) {
+        prefetching = {
+            href: href,
+            promise: selected.route.load().then(function (mod) { return prepare_route(mod["default"], selected.data); })
+        };
+    }
+}
+function handle_touchstart_mouseover(event) {
+    var a = findAnchor(event.target);
+    if (!a || a.rel !== 'prefetch')
+        return;
+    prefetch(a.href);
+}
+var inited;
+function init(_target, _routes) {
+    target = _target;
+    routes = _routes.filter(function (r) { return !r.error; });
+    errors = {
+        '4xx': _routes.find(function (r) { return r.error === '4xx'; }),
+        '5xx': _routes.find(function (r) { return r.error === '5xx'; })
+    };
+    if (!inited) {
+        window.addEventListener('click', handle_click);
+        window.addEventListener('popstate', handle_popstate);
+        // prefetch
+        window.addEventListener('touchstart', handle_touchstart_mouseover);
+        window.addEventListener('mouseover', handle_touchstart_mouseover);
+        inited = true;
+    }
+    return Promise.resolve().then(function () {
+        var _a = window.location, hash = _a.hash, href = _a.href;
+        var deep_linked = hash && document.getElementById(hash.slice(1));
+        scroll_history[uid] = deep_linked ?
+            { x: 0, y: deep_linked.getBoundingClientRect().top } :
+            scroll_state();
+        history.replaceState({ id: uid }, '', href);
+        var target = select_route(new URL(window.location.href));
+        return navigate(target, uid);
+    });
+}
+function goto(href, opts) {
+    if (opts === void 0) { opts = { replaceState: false }; }
+    var target = select_route(new URL(href, window.location.href));
+    if (target) {
+        navigate(target, null);
+        if (history)
+            history[opts.replaceState ? 'replaceState' : 'pushState']({ id: cid }, '', href);
+    }
+    else {
+        window.location.href = href;
+    }
+}
+function prefetchRoutes(pathnames) {
+    if (!routes)
+        throw new Error("You must call init() first");
+    return routes
+        .filter(function (route) {
+        if (!pathnames)
+            return true;
+        return pathnames.some(function (pathname) {
+            return route.error
+                ? route.error === pathname
+                : route.pattern.test(pathname);
+        });
+    })
+        .reduce(function (promise, route) {
+        return promise.then(route.load);
+    }, Promise.resolve());
+}
+
+export { component, prefetch, init, goto, prefetchRoutes, prefetchRoutes as preloadRoutes };
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('./dist/cli.ts.js');
--- a/sapper-dev-client.js
+++ b/sapper-dev-client.js
@@ -3,7 +3,7 @@ let source;
 function check() {
 	if (module.hot.status() === 'idle') {
 		module.hot.check(true).then(modules => {
-			console.log(`HMR updated`);
+			console.log(`[SAPPER] applied HMR update`);
 		});
 	}
 }
@@ -11,16 +11,26 @@ function check() {
 export function connect(port) {
 	if (source || !window.EventSource) return;

-	source = new EventSource(`http://localhost:${port}/hmr`);
+	source = new EventSource(`http://${window.location.hostname}:${port}/__sapper__`);
+
+	window.source = source;

 	source.onopen = function(event) {
-		console.log(`HMR connected`);
+		console.log(`[SAPPER] dev client connected`);
+	};
+
+	source.onerror = function(error) {
+		console.error(error);
 	};

 	source.onmessage = function(event) {
 		const data = JSON.parse(event.data);
 		if (!data) return; // just a heartbeat

+		if (data.action === 'reload') {
+			window.location.reload();
+		}
+
 		if (data.status === 'completed') {
 			check();
 		}
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -0,0 +1,77 @@
+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 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);
+
+prog.command('dev')
+	.describe('Start a development server')
+	.option('-p, --port', 'Specify a port')
+	.action(async (opts: { port: number }) => {
+		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') => {
+		console.log(`> Building...`);
+
+		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.`);
+		} catch (err) {
+			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+		}
+	});
+
+prog.command('start [dir]')
+	.describe('Start your app')
+	.option('-p, --port', 'Specify a port')
+	.action(async (dir = 'build', opts: { port: number }) => {
+		const { start } = await import('./cli/start');
+		start(dir, opts);
+	});
+
+prog.command('export [dest]')
+	.describe('Export your app as static files (if possible)')
+	.action(async (dest = 'export') => {
+		console.log(`> Building...`);
+
+		process.env.NODE_ENV = 'production';
+		process.env.SAPPER_DEST = '.sapper/.export';
+
+		const start = Date.now();
+
+		try {
+			const { build } = await import('./cli/build');
+			await build();
+			console.error(`\n> Built in ${elapsed(start)}. Exporting...`);
+
+			const { exporter } = await import('./cli/export');
+			await exporter(dest);
+			console.error(`\n> Finished in ${elapsed(start)}. Type ${clorox.bold.cyan(`npx serve ${dest}`)} to run the app.`);
+		} catch (err) {
+			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+		}
+	});
+
+// TODO upgrade
+
+prog.parse(process.argv);
+
+function elapsed(start: number) {
+	return prettyMs(Date.now() - start);
+}
--- a/src/cli/build.ts
+++ b/src/cli/build.ts
@@ -1,19 +1,18 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import * as clorox from 'clorox';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import { create_compilers, create_app, create_routes, create_serviceworker } from 'sapper/core.js';
+import { create_compilers, create_app, create_routes, create_serviceworker } from '../core'
+import { src, dest, dev } from '../config';

-export default async function build({ src, dest, dev, entry }: {
-	src: string;
-	dest: string;
-	dev: boolean;
-	entry: { client: string, server: string }
-}) {
-	mkdirp.sync(dest);
-	rimraf.sync(path.join(dest, '**/*'));
+export async function build() {
+	const output = dest();

-	const routes = create_routes({ src });
+	mkdirp.sync(output);
+	rimraf.sync(path.join(output, '**/*'));
+
+	const routes = create_routes();

 	// create app/manifest/client.js and app/manifest/server.js
 	create_app({ routes, src, dev });
@@ -21,9 +20,15 @@ export default async function build({ src, dest, dev, entry }: {
 	const { client, server, serviceworker } = create_compilers();

 	const client_stats = await compile(client);
-	fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(client_stats.toJson()));
+	console.log(clorox.inverse(`\nbuilt client`).toString());
+	console.log(client_stats.toString({ colors: true }));
+	fs.writeFileSync(path.join(output, 'client_info.json'), JSON.stringify(client_stats.toJson()));

-	await compile(server);
+	const server_stats = await compile(server);
+	console.log(clorox.inverse(`\nbuilt server`).toString());
+	console.log(server_stats.toString({ colors: true }));
+
+	let serviceworker_stats;

 	if (serviceworker) {
 		create_serviceworker({
@@ -32,7 +37,9 @@ export default async function build({ src, dest, dev, entry }: {
 			src
 		});

-		await compile(serviceworker);
+		serviceworker_stats = await compile(serviceworker);
+		console.log(clorox.inverse(`\nbuilt service worker`).toString());
+		console.log(serviceworker_stats.toString({ colors: true }));
 	}
 }

@@ -54,4 +61,4 @@ function compile(compiler: any) {
 			}
 		});
 	});
-}
+}
--- a/src/cli/dev.ts
+++ b/src/cli/dev.ts
@@ -1,13 +1,16 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as net from 'net';
-import * as chalk from 'chalk';
+import * as clorox from 'clorox';
 import * as child_process from 'child_process';
 import * as http from 'http';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import { wait_for_port } from './utils';
-import { create_compilers, create_app, create_routes, create_serviceworker, create_template } from 'sapper/core.js';
+import format_messages from 'webpack-format-messages';
+import prettyMs from 'pretty-ms';
+import * as ports from 'port-authority';
+import { dest } from '../config';
+import { create_compilers, create_app, create_routes, create_serviceworker } from '../core';

 type Deferred = {
 	promise?: Promise<any>;
@@ -30,11 +33,12 @@ function create_hot_update_server(port: number, interval = 10000) {
 	const clients = new Set();

 	const server = http.createServer((req, res) => {
-		if (req.url !== '/hmr') return;
+		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',
@@ -66,79 +70,158 @@ function create_hot_update_server(port: number, interval = 10000) {
 	return { send };
 }

-export default async function dev(src: string, dir: string) {
+export async function dev(opts: { port: number }) {
+	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 = dest();
 	rimraf.sync(dir);
 	mkdirp.sync(dir);

-	const chokidar = require('chokidar');
+	const dev_port = await ports.find(10000);

-	// initial build
-	const dev_port = await require('get-port')(10000);
-
-	const routes = create_routes({ src });
-	create_app({ routes, src, dev: true, dev_port });
+	const routes = create_routes();
+	create_app({ routes, dev_port });

 	const hot_update_server = create_hot_update_server(dev_port);

-	// TODO watch the configs themselves?
-	const compilers = create_compilers();
-
-	function watch_files(pattern: string, callback: () => void) {
-		const watcher = chokidar.watch(pattern, {
-			persistent: false
-		});
-
-		watcher.on('add', callback);
-		watcher.on('change', callback);
-		watcher.on('unlink', callback);
-	}
-
-	watch_files('routes/**/*.+(html|js|mjs)', () => {
-		const routes = create_routes({ src });
-		create_app({ routes, src, dev: true, dev_port });
+	watch_files('routes/**/*', ['add', 'unlink'], () => {
+		const routes = create_routes();
+		create_app({ routes, dev_port });
 	});

-	watch_files('app/template.html', () => {
-		const template = create_template();
-		// TODO reload current page?
+	watch_files('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()
 	};

-	const times = {
-		client_start: Date.now(),
-		server_start: Date.now(),
-		serviceworker_start: Date.now()
+	let restarting = false;
+	let build = {
+		unique_warnings: new Set(),
+		unique_errors: new Set()
 	};

-	compilers.server.plugin('invalid', () => {
-		times.server_start = Date.now();
-		// TODO print message
-		deferreds.server = deferred();
-	});
+	function restart_build(filename: string) {
+		if (restarting) return;

-	compilers.server.watch({}, (err: Error, stats: any) => {
-		if (err) {
-			console.error(chalk.red(err.message));
-		} else if (stats.hasErrors()) {
-			// print errors. TODO notify client
-			stats.toJson().errors.forEach((error: Error) => {
-				console.error(error); // TODO make this look nice
-			});
-		} else {
-			console.log(`built server in ${Date.now() - times.server_start}ms`); // TODO prettify
+		restarting = true;
+		build = {
+			unique_warnings: new Set(),
+			unique_errors: new Set()
+		};

-			const server_info = stats.toJson();
-			fs.writeFileSync(path.join(dir, 'server_info.json'), JSON.stringify(server_info, null, '  '));
+		process.nextTick(() => {
+			restarting = false;
+		});
+
+		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);
+		});
+
+		compiler.watch({}, (err: Error, stats: any) => {
+			if (err) {
+				console.error(clorox.red(`✗ ${name}`));
+				console.error(clorox.red(err.message));
+				error(err);
+			} else {
+				const messages = format_messages(stats);
+				const info = stats.toJson();
+
+				if (messages.errors.length > 0) {
+					console.log(clorox.bold.red(`✗ ${name}`));
+
+					const filtered = messages.errors.filter((message: string) => {
+						return !build.unique_errors.has(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);
+				}
+			}
+		});
+	}
+
+	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() {
-					wait_for_port(3000, deferreds.server.fulfil); // TODO control port
+					ports.wait(port).then(deferreds.server.fulfil);
 				}

 				if (proc) {
@@ -150,38 +233,31 @@ export default async function dev(src: string, dir: string) {

 				proc = child_process.fork(`${dir}/server.js`, [], {
 					cwd: process.cwd(),
-					env: Object.assign({}, process.env)
+					env: Object.assign({
+						PORT: port
+					}, process.env)
 				});
 			});
 		}
 	});

-	compilers.client.plugin('invalid', (filename: string) => {
-		times.client_start = Date.now();
+	watch(compilers.client, {
+		name: 'client',

-		deferreds.client = deferred();
+		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
-	});
+			// TODO we should delete old assets. due to a webpack bug
+			// i don't even begin to comprehend, this is apparently
+			// quite difficult
+		},

-	compilers.client.watch({}, (err: Error, stats: any) => {
-		if (err) {
-			console.error(chalk.red(err.message));
-		} else if (stats.hasErrors()) {
-			// print errors. TODO notify client
-			stats.toJson().errors.forEach((error: Error) => {
-				console.error(error); // TODO make this look nice
-			});
-		} else {
-			console.log(`built client in ${Date.now() - times.client_start}ms`); // TODO prettify
-
-			const client_info = stats.toJson();
-			fs.writeFileSync(path.join(dir, 'client_info.json'), JSON.stringify(client_info, null, '  '));
+		result: info => {
+			fs.writeFileSync(path.join(dir, 'client_info.json'), JSON.stringify(info, null, '  '));
 			deferreds.client.fulfil();

-			const client_files = client_info.assets.map((chunk: { name: string }) => `/client/${chunk.name}`);
+			const client_files = info.assets.map((chunk: { name: string }) => `/client/${chunk.name}`);

 			deferreds.server.promise.then(() => {
 				hot_update_server.send({
@@ -190,9 +266,8 @@ export default async function dev(src: string, dir: string) {
 			});

 			create_serviceworker({
-				routes: create_routes({ src }),
-				client_files,
-				src
+				routes: create_routes(),
+				client_files
 			});

 			watch_serviceworker();
@@ -203,27 +278,28 @@ export default async function dev(src: string, dir: string) {
 		? function() {
 			watch_serviceworker = noop;

-			compilers.serviceworker.plugin('invalid', (filename: string) => {
-				times.serviceworker_start = Date.now();
-			});
+			watch(compilers.serviceworker, {
+				name: 'service worker',

-			compilers.serviceworker.watch({}, (err: Error, stats: any) => {
-				if (err) {
-					// TODO notify client
-				} else if (stats.hasErrors()) {
-					// print errors. TODO notify client
-					stats.toJson().errors.forEach((error: Error) => {
-						console.error(error); // TODO make this look nice
-					});
-				} else {
-					console.log(`built service worker in ${Date.now() - times.serviceworker_start}ms`); // TODO prettify
-
-					const serviceworker_info = stats.toJson();
-					fs.writeFileSync(path.join(dir, 'serviceworker_info.json'), JSON.stringify(serviceworker_info, null, '  '));
+				result: info => {
+					fs.writeFileSync(path.join(dir, 'serviceworker_info.json'), JSON.stringify(info, null, '  '));
 				}
 			});
 		}
 		: noop;
 }

-function 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);
+	});
+}
--- a/src/cli/export.ts
+++ b/src/cli/export.ts
@@ -1,37 +1,35 @@
 import * as child_process from 'child_process';
 import * as path from 'path';
 import * as sander from 'sander';
-import express from 'express';
 import cheerio from 'cheerio';
 import URL from 'url-parse';
 import fetch from 'node-fetch';
-import { wait_for_port } from './utils';
+import * as ports from 'port-authority';
+import { dest } from '../config';

-const { OUTPUT_DIR = 'dist' } = process.env;
+export async function exporter(export_dir: string) {
+	const build_dir = dest();

-const app = express();
-
-function read_json(file: string) {
-	return JSON.parse(sander.readFileSync(file, { encoding: 'utf-8' }));
-}
-
-export default async function exporter(dir: string) { // dir === '.sapper'
 	// Prep output directory
-	sander.rimrafSync(OUTPUT_DIR);
+	sander.rimrafSync(export_dir);

-	sander.copydirSync('assets').to(OUTPUT_DIR);
-	sander.copydirSync(dir, 'client').to(OUTPUT_DIR, 'client');
-	sander.copyFileSync(dir, 'service-worker.js').to(OUTPUT_DIR, 'service-worker.js');
+	sander.copydirSync('assets').to(export_dir);
+	sander.copydirSync(build_dir, 'client').to(export_dir, 'client');

-	const port = await require('get-port')(3000);
+	if (sander.existsSync(build_dir, 'service-worker.js')) {
+		sander.copyFileSync(build_dir, 'service-worker.js').to(export_dir, 'service-worker.js');
+	}
+
+	const port = await ports.find(3000);

 	const origin = `http://localhost:${port}`;

-	const proc = child_process.fork(path.resolve(`${dir}/server.js`), [], {
+	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'
 		}
 	});
@@ -48,11 +46,11 @@ export default async function exporter(dir: string) { // dir === '.sapper'
 		saved.add(url.pathname);

 		if (message.type === 'text/html') {
-			const dest = `${OUTPUT_DIR}/${url.pathname}/index.html`;
-			sander.writeFileSync(dest, message.body);
+			const file = `${export_dir}/${url.pathname}/index.html`;
+			sander.writeFileSync(file, message.body);
 		} else {
-			const dest = `${OUTPUT_DIR}/${url.pathname}`;
-			sander.writeFileSync(dest, message.body);
+			const file = `${export_dir}/${url.pathname}`;
+			sander.writeFileSync(file, message.body);
 		}
 	});

@@ -84,8 +82,7 @@ export default async function exporter(dir: string) { // dir === '.sapper'
 			});
 	}

-	wait_for_port(port, () => {
-		handle(new URL(origin)) // TODO all static routes
-			.then(() => proc.kill())
-	});
+	return ports.wait(port)
+		.then(() => handle(new URL(origin))) // TODO all static routes
+		.then(() => proc.kill());
 }
--- a/src/cli/help.md
+++ b/src/cli/help.md
@@ -1,20 +0,0 @@
-# sapper v<@version@>
-
-https://sapper.svelte.technology
-
-> sapper dev
-
-Start a development server
-
-> sapper build
-
-Creates a production-ready version of your app
-
-> sapper export
-
-If possible, exports your app as static files, suitable for hosting on
-services like Netlify or Surge
-
-> sapper --help
-
-Shows this message
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -1,57 +0,0 @@
-import mri from 'mri';
-import chalk from 'chalk';
-import help from './help.md';
-import build from './build';
-import exporter from './export';
-import dev from './dev';
-import upgrade from './upgrade';
-import { dest, entry, src } from '../config';
-import * as pkg from '../../package.json';
-
-const opts = mri(process.argv.slice(2), {
-	alias: {
-		h: 'help'
-	}
-});
-
-if (opts.help) {
-	const rendered = help
-		.replace('<@version@>', pkg.version)
-		.replace(/^(.+)/gm, (m: string, $1: string) => /[#>]/.test(m) ? $1 : `  ${$1}`)
-		.replace(/^# (.+)/gm, (m: string, $1: string) => chalk.bold.underline($1))
-		.replace(/^> (.+)/gm, (m: string, $1: string) => chalk.cyan($1));
-
-	console.log(`\n${rendered}\n`);
-	process.exit(0);
-}
-
-const [cmd] = opts._;
-
-const start = Date.now();
-
-if (cmd === 'build') {
-	build({ dest, dev: false, entry, src })
-		.then(() => {
-			const elapsed = Date.now() - start;
-			console.error(`built in ${elapsed}ms`); // TODO beautify this, e.g. 'built in 4.7 seconds'
-		})
-		.catch(err => {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
-		});
-} else if (cmd === 'export') {
-	build({ dest, dev: false, entry, src })
-		.then(() => exporter(dest))
-		.then(() => {
-			const elapsed = Date.now() - start;
-			console.error(`extracted in ${elapsed}ms`); // TODO beautify this, e.g. 'built in 4.7 seconds'
-		})
-		.catch(err => {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
-		});
-} else if (cmd === 'dev') {
-	dev(src, dest);
-} else if (cmd === 'upgrade') {
-	upgrade();
-} else {
-	console.log(`unrecognized command ${cmd} — try \`sapper --help\` for more information`);
-}
--- a/src/cli/start.ts
+++ b/src/cli/start.ts
@@ -0,0 +1,35 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as child_process from 'child_process';
+import * as clorox from 'clorox';
+import * as ports from 'port-authority';
+
+export async function start(dir: string, opts: { port: number }) {
+	let port = opts.port || +process.env.PORT;
+
+	const resolved = path.resolve(dir);
+	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`));
+		return;
+	}
+
+	if (port) {
+		if (!await ports.check(port)) {
+			console.log(clorox.bold.red(`> Port ${port} is unavailable`));
+			return;
+		}
+	} else {
+		port = await ports.find(3000);
+	}
+
+	child_process.fork(server, [], {
+		cwd: process.cwd(),
+		env: Object.assign({
+			NODE_ENV: 'production',
+			PORT: port,
+			SAPPER_DEST: dir
+		}, process.env)
+	});
+}
--- a/src/cli/upgrade.ts
+++ b/src/cli/upgrade.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import chalk from 'chalk';
+import * as clorox from 'clorox';

 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(chalk.red(`Could not replace %sapper.main% in ${file}`));
+				console.log(clorox.red(`Could not replace %sapper.main% in ${file}`));
 			} else {
 				write(file, template.replace(pattern, `%sapper.scripts%`));
-				console.log(chalk.green(`Replaced %sapper.main% in ${file}`));
+				console.log(clorox.green(`Replaced %sapper.main% in ${file}`));
 				replaced = true;
 			}
 		}
@@ -50,4 +50,4 @@ function read(file: string) {

 function write(file: string, data: string) {
 	fs.writeFileSync(file, data);
-}
+}
--- a/src/cli/utils.ts
+++ b/src/cli/utils.ts
@@ -1,24 +0,0 @@
-import waitPort from 'wait-port';
-
-export function wait_for_port(port: number, cb: () => void) {
-	waitPort({ port }).then(cb);
-}
-
-// import * as net from 'net';
-
-// export function wait_for_port(port: number, cb: () => void) {
-// 	const socket = net.createConnection(port, 'localhost', () => {
-// 		cb();
-// 		socket.destroy();
-// 	});
-
-// 	socket.on('error', err => {
-// 		setTimeout(() => {
-// 			wait_for_port(port, cb);
-// 		}, 100);
-// 	});
-
-// 	setTimeout(() => {
-// 		socket.destroy();
-// 	}, 100);
-// }
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,12 +1,5 @@
 import * as path from 'path';

-export const isDev = () => process.env.NODE_ENV !== 'production';
-
-export const templates = path.resolve(process.env.SAPPER_TEMPLATES || 'templates');
-export const src = path.resolve(process.env.SAPPER_ROUTES || 'routes');
-export const dest = path.resolve(process.env.SAPPER_DEST || '.sapper');
-
-export const entry = {
-	client: path.resolve(templates, '.main.rendered.js'),
-	server: path.resolve(dest, 'server-entry.js')
-};
+export const dev = () => process.env.NODE_ENV !== 'production';
+export const src = () => path.resolve(process.env.SAPPER_ROUTES || 'routes');
+export const dest = () => path.resolve(process.env.SAPPER_DEST || '.sapper');
--- a/src/core.ts
+++ b/src/core.ts
@@ -0,0 +1,4 @@
+export { default as create_app } from './core/create_app';
+export { default as create_serviceworker } from './core/create_serviceworker';
+export { default as create_compilers } from './core/create_compilers';
+export { default as create_routes } from './core/create_routes';
--- a/src/core/create_app.ts
+++ b/src/core/create_app.ts
@@ -3,51 +3,67 @@ import * as path from 'path';
 import mkdirp from 'mkdirp';
 import create_routes from './create_routes';
 import { fudge_mtime, posixify, write } from './utils';
+import { dev } from '../config';
 import { Route } from '../interfaces';

-export default function create_app({ routes, src, dev, dev_port }: {
+// in dev mode, we avoid touching the fs unnecessarily
+let last_client_manifest: string = null;
+let last_server_manifest: string = null;
+
+export default function create_app({ routes, dev_port }: {
 	routes: Route[];
-	src: string;
-	dev: boolean;
 	dev_port: number;
 }) {
 	mkdirp.sync('app/manifest');

-	write('app/manifest/client.js', generate_client(routes, src, dev, dev_port));
-	write('app/manifest/server.js', generate_server(routes, src));
+	const client_manifest = generate_client(routes, dev_port);
+	const server_manifest = generate_server(routes);
+
+	if (client_manifest !== last_client_manifest) {
+		write(`app/manifest/client.js`, client_manifest);
+		last_client_manifest = client_manifest;
+	}
+
+	if (server_manifest !== last_server_manifest) {
+		write(`app/manifest/server.js`, server_manifest);
+		last_server_manifest = server_manifest;
+	}
 }

-function generate_client(routes: Route[], src: string, dev: boolean, dev_port?: number) {
+function generate_client(routes: Route[], dev_port?: number) {
 	let code = `
 		// This file is generated by Sapper — do not edit it!
 		export const routes = [
 			${routes
-				.filter(route => route.type === 'page')
 				.map(route => {
+					if (route.type !== 'page') {
+						return `{ pattern: ${route.pattern}, ignore: true }`;
+					}
+
 					const file = posixify(`../../routes/${route.file}`);

 					if (route.id === '_4xx' || route.id === '_5xx') {
 						return `{ error: '${route.id.slice(1)}', load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
 					}

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

-					return `{ pattern: ${route.pattern}, params: ${route.dynamic.length > 0 ? `match` : `()`} => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`;
+					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();

-	if (dev) {
-		const hmr_client = posixify(
-			path.resolve(__dirname, 'hmr-client.js')
+	if (dev()) {
+		const sapper_dev_client = posixify(
+			path.resolve(__dirname, 'sapper-dev-client.js')
 		);

 		code += `

 			if (module.hot) {
-				import('${hmr_client}').then(client => {
+				import('${sapper_dev_client}').then(client => {
 					client.connect(${dev_port});
 				});
 			}`.replace(/^\t{3}/gm, '');
@@ -56,7 +72,7 @@ function generate_client(routes: Route[], src: string, dev: boolean, dev_port?:
 	return code;
 }

-function generate_server(routes: Route[], src: string) {
+function generate_server(routes: Route[]) {
 	let code = `
 		// This file is generated by Sapper — do not edit it!
 		${routes
@@ -71,17 +87,17 @@ function generate_server(routes: Route[], src: string) {
 		export const routes = [
 			${routes
 				.map(route => {
-					const file = posixify(`${src}/${route.file}`);
+					const file = posixify(`../../${route.file}`);

 					if (route.id === '_4xx' || route.id === '_5xx') {
 						return `{ error: '${route.id.slice(1)}', module: ${route.id} }`;
 					}

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

-					return `{ id: '${route.id}', type: '${route.type}', pattern: ${route.pattern}, params: ${route.dynamic.length > 0 ? `match` : `()`} => (${params}), module: ${route.id} }`;
+					return `{ id: '${route.id}', type: '${route.type}', pattern: ${route.pattern}, params: ${route.params.length > 0 ? `match` : `()`} => (${params}), module: ${route.id} }`;
 				})
 				.join(',\n\t')
 			}
--- a/src/core/create_routes.ts
+++ b/src/core/create_routes.ts
@@ -1,35 +1,44 @@
 import * as path from 'path';
 import glob from 'glob';
+import { src } from '../config';
 import { Route } from '../interfaces';

-export default function create_routes({ src, files = glob.sync('**/*.+(html|js|mjs)', { cwd: src }) }: {
-	src: string;
-	files?: string[];
-}) {
+export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: src(), nodir: true }) }) {
 	const routes: Route[] = files
 		.map((file: string) => {
 			if (/(^|\/|\\)_/.test(file)) return;

-			const parts = file.replace(/\.(html|js|mjs)$/, '').split('/'); // glob output is always posix-style
+			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 dynamic = parts
-				.filter(part => part[0] === '[')
-				.map(part => part.slice(1, -1));
+			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 = parts[i];
-				const dynamic = part[0] === '[';
+				const part = encodeURIComponent(parts[i].normalize()).replace(/%5B/g, '[').replace(/%5D/g, ']');
+				const dynamic = ~part.indexOf('[');

 				if (dynamic) {
-					pattern_string = nested ? `(?:\\/([^/]+)${pattern_string})?` : `\\/([^/]+)${pattern_string}`;
+					const matcher = part.replace(param_pattern, `([^\/]+?)`);
+					pattern_string = nested ? `(?:\\/${matcher}${pattern_string})?` : `\\/${matcher}${pattern_string}`;
 				} else {
 					nested = false;
 					pattern_string = `\\/${part}${pattern_string}`;
@@ -44,12 +53,12 @@ export default function create_routes({ src, files = glob.sync('**/*.+(html|js|m
 				const match = pattern.exec(url);
 				if (!match) return;

-				const params: Record<string, string> = {};
-				dynamic.forEach((param, i) => {
-					params[param] = match[i + 1];
+				const result: Record<string, string> = {};
+				params.forEach((param, i) => {
+					result[param] = match[i + 1];
 				});

-				return params;
+				return result;
 			};

 			return {
@@ -60,36 +69,58 @@ export default function create_routes({ src, files = glob.sync('**/*.+(html|js|m
 				test,
 				exec,
 				parts,
-				dynamic
+				params
 			};
 		})
 		.filter(Boolean)
 		.sort((a: Route, b: Route) => {
-			let same = true;
+			if (a.file === '4xx.html' || a.file === '5xx.html') return -1;
+			if (b.file === '4xx.html' || b.file === '5xx.html') return 1;

-			for (let i = 0; true; i += 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 && !b_part) {
-					if (same) throw new Error(`The ${a.file} and ${b.file} routes clash`);
-					return 0;
-				}
-
 				if (!a_part) return -1;
 				if (!b_part) return 1;

-				const a_is_dynamic = a_part[0] === '[';
-				const b_is_dynamic = b_part[0] === '[';
+				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);

-				if (a_is_dynamic === b_is_dynamic) {
-					if (!a_is_dynamic && a_part !== b_part) same = false;
-					continue;
+				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;
+					}
 				}
-
-				return a_is_dynamic ? 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);
 }
--- a/src/core/create_serviceworker.ts
+++ b/src/core/create_serviceworker.ts
@@ -5,10 +5,9 @@ import create_routes from './create_routes';
 import { fudge_mtime, posixify, write } from './utils';
 import { Route } from '../interfaces';

-export default function create_serviceworker({ routes, client_files, src }: {
+export default function create_serviceworker({ routes, client_files }: {
 	routes: Route[];
 	client_files: string[];
-	src: string;
 }) {
 	const assets = glob.sync('**', { cwd: 'assets', nodir: true });

--- a/src/core/create_template.ts
+++ b/src/core/create_template.ts
@@ -1,39 +0,0 @@
-import * as fs from 'fs';
-import chalk from 'chalk';
-import framer from 'code-frame';
-import { locate } from 'locate-character';
-
-function error(e: any) {
-	if (e.title) console.error(chalk.bold.red(e.title));
-	if (e.body) console.error(chalk.red(e.body));
-	if (e.url) console.error(chalk.cyan(e.url));
-	if (e.frame) console.error(chalk.grey(e.frame));
-
-	process.exit(1);
-}
-
-export default function create_templates() {
-	const template = fs.readFileSync(`app/template.html`, 'utf-8');
-
-	const index = template.indexOf('%sapper.main%');
-	if (index !== -1) {
-		// TODO remove this in a future version
-		const { line, column } = locate(template, index, { offsetLine: 1 });
-		const frame = framer(template, line, column);
-
-		error({
-			title: `app/template.html`,
-			body: `<script src='%sapper.main%'> is unsupported — use %sapper.scripts% (without the <script> tag) instead`,
-			url: 'https://github.com/sveltejs/sapper/issues/86',
-			frame
-		});
-	}
-
-	return {
-		render: (data: Record<string, string>) => {
-			return template.replace(/%sapper\.(\w+)%/g, (match, key) => {
-				return key in data ? data[key] : '';
-			});
-		}
-	};
-}
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -1,5 +0,0 @@
-export { default as create_app } from './create_app';
-export { default as create_serviceworker } from './create_serviceworker';
-export { default as create_compilers } from './create_compilers';
-export { default as create_routes } from './create_routes';
-export { default as create_template } from './create_template';
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -6,7 +6,7 @@ export type Route = {
 	test: (url: string) => boolean;
 	exec: (url: string) => Record<string, string>;
 	parts: string[];
-	dynamic: string[];
+	params: string[];
 };

 export type Template = {
--- a/src/middleware/index.ts
+++ b/src/middleware/index.ts
@@ -1,16 +1,16 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { ClientRequest, ServerResponse } from 'http';
-// import * as mime from 'mime';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import serialize from 'serialize-javascript';
-import escape_html from 'escape-html';
-import { create_routes, templates, create_compilers, create_template } from 'sapper/core.js';
-import { dest, entry, isDev, src } from '../config';
-import { Route, Template } from '../interfaces';
+import devalue from 'devalue';
+import { lookup } from './middleware/mime';
+import { create_routes, templates, create_compilers } from './core/index';
+import { dest, dev } from './config';
+import { Route, Template } from './interfaces';
+import sourceMapSupport from 'source-map-support';

-const dev = isDev();
+sourceMapSupport.install();

 type RouteObject = {
 	id: string;
@@ -40,12 +40,9 @@ interface Req extends ClientRequest {
 export default function middleware({ routes }: {
 	routes: RouteObject[]
 }) {
-	const client_info = JSON.parse(fs.readFileSync(path.join(dest, 'client_info.json'), 'utf-8'));
+	const output = dest();

-	const template = create_template();
-
-	const shell = try_read(path.join(dest, 'index.html'));
-	const serviceworker = try_read(path.join(dest, 'service-worker.js'));
+	const client_info = JSON.parse(fs.readFileSync(path.join(output, 'client_info.json'), 'utf-8'));

 	const middleware = compose_handlers([
 		(req: Req, res: ServerResponse, next: () => void) => {
@@ -53,65 +50,71 @@ export default function middleware({ routes }: {
 			next();
 		},

-		shell && get_asset_handler({
+		fs.existsSync(path.join(output, 'index.html')) && serve({
 			pathname: '/index.html',
-			type: 'text/html',
-			cache: 'max-age=600',
-			body: shell
+			cache_control: 'max-age=600'
 		}),

-		serviceworker && get_asset_handler({
+		fs.existsSync(path.join(output, 'service-worker.js')) && serve({
 			pathname: '/service-worker.js',
-			type: 'application/javascript',
-			cache: 'max-age=600',
-			body: serviceworker
+			cache_control: 'max-age=600'
 		}),

-		(req: Req, res: ServerResponse, next: () => void) => {
-			if (req.pathname.startsWith('/client/')) {
-				// const type = mime.getType(req.pathname);
-				const type = 'application/javascript'; // TODO might not be, if using e.g. CSS plugin
+		serve({
+			prefix: '/client/',
+			cache_control: 'max-age=31536000'
+		}),

-				// TODO cache?
-				const rs = fs.createReadStream(path.join(dest, req.pathname.slice(1)));
-
-				rs.on('error', error => {
-					res.statusCode = 404;
-					res.end('not found');
-				});
-
-				res.setHeader('Content-Type', type);
-				res.setHeader('Cache-Control', 'max-age=31536000');
-				rs.pipe(res);
-			} else {
-				next();
-			}
-		},
-
-		get_route_handler(client_info.assetsByChunkName, routes, template)
+		get_route_handler(client_info.assetsByChunkName, routes)
 	].filter(Boolean));

 	return middleware;
 }

-function get_asset_handler({ pathname, type, cache, body }: {
-	pathname: string;
-	type: string;
-	cache: string;
-	body: string;
+function serve({ prefix, pathname, cache_control }: {
+	prefix?: string,
+	pathname?: string,
+	cache_control: string
 }) {
-	return (req: Req, res: ServerResponse, next: () => void) => {
-		if (req.pathname !== pathname) return next();
+	const filter = pathname
+		? (req: Req) => req.pathname === pathname
+		: (req: Req) => req.pathname.startsWith(prefix);

-		res.setHeader('Content-Type', type);
-		res.setHeader('Cache-Control', cache);
-		res.end(body);
+	const output = dest();
+
+	const cache: Map<string, Buffer> = new Map();
+
+	const read = dev()
+		? (file: string) => fs.readFileSync(path.resolve(output, file))
+		: (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 (filter(req)) {
+			const type = lookup(req.pathname);
+
+			try {
+				const data = read(req.pathname.slice(1));
+
+				res.setHeader('Content-Type', type);
+				res.setHeader('Cache-Control', cache_control);
+				res.end(data);
+			} catch (err) {
+				res.statusCode = 404;
+				res.end('not found');
+			}
+		} else {
+			next();
+		}
 	};
 }

 const resolved = Promise.resolve();

-function get_route_handler(chunks: Record<string, string>, routes: RouteObject[], template: Template) {
+function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]) {
+	const template = dev()
+		? () => fs.readFileSync('app/template.html', 'utf-8')
+		: (str => () => str)(fs.readFileSync('app/template.html', 'utf-8'));
+
 	function handle_route(route: RouteObject, req: Req, res: ServerResponse) {
 		req.params = route.params(route.pattern.exec(req.pathname));

@@ -171,12 +174,11 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]

 				scripts = `<script>__SAPPER__ = { preloaded: ${serialized} };</script>${scripts}`;

-				const page = template.render({
-					scripts,
-					html,
-					head: `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`,
-					styles: (css && css.code ? `<style>${css.code}</style>` : '')
-				});
+				const page = template()
+					.replace('%sapper.scripts%', 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);

@@ -231,67 +233,64 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
 					};
 				}

-				handler(req, res, () => {
-					handle_not_found(req, res, 404, 'Not found');
-				});
+				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');
+					}
+				};
+
+				try {
+					handler(req, res, handle_bad_result);
+				} catch (err) {
+					handle_bad_result(err);
+				}
 			} else {
 				// no matching handler for method — 404
-				handle_not_found(req, res, 404, 'Not found');
+				handle_error(req, res, 404, 'Not found');
 			}
 		}
 	}

 	const not_found_route = routes.find((route: RouteObject) => route.error === '4xx');
-
-	function handle_not_found(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 rendered = not_found_route ? not_found_route.module.render({
-			status: 404,
-			error
-		}) : { head: '', css: null, html: error.message };
-
-		const { head, css, html } = rendered;
-
-		res.end(template.render({
-			scripts: `<script src='/client/${chunks.main}'></script>`,
-			html,
-			head: `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`,
-			styles: (css && css.code ? `<style>${css.code}</style>` : '')
-		}));
-	}
-
 	const error_route = routes.find((route: RouteObject) => route.error === '5xx');

 	function handle_error(req: Req, res: ServerResponse, statusCode: number, message: Error | string) {
-		if (statusCode >= 400 && statusCode < 500) {
-			return handle_not_found(req, res, statusCode, message);
-		}
-
 		res.statusCode = statusCode;
 		res.setHeader('Content-Type', 'text/html');

 		const error = message instanceof Error ? message : new Error(message);

-		const rendered = error_route ? error_route.module.render({
-			status: 500,
+		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
-		}) : { head: '', css: null, html: `Internal server error: ${error.message}` };
+		}) : { head: '', css: null, html: title };

 		const { head, css, html } = rendered;

-		res.end(template.render({
-			scripts: `<script src='/client/${chunks.main}'></script>`,
-			html,
-			head: `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`,
-			styles: (css && css.code ? `<style>${css.code}</style>` : '')
-		}));
+		const page = template()
+			.replace('%sapper.scripts%', `<script src='/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, next: () => void) {
+	return function find_route(req: Req, res: ServerResponse) {
 		const url = req.pathname;

 		try {
@@ -299,7 +298,7 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
 				if (!route.error && route.pattern.test(url)) return handle_route(route, req, res);
 			}

-			handle_not_found(req, res, 404, 'Not found');
+			handle_error(req, res, 404, 'Not found');
 		} catch (error) {
 			handle_error(req, res, 500, error);
 		}
@@ -332,15 +331,7 @@ function read_json(file: string) {

 function try_serialize(data: any) {
 	try {
-		return serialize(data);
-	} catch (err) {
-		return null;
-	}
-}
-
-function try_read(file: string) {
-	try {
-		return fs.readFileSync(file, 'utf-8');
+		return devalue(data);
 	} catch (err) {
 		return null;
 	}
--- a/src/middleware/mime-types.md
+++ b/src/middleware/mime-types.md
@@ -0,0 +1,767 @@
+application/andrew-inset			ez
+application/applixware				aw
+application/atom+xml				atom
+application/atomcat+xml				atomcat
+application/atomsvc+xml				atomsvc
+application/ccxml+xml				ccxml
+application/cdmi-capability			cdmia
+application/cdmi-container			cdmic
+application/cdmi-domain				cdmid
+application/cdmi-object				cdmio
+application/cdmi-queue				cdmiq
+application/cu-seeme				cu
+application/davmount+xml			davmount
+application/docbook+xml				dbk
+application/dssc+der				dssc
+application/dssc+xml				xdssc
+application/ecmascript				ecma
+application/emma+xml				emma
+application/epub+zip				epub
+application/exi					exi
+application/font-tdpfr				pfr
+application/gml+xml				gml
+application/gpx+xml				gpx
+application/gxf					gxf
+application/hyperstudio				stk
+application/inkml+xml				ink inkml
+application/ipfix				ipfix
+application/java-archive			jar
+application/java-serialized-object		ser
+application/java-vm				class
+application/javascript				js
+application/json				json
+application/jsonml+json				jsonml
+application/lost+xml				lostxml
+application/mac-binhex40			hqx
+application/mac-compactpro			cpt
+application/mads+xml				mads
+application/marc				mrc
+application/marcxml+xml				mrcx
+application/mathematica				ma nb mb
+application/mathml+xml				mathml
+application/mbox				mbox
+application/mediaservercontrol+xml		mscml
+application/metalink+xml			metalink
+application/metalink4+xml			meta4
+application/mets+xml				mets
+application/mods+xml				mods
+application/mp21				m21 mp21
+application/mp4					mp4s
+application/msword				doc dot
+application/mxf					mxf
+application/octet-stream	bin dms lrf mar so dist distz pkg bpk dump elc deploy
+application/oda					oda
+application/oebps-package+xml			opf
+application/ogg					ogx
+application/omdoc+xml				omdoc
+application/onenote				onetoc onetoc2 onetmp onepkg
+application/oxps				oxps
+application/patch-ops-error+xml			xer
+application/pdf					pdf
+application/pgp-encrypted			pgp
+application/pgp-signature			asc sig
+application/pics-rules				prf
+application/pkcs10				p10
+application/pkcs7-mime				p7m p7c
+application/pkcs7-signature			p7s
+application/pkcs8				p8
+application/pkix-attr-cert			ac
+application/pkix-cert				cer
+application/pkix-crl				crl
+application/pkix-pkipath			pkipath
+application/pkixcmp				pki
+application/pls+xml				pls
+application/postscript				ai eps ps
+application/prs.cww				cww
+application/pskc+xml				pskcxml
+application/rdf+xml				rdf
+application/reginfo+xml				rif
+application/relax-ng-compact-syntax		rnc
+application/resource-lists+xml			rl
+application/resource-lists-diff+xml		rld
+application/rls-services+xml			rs
+application/rpki-ghostbusters			gbr
+application/rpki-manifest			mft
+application/rpki-roa				roa
+application/rsd+xml				rsd
+application/rss+xml				rss
+application/rtf					rtf
+application/sbml+xml				sbml
+application/scvp-cv-request			scq
+application/scvp-cv-response			scs
+application/scvp-vp-request			spq
+application/scvp-vp-response			spp
+application/sdp					sdp
+application/set-payment-initiation		setpay
+application/set-registration-initiation		setreg
+application/shf+xml				shf
+application/smil+xml				smi smil
+application/sparql-query			rq
+application/sparql-results+xml			srx
+application/srgs				gram
+application/srgs+xml				grxml
+application/sru+xml				sru
+application/ssdl+xml				ssdl
+application/ssml+xml				ssml
+application/tei+xml				tei teicorpus
+application/thraud+xml				tfi
+application/timestamped-data			tsd
+application/vnd.3gpp.pic-bw-large		plb
+application/vnd.3gpp.pic-bw-small		psb
+application/vnd.3gpp.pic-bw-var			pvb
+application/vnd.3gpp2.tcap			tcap
+application/vnd.3m.post-it-notes		pwn
+application/vnd.accpac.simply.aso		aso
+application/vnd.accpac.simply.imp		imp
+application/vnd.acucobol			acu
+application/vnd.acucorp				atc acutc
+application/vnd.adobe.air-application-installer-package+zip	air
+application/vnd.adobe.formscentral.fcdt		fcdt
+application/vnd.adobe.fxp			fxp fxpl
+application/vnd.adobe.xdp+xml			xdp
+application/vnd.adobe.xfdf			xfdf
+application/vnd.ahead.space			ahead
+application/vnd.airzip.filesecure.azf		azf
+application/vnd.airzip.filesecure.azs		azs
+application/vnd.amazon.ebook			azw
+application/vnd.americandynamics.acc		acc
+application/vnd.amiga.ami			ami
+application/vnd.android.package-archive		apk
+application/vnd.anser-web-certificate-issue-initiation	cii
+application/vnd.anser-web-funds-transfer-initiation	fti
+application/vnd.antix.game-component		atx
+application/vnd.apple.installer+xml		mpkg
+application/vnd.apple.mpegurl			m3u8
+application/vnd.aristanetworks.swi		swi
+application/vnd.astraea-software.iota		iota
+application/vnd.audiograph			aep
+application/vnd.blueice.multipass		mpm
+application/vnd.bmi				bmi
+application/vnd.businessobjects			rep
+application/vnd.chemdraw+xml			cdxml
+application/vnd.chipnuts.karaoke-mmd		mmd
+application/vnd.cinderella			cdy
+application/vnd.claymore			cla
+application/vnd.cloanto.rp9			rp9
+application/vnd.clonk.c4group			c4g c4d c4f c4p c4u
+application/vnd.cluetrust.cartomobile-config		c11amc
+application/vnd.cluetrust.cartomobile-config-pkg	c11amz
+application/vnd.commonspace			csp
+application/vnd.contact.cmsg			cdbcmsg
+application/vnd.cosmocaller			cmc
+application/vnd.crick.clicker			clkx
+application/vnd.crick.clicker.keyboard		clkk
+application/vnd.crick.clicker.palette		clkp
+application/vnd.crick.clicker.template		clkt
+application/vnd.crick.clicker.wordbank		clkw
+application/vnd.criticaltools.wbs+xml		wbs
+application/vnd.ctc-posml			pml
+application/vnd.cups-ppd			ppd
+application/vnd.curl.car			car
+application/vnd.curl.pcurl			pcurl
+application/vnd.dart				dart
+application/vnd.data-vision.rdz			rdz
+application/vnd.dece.data			uvf uvvf uvd uvvd
+application/vnd.dece.ttml+xml			uvt uvvt
+application/vnd.dece.unspecified		uvx uvvx
+application/vnd.dece.zip			uvz uvvz
+application/vnd.denovo.fcselayout-link		fe_launch
+application/vnd.dna				dna
+application/vnd.dolby.mlp			mlp
+application/vnd.dpgraph				dpg
+application/vnd.dreamfactory			dfac
+application/vnd.ds-keypoint			kpxx
+application/vnd.dvb.ait				ait
+application/vnd.dvb.service			svc
+application/vnd.dynageo				geo
+application/vnd.ecowin.chart			mag
+application/vnd.enliven				nml
+application/vnd.epson.esf			esf
+application/vnd.epson.msf			msf
+application/vnd.epson.quickanime		qam
+application/vnd.epson.salt			slt
+application/vnd.epson.ssf			ssf
+application/vnd.eszigno3+xml			es3 et3
+application/vnd.ezpix-album			ez2
+application/vnd.ezpix-package			ez3
+application/vnd.fdf				fdf
+application/vnd.fdsn.mseed			mseed
+application/vnd.fdsn.seed			seed dataless
+application/vnd.flographit			gph
+application/vnd.fluxtime.clip			ftc
+application/vnd.framemaker			fm frame maker book
+application/vnd.frogans.fnc			fnc
+application/vnd.frogans.ltf			ltf
+application/vnd.fsc.weblaunch			fsc
+application/vnd.fujitsu.oasys			oas
+application/vnd.fujitsu.oasys2			oa2
+application/vnd.fujitsu.oasys3			oa3
+application/vnd.fujitsu.oasysgp			fg5
+application/vnd.fujitsu.oasysprs		bh2
+application/vnd.fujixerox.ddd			ddd
+application/vnd.fujixerox.docuworks		xdw
+application/vnd.fujixerox.docuworks.binder	xbd
+application/vnd.fuzzysheet			fzs
+application/vnd.genomatix.tuxedo		txd
+application/vnd.geogebra.file			ggb
+application/vnd.geogebra.tool			ggt
+application/vnd.geometry-explorer		gex gre
+application/vnd.geonext				gxt
+application/vnd.geoplan				g2w
+application/vnd.geospace			g3w
+application/vnd.gmx				gmx
+application/vnd.google-earth.kml+xml		kml
+application/vnd.google-earth.kmz		kmz
+application/vnd.grafeq				gqf gqs
+application/vnd.groove-account			gac
+application/vnd.groove-help			ghf
+application/vnd.groove-identity-message		gim
+application/vnd.groove-injector			grv
+application/vnd.groove-tool-message		gtm
+application/vnd.groove-tool-template		tpl
+application/vnd.groove-vcard			vcg
+application/vnd.hal+xml				hal
+application/vnd.handheld-entertainment+xml	zmm
+application/vnd.hbci				hbci
+application/vnd.hhe.lesson-player		les
+application/vnd.hp-hpgl				hpgl
+application/vnd.hp-hpid				hpid
+application/vnd.hp-hps				hps
+application/vnd.hp-jlyt				jlt
+application/vnd.hp-pcl				pcl
+application/vnd.hp-pclxl			pclxl
+application/vnd.hydrostatix.sof-data		sfd-hdstx
+application/vnd.ibm.minipay			mpy
+application/vnd.ibm.modcap			afp listafp list3820
+application/vnd.ibm.rights-management		irm
+application/vnd.ibm.secure-container		sc
+application/vnd.iccprofile			icc icm
+application/vnd.igloader			igl
+application/vnd.immervision-ivp			ivp
+application/vnd.immervision-ivu			ivu
+application/vnd.insors.igm			igm
+application/vnd.intercon.formnet		xpw xpx
+application/vnd.intergeo			i2g
+application/vnd.intu.qbo			qbo
+application/vnd.intu.qfx			qfx
+application/vnd.ipunplugged.rcprofile		rcprofile
+application/vnd.irepository.package+xml		irp
+application/vnd.is-xpr				xpr
+application/vnd.isac.fcs			fcs
+application/vnd.jam				jam
+application/vnd.jcp.javame.midlet-rms		rms
+application/vnd.jisp				jisp
+application/vnd.joost.joda-archive		joda
+application/vnd.kahootz				ktz ktr
+application/vnd.kde.karbon			karbon
+application/vnd.kde.kchart			chrt
+application/vnd.kde.kformula			kfo
+application/vnd.kde.kivio			flw
+application/vnd.kde.kontour			kon
+application/vnd.kde.kpresenter			kpr kpt
+application/vnd.kde.kspread			ksp
+application/vnd.kde.kword			kwd kwt
+application/vnd.kenameaapp			htke
+application/vnd.kidspiration			kia
+application/vnd.kinar				kne knp
+application/vnd.koan				skp skd skt skm
+application/vnd.kodak-descriptor		sse
+application/vnd.las.las+xml			lasxml
+application/vnd.llamagraphics.life-balance.desktop	lbd
+application/vnd.llamagraphics.life-balance.exchange+xml	lbe
+application/vnd.lotus-1-2-3			123
+application/vnd.lotus-approach			apr
+application/vnd.lotus-freelance			pre
+application/vnd.lotus-notes			nsf
+application/vnd.lotus-organizer			org
+application/vnd.lotus-screencam			scm
+application/vnd.lotus-wordpro			lwp
+application/vnd.macports.portpkg		portpkg
+application/vnd.mcd				mcd
+application/vnd.medcalcdata			mc1
+application/vnd.mediastation.cdkey		cdkey
+application/vnd.mfer				mwf
+application/vnd.mfmp				mfm
+application/vnd.micrografx.flo			flo
+application/vnd.micrografx.igx			igx
+application/vnd.mif				mif
+application/vnd.mobius.daf			daf
+application/vnd.mobius.dis			dis
+application/vnd.mobius.mbk			mbk
+application/vnd.mobius.mqy			mqy
+application/vnd.mobius.msl			msl
+application/vnd.mobius.plc			plc
+application/vnd.mobius.txf			txf
+application/vnd.mophun.application		mpn
+application/vnd.mophun.certificate		mpc
+application/vnd.mozilla.xul+xml			xul
+application/vnd.ms-artgalry			cil
+application/vnd.ms-cab-compressed		cab
+application/vnd.ms-excel			xls xlm xla xlc xlt xlw
+application/vnd.ms-excel.addin.macroenabled.12		xlam
+application/vnd.ms-excel.sheet.binary.macroenabled.12	xlsb
+application/vnd.ms-excel.sheet.macroenabled.12		xlsm
+application/vnd.ms-excel.template.macroenabled.12	xltm
+application/vnd.ms-fontobject			eot
+application/vnd.ms-htmlhelp			chm
+application/vnd.ms-ims				ims
+application/vnd.ms-lrm				lrm
+application/vnd.ms-officetheme			thmx
+application/vnd.ms-pki.seccat			cat
+application/vnd.ms-pki.stl			stl
+application/vnd.ms-powerpoint			ppt pps pot
+application/vnd.ms-powerpoint.addin.macroenabled.12		ppam
+application/vnd.ms-powerpoint.presentation.macroenabled.12	pptm
+application/vnd.ms-powerpoint.slide.macroenabled.12		sldm
+application/vnd.ms-powerpoint.slideshow.macroenabled.12		ppsm
+application/vnd.ms-powerpoint.template.macroenabled.12		potm
+application/vnd.ms-project			mpp mpt
+application/vnd.ms-word.document.macroenabled.12	docm
+application/vnd.ms-word.template.macroenabled.12	dotm
+application/vnd.ms-works			wps wks wcm wdb
+application/vnd.ms-wpl				wpl
+application/vnd.ms-xpsdocument			xps
+application/vnd.mseq				mseq
+application/vnd.musician			mus
+application/vnd.muvee.style			msty
+application/vnd.mynfc				taglet
+application/vnd.neurolanguage.nlu		nlu
+application/vnd.nitf				ntf nitf
+application/vnd.noblenet-directory		nnd
+application/vnd.noblenet-sealer			nns
+application/vnd.noblenet-web			nnw
+application/vnd.nokia.n-gage.data		ngdat
+application/vnd.nokia.n-gage.symbian.install	n-gage
+application/vnd.nokia.radio-preset		rpst
+application/vnd.nokia.radio-presets		rpss
+application/vnd.novadigm.edm			edm
+application/vnd.novadigm.edx			edx
+application/vnd.novadigm.ext			ext
+application/vnd.oasis.opendocument.chart		odc
+application/vnd.oasis.opendocument.chart-template	otc
+application/vnd.oasis.opendocument.database		odb
+application/vnd.oasis.opendocument.formula		odf
+application/vnd.oasis.opendocument.formula-template	odft
+application/vnd.oasis.opendocument.graphics		odg
+application/vnd.oasis.opendocument.graphics-template	otg
+application/vnd.oasis.opendocument.image		odi
+application/vnd.oasis.opendocument.image-template	oti
+application/vnd.oasis.opendocument.presentation		odp
+application/vnd.oasis.opendocument.presentation-template	otp
+application/vnd.oasis.opendocument.spreadsheet		ods
+application/vnd.oasis.opendocument.spreadsheet-template	ots
+application/vnd.oasis.opendocument.text			odt
+application/vnd.oasis.opendocument.text-master		odm
+application/vnd.oasis.opendocument.text-template	ott
+application/vnd.oasis.opendocument.text-web		oth
+application/vnd.olpc-sugar			xo
+application/vnd.oma.dd2+xml			dd2
+application/vnd.openofficeorg.extension		oxt
+application/vnd.openxmlformats-officedocument.presentationml.presentation	pptx
+application/vnd.openxmlformats-officedocument.presentationml.slide	sldx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow	ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template	potx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet	xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template	xltx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document	docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template	dotx
+application/vnd.osgeo.mapguide.package		mgp
+application/vnd.osgi.dp				dp
+application/vnd.osgi.subsystem			esa
+application/vnd.palm				pdb pqa oprc
+application/vnd.pawaafile			paw
+application/vnd.pg.format			str
+application/vnd.pg.osasli			ei6
+application/vnd.picsel				efif
+application/vnd.pmi.widget			wg
+application/vnd.pocketlearn			plf
+application/vnd.powerbuilder6			pbd
+application/vnd.previewsystems.box		box
+application/vnd.proteus.magazine		mgz
+application/vnd.publishare-delta-tree		qps
+application/vnd.pvi.ptid1			ptid
+application/vnd.quark.quarkxpress		qxd qxt qwd qwt qxl qxb
+application/vnd.realvnc.bed			bed
+application/vnd.recordare.musicxml		mxl
+application/vnd.recordare.musicxml+xml		musicxml
+application/vnd.rig.cryptonote			cryptonote
+application/vnd.rim.cod				cod
+application/vnd.rn-realmedia			rm
+application/vnd.rn-realmedia-vbr		rmvb
+application/vnd.route66.link66+xml		link66
+application/vnd.sailingtracker.track		st
+application/vnd.seemail				see
+application/vnd.sema				sema
+application/vnd.semd				semd
+application/vnd.semf				semf
+application/vnd.shana.informed.formdata		ifm
+application/vnd.shana.informed.formtemplate	itp
+application/vnd.shana.informed.interchange	iif
+application/vnd.shana.informed.package		ipk
+application/vnd.simtech-mindmapper		twd twds
+application/vnd.smaf				mmf
+application/vnd.smart.teacher			teacher
+application/vnd.solent.sdkm+xml			sdkm sdkd
+application/vnd.spotfire.dxp			dxp
+application/vnd.spotfire.sfs			sfs
+application/vnd.stardivision.calc		sdc
+application/vnd.stardivision.draw		sda
+application/vnd.stardivision.impress		sdd
+application/vnd.stardivision.math		smf
+application/vnd.stardivision.writer		sdw vor
+application/vnd.stardivision.writer-global	sgl
+application/vnd.stepmania.package		smzip
+application/vnd.stepmania.stepchart		sm
+application/vnd.sun.xml.calc			sxc
+application/vnd.sun.xml.calc.template		stc
+application/vnd.sun.xml.draw			sxd
+application/vnd.sun.xml.draw.template		std
+application/vnd.sun.xml.impress			sxi
+application/vnd.sun.xml.impress.template	sti
+application/vnd.sun.xml.math			sxm
+application/vnd.sun.xml.writer			sxw
+application/vnd.sun.xml.writer.global		sxg
+application/vnd.sun.xml.writer.template		stw
+application/vnd.sus-calendar			sus susp
+application/vnd.svd				svd
+application/vnd.symbian.install			sis sisx
+application/vnd.syncml+xml			xsm
+application/vnd.syncml.dm+wbxml			bdm
+application/vnd.syncml.dm+xml			xdm
+application/vnd.tao.intent-module-archive	tao
+application/vnd.tcpdump.pcap			pcap cap dmp
+application/vnd.tmobile-livetv			tmo
+application/vnd.trid.tpt			tpt
+application/vnd.triscape.mxs			mxs
+application/vnd.trueapp				tra
+application/vnd.ufdl				ufd ufdl
+application/vnd.uiq.theme			utz
+application/vnd.umajin				umj
+application/vnd.unity				unityweb
+application/vnd.uoml+xml			uoml
+application/vnd.vcx				vcx
+application/vnd.visio				vsd vst vss vsw
+application/vnd.visionary			vis
+application/vnd.vsf				vsf
+application/vnd.wap.wbxml			wbxml
+application/vnd.wap.wmlc			wmlc
+application/vnd.wap.wmlscriptc			wmlsc
+application/vnd.webturbo			wtb
+application/vnd.wolfram.player			nbp
+application/vnd.wordperfect			wpd
+application/vnd.wqd				wqd
+application/vnd.wt.stf				stf
+application/vnd.xara				xar
+application/vnd.xfdl				xfdl
+application/vnd.yamaha.hv-dic			hvd
+application/vnd.yamaha.hv-script		hvs
+application/vnd.yamaha.hv-voice			hvp
+application/vnd.yamaha.openscoreformat			osf
+application/vnd.yamaha.openscoreformat.osfpvg+xml	osfpvg
+application/vnd.yamaha.smaf-audio		saf
+application/vnd.yamaha.smaf-phrase		spf
+application/vnd.yellowriver-custom-menu		cmp
+application/vnd.zul				zir zirz
+application/vnd.zzazz.deck+xml			zaz
+application/voicexml+xml			vxml
+application/widget				wgt
+application/winhlp				hlp
+application/wsdl+xml				wsdl
+application/wspolicy+xml			wspolicy
+application/x-7z-compressed			7z
+application/x-abiword				abw
+application/x-ace-compressed			ace
+application/x-apple-diskimage			dmg
+application/x-authorware-bin			aab x32 u32 vox
+application/x-authorware-map			aam
+application/x-authorware-seg			aas
+application/x-bcpio				bcpio
+application/x-bittorrent			torrent
+application/x-blorb				blb blorb
+application/x-bzip				bz
+application/x-bzip2				bz2 boz
+application/x-cbr				cbr cba cbt cbz cb7
+application/x-cdlink				vcd
+application/x-cfs-compressed			cfs
+application/x-chat				chat
+application/x-chess-pgn				pgn
+application/x-conference			nsc
+application/x-cpio				cpio
+application/x-csh				csh
+application/x-debian-package			deb udeb
+application/x-dgc-compressed			dgc
+application/x-director			dir dcr dxr cst cct cxt w3d fgd swa
+application/x-doom				wad
+application/x-dtbncx+xml			ncx
+application/x-dtbook+xml			dtb
+application/x-dtbresource+xml			res
+application/x-dvi				dvi
+application/x-envoy				evy
+application/x-eva				eva
+application/x-font-bdf				bdf
+application/x-font-ghostscript			gsf
+application/x-font-linux-psf			psf
+application/x-font-pcf				pcf
+application/x-font-snf				snf
+application/x-font-type1			pfa pfb pfm afm
+application/x-freearc				arc
+application/x-futuresplash			spl
+application/x-gca-compressed			gca
+application/x-glulx				ulx
+application/x-gnumeric				gnumeric
+application/x-gramps-xml			gramps
+application/x-gtar				gtar
+application/x-hdf				hdf
+application/x-install-instructions		install
+application/x-iso9660-image			iso
+application/x-java-jnlp-file			jnlp
+application/x-latex				latex
+application/x-lzh-compressed			lzh lha
+application/x-mie				mie
+application/x-mobipocket-ebook			prc mobi
+application/x-ms-application			application
+application/x-ms-shortcut			lnk
+application/x-ms-wmd				wmd
+application/x-ms-wmz				wmz
+application/x-ms-xbap				xbap
+application/x-msaccess				mdb
+application/x-msbinder				obd
+application/x-mscardfile			crd
+application/x-msclip				clp
+application/x-msdownload			exe dll com bat msi
+application/x-msmediaview			mvb m13 m14
+application/x-msmetafile			wmf wmz emf emz
+application/x-msmoney				mny
+application/x-mspublisher			pub
+application/x-msschedule			scd
+application/x-msterminal			trm
+application/x-mswrite				wri
+application/x-netcdf				nc cdf
+application/x-nzb				nzb
+application/x-pkcs12				p12 pfx
+application/x-pkcs7-certificates		p7b spc
+application/x-pkcs7-certreqresp			p7r
+application/x-rar-compressed			rar
+application/x-research-info-systems		ris
+application/x-sh				sh
+application/x-shar				shar
+application/x-shockwave-flash			swf
+application/x-silverlight-app			xap
+application/x-sql				sql
+application/x-stuffit				sit
+application/x-stuffitx				sitx
+application/x-subrip				srt
+application/x-sv4cpio				sv4cpio
+application/x-sv4crc				sv4crc
+application/x-t3vm-image			t3
+application/x-tads				gam
+application/x-tar				tar
+application/x-tcl				tcl
+application/x-tex				tex
+application/x-tex-tfm				tfm
+application/x-texinfo				texinfo texi
+application/x-tgif				obj
+application/x-ustar				ustar
+application/x-wais-source			src
+application/x-x509-ca-cert			der crt
+application/x-xfig				fig
+application/x-xliff+xml				xlf
+application/x-xpinstall				xpi
+application/x-xz				xz
+application/x-zmachine				z1 z2 z3 z4 z5 z6 z7 z8
+application/xaml+xml				xaml
+application/xcap-diff+xml			xdf
+application/xenc+xml				xenc
+application/xhtml+xml				xhtml xht
+application/xml					xml xsl
+application/xml-dtd				dtd
+application/xop+xml				xop
+application/xproc+xml				xpl
+application/xslt+xml				xslt
+application/xspf+xml				xspf
+application/xv+xml				mxml xhvml xvml xvm
+application/yang				yang
+application/yin+xml				yin
+application/zip					zip
+audio/adpcm					adp
+audio/basic					au snd
+audio/midi					mid midi kar rmi
+audio/mp4					m4a mp4a
+audio/mpeg					mpga mp2 mp2a mp3 m2a m3a
+audio/ogg					oga ogg spx
+audio/s3m					s3m
+audio/silk					sil
+audio/vnd.dece.audio				uva uvva
+audio/vnd.digital-winds				eol
+audio/vnd.dra					dra
+audio/vnd.dts					dts
+audio/vnd.dts.hd				dtshd
+audio/vnd.lucent.voice				lvp
+audio/vnd.ms-playready.media.pya		pya
+audio/vnd.nuera.ecelp4800			ecelp4800
+audio/vnd.nuera.ecelp7470			ecelp7470
+audio/vnd.nuera.ecelp9600			ecelp9600
+audio/vnd.rip					rip
+audio/webm					weba
+audio/x-aac					aac
+audio/x-aiff					aif aiff aifc
+audio/x-caf					caf
+audio/x-flac					flac
+audio/x-matroska				mka
+audio/x-mpegurl					m3u
+audio/x-ms-wax					wax
+audio/x-ms-wma					wma
+audio/x-pn-realaudio				ram ra
+audio/x-pn-realaudio-plugin			rmp
+audio/x-wav					wav
+audio/xm					xm
+chemical/x-cdx					cdx
+chemical/x-cif					cif
+chemical/x-cmdf					cmdf
+chemical/x-cml					cml
+chemical/x-csml					csml
+chemical/x-xyz					xyz
+font/collection					ttc
+font/otf					otf
+font/ttf					ttf
+font/woff					woff
+font/woff2					woff2
+image/bmp					bmp
+image/cgm					cgm
+image/g3fax					g3
+image/gif					gif
+image/ief					ief
+image/jpeg					jpeg jpg jpe
+image/ktx					ktx
+image/png					png
+image/prs.btif					btif
+image/sgi					sgi
+image/svg+xml					svg svgz
+image/tiff					tiff tif
+image/vnd.adobe.photoshop			psd
+image/vnd.dece.graphic				uvi uvvi uvg uvvg
+image/vnd.djvu					djvu djv
+image/vnd.dvb.subtitle				sub
+image/vnd.dwg					dwg
+image/vnd.dxf					dxf
+image/vnd.fastbidsheet				fbs
+image/vnd.fpx					fpx
+image/vnd.fst					fst
+image/vnd.fujixerox.edmics-mmr			mmr
+image/vnd.fujixerox.edmics-rlc			rlc
+image/vnd.ms-modi				mdi
+image/vnd.ms-photo				wdp
+image/vnd.net-fpx				npx
+image/vnd.wap.wbmp				wbmp
+image/vnd.xiff					xif
+image/webp					webp
+image/x-3ds					3ds
+image/x-cmu-raster				ras
+image/x-cmx					cmx
+image/x-freehand				fh fhc fh4 fh5 fh7
+image/x-icon					ico
+image/x-mrsid-image				sid
+image/x-pcx					pcx
+image/x-pict					pic pct
+image/x-portable-anymap				pnm
+image/x-portable-bitmap				pbm
+image/x-portable-graymap			pgm
+image/x-portable-pixmap				ppm
+image/x-rgb					rgb
+image/x-tga					tga
+image/x-xbitmap					xbm
+image/x-xpixmap					xpm
+image/x-xwindowdump				xwd
+message/rfc822					eml mime
+model/iges					igs iges
+model/mesh					msh mesh silo
+model/vnd.collada+xml				dae
+model/vnd.dwf					dwf
+model/vnd.gdl					gdl
+model/vnd.gtw					gtw
+model/vnd.mts					mts
+model/vnd.vtu					vtu
+model/vrml					wrl vrml
+model/x3d+binary				x3db x3dbz
+model/x3d+vrml					x3dv x3dvz
+model/x3d+xml					x3d x3dz
+text/cache-manifest				appcache
+text/calendar					ics ifb
+text/css					css
+text/csv					csv
+text/html					html htm
+text/n3						n3
+text/plain					txt text conf def list log in
+text/prs.lines.tag				dsc
+text/richtext					rtx
+text/sgml					sgml sgm
+text/tab-separated-values			tsv
+text/troff					t tr roff man me ms
+text/turtle					ttl
+text/uri-list					uri uris urls
+text/vcard					vcard
+text/vnd.curl					curl
+text/vnd.curl.dcurl				dcurl
+text/vnd.curl.mcurl				mcurl
+text/vnd.curl.scurl				scurl
+text/vnd.dvb.subtitle				sub
+text/vnd.fly					fly
+text/vnd.fmi.flexstor				flx
+text/vnd.graphviz				gv
+text/vnd.in3d.3dml				3dml
+text/vnd.in3d.spot				spot
+text/vnd.sun.j2me.app-descriptor		jad
+text/vnd.wap.wml				wml
+text/vnd.wap.wmlscript				wmls
+text/x-asm					s asm
+text/x-c					c cc cxx cpp h hh dic
+text/x-fortran					f for f77 f90
+text/x-java-source				java
+text/x-nfo					nfo
+text/x-opml					opml
+text/x-pascal					p pas
+text/x-setext					etx
+text/x-sfv					sfv
+text/x-uuencode					uu
+text/x-vcalendar				vcs
+text/x-vcard					vcf
+video/3gpp					3gp
+video/3gpp2					3g2
+video/h261					h261
+video/h263					h263
+video/h264					h264
+video/jpeg					jpgv
+video/jpm					jpm jpgm
+video/mj2					mj2 mjp2
+video/mp4					mp4 mp4v mpg4
+video/mpeg					mpeg mpg mpe m1v m2v
+video/ogg					ogv
+video/quicktime					qt mov
+video/vnd.dece.hd				uvh uvvh
+video/vnd.dece.mobile				uvm uvvm
+video/vnd.dece.pd				uvp uvvp
+video/vnd.dece.sd				uvs uvvs
+video/vnd.dece.video				uvv uvvv
+video/vnd.dvb.file				dvb
+video/vnd.fvt					fvt
+video/vnd.mpegurl				mxu m4u
+video/vnd.ms-playready.media.pyv		pyv
+video/vnd.uvvu.mp4				uvu uvvu
+video/vnd.vivo					viv
+video/webm					webm
+video/x-f4v					f4v
+video/x-fli					fli
+video/x-flv					flv
+video/x-m4v					m4v
+video/x-matroska				mkv mk3d mks
+video/x-mng					mng
+video/x-ms-asf					asf asx
+video/x-ms-vob					vob
+video/x-ms-wm					wm
+video/x-ms-wmv					wmv
+video/x-ms-wmx					wmx
+video/x-ms-wvx					wvx
+video/x-msvideo					avi
+video/x-sgi-movie				movie
+video/x-smv					smv
+x-conference/x-cooltalk				ice
--- a/src/middleware/mime.ts
+++ b/src/middleware/mime.ts
@@ -0,0 +1,20 @@
+import mime_raw from './mime-types.md';
+
+const map: Map<string, string> = new Map();
+
+mime_raw.split('\n').forEach((row: string) => {
+	const match = /(.+?)\t+(.+)/.exec(row);
+	if (!match) return;
+
+	const type = match[1];
+	const extensions = match[2].split(' ');
+
+	extensions.forEach(ext => {
+		map.set(ext, type);
+	});
+});
+
+export function lookup(file: string) {
+	const match = /\.([^\.]+)$/.exec(file);
+	return match && map.get(match[1]);
+}
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -26,6 +26,8 @@ function select_route(url: URL): Target {
 	for (const route of routes) {
 		const match = route.pattern.exec(url.pathname);
 		if (match) {
+			if (route.ignore) return null;
+
 			const params = route.params(match);

 			const query: Record<string, string | true> = {};
@@ -57,9 +59,6 @@ function render(Component: ComponentConstructor, data: any, scroll: ScrollPositi
 			detach(start);
 			detach(end);
 		}
-
-		// preload additional routes
-		routes.reduce((promise: Promise<any>, route) => promise.then(route.load), Promise.resolve());
 	}

 	component = new Component({
@@ -266,3 +265,23 @@ export function goto(href: string, opts = { replaceState: false }) {
 		window.location.href = href;
 	}
 }
+
+export function prefetchRoutes(pathnames: string[]) {
+	if (!routes) throw new Error(`You must call init() first`);
+
+	return routes
+		.filter(route => {
+			if (!pathnames) return true;
+			return pathnames.some(pathname => {
+				return route.error
+					? route.error === pathname
+					: route.pattern.test(pathname)
+			});
+		})
+		.reduce((promise: Promise<any>, route) => {
+			return promise.then(route.load);
+		}, Promise.resolve());
+}
+
+// remove this in 0.9
+export { prefetchRoutes as preloadRoutes };
--- a/src/runtime/interfaces.ts
+++ b/src/runtime/interfaces.ts
@@ -13,8 +13,10 @@ export interface Component {

 export type Route = {
 	pattern: RegExp;
-	params: (match: RegExpExecArray) => Record<string, string>;
-	load: () => Promise<{ default: ComponentConstructor }>
+	load: () => Promise<{ default: ComponentConstructor }>;
+	error?: string;
+	params?: (match: RegExpExecArray) => Record<string, string>;
+	ignore?: boolean;
 };

 export type ScrollPosition = {
--- a/src/webpack/index.ts
+++ b/src/webpack/index.ts
@@ -1,23 +1,18 @@
-import { dest, isDev, entry } from '../config';
+import { dest, dev } from './config';

 export default {
-	dev: isDev(),
+	dev: dev(),

 	client: {
 		entry: () => {
 			return {
-				main: [
-					'./app/client.js',
-					// workaround for https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/456
-					'style-loader/lib/addStyles',
-					'css-loader/lib/css-base'
-				]
+				main: './app/client'
 			};
 		},

 		output: () => {
 			return {
-				path: `${dest}/client`,
+				path: `${dest()}/client`,
 				filename: '[hash]/[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				publicPath: '/client/'
@@ -28,17 +23,33 @@ export default {
 	server: {
 		entry: () => {
 			return {
-				server: './app/server.js'
+				server: './app/server'
 			};
 		},

 		output: () => {
 			return {
-				path: `${dest}`,
+				path: dest(),
 				filename: '[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				libraryTarget: 'commonjs2'
 			};
 		}
+	},
+
+	serviceworker: {
+		entry: () => {
+			return {
+				'service-worker': './app/service-worker'
+			};
+		},
+
+		output: () => {
+			return {
+				path: dest(),
+				filename: '[name].js',
+				chunkFilename: '[name].[id].[hash].js'
+			}
+		}
 	}
-};
+};
--- a/test/app/app/client.js
+++ b/test/app/app/client.js
@@ -1,6 +1,8 @@
-import { init } from '../../../runtime.js';
+import { init, prefetchRoutes } from '../../../runtime.js';
 import { routes } from './manifest/client.js';

 window.init = () => {
 	return init(document.querySelector('#sapper'), routes);
-};
+};
+
+window.prefetchRoutes = prefetchRoutes;
--- a/test/app/app/server.js
+++ b/test/app/app/server.js
@@ -1,30 +1,37 @@
 import fs from 'fs';
-import express from 'express';
+import polka from 'polka';
 import compression from 'compression';
 import serve from 'serve-static';
 import sapper from '../../../middleware';
 import { routes } from './manifest/server.js';

-let count;
+let pending;
 let ended;

 process.on('message', message => {
 	if (message.action === 'start') {
-		count = 0;
+		if (pending) {
+			throw new Error(`Already capturing`);
+		}
+
+		pending = new Set();
 		ended = false;
 		process.send({ type: 'ready' });
 	}

 	if (message.action === 'end') {
 		ended = true;
-		if (count === 0) process.send({ type: 'done' });
+		if (pending.size === 0) {
+			process.send({ type: 'done' });
+			pending = null;
+		}
 	}
 });

-const app = express();
+const app = polka();

 app.use((req, res, next) => {
-	count += 1;
+	if (pending) pending.add(req.url);

 	const { write, end } = res;
 	const chunks = [];
@@ -38,7 +45,7 @@ app.use((req, res, next) => {
 		if (chunk) chunks.push(new Buffer(chunk));
 		end.apply(res, arguments);

-		count -= 1;
+		if (pending) pending.delete(req.url);

 		process.send({
 			method: req.method,
@@ -48,7 +55,7 @@ app.use((req, res, next) => {
 			body: Buffer.concat(chunks).toString()
 		});

-		if (count === 0 && ended) {
+		if (pending && pending.size === 0 && ended) {
 			process.send({ type: 'done' });
 		}
 	};
--- a/test/app/app/template.html
+++ b/test/app/app/template.html
@@ -1,4 +1,4 @@
-<!doctype>
+<!doctype html>
 <html lang='en'>
 <head>
 	<meta charset='utf-8'>
--- a/test/app/package-lock.json
+++ b/test/app/package-lock.json
--- a/test/app/package.json
+++ b/test/app/package.json
@@ -1,28 +0,0 @@
-{
-  "name": "TODO",
-  "description": "TODO",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "node server.js",
-    "build": "sapper build",
-    "start": "cross-env NODE_ENV=production node server.js",
-    "prestart": "npm run build"
-  },
-  "dependencies": {
-    "compression": "^1.7.1",
-    "cross-env": "^5.1.1",
-    "css-loader": "^0.28.7",
-    "express": "^4.16.2",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "glob": "^7.1.2",
-    "marked": "^0.3.9",
-    "node-fetch": "^1.7.3",
-    "npm-run-all": "^4.1.2",
-    "serve-static": "^1.13.1",
-    "style-loader": "^0.19.0",
-    "svelte": "^1.49.1",
-    "svelte-loader": "^2.2.1",
-    "uglifyjs-webpack-plugin": "^1.1.2",
-    "webpack": "^3.10.0"
-  }
-}
--- a/test/app/routes/api/delete/[id].js
+++ b/test/app/routes/api/delete/[id].js
@@ -1,5 +1,5 @@
 export function del(req, res) {
-	res.set({
+	res.writeHead(200, {
 		'Content-Type': 'application/json'
 	});

--- a/test/app/routes/api/blog/contents.js
+++ b/test/app/routes/api/blog/contents.js
@@ -1,4 +1,4 @@
-import posts from './_posts.js';
+import posts from './blog/_posts.js';

 const contents = JSON.stringify(posts.map(post => {
 	return {
@@ -8,7 +8,7 @@ const contents = JSON.stringify(posts.map(post => {
 }));

 export function get(req, res) {
-	res.set({
+	res.writeHead(200, {
 		'Content-Type': 'application/json',
 		'Cache-Control': `max-age=${30 * 60 * 1e3}` // cache for 30 minutes
 	});
--- a/test/app/routes/blog/[slug].html
+++ b/test/app/routes/blog/[slug].html
@@ -63,7 +63,7 @@
 				return this.error(500, 'something went wrong');
 			}

-			return fetch(`/api/blog/${slug}`).then(r => {
+			return fetch(`/blog/${slug}.json`).then(r => {
 				if (r.status === 200) {
 					return r.json().then(post => ({ post }));
 					this.error(r.status, '')
--- a/test/app/routes/blog/[slug].json.js
+++ b/test/app/routes/blog/[slug].json.js
@@ -11,7 +11,7 @@ export function get(req, res, next) {
 	const { slug } = req.params;

 	if (slug in lookup) {
-		res.set({
+		res.writeHead(200, {
 			'Content-Type': 'application/json',
 			'Cache-Control': `no-cache`
 		});
--- a/test/app/routes/api/blog/_posts.js
+++ b/test/app/routes/api/blog/_posts.js
@@ -70,7 +70,7 @@ const posts = [
 			<ul>
 				<li>It's powered by <a href='https://svelte.technology'>Svelte</a> instead of React, so it's faster and your apps are smaller</li>
 				<li>Instead of route masking, we encode route parameters in filenames. For example, the page you're looking at right now is <code>routes/blog/[slug].html</code></li>
-				<li>As well as pages (Svelte components, which render on server or client), you can create <em>server routes</em> in your <code>routes</code> directory. These are just <code>.js</code> files that export functions corresponding to HTTP methods, and receive Express <code>request</code> and <code>response</code> objects as arguments. This makes it very easy to, for example, add a JSON API such as the one powering this very page (look in <code>routes/api/blog</code>)</li>
+				<li>As well as pages (Svelte components, which render on server or client), you can create <em>server routes</em> in your <code>routes</code> directory. These are just <code>.js</code> files that export functions corresponding to HTTP methods, and receive Express <code>request</code> and <code>response</code> objects as arguments. This makes it very easy to, for example, add a JSON API such as the one <a href='/blog/how-is-sapper-different-from-next.json'>powering this very page</a></li>
 				<li>Links are just <code>&lt;a&gt;</code> elements, rather than framework-specific <code>&lt;Link&gt;</code> components. That means, for example, that <a href='/blog/how-can-i-get-involved'>this link right here</a>, despite being inside a blob of HTML, works with the router as you'd expect.</li>
 			</ul>
 		`
--- a/test/app/routes/blog/index.html
+++ b/test/app/routes/blog/index.html
@@ -32,7 +32,7 @@
 		},

 		preload({ params, query }) {
-			return fetch(`/api/blog/contents`).then(r => r.json()).then(posts => {
+			return fetch(`/blog.json`).then(r => r.json()).then(posts => {
 				return { posts };
 			});
 		}
--- a/test/app/routes/fünke.html
+++ b/test/app/routes/fünke.html
@@ -0,0 +1 @@
+<h1>I'm afraid I just blue myself</h1>
--- a/test/app/routes/preload-values/custom-class.html
+++ b/test/app/routes/preload-values/custom-class.html
@@ -0,0 +1,17 @@
+<h1>{{foo.bar()}}</h1>
+
+<script>
+	export default {
+		preload() {
+			class Foo {
+				bar() {
+					return 42;
+				}
+			}
+
+			return {
+				foo: new Foo()
+			};
+		}
+	};
+</script>
--- a/test/app/routes/preload-values/set.html
+++ b/test/app/routes/preload-values/set.html
@@ -0,0 +1,11 @@
+<h1>{{set.has('x')}}</h1>
+
+<script>
+	export default {
+		preload() {
+			return {
+				set: new Set(['x'])
+			};
+		}
+	};
+</script>
--- a/test/app/routes/throw-an-error.js
+++ b/test/app/routes/throw-an-error.js
@@ -0,0 +1,3 @@
+export function get() {
+	throw new Error('nope');
+}
--- a/test/app/webpack/client.config.js
+++ b/test/app/webpack/client.config.js
@@ -1,8 +1,11 @@
 const config = require('../../../webpack/config.js');
 const webpack = require('webpack');

+const mode = process.env.NODE_ENV;
+const isDev = mode === 'development';
+
 module.exports = {
-	entry: './app/client.js',
+	entry: config.client.entry(),
 	output: config.client.output(),
 	resolve: {
 		extensions: ['.js', '.html']
@@ -16,24 +19,16 @@ module.exports = {
 					loader: 'svelte-loader',
 					options: {
 						hydratable: true,
-						emitCss: !config.dev,
 						cascade: false,
 						store: true
 					}
 				}
-			},
-			{
-				test: /\.css$/,
-				use: [
-					{ loader: "style-loader" },
-					{ loader: "css-loader" }
-				]
 			}
-		].filter(Boolean)
+		]
 	},
+	mode,
 	plugins: [
-		config.dev && new webpack.HotModuleReplacementPlugin(),
-		!config.dev && new webpack.optimize.ModuleConcatenationPlugin()
+		isDev && new webpack.HotModuleReplacementPlugin()
 	].filter(Boolean),
-	devtool: config.dev ? 'inline-source-map' : false
+	devtool: isDev && 'inline-source-map'
 };
--- a/test/app/webpack/server.config.js
+++ b/test/app/webpack/server.config.js
@@ -1,17 +1,17 @@
 const config = require('../../../webpack/config.js');
-const pkg = require('../package.json');
 const sapper_pkg = require('../../../package.json');

 module.exports = {
-	entry: {
-		'server': './app/server.js'
-	},
+	entry: config.server.entry(),
 	output: config.server.output(),
 	target: 'node',
 	resolve: {
 		extensions: ['.js', '.html']
 	},
-	externals: Object.keys(pkg.dependencies).concat(Object.keys(sapper_pkg.dependencies)),
+	externals: [].concat(
+		Object.keys(sapper_pkg.dependencies),
+		Object.keys(sapper_pkg.devDependencies)
+	),
 	module: {
 		rules: [
 			{
@@ -28,5 +28,9 @@ module.exports = {
 				}
 			}
 		]
+	},
+	mode: process.env.NODE_ENV,
+	performance: {
+		hints: false // it doesn't matter if server.js is large
 	}
 };
--- a/test/app/webpack/service-worker.config.js
+++ b/test/app/webpack/service-worker.config.js
@@ -1,17 +1,7 @@
-const path = require('path');
 const config = require('../../../webpack/config.js');
-const webpack = require('webpack');

 module.exports = {
-	entry: {
-		'service-worker': './app/service-worker.js'
-	},
-	output: {
-		path: path.resolve(`.sapper`),
-		filename: '[name].js',
-		chunkFilename: '[name].[id].[hash].js'
-	},
-	plugins: [
-		!config.dev && new webpack.optimize.ModuleConcatenationPlugin()
-	].filter(Boolean)
+	entry: config.serviceworker.entry(),
+	output: config.serviceworker.output(),
+	mode: process.env.NODE_ENV
 };
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -1,17 +1,19 @@
 const path = require('path');
 const assert = require('assert');
 const Nightmare = require('nightmare');
-const express = require('express');
 const serve = require('serve-static');
 const walkSync = require('walk-sync');
 const fetch = require('node-fetch');
-
-run('production');
-run('development');
+const rimraf = require('rimraf');
+const ports = require('port-authority');

 Nightmare.action('page', {
 	title(done) {
 		this.evaluate_now(() => document.querySelector('h1').textContent, done);
+	},
+
+	text(done) {
+		this.evaluate_now(() => document.body.textContent, done);
 	}
 });

@@ -19,11 +21,98 @@ Nightmare.action('init', function(done) {
 	this.evaluate_now(() => window.init(), done);
 });

+Nightmare.action('prefetchRoutes', function(done) {
+	this.evaluate_now(() => window.prefetchRoutes(), done);
+});
+
+const cli = path.resolve(__dirname, '../../sapper');
+
+describe('sapper', function() {
+	process.chdir(path.resolve(__dirname, '../app'));
+
+	// clean up after previous test runs
+	rimraf.sync('export');
+	rimraf.sync('build');
+	rimraf.sync('.sapper');
+
+	this.timeout(30000);
+
+	// TODO reinstate dev tests
+	// run('development');
+	run('production');
+
+	describe('export', () => {
+		before(() => {
+			return exec(`node ${cli} export`);
+		});
+
+		it('export all pages', () => {
+			const dest = path.resolve(__dirname, '../app/export');
+
+			// Pages that should show up in the extraction directory.
+			const expectedPages = [
+				'index.html',
+				'about/index.html',
+				'slow-preload/index.html',
+
+				'blog/index.html',
+				'blog/a-very-long-post/index.html',
+				'blog/how-can-i-get-involved/index.html',
+				'blog/how-is-sapper-different-from-next/index.html',
+				'blog/how-to-use-sapper/index.html',
+				'blog/what-is-sapper/index.html',
+				'blog/why-the-name/index.html',
+
+				'blog.json',
+				'blog/a-very-long-post.json',
+				'blog/how-can-i-get-involved.json',
+				'blog/how-is-sapper-different-from-next.json',
+				'blog/how-to-use-sapper.json',
+				'blog/what-is-sapper.json',
+				'blog/why-the-name.json',
+
+				'favicon.png',
+				'global.css',
+				'great-success.png',
+				'manifest.json',
+				'service-worker.js',
+				'svelte-logo-192.png',
+				'svelte-logo-512.png',
+			];
+			// 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/,
+			];
+			const allPages = walkSync(dest);
+
+			expectedPages.forEach((expectedPage) => {
+				assert.ok(allPages.includes(expectedPage),`Could not find page matching ${expectedPage}`);
+			});
+
+			expectedClientRegexes.forEach((expectedRegex) => {
+				// Ensure each client page regular expression matches at least one
+				// generated page.
+				let matched = false;
+				for (const page of allPages) {
+					if (expectedRegex.test(page)) {
+						matched = true;
+						break;
+					}
+				}
+				assert.ok(matched, `Could not find client page matching ${expectedRegex}`);
+			});
+		});
+	});
+});
+
 function run(env) {
 	describe(`env=${env}`, function () {
-		this.timeout(20000);
-
-		let PORT;
 		let proc;
 		let nightmare;
 		let capture;
@@ -31,28 +120,23 @@ function run(env) {
 		let base;

 		before(() => {
-			process.chdir(path.resolve(__dirname, '../app'));
+			const promise = env === 'production'
+				? exec(`node ${cli} build`).then(() => ports.find(3000))
+				: ports.find(3000).then(port => {
+					exec(`node ${cli} dev`);
+					return ports.wait(port).then(() => port);
+				});

-			let exec_promise = Promise.resolve();
-
-			if (env === 'production') {
-				const cli = path.resolve(__dirname, '../../cli.js');
-				exec_promise = exec(`node ${cli} export`);
-			}
-
-			return exec_promise.then(() => {
-				const resolved = require.resolve('../../middleware.js');
-				delete require.cache[resolved];
-				delete require.cache[require.resolve('../../core.js')]; // TODO remove this
-
-				return require('get-port')();
-			}).then(port => {
+			return promise.then(port => {
 				base = `http://localhost:${port}`;

-				proc = require('child_process').fork('.sapper/server.js', {
+				const dir = env === 'production' ? 'build' : '.sapper';
+
+				proc = require('child_process').fork(`${dir}/server.js`, {
 					cwd: process.cwd(),
 					env: {
 						NODE_ENV: env,
+						SAPPER_DEST: dir,
 						PORT: port
 					}
 				});
@@ -98,10 +182,11 @@ function run(env) {
 		});

 		after(() => {
-			proc.kill();
-
 			// give a chance to clean up
-			return new Promise(fulfil => setTimeout(fulfil, 500));
+			return new Promise(fulfil => {
+				proc.on('exit', fulfil);
+				proc.kill();
+			});
 		});

 		beforeEach(() => {
@@ -150,7 +235,7 @@ function run(env) {
 			});

 			it('navigates to a new page without reloading', () => {
-				return capture(() => nightmare.goto(base).init().wait(400))
+				return capture(() => nightmare.goto(base).init().prefetchRoutes())
 					.then(() => {
 						return capture(() => nightmare.click('a[href="/about"]'));
 					})
@@ -184,7 +269,6 @@ function run(env) {
 				return nightmare
 					.goto(`${base}/about`)
 					.init()
-					.wait(200)
 					.then(() => {
 						return capture(() => {
 							return nightmare
@@ -193,7 +277,7 @@ function run(env) {
 						});
 					})
 					.then(requests => {
-						assert.ok(!!requests.find(r => r.url === '/api/blog/why-the-name'));
+						assert.ok(!!requests.find(r => r.url === '/blog/why-the-name.json'));
 					});
 			});

@@ -210,7 +294,7 @@ function run(env) {
 			it('reuses prefetch promise', () => {
 				return nightmare
 					.goto(`${base}/blog`)
-					.init().wait(300)
+					.init()
 					.then(() => {
 						return capture(() => {
 							return nightmare
@@ -219,7 +303,7 @@ function run(env) {
 						});
 					})
 					.then(mouseover_requests => {
-						assert.ok(mouseover_requests.findIndex(r => r.url === '/api/blog/what-is-sapper') !== -1);
+						assert.ok(mouseover_requests.findIndex(r => r.url === '/blog/what-is-sapper.json') !== -1);

 						return capture(() => {
 							return nightmare
@@ -228,7 +312,7 @@ function run(env) {
 						});
 					})
 					.then(click_requests => {
-						assert.ok(click_requests.findIndex(r => r.url === '/api/blog/what-is-sapper') === -1);
+						assert.ok(click_requests.findIndex(r => r.url === '/blog/what-is-sapper.json') === -1);
 					});
 			});

@@ -376,6 +460,57 @@ function run(env) {
 						assert.equal(title, 'Internal server error');
 					});
 			});
+
+			it('does not attempt client-side navigation to server routes', () => {
+				return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`)
+					.init()
+					.click(`[href="/blog/how-is-sapper-different-from-next.json"]`)
+					.wait(200)
+					.page.text()
+					.then(text => {
+						JSON.parse(text);
+					});
+			});
+
+			it('does not serve error page for non-page errors', () => {
+				return nightmare.goto(`${base}/throw-an-error`)
+					.page.text()
+					.then(text => {
+						assert.equal(text, 'nope');
+					});
+			});
+
+			it('encodes routes', () => {
+				return nightmare.goto(`${base}/fünke`)
+					.page.title()
+					.then(title => {
+						assert.equal(title, `I'm afraid I just blue myself`);
+					});
+			});
+
+			it('serializes Set objects returned from preload', () => {
+				return nightmare.goto(`${base}/preload-values/set`)
+					.page.title()
+					.then(title => {
+						assert.equal(title, 'true');
+						return nightmare.init().page.title();
+					})
+					.then(title => {
+						assert.equal(title, 'true');
+					});
+			});
+
+			it('bails on custom classes returned from preload', () => {
+				return nightmare.goto(`${base}/preload-values/custom-class`)
+					.page.title()
+					.then(title => {
+						assert.equal(title, '42');
+						return nightmare.init().page.title();
+					})
+					.then(title => {
+						assert.equal(title, '42');
+					});
+			});
 		});

 		describe('headers', () => {
@@ -389,79 +524,12 @@ function run(env) {
 					);

 					assert.ok(
-						/<\/client\/[^/]+\/main\.js>;rel="preload";as="script", <\/client\/[^/]+\/_\.0\.js>;rel="preload";as="script"/.test(headers['link']),
+						/<\/client\/[^/]+\/main\.js>;rel="preload";as="script", <\/client\/[^/]+\/_\.\d+\.js>;rel="preload";as="script"/.test(headers['link']),
 						headers['link']
 					);
 				});
 			});
 		});
-
-		if (env === 'production') {
-			describe('export', () => {
-				it('export all pages', () => {
-					const dest = path.resolve(__dirname, '../app/dist');
-
-					// Pages that should show up in the extraction directory.
-					const expectedPages = [
-						'index.html',
-						'about/index.html',
-						'slow-preload/index.html',
-
-						'blog/index.html',
-						'blog/a-very-long-post/index.html',
-						'blog/how-can-i-get-involved/index.html',
-						'blog/how-is-sapper-different-from-next/index.html',
-						'blog/how-to-use-sapper/index.html',
-						'blog/what-is-sapper/index.html',
-						'blog/why-the-name/index.html',
-
-						'api/blog/contents',
-						'api/blog/a-very-long-post',
-						'api/blog/how-can-i-get-involved',
-						'api/blog/how-is-sapper-different-from-next',
-						'api/blog/how-to-use-sapper',
-						'api/blog/what-is-sapper',
-						'api/blog/why-the-name',
-
-						'favicon.png',
-						'global.css',
-						'great-success.png',
-						'manifest.json',
-						'service-worker.js',
-						'svelte-logo-192.png',
-						'svelte-logo-512.png',
-					];
-					// 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/,
-					];
-					const allPages = walkSync(dest);
-
-					expectedPages.forEach((expectedPage) => {
-						assert.ok(allPages.includes(expectedPage),`Could not find page matching ${expectedPage}`);
-					});
-
-					expectedClientRegexes.forEach((expectedRegex) => {
-						// Ensure each client page regular expression matches at least one
-						// generated page.
-						let matched = false;
-						for (const page of allPages) {
-							if (expectedRegex.test(page)) {
-								matched = true;
-								break;
-							}
-						}
-						assert.ok(matched, `Could not find client page matching ${expectedRegex}`);
-					});
-				});
-			});
-		}
 	});
 }

--- a/test/unit/create_routes.test.js
+++ b/test/unit/create_routes.test.js
@@ -1,10 +1,10 @@
 const assert = require('assert');
-const { create_routes } = require('../../core.js');
+const { create_routes } = require('../../dist/core.ts.js');

 describe('create_routes', () => {
 	it('sorts routes correctly', () => {
 		const routes = create_routes({
-			files: ['index.html', 'about.html', '[wildcard].html', 'post/foo.html', 'post/[id].html', 'post/bar.html']
+			files: ['index.html', 'about.html', 'post/f[xx].html', '[wildcard].html', 'post/foo.html', 'post/[id].html', 'post/bar.html', 'post/[id].json.js']
 		});

 		assert.deepEqual(
@@ -14,12 +14,49 @@ describe('create_routes', () => {
 				'about.html',
 				'post/foo.html',
 				'post/bar.html',
+				'post/f[xx].html',
+				'post/[id].json.js',
 				'post/[id].html',
 				'[wildcard].html'
 			]
 		);
 	});

+	it('prefers index page to nested route', () => {
+		const routes = create_routes({
+			files: [
+				'api/examples/[slug].js',
+				'api/examples/index.js',
+				'blog/[slug].html',
+				'api/gists/[id].js',
+				'api/gists/index.js',
+				'4xx.html',
+				'5xx.html',
+				'blog/index.html',
+				'blog/rss.xml.js',
+				'guide/index.html',
+				'index.html'
+			]
+		});
+
+		assert.deepEqual(
+			routes.map(r => r.file),
+			[
+				'4xx.html',
+				'5xx.html',
+				'index.html',
+				'guide/index.html',
+				'blog/index.html',
+				'blog/rss.xml.js',
+				'blog/[slug].html',
+				'api/examples/index.js',
+				'api/examples/[slug].js',
+				'api/gists/index.js',
+				'api/gists/[id].js',
+			]
+		);
+	});
+
 	it('generates params', () => {
 		const routes = create_routes({
 			files: ['index.html', 'about.html', '[wildcard].html', 'post/[id].html']
@@ -133,4 +170,33 @@ describe('create_routes', () => {
 			b: null
 		});
 	});
+
+	it('matches a dynamic part within a part', () => {
+		const route = create_routes({
+			files: ['things/[slug].json.js']
+		})[0];
+
+		assert.deepEqual(route.exec('/things/foo.json'), {
+			slug: 'foo'
+		});
+	});
+
+	it('matches multiple dynamic parts within a part', () => {
+		const route = create_routes({
+			files: ['things/[id]_[slug].json.js']
+		})[0];
+
+		assert.deepEqual(route.exec('/things/someid_someslug.json'), {
+			id: 'someid',
+			slug: 'someslug'
+		});
+	});
+
+	it('fails if dynamic params are not separated', () => {
+		assert.throws(() => {
+			create_routes({
+				files: ['[foo][bar].js']
+			});
+		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
+	});
 });
--- a/webpack.js
+++ b/webpack.js
@@ -0,0 +1,2 @@
+// TODO write to this file, instead of webpack.ts.js
+module.exports = require('./dist/webpack.ts.js');
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -0,0 +1,2 @@
+// TODO deprecate this file in favour of sapper/webpack.js
+module.exports = require('../dist/webpack.ts.js');
Author	SHA1	Message	Date
Rich Harris	b1c57466c0	-> v0.9.0	2018-03-10 23:24:03 -05:00
Rich Harris	ef55fc5ddd	move built files to dist	2018-03-10 23:20:11 -05:00
Rich Harris	e011fce935	Merge pull request #191 from sveltejs/gh-173 use code-splitting etc	2018-03-10 23:14:53 -05:00
Rich Harris	ba3d9c85c5	clorox seems to have a bug with inverse (TODO investigate)	2018-03-10 23:09:02 -05:00
Rich Harris	cddd7adaad	lazy-load stuff	2018-03-10 23:00:36 -05:00
Rich Harris	d8412f33ba	ignore some files	2018-03-10 22:33:33 -05:00
Rich Harris	254e41b11e	use code-splitting etc	2018-03-10 22:26:53 -05:00
Rich Harris	491c5e3b92	Merge pull request #190 from sveltejs/gh-57 allow server routes to be .ts files (or anything else)	2018-03-10 20:46:25 -05:00
Rich Harris	4441ceb91d	Merge pull request #189 from sveltejs/introduce-spelling-error use wrong spelling of "grey"	2018-03-10 20:45:56 -05:00
Rich Harris	77e418cd21	Merge pull request #188 from sveltejs/gh-112 use devalue instead of serialize-javascript	2018-03-10 20:45:39 -05:00
Rich Harris	4171786953	ensure directories are not mistaken for routes	2018-03-10 20:38:48 -05:00
Rich Harris	5f7cbadd8d	remove extensions from entry points	2018-03-10 20:16:46 -05:00
Rich Harris	9bac32eea4	allow server routes to be .ts files (or anything else) - fixes #57	2018-03-10 20:08:23 -05:00
Rich Harris	3a19657ad9	use wrong spelling of "grey"	2018-03-10 20:04:44 -05:00
Rich Harris	d1b6d029e9	merge master -> gh-112	2018-03-10 19:36:08 -05:00
Rich Harris	45b1147228	use devalue instead of serialize-javascript - fixes #112	2018-03-10 19:27:04 -05:00
Rich Harris	c827fda703	Merge pull request #187 from lukeed/fix/chalk Replace Chalk with Clorox	2018-03-10 16:11:35 -05:00
Luke Edwards	dd39909371	replace chalk with clorox	2018-03-10 12:30:36 -08:00
Rich Harris	fb24c862f3	Merge pull request #185 from sveltejs/gh-165 use window.location.hostname in dev client	2018-03-10 10:44:48 -05:00
Rich Harris	542115f82e	Merge pull request #184 from sveltejs/gh-169-b Fix hard-coded port	2018-03-10 10:28:21 -05:00
Rich Harris	61000a4795	use window.location.hostname in dev client - fixes #165	2018-03-10 10:26:00 -05:00
Rich Harris	7f98d50e15	treat PORT=xxxx the same as --port xxxx	2018-03-10 10:09:18 -05:00
Rich Harris	c580259c07	dont hardcode port	2018-03-10 10:01:42 -05:00
Rich Harris	e8f3aff0da	Merge pull request #183 from sveltejs/use-polka Use polka, remove unused dependencies	2018-03-10 09:54:22 -05:00
Rich Harris	c82031a8e5	remove some unused deps	2018-03-10 09:48:52 -05:00
Rich Harris	1eed1023aa	switch to polka, remove unused deps	2018-03-10 09:39:07 -05:00
Rich Harris	c1a2d93da6	Merge pull request #182 from sveltejs/gh-177 kill child process if webpack crashes	2018-03-10 08:51:05 -05:00
Rich Harris	504654b58e	kill child process if webpack crashes - fixes #177	2018-03-09 21:02:05 -05:00
Rich Harris	b1067103a4	-> v0.8.4	2018-03-07 15:57:46 -05:00
Rich Harris	06af8e87da	Merge pull request #175 from sveltejs/fix-route-sorting fix route sorting	2018-03-07 14:32:56 -05:00
Rich Harris	8bb0999878	fix route sorting	2018-03-07 14:26:30 -05:00
Rich Harris	b5a8d29c37	-> v0.8.3	2018-03-05 15:27:38 -05:00
Rich Harris	5925636b16	Merge pull request #170 from sveltejs/gh-169 better CLI	2018-03-05 15:25:33 -05:00
Rich Harris	bc232007c3	simplify sade initialisation	2018-03-05 15:17:34 -05:00
Rich Harris	ffaacb4c99	use fs.existsSync	2018-03-05 15:11:44 -05:00
Rich Harris	47b50f2c0e	admin	2018-03-05 15:09:59 -05:00
Rich Harris	a66ac00d42	tidy up tests	2018-03-05 15:09:51 -05:00
Rich Harris	0f8c04b03d	use port-authority	2018-03-05 15:09:33 -05:00
Rich Harris	d9d93f41c4	add get-port back as dev dependency, for testing	2018-03-05 13:57:30 -05:00
Rich Harris	5289fc11d8	better CLI, more port control. fixes #169	2018-03-05 13:51:11 -05:00
Rich Harris	dd6c51567a	-> v0.8.2	2018-03-04 22:55:00 -05:00
Rich Harris	01ff84f241	Merge pull request #167 from sveltejs/gh-166 rename preloadRoutes to prefetchRoutes	2018-03-04 22:54:11 -05:00
Rich Harris	329c113723	rename preloadRoutes to prefetchRoutes	2018-03-04 22:38:55 -05:00
Rich Harris	2ad10b380f	-> v0.8.1	2018-03-04 21:37:55 -05:00
Rich Harris	e6314cde96	Merge pull request #164 from sveltejs/gh-163 add sapper start task	2018-03-04 21:36:51 -05:00
Rich Harris	b64e25a177	add sapper start task	2018-03-04 21:28:31 -05:00
Rich Harris	49bc1b00a9	-> v0.8.0	2018-03-04 19:31:14 -05:00
Rich Harris	24bfcc8d2d	Merge pull request #162 from sveltejs/gh-103 URI-encode routes	2018-03-04 19:11:22 -05:00
Rich Harris	b405e5878e	Merge branch 'master' into gh-103	2018-03-04 19:00:28 -05:00
Rich Harris	ef0ca58a21	Merge pull request #161 from sveltejs/gh-160 add preloadRoutes function	2018-03-04 19:00:14 -05:00
Rich Harris	854147fa6c	URI-encodes routes - fixes #103	2018-03-04 18:59:35 -05:00
Rich Harris	50ecc5c130	preload errors	2018-03-04 18:26:58 -05:00
Rich Harris	7e2f5f8fb6	add preloadRoutes function - closes #160	2018-03-04 18:05:33 -05:00
Rich Harris	acef0e808f	Merge branch 'logging'	2018-03-04 16:17:18 -05:00
Rich Harris	248573f510	fix deprecation warning	2018-03-04 16:17:10 -05:00
Rich Harris	e91955fdad	Merge pull request #158 from sveltejs/logging vastly better logging	2018-03-04 15:49:14 -05:00
Rich Harris	368e6d5cb1	bump timeout for travis	2018-03-04 15:27:35 -05:00
Rich Harris	1984203e87	vastly better logging	2018-03-04 15:11:36 -05:00
Rich Harris	0165c14fd9	update webpack/config	2018-03-04 12:35:13 -05:00
Rich Harris	bdb9d49187	simpler wait-for-port	2018-03-04 11:25:59 -05:00
Rich Harris	4d79cb81ed	Merge pull request #153 from sveltejs/stability various stability improvements	2018-03-03 23:02:24 -05:00
Rich Harris	181b0711ec	replace mime, having weird bundling problems with it	2018-03-03 22:50:10 -05:00
Rich Harris	1b282e7b0d	remove unused get_asset_handler	2018-03-03 21:54:19 -05:00
Rich Harris	99853c5181	various stability improvements	2018-03-03 21:48:50 -05:00
Rich Harris	ff3b43443e	Merge pull request #152 from sveltejs/gh-148 various improvements to manifest generation - fixes #148	2018-03-03 16:35:27 -05:00
Rich Harris	2622692f69	various improvements to manifest generation - fixes #148	2018-03-03 15:39:40 -05:00
Rich Harris	7625302ec7	Merge pull request #150 from sveltejs/gh-133 sapper build defaults to `build` dir, sapper export defaults to `export` dir	2018-03-03 15:07:35 -05:00
Rich Harris	09422e3c5a	Merge branch 'master' into gh-133	2018-03-03 14:34:22 -05:00
Rich Harris	a96fb93bfb	Fix test failures — closes #132	2018-03-03 14:33:47 -05:00
Rich Harris	17d7ca36f1	update test	2018-03-03 12:20:46 -05:00
Rich Harris	b73e5eaa8e	sapper build defaults to build dir, sapper export defaults to export dir (#133 )	2018-03-03 12:09:06 -05:00
Rich Harris	d9cb572271	-> v0.7.6	2018-02-28 17:14:38 -05:00
Rich Harris	34c28f36cd	Merge pull request #147 from sveltejs/gh-138 don't serve error page for unhandled server route errors	2018-02-28 17:11:52 -05:00
Rich Harris	5dd04eb35c	tidy up - next is unused	2018-02-28 16:59:39 -05:00
Rich Harris	b1d072d43a	dont serve error page for unhandled server route errors - fixes #138	2018-02-28 16:54:38 -05:00
Rich Harris	5ad3f3f1d5	Merge pull request #146 from sveltejs/gh-145 prevent client-side navigation to server routes	2018-02-28 16:20:42 -05:00
Rich Harris	58754c6d15	use blog.json instead of blog/list.json	2018-02-28 16:17:07 -05:00
Rich Harris	c36780fdc8	prevent client-side navigation to server routes - fixes #145	2018-02-28 14:23:19 -05:00
Rich Harris	9bebb56bd6	-> v0.7.5	2018-02-28 13:40:42 -05:00
Rich Harris	f475634d8d	Merge pull request #144 from sveltejs/gh-139 allow dynamic parameters inside route parts	2018-02-28 12:26:00 -05:00
Rich Harris	58c1eb9fa8	allow dynamic parameters inside route parts - fixes #139	2018-02-28 09:39:21 -05:00
Rich Harris	631afbbfe4	-> v0.7.4	2018-02-27 20:10:48 -05:00
Rich Harris	1cc9acb4f1	Merge pull request #142 from sveltejs/gh-141 force NODE_ENV=production in build/export	2018-02-27 20:09:05 -05:00
Rich Harris	19005110f1	huh, not sure why that changed	2018-02-27 19:58:49 -05:00
Rich Harris	21ee8ad39d	force NODE_ENV=production in build/export	2018-02-27 19:49:58 -05:00
Rich Harris	906b0c7ad5	Merge pull request #134 from sveltejs/source-map-support install source-map-support	2018-02-27 19:46:17 -05:00
Rich Harris	896fd410d1	install source-map-support	2018-02-20 14:01:25 -05:00