-> v0.8.1

add sapper start task

.gitignore

@@ -4,6 +4,7 @@ node_modules
 cypress/screenshots
 test/app/.sapper
 test/app/app/manifest
+test/app/export
 runtime.js
 runtime.js.map
 cli.js
@@ -13,4 +14,5 @@ middleware.js.map
 core.js
 core.js.map
 webpack/config.js
-webpack/config.js.map
+webpack/config.js.map
+yarn-error.log

.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)

CHANGELOG.md

@@ -1,5 +1,19 @@
 # sapper changelog
 
+## 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))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.7.6",
+  "version": "0.8.1",
   "description": "Military-grade apps, engineered by Svelte",
   "main": "middleware.js",
   "bin": {
@@ -12,7 +12,7 @@
     "middleware.js",
     "runtime",
     "runtime.js",
-    "hmr-client.js",
+    "sapper-dev-client.js",
     "webpack"
   ],
   "directories": {
@@ -28,10 +28,10 @@
     "get-port": "^3.2.0",
     "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",
+    "pretty-ms": "^3.1.0",
     "relative": "^3.0.2",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
@@ -40,9 +40,8 @@
     "source-map-support": "^0.5.3",
     "tslib": "^1.8.1",
     "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",
@@ -58,6 +57,7 @@
     "nightmare": "^2.10.0",
     "npm-run-all": "^4.1.2",
     "rollup": "^0.53.0",
+    "rollup-plugin-commonjs": "^8.3.0",
     "rollup-plugin-json": "^2.3.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-typescript": "^0.8.1",
@@ -65,7 +65,8 @@
     "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 +74,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": [

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(
@@ -18,6 +19,7 @@ const plugins = [
 		include: '**/*.md'
 	}),
 	json(),
+	commonjs(),
 	typescript({
 		typescript: require('typescript')
 	})

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://localhost:${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();
 		}

src/cli/build.ts

@@ -2,18 +2,16 @@ import * as fs from 'fs';
 import * as path from 'path';
 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 'sapper/core.js'
+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 default 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,7 +19,7 @@ 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()));
+	fs.writeFileSync(path.join(output, 'client_info.json'), JSON.stringify(client_stats.toJson()));
 
 	await compile(server);
 

src/cli/dev.ts

@@ -6,8 +6,11 @@ import * as child_process from 'child_process';
 import * as http from 'http';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
+import format_messages from 'webpack-format-messages';
+import prettyMs from 'pretty-ms';
 import { wait_for_port } from './utils';
-import { create_compilers, create_app, create_routes, create_serviceworker, create_template } from 'sapper/core.js';
+import { dest } from '../config';
+import { create_compilers, create_app, create_routes, create_serviceworker } from 'sapper/core.js';
 
 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,41 +70,30 @@ function create_hot_update_server(port: number, interval = 10000) {
 	return { send };
 }
 
-export default async function dev(src: string, dir: string) {
+export default async function dev() {
+	process.env.NODE_ENV = 'development';
+
+	const dir = dest();
 	rimraf.sync(dir);
 	mkdirp.sync(dir);
 
-	const chokidar = require('chokidar');
-
 	// 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;
@@ -110,35 +103,110 @@ export default async function dev(src: string, dir: string) {
 		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) {
+		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${chalk.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(chalk.red(`✗ ${name}`));
+				console.error(chalk.red(err.message));
+				error(err);
+			} else {
+				const messages = format_messages(stats);
+				const info = stats.toJson();
+
+				if (messages.errors.length > 0) {
+					console.log(chalk.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(chalk.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(`${chalk.bold.green(`✔ ${name}`)} ${chalk.grey(`(${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
+					wait_for_port(3000).then(deferreds.server.fulfil); // TODO control port
 				}
 
 				if (proc) {
@@ -156,32 +224,23 @@ export default async function dev(src: string, dir: string) {
 		}
 	});
 
-	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 +249,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 +261,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);
+	});
+}

src/cli/export.ts

@@ -6,8 +6,7 @@ import cheerio from 'cheerio';
 import URL from 'url-parse';
 import fetch from 'node-fetch';
 import { wait_for_port } from './utils';
-
-const { OUTPUT_DIR = 'dist' } = process.env;
+import { dest } from '../config';
 
 const app = express();
 
@@ -15,19 +14,24 @@ 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);
+export default async function exporter(export_dir: string) {
+	const build_dir = dest();
 
-	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');
+	// Prep output directory
+	sander.rimrafSync(export_dir);
+
+	sander.copydirSync('assets').to(export_dir);
+	sander.copydirSync(build_dir, 'client').to(export_dir, 'client');
+
+	if (sander.existsSync(build_dir, 'service-worker.js')) {
+		sander.copyFileSync(build_dir, 'service-worker.js').to(export_dir, 'service-worker.js');
+	}
 
 	const port = await require('get-port')(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,
@@ -48,11 +52,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 +88,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())
-	});
+	wait_for_port(port)
+		.then(() => handle(new URL(origin))) // TODO all static routes
+		.then(() => proc.kill());
 }

src/cli/index.ts

@@ -1,3 +1,5 @@
+import * as path from 'path';
+import * as child_process from 'child_process';
 import mri from 'mri';
 import chalk from 'chalk';
 import help from './help.md';
@@ -5,7 +7,6 @@ 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), {
@@ -29,33 +30,60 @@ const [cmd] = opts._;
 
 const start = Date.now();
 
-if (cmd === 'build') {
-	process.env.NODE_ENV = 'production';
+switch (cmd) {
+	case 'build':
+		process.env.NODE_ENV = 'production';
+		process.env.SAPPER_DEST = opts._[1] || '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') {
-	process.env.NODE_ENV = 'production';
+		build()
+			.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');
+			});
 
-	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');
+		break;
+
+	case 'export':
+		process.env.NODE_ENV = 'production';
+
+		const export_dir = opts._[1] || 'export';
+
+		build()
+			.then(() => exporter(export_dir))
+			.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');
+			});
+
+		break;
+
+	case 'dev':
+		dev();
+		break;
+
+	case 'upgrade':
+		upgrade();
+		break;
+
+	case 'start':
+		const dir = path.resolve(opts._[1] || 'build');
+
+		child_process.fork(`${dir}/server.js`, [], {
+			cwd: process.cwd(),
+			env: Object.assign({
+				NODE_ENV: 'production',
+				SAPPER_DEST: dir
+			}, process.env)
 		});
-} else if (cmd === 'dev') {
-	dev(src, dest);
-} else if (cmd === 'upgrade') {
-	upgrade();
-} else {
-	console.log(`unrecognized command ${cmd} — try \`sapper --help\` for more information`);
-}
+
+		break;
+
+	default:
+		console.log(`unrecognized command ${cmd} — try \`sapper --help\` for more information`);
+}

src/cli/utils.ts

@@ -1,24 +1,25 @@
-import waitPort from 'wait-port';
+import * as net from 'net';
 
-export function wait_for_port(port: number, cb: () => void) {
-	waitPort({ port }).then(cb);
+export function wait_for_port(port: number, timeout = 5000) {
+	return new Promise((fulfil, reject) => {
+		get_connection(port, fulfil);
+		setTimeout(() => reject(new Error(`timed out waiting for connection`)), timeout);
+	});
 }
 
-// import * as net from 'net';
+export function get_connection(port: number, cb: () => void) {
+	const socket = net.createConnection(port, 'localhost', () => {
+		cb();
+		socket.destroy();
+	});
 
-// export function wait_for_port(port: number, cb: () => void) {
-// 	const socket = net.createConnection(port, 'localhost', () => {
-// 		cb();
-// 		socket.destroy();
-// 	});
+	socket.on('error', err => {
+		setTimeout(() => {
+			get_connection(port, cb);
+		}, 10);
+	});
 
-// 	socket.on('error', err => {
-// 		setTimeout(() => {
-// 			wait_for_port(port, cb);
-// 		}, 100);
-// 	});
-
-// 	setTimeout(() => {
-// 		socket.destroy();
-// 	}, 100);
-// }
+	setTimeout(() => {
+		socket.destroy();
+	}, 1000);
+}

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');

src/core/create_app.ts

@@ -3,21 +3,34 @@ 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 = [
@@ -42,15 +55,15 @@ function generate_client(routes: Route[], src: string, dev: boolean, dev_port?:
 				.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, '');
@@ -59,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
@@ -74,7 +87,7 @@ 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} }`;

src/core/create_routes.ts

@@ -1,11 +1,9 @@
 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('**/*.+(html|js|mjs)', { cwd: src() }) }) {
 	const routes: Route[] = files
 		.map((file: string) => {
 			if (/(^|\/|\\)_/.test(file)) return;
@@ -35,8 +33,8 @@ export default function create_routes({ src, files = glob.sync('**/*.+(html|js|m
 			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) {
 					const matcher = part.replace(param_pattern, `([^\/]+?)`);

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

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] : '';
-			});
-		}
-	};
-}

src/core/index.ts

@@ -1,5 +1,4 @@
 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';
+export { default as create_routes } from './create_routes';

src/middleware/index.ts

@@ -1,20 +1,18 @@
 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 { lookup } from './mime';
+import { create_routes, templates, create_compilers } from 'sapper/core.js';
+import { dest, dev } from '../config';
 import { Route, Template } from '../interfaces';
 import sourceMapSupport from 'source-map-support';
 
 sourceMapSupport.install();
 
-const dev = isDev();
-
 type RouteObject = {
 	id: string;
 	type: 'page' | 'route';
@@ -43,12 +41,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) => {
@@ -56,65 +51,71 @@ export default function middleware({ routes }: {
 			next();
 		},
 
-		shell && get_asset_handler({
+		exists(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({
+		exists(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));
 
@@ -174,12 +175,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);
 
@@ -234,76 +234,61 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
 					};
 				}
 
-				const handle_error = (err?: Error) => {
+				const handle_bad_result = (err?: Error) => {
 					if (err) {
 						console.error(err.stack);
 						res.statusCode = 500;
 						res.end(err.message);
 					} else {
-						handle_not_found(req, res, 404, 'Not found');
+						handle_error(req, res, 404, 'Not found');
 					}
 				};
 
 				try {
-					handler(req, res, handle_error);
+					handler(req, res, handle_bad_result);
 				} catch (err) {
-					handle_error(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) {
@@ -314,7 +299,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);
 		}
@@ -353,10 +338,11 @@ function try_serialize(data: any) {
 	}
 }
 
-function try_read(file: string) {
+function exists(file: string) {
 	try {
-		return fs.readFileSync(file, 'utf-8');
+		fs.statSync(file);
+		return true;
 	} catch (err) {
-		return null;
+		return false;
 	}
 }

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

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

src/runtime/index.ts

@@ -59,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({
@@ -268,3 +265,20 @@ export function goto(href: string, opts = { replaceState: false }) {
 		window.location.href = href;
 	}
 }
+
+export function preloadRoutes(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());
+}

src/runtime/interfaces.ts

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

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.js'
 			};
 		},
 
 		output: () => {
 			return {
-				path: `${dest}/client`,
+				path: `${dest()}/client`,
 				filename: '[hash]/[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				publicPath: '/client/'
@@ -34,11 +29,27 @@ export default {
 
 		output: () => {
 			return {
-				path: `${dest}`,
+				path: dest(),
 				filename: '[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
 				libraryTarget: 'commonjs2'
 			};
 		}
+	},
+
+	serviceworker: {
+		entry: () => {
+			return {
+				'service-worker': './app/service-worker.js'
+			};
+		},
+
+		output: () => {
+			return {
+				path: dest(),
+				filename: '[name].js',
+				chunkFilename: '[name].[id].[hash].js'
+			}
+		}
 	}
-};
+};

test/app/app/client.js

@@ -1,6 +1,8 @@
-import { init } from '../../../runtime.js';
+import { init, preloadRoutes } from '../../../runtime.js';
 import { routes } from './manifest/client.js';
 
 window.init = () => {
 	return init(document.querySelector('#sapper'), routes);
-};
+};
+
+window.preloadRoutes = preloadRoutes;

test/app/app/server.js

@@ -5,26 +5,33 @@ 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();
 
 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' });
 		}
 	};

test/app/app/template.html

@@ -1,4 +1,4 @@
-<!doctype>
+<!doctype html>
 <html lang='en'>
 <head>
 	<meta charset='utf-8'>

test/app/package.json

@@ -9,20 +9,20 @@
     "prestart": "npm run build"
   },
   "dependencies": {
-    "compression": "^1.7.1",
-    "cross-env": "^5.1.1",
-    "css-loader": "^0.28.7",
+    "compression": "^1.7.2",
+    "cross-env": "^5.1.3",
+    "css-loader": "^0.28.10",
     "express": "^4.16.2",
     "extract-text-webpack-plugin": "^3.0.2",
     "glob": "^7.1.2",
-    "marked": "^0.3.9",
+    "marked": "^0.3.17",
     "node-fetch": "^1.7.3",
     "npm-run-all": "^4.1.2",
-    "serve-static": "^1.13.1",
+    "serve-static": "^1.13.2",
     "style-loader": "^0.19.0",
-    "svelte": "^1.49.1",
-    "svelte-loader": "^2.2.1",
-    "uglifyjs-webpack-plugin": "^1.1.2",
-    "webpack": "^3.10.0"
+    "svelte": "^1.56.0",
+    "svelte-loader": "^2.3.3",
+    "uglifyjs-webpack-plugin": "^1.2.2",
+    "webpack": "^4.1.0"
   }
 }

test/app/routes/fünke.html

@@ -0,0 +1 @@
+<h1>I'm afraid I just blue myself</h1>

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

test/app/webpack/server.config.js

@@ -3,9 +3,7 @@ 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: {
@@ -28,5 +26,9 @@ module.exports = {
 				}
 			}
 		]
+	},
+	mode: process.env.NODE_ENV,
+	performance: {
+		hints: false // it doesn't matter if server.js is large
 	}
 };

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

test/common/test.js

@@ -23,9 +23,13 @@ Nightmare.action('init', function(done) {
 	this.evaluate_now(() => window.init(), done);
 });
 
+Nightmare.action('preloadRoutes', function(done) {
+	this.evaluate_now(() => window.preloadRoutes(), done);
+});
+
 function run(env) {
 	describe(`env=${env}`, function () {
-		this.timeout(20000);
+		this.timeout(30000);
 
 		let PORT;
 		let proc;
@@ -102,10 +106,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(() => {
@@ -154,7 +159,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().preloadRoutes())
 					.then(() => {
 						return capture(() => nightmare.click('a[href="/about"]'));
 					})
@@ -188,7 +193,6 @@ function run(env) {
 				return nightmare
 					.goto(`${base}/about`)
 					.init()
-					.wait(200)
 					.then(() => {
 						return capture(() => {
 							return nightmare
@@ -214,7 +218,7 @@ function run(env) {
 			it('reuses prefetch promise', () => {
 				return nightmare
 					.goto(`${base}/blog`)
-					.init().wait(300)
+					.init()
 					.then(() => {
 						return capture(() => {
 							return nightmare
@@ -399,6 +403,14 @@ function run(env) {
 						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`);
+					});
+			});
 		});
 
 		describe('headers', () => {
@@ -422,7 +434,7 @@ function run(env) {
 		if (env === 'production') {
 			describe('export', () => {
 				it('export all pages', () => {
-					const dest = path.resolve(__dirname, '../app/dist');
+					const dest = path.resolve(__dirname, '../app/export');
 
 					// Pages that should show up in the extraction directory.
 					const expectedPages = [