fix splitting

better unicode handling - fixes #347, i think

CHANGELOG.md

@@ -1,5 +1,25 @@
 # sapper changelog
 
+## 0.19.3
+
+* Better unicode route handling ([#347](https://github.com/sveltejs/sapper/issues/347))
+
+## 0.19.2
+
+* Ignore editor tmp files ([#220](https://github.com/sveltejs/sapper/issues/220))
+* Ignore clicks an `<a>` element without `href` ([#235](https://github.com/sveltejs/sapper/issues/235))
+* Allow routes that are reserved JavaScript words ([#315](https://github.com/sveltejs/sapper/issues/315))
+* Print out webpack errors ([#403](https://github.com/sveltejs/sapper/issues/403))
+
+## 0.19.1
+
+* Don't include local origin in export redirects ([#409](https://github.com/sveltejs/sapper/pull/409))
+
+## 0.19.0
+
+* Extract styles out of JS into .css files, for Rollup apps ([#388](https://github.com/sveltejs/sapper/issues/388))
+* Fix `prefetchRoutes` ([#380](https://github.com/sveltejs/sapper/issues/380))
+
 ## 0.18.7
 
 * Support differential bundling for Rollup apps via a `--legacy` flag ([#280](https://github.com/sveltejs/sapper/issues/280))

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.18.5",
+  "version": "0.19.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,6 +10,15 @@
       "integrity": "sha1-MU+BaPUK5IoDLP2tX9tDb0ZKl6w=",
       "dev": true
     },
+    "@types/blessed": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@types/blessed/-/blessed-0.1.10.tgz",
+      "integrity": "sha512-lCpkGnCq2lj9RBPwh/RH/ZJegYV6JdyyRHmURIW1DwMdtNhRRxYeHllqaMu8K6bDf6zhO7PpHsmEqlYMDPlmhw==",
+      "requires": {
+        "@types/events": "*",
+        "@types/node": "*"
+      }
+    },
     "@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
@@ -19,8 +28,7 @@
     "@types/events": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
-      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
+      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="
-      "dev": true
     },
     "@types/glob": {
       "version": "5.0.35",
@@ -57,8 +65,7 @@
     "@types/node": {
       "version": "10.9.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz",
-      "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==",
+      "integrity": "sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="
-      "dev": true
     },
     "@types/rimraf": {
       "version": "2.0.2",
@@ -1010,6 +1017,11 @@
       "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
       "dev": true
     },
+    "blessed": {
+      "version": "0.1.81",
+      "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz",
+      "integrity": "sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk="
+    },
     "bluebird": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
@@ -2235,7 +2247,7 @@
     },
     "eslint": {
       "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
       "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
       "dev": true,
       "requires": {
@@ -6505,6 +6517,11 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
+    "sourcemap-codec": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz",
+      "integrity": "sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA=="
+    },
     "spdx-correct": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
@@ -6703,6 +6720,11 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
+    "string-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
+    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.18.7",
+  "version": "0.19.3",
   "description": "Military-grade apps, engineered by Svelte",
   "main": "dist/middleware.js",
   "bin": {
@@ -13,15 +13,19 @@
     "config",
     "sapper",
     "components",
-    "dist"
+    "dist/*.js"
   ],
   "directories": {
     "test": "test"
   },
   "dependencies": {
+    "@types/blessed": "^0.1.10",
+    "blessed": "^0.1.81",
     "html-minifier": "^3.5.16",
     "shimport": "^0.0.10",
     "source-map-support": "^0.5.6",
+    "sourcemap-codec": "^1.4.1",
+    "string-hash": "^1.1.3",
     "tslib": "^1.9.1"
   },
   "devDependencies": {

src/api/build.ts

@@ -3,15 +3,24 @@ import * as path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import { EventEmitter } from 'events';
+import * as codec from 'sourcemap-codec';
+import hash from 'string-hash';
 import minify_html from './utils/minify_html';
-import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core';
+import { create_compilers, create_main_manifests, create_manifest_data, create_serviceworker_manifest } from '../core';
 import * as events from './interfaces';
 import { copy_shimport } from './utils/copy_shimport';
+import { Dirs, PageComponent } from '../interfaces';
+import { CompileResult } from '../core/create_compilers/interfaces';
 
-export function build(opts: {}) {
+type Opts = {
+	legacy: boolean;
+	bundler: string;
+};
+
+export function build(opts: Opts, dirs: Dirs) {
 	const emitter = new EventEmitter();
 
-	execute(emitter, opts).then(
+	execute(emitter, opts, dirs).then(
 		() => {
 			emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
 		},
@@ -25,22 +34,14 @@ export function build(opts: {}) {
 	return emitter;
 }
 
-async function execute(emitter: EventEmitter, {
+async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
-	dest = 'build',
+	rimraf.sync(path.join(dirs.dest, '**/*'));
-	app = 'app',
+	mkdirp.sync(`${dirs.dest}/client`);
-	legacy,
+	copy_shimport(dirs.dest);
-	bundler,
-	webpack = 'webpack',
-	rollup = 'rollup',
-	routes = 'routes'
-} = {}) {
-	rimraf.sync(path.join(dest, '**/*'));
-	mkdirp.sync(`${dest}/client`);
-	copy_shimport(dest);
 
 	// minify app/template.html
 	// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
-	const template = fs.readFileSync(`${app}/template.html`, 'utf-8');
+	const template = fs.readFileSync(`${dirs.app}/template.html`, 'utf-8');
 
 	// remove this in a future version
 	if (template.indexOf('%sapper.base%') === -1) {
@@ -49,14 +50,14 @@ async function execute(emitter: EventEmitter, {
 		throw error;
 	}
 
-	fs.writeFileSync(`${dest}/template.html`, minify_html(template));
+	fs.writeFileSync(`${dirs.dest}/template.html`, minify_html(template));
 
-	const route_objects = create_routes();
+	const manifest_data = create_manifest_data();
 
 	// create app/manifest/client.js and app/manifest/server.js
-	create_main_manifests({ bundler, routes: route_objects });
+	create_main_manifests({ bundler: opts.bundler, manifest_data });
 
-	const { client, server, serviceworker } = create_compilers(bundler, { webpack, rollup });
+	const { client, server, serviceworker } = create_compilers(opts.bundler, dirs);
 
 	const client_result = await client.compile();
 	emitter.emit('build', <events.BuildEvent>{
@@ -65,20 +66,11 @@ async function execute(emitter: EventEmitter, {
 		result: client_result
 	});
 
-	const build_info: {
+	const build_info = client_result.to_json(manifest_data, dirs);
-		bundler: string;
-		shimport: string;
-		assets: Record<string, string>;
-		legacy_assets?: Record<string, string>;
-	} = {
-		bundler,
-		shimport: bundler === 'rollup' && require('shimport/package.json').version,
-		assets: client_result.assets
-	};
 
-	if (legacy) {
+	if (opts.legacy) {
 		process.env.SAPPER_LEGACY_BUILD = 'true';
-		const { client } = create_compilers(bundler, { webpack, rollup });
+		const { client } = create_compilers(opts.bundler, dirs);
 
 		const client_result = await client.compile();
 
@@ -92,7 +84,7 @@ async function execute(emitter: EventEmitter, {
 		delete process.env.SAPPER_LEGACY_BUILD;
 	}
 
-	fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify(build_info));
+	fs.writeFileSync(path.join(dirs.dest, 'build.json'), JSON.stringify(build_info));
 
 	const server_stats = await server.compile();
 	emitter.emit('build', <events.BuildEvent>{
@@ -105,8 +97,8 @@ async function execute(emitter: EventEmitter, {
 
 	if (serviceworker) {
 		create_serviceworker_manifest({
-			routes: route_objects,
+			manifest_data,
-			client_files: client_result.chunks.map((file: string) => `client/${file}`)
+			client_files: client_result.chunks.map(chunk => `client/${chunk.file}`)
 		});
 
 		serviceworker_stats = await serviceworker.compile();

src/api/dev.ts

@@ -7,12 +7,14 @@ import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import { locations } from '../config';
 import { EventEmitter } from 'events';
-import { create_routes, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
+import { create_manifest_data, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
-import { Compiler, Compilers, CompileResult, CompileError } from '../core/create_compilers';
+import { Compiler, Compilers } from '../core/create_compilers';
+import { CompileResult, CompileError } from '../core/create_compilers/interfaces';
 import Deferred from './utils/Deferred';
 import * as events from './interfaces';
 import validate_bundler from '../cli/utils/validate_bundler';
 import { copy_shimport } from './utils/copy_shimport';
+import { ManifestData } from '../interfaces';
 
 export function dev(opts) {
 	return new Watcher(opts);
@@ -127,9 +129,11 @@ class Watcher extends EventEmitter {
 
 		if (!this.dev_port) this.dev_port = await ports.find(10000);
 
+		let manifest_data: ManifestData;
+
 		try {
-			const routes = create_routes();
+			manifest_data = create_manifest_data();
-			create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
+			create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
 		} catch (err) {
 			this.emit('fatal', <events.FatalEvent>{
 				message: err.message
@@ -149,12 +153,11 @@ class Watcher extends EventEmitter {
 					return true;
 				},
 				() => {
-					const routes = create_routes();
-					create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
-
 					try {
-						const routes = create_routes();
+						const new_manifest_data = create_manifest_data();
-						create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
+						create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
+
+						manifest_data = new_manifest_data;
 					} catch (err) {
 						this.emit('error', <events.ErrorEvent>{
 							message: err.message
@@ -173,10 +176,7 @@ class Watcher extends EventEmitter {
 		let deferred = new Deferred();
 
 		// TODO watch the configs themselves?
-		const compilers: Compilers = create_compilers(this.bundler, {
+		const compilers: Compilers = create_compilers(this.bundler, this.dirs);
-			webpack: this.dirs.webpack,
-			rollup: this.dirs.rollup
-		});
 
 		let log = '';
 
@@ -200,6 +200,8 @@ class Watcher extends EventEmitter {
 			handle_result: (result: CompileResult) => {
 				deferred.promise.then(() => {
 					const restart = () => {
+						this.emit('restart');
+
 						log = '';
 						this.crashed = false;
 
@@ -282,16 +284,17 @@ class Watcher extends EventEmitter {
 			},
 
 			handle_result: (result: CompileResult) => {
-				fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
+				fs.writeFileSync(
-					bundler: this.bundler,
+					path.join(dest, 'build.json'),
-					shimport: this.bundler === 'rollup' && require('shimport/package.json').version,
-					assets: result.assets
-				}, null, '  '));
 
-				const client_files = result.chunks.map((file: string) => `client/${file}`);
+					// TODO should be more explicit that to_json has effects
+					JSON.stringify(result.to_json(manifest_data, this.dirs), null, '  ')
+				);
+
+				const client_files = result.chunks.map(chunk => `client/${chunk.file}`);
 
 				create_serviceworker_manifest({
-					routes: create_routes(),
+					manifest_data,
 					client_files
 				});
 

src/api/export.ts

@@ -170,7 +170,7 @@ async function execute(emitter: EventEmitter, opts: Opts) {
 			const location = r.headers.get('Location');
 
 			type = 'text/html';
-			body = `<script>window.location.href = "${location}"</script>`;
+			body = `<script>window.location.href = "${location.replace(origin, '')}"</script>`;
 
 			await handle(resolve(root.href, location));
 		}

src/api/find_page.ts

@@ -1,8 +1,8 @@
 import { locations } from '../config';
-import { create_routes } from '../core';
+import { create_manifest_data } from '../core';
 
 export function find_page(pathname: string, cwd = locations.routes()) {
-	const { pages } = create_routes(cwd);
+	const { pages } = create_manifest_data(cwd);
 
 	for (let i = 0; i < pages.length; i += 1) {
 		const page = pages[i];

src/api/interfaces.ts

@@ -42,4 +42,4 @@ export type FailureEvent = {
 
 }
 
-export type DoneEvent = {}
+export type DoneEvent = {};

src/cli.ts

@@ -15,13 +15,15 @@ prog.command('dev')
 	.option('--hot', 'Use hot module replacement (requires webpack)', true)
 	.option('--live', 'Reload on changes if not using --hot', true)
 	.option('--bundler', 'Specify a bundler (rollup or webpack)')
+	.option('--stream', 'Stream logs, instead of boxing them', false)
 	.action(async (opts: {
 		port: number,
 		open: boolean,
 		'dev-port': number,
 		live: boolean,
 		hot: boolean,
-		bundler?: string
+		bundler?: string,
+		stream: boolean
 	}) => {
 		const { dev } = await import('./cli/dev');
 		dev(opts);

src/cli/build.ts

@@ -14,11 +14,12 @@ export function build(opts: { bundler?: string, legacy?: boolean }) {
 	return new Promise((fulfil, reject) => {
 		try {
 			const emitter = _build({
+				legacy: opts.legacy,
+				bundler
+			}, {
 				dest: locations.dest(),
 				app: locations.app(),
 				routes: locations.routes(),
-				legacy: opts.legacy,
-				bundler,
 				webpack: 'webpack',
 				rollup: 'rollup'
 			});

src/cli/dev.ts

@@ -1,80 +1,263 @@
 import * as path from 'path';
 import colors from 'kleur';
 import * as child_process from 'child_process';
+import * as blessed from 'blessed';
 import prettyMs from 'pretty-ms';
 import { dev as _dev } from '../api/dev';
 import * as events from '../api/interfaces';
 
-export function dev(opts: { port: number, open: boolean, bundler?: string }) {
+function boxed_output() {
+	const screen = blessed.screen({
+		smartCSR: true
+	});
+
+	function box(opts) {
+		opts = Object.assign({
+			width: '100%',
+			height: '50%',
+			scrollable: true,
+			style: {
+				scrollbar: {
+					bg: 'black'
+				}
+			},
+			scrollbar: {},
+			input: true,
+			mouse: true,
+			keys: true,
+			scrollOnInput: false
+		}, opts);
+
+		return blessed.box(opts);
+	}
+
+	const status_box = box({});
+	const log_box = box({
+		bottom: '0'
+	});
+
+	let mouse_is_down = false;
+	let dragging = false;
+	let did_drag = false;
+
+	let divider_is_horizontal = true;
+
+	function update_split(x: number, y: number) {
+		if (divider_is_horizontal) {
+			horizontal_divider.top = y;
+			status_box.width = log_box.width = '100%';
+			status_box.height = y;
+			log_box.height = screen.height - (y + 1);
+			log_box.top = y + 1;
+			log_box.left = 0;
+		} else {
+			vertical_divider.left = x;
+			status_box.height = log_box.height = '100%';
+			status_box.width = x;
+			log_box.width = screen.width - (x + 1);
+			log_box.left = x + 1;
+			log_box.top = 0;
+		}
+
+		screen.render();
+	}
+
+	screen.on('mousedown', data => {
+		if (mouse_is_down) {
+			if (dragging) {
+				update_split(data.x, data.y);
+				did_drag = true;
+			}
+		} else {
+			if (data.y === horizontal_divider.top) {
+				dragging = true;
+			}
+
+			mouse_is_down = true;
+		}
+	});
+
+	screen.on('mouseup', data => {
+		mouse_is_down = false;
+		dragging = false;
+		did_drag = false;
+	});
+
+	const horizontal_divider = blessed.line({
+		top: '50%',
+		orientation: 'horizontal'
+	});
+
+	const vertical_divider = blessed.line({
+		left: '50%',
+		orientation: 'vertical'
+	});
+
+	horizontal_divider.on('click', event => {
+		if (!did_drag) {
+			horizontal_divider.hide();
+			vertical_divider.show();
+			divider_is_horizontal = false;
+			update_split(event.x, event.y);
+		}
+	});
+
+	vertical_divider.on('click', event => {
+		if (!did_drag) {
+			vertical_divider.hide();
+			horizontal_divider.show();
+			divider_is_horizontal = true;
+			update_split(event.x, event.y);
+		}
+	});
+
+	vertical_divider.hide();
+
+	screen.append(status_box);
+	screen.append(log_box);
+	screen.append(horizontal_divider);
+	screen.append(vertical_divider);
+
+	update_split(process.stdout.columns >> 1, process.stdout.rows >> 1);
+
+	screen.key(['escape', 'q', 'C-c'], function(ch, key) {
+		return process.exit(0);
+	});
+
+	const append_log = (data: Buffer | string) => {
+		log_box.setContent(log_box.content + data);
+		screen.render();
+	};
+
+	const append_status = (data: Buffer | string) => {
+		status_box.setContent(status_box.content + data);
+		screen.render();
+	};
+
+	let first = true;
+
+	return {
+		stdout: append_log,
+
+		stderr: append_log,
+
+		clear_logs: () => {
+			let content = `${colors.inverse(` server log • ${new Date().toISOString()}\n`)} \n`;
+			if (first) {
+				content += colors.gray(`> Click/drag the divider to adjust the split\n\n`);
+				first = false;
+			}
+
+			log_box.setContent(content);
+			screen.render();
+		},
+
+		log: (line: string) => {
+			append_status(line + '\n');
+		},
+
+		append: append_status,
+
+		clear: () => {
+			status_box.setContent(`${colors.inverse(` build log • ${new Date().toISOString()}\n`)} \n`);
+			screen.render();
+		}
+	};
+}
+
+function streamed_output() {
+	return {
+		stdout: process.stdout.write.bind(process.stdout),
+
+		stderr: process.stderr.write.bind(process.stderr),
+
+		clear_logs: () => {},
+
+		log: (line: string) => {
+			console.log(line);
+		},
+
+		append: (data: Buffer | string) => {
+			process.stdout.write(data);
+		},
+
+		clear: () => {}
+	};
+}
+
+export function dev(opts: { port: number, open: boolean, bundler?: string, stream: boolean }) {
+	const output = opts.stream
+		? streamed_output()
+		: boxed_output();
+
+	output.clear();
+
 	try {
 		const watcher = _dev(opts);
 
 		let first = true;
 
 		watcher.on('ready', (event: events.ReadyEvent) => {
+			output.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
+
 			if (first) {
-				console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
 				if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
 				first = false;
 			}
-
-			// TODO clear screen?
-
-			event.process.stdout.on('data', data => {
-				process.stdout.write(data);
-			});
-
-			event.process.stderr.on('data', data => {
-				process.stderr.write(data);
-			});
 		});
 
+		watcher.on('restart', output.clear_logs);
+		watcher.on('stdout', output.stdout);
+		watcher.on('stderr', output.stderr);
+
 		watcher.on('invalid', (event: events.InvalidEvent) => {
 			const changed = event.changed.map(filename => path.relative(process.cwd(), filename)).join(', ');
-			console.log(`\n${colors.bold.cyan(changed)} changed. rebuilding...`);
+
+			output.clear();
+			output.log(`${colors.bold.cyan(changed)} changed. rebuilding...`);
 		});
 
 		watcher.on('error', (event: events.ErrorEvent) => {
-			console.log(colors.red(`✗ ${event.type}`));
+			output.log(colors.red(`✗ ${event.type}`));
-			console.log(colors.red(event.message));
+			output.log(colors.red(event.message));
 		});
 
 		watcher.on('fatal', (event: events.FatalEvent) => {
-			console.log(colors.bold.red(`> ${event.message}`));
+			output.log(colors.bold.red(`> ${event.message}`));
-			if (event.log) console.log(event.log);
+			if (event.log) output.log(event.log);
 		});
 
 		watcher.on('build', (event: events.BuildEvent) => {
 			if (event.errors.length) {
-				console.log(colors.bold.red(`✗ ${event.type}`));
+				output.log(colors.bold.red(`✗ ${event.type}`));
 
 				event.errors.filter(e => !e.duplicate).forEach(error => {
-					if (error.file) console.log(colors.bold(error.file));
+					if (error.file) output.log(colors.bold(error.file));
-					console.log(error.message);
+					output.log(error.message);
 				});
 
 				const hidden = event.errors.filter(e => e.duplicate).length;
 				if (hidden > 0) {
-					console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
+					output.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
 				}
 			} else if (event.warnings.length) {
-				console.log(colors.bold.yellow(`• ${event.type}`));
+				output.log(colors.bold.yellow(`• ${event.type}`));
 
 				event.warnings.filter(e => !e.duplicate).forEach(warning => {
-					if (warning.file) console.log(colors.bold(warning.file));
+					if (warning.file) output.log(colors.bold(warning.file));
-					console.log(warning.message);
+					output.log(warning.message);
 				});
 
 				const hidden = event.warnings.filter(e => e.duplicate).length;
 				if (hidden > 0) {
-					console.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
+					output.log(`${hidden} duplicate ${hidden === 1 ? 'warning' : 'warnings'} hidden\n`);
 				}
 			} else {
-				console.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${prettyMs(event.duration)})`)}`);
+				output.log(`${colors.bold.green(`✔ ${event.type}`)} ${colors.gray(`(${prettyMs(event.duration)})`)}`);
 			}
 		});
 	} catch (err) {
-		console.log(colors.bold.red(`> ${err.message}`));
+		output.log(colors.bold.red(`> ${err.message}`));
 		process.exit(1);
 	}
 }

src/core.ts

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

src/core/create_compilers.ts

@@ -1,377 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import colors from 'kleur';
-import pb from 'pretty-bytes';
-import relative from 'require-relative';
-import format_messages from 'webpack-format-messages';
-import { left_pad } from '../utils';
-
-let r: any;
-let wp: any;
-
-export class CompileError {
-	file: string;
-	message: string;
-}
-
-export class CompileResult {
-	duration: number;
-	errors: CompileError[];
-	warnings: CompileError[];
-	chunks: string[];
-	assets: Record<string, string>;
-}
-
-class RollupResult extends CompileResult {
-	summary: string;
-
-	constructor(duration: number, compiler: RollupCompiler) {
-		super();
-
-		this.duration = duration;
-
-		this.errors = compiler.errors.map(munge_rollup_warning_or_error);
-		this.warnings = compiler.warnings.map(munge_rollup_warning_or_error); // TODO emit this as they happen
-
-		this.chunks = compiler.chunks.map(chunk => chunk.fileName);
-
-		// TODO populate this properly. We don't have namedcompiler. chunks, as in
-		// webpack, but we can have a route -> [chunk] map or something
-		this.assets = {};
-
-		compiler.chunks.forEach(chunk => {
-			if (compiler.input in chunk.modules) {
-				this.assets.main = chunk.fileName;
-			}
-		});
-
-		this.summary = compiler.chunks.map(chunk => {
-			const size_color = chunk.code.length > 150000 ? colors.bold.red : chunk.code.length > 50000 ? colors.bold.yellow : colors.bold.white;
-			const size_label = left_pad(pb(chunk.code.length), 10);
-
-			const lines = [size_color(`${size_label} ${chunk.fileName}`)];
-
-			const deps = Object.keys(chunk.modules)
-				.map(file => {
-					return {
-						file: path.relative(process.cwd(), file),
-						size: chunk.modules[file].renderedLength
-					};
-				})
-				.filter(dep => dep.size > 0)
-				.sort((a, b) => b.size - a.size);
-
-			const total_unminified = deps.reduce((t, d) => t + d.size, 0);
-
-			deps.forEach((dep, i) => {
-				const c = i === deps.length - 1 ? '└' : '│';
-				let line = `           ${c} ${dep.file}`;
-
-				if (deps.length > 1) {
-					const p = (100 * dep.size / total_unminified).toFixed(1);
-					line += ` (${p}%)`;
-				}
-
-				lines.push(colors.gray(line));
-			});
-
-			return lines.join('\n');
-		}).join('\n');
-	}
-
-	print() {
-		const blocks: string[] = this.warnings.map(warning => {
-			return warning.file
-				? `> ${colors.bold(warning.file)}\n${warning.message}`
-				: `> ${warning.message}`;
-		});
-
-		blocks.push(this.summary);
-
-		return blocks.join('\n\n');
-	}
-}
-
-class WebpackResult extends CompileResult {
-	stats: any;
-
-	constructor(stats: any) {
-		super();
-
-		this.stats = stats;
-
-		const info = stats.toJson();
-
-		const messages = format_messages(stats);
-
-		this.errors = messages.errors.map(munge_webpack_warning_or_error);
-		this.warnings = messages.warnings.map(munge_webpack_warning_or_error);
-
-		this.duration = info.time;
-
-		this.chunks = info.assets.map((chunk: { name: string }) => chunk.name);
-		this.assets = info.assetsByChunkName;
-	}
-
-	print() {
-		return this.stats.toString({ colors: true });
-	}
-}
-
-export class RollupCompiler {
-	_: Promise<any>;
-	_oninvalid: (filename: string) => void;
-	_start: number;
-	input: string;
-	warnings: any[];
-	errors: any[];
-	chunks: any[]; // TODO types
-
-	constructor(config: any) {
-		this._ = this.get_config(path.resolve(config));
-		this.input = null;
-		this.warnings = [];
-		this.errors = [];
-		this.chunks = [];
-	}
-
-	async get_config(input: string) {
-		const bundle = await r.rollup({
-			input,
-			external: (id: string) => {
-				return (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json';
-			}
-		});
-
-		const { code } = await bundle.generate({ format: 'cjs' });
-
-		// temporarily override require
-		const defaultLoader = require.extensions['.js'];
-		require.extensions['.js'] = (module: any, filename: string) => {
-			if (filename === input) {
-				module._compile(code, filename);
-			} else {
-				defaultLoader(module, filename);
-			}
-		};
-
-		const mod: any = require(input);
-		delete require.cache[input];
-
-		(mod.plugins || (mod.plugins = [])).push({
-			name: 'sapper-internal',
-			options: (opts: any) => {
-				this.input = opts.input;
-			},
-			renderChunk: (code: string, chunk: any) => {
-				if (chunk.isEntry) {
-					this.chunks.push(chunk);
-				}
-			}
-		});
-
-		const onwarn = mod.onwarn || ((warning: any, handler: (warning: any) => void) => {
-			handler(warning);
-		});
-
-		mod.onwarn = (warning: any) => {
-			onwarn(warning, (warning: any) => {
-				this.warnings.push(warning);
-			});
-		};
-
-		return mod;
-	}
-
-	oninvalid(cb: (filename: string) => void) {
-		this._oninvalid = cb;
-	}
-
-	async compile(): Promise<CompileResult> {
-		const config = await this._;
-
-		const start = Date.now();
-
-		try {
-			const bundle = await r.rollup(config);
-			await bundle.write(config.output);
-
-			return new RollupResult(Date.now() - start, this);
-		} catch (err) {
-			if (err.filename) {
-				// TODO this is a bit messy. Also, can
-				// Rollup emit other kinds of error?
-				err.message = [
-					`Failed to build — error in ${err.filename}: ${err.message}`,
-					err.frame
-				].filter(Boolean).join('\n');
-			}
-
-			throw err;
-		}
-	}
-
-	async watch(cb: (err?: Error, stats?: any) => void) {
-		const config = await this._;
-
-		const watcher = r.watch(config);
-
-		watcher.on('change', (id: string) => {
-			this.chunks = [];
-			this.warnings = [];
-			this.errors = [];
-			this._oninvalid(id);
-		});
-
-		watcher.on('event', (event: any) => {
-			switch (event.code) {
-				case 'FATAL':
-					// TODO kill the process?
-					if (event.error.filename) {
-						// TODO this is a bit messy. Also, can
-						// Rollup emit other kinds of error?
-						event.error.message = [
-							`Failed to build — error in ${event.error.filename}: ${event.error.message}`,
-							event.error.frame
-						].filter(Boolean).join('\n');
-					}
-
-					cb(event.error);
-					break;
-
-				case 'ERROR':
-					this.errors.push(event.error);
-					cb(null, new RollupResult(Date.now() - this._start, this));
-					break;
-
-				case 'START':
-				case 'END':
-					// TODO is there anything to do with this info?
-					break;
-
-				case 'BUNDLE_START':
-					this._start = Date.now();
-					break;
-
-				case 'BUNDLE_END':
-					cb(null, new RollupResult(Date.now() - this._start, this));
-					break;
-
-				default:
-					console.log(`Unexpected event ${event.code}`);
-			}
-		});
-	}
-}
-
-export class WebpackCompiler {
-	_: any;
-
-	constructor(config: any) {
-		this._ = wp(require(path.resolve(config)));
-	}
-
-	oninvalid(cb: (filename: string) => void) {
-		this._.hooks.invalid.tap('sapper', cb);
-	}
-
-	compile(): Promise<CompileResult> {
-		return new Promise((fulfil, reject) => {
-			this._.run((err: Error, stats: any) => {
-				if (err) {
-					reject(err);
-					process.exit(1);
-				}
-
-				const result = new WebpackResult(stats);
-
-				if (result.errors.length) {
-					// TODO print errors
-					// console.error(stats.toString({ colors: true }));
-					reject(new Error(`Encountered errors while building app`));
-				}
-
-				else {
-					fulfil(result);
-				}
-			});
-		});
-	}
-
-	watch(cb: (err?: Error, stats?: any) => void) {
-		this._.watch({}, (err?: Error, stats?: any) => {
-			cb(err, stats && new WebpackResult(stats));
-		});
-	}
-}
-
-export type Compiler = RollupCompiler | WebpackCompiler;
-
-export type Compilers = {
-	client: Compiler;
-	server: Compiler;
-	serviceworker?: Compiler;
-}
-
-export default function create_compilers(bundler: string, { webpack, rollup }: { webpack: string, rollup: string }): Compilers {
-	if (bundler === 'rollup') {
-		if (!r) r = relative('rollup', process.cwd());
-
-		const sw = `${rollup}/service-worker.config.js`;
-
-		return {
-			client: new RollupCompiler(`${rollup}/client.config.js`),
-			server: new RollupCompiler(`${rollup}/server.config.js`),
-			serviceworker: fs.existsSync(sw) && new RollupCompiler(sw)
-		};
-	}
-
-	if (bundler === 'webpack') {
-		if (!wp) wp = relative('webpack', process.cwd());
-
-		const sw = `${webpack}/service-worker.config.js`;
-
-		return {
-			client: new WebpackCompiler(`${webpack}/client.config.js`),
-			server: new WebpackCompiler(`${webpack}/server.config.js`),
-			serviceworker: fs.existsSync(sw) && new WebpackCompiler(sw)
-		};
-	}
-
-	// this shouldn't be possible...
-	throw new Error(`Invalid bundler option '${bundler}'`);
-}
-
-const locPattern = /\((\d+):(\d+)\)$/;
-
-function munge_webpack_warning_or_error(message: string) {
-	// TODO this is all a bit rube goldberg...
-	const lines = message.split('\n');
-
-	const file = lines.shift()
-		.replace('', '') // careful — there is a special character at the beginning of this string
-		.replace('', '')
-		.replace('./', '');
-
-	let line = null;
-	let column = null;
-
-	const match = locPattern.exec(lines[0]);
-	if (match) {
-		lines[0] = lines[0].replace(locPattern, '');
-		line = +match[1];
-		column = +match[2];
-	}
-
-	return {
-		file,
-		message: lines.join('\n')
-	};
-}
-
-function munge_rollup_warning_or_error(warning_or_error: any) {
-	return {
-		file: warning_or_error.filename,
-		message: [warning_or_error.message, warning_or_error.frame].filter(Boolean).join('\n')
-	};
-}

src/core/create_compilers/RollupCompiler.ts

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

src/core/create_compilers/RollupResult.ts

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

src/core/create_compilers/WebpackCompiler.ts

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

src/core/create_compilers/WebpackResult.ts

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

src/core/create_compilers/extract_css.ts

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

src/core/create_compilers/index.ts

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

src/core/create_compilers/interfaces.ts

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

src/core/create_manifest_data.ts

@@ -1,10 +1,10 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { locations } from '../config';
-import { Page, PageComponent, ServerRoute } from '../interfaces';
+import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
-import { posixify } from './utils';
+import { posixify, reserved_words } from './utils';
 
-export default function create_routes(cwd = locations.routes()) {
+export default function create_manifest_data(cwd = locations.routes()): ManifestData {
 	const components: PageComponent[] = [];
 	const pages: Page[] = [];
 	const server_routes: ServerRoute[] = [];
@@ -30,13 +30,16 @@ export default function create_routes(cwd = locations.routes()) {
 				const file = path.relative(cwd, resolved);
 				const is_dir = fs.statSync(resolved).isDirectory();
 
+				const ext = path.extname(basename);
+				if (!is_dir && !/^\.[a-z]+$/i.test(ext)) return null; // filter out tmp files etc
+
 				const segment = is_dir
 					? basename
 					: basename.slice(0, -path.extname(basename).length);
 
 				const parts = get_parts(segment);
 				const is_index = is_dir ? false : basename.startsWith('index.');
-				const is_page = path.extname(basename) === '.html';
+				const is_page = ext === '.html';
 
 				parts.forEach(part => {
 					if (/\]\[/.test(part.content)) {
@@ -57,6 +60,7 @@ export default function create_routes(cwd = locations.routes()) {
 					is_page
 				};
 			})
+			.filter(Boolean)
 			.sort(comparator);
 
 		items.forEach(item => {
@@ -265,7 +269,7 @@ function get_parts(part: string): Part[] {
 }
 
 function get_slug(file: string) {
-	return file
+	let name = file
 		.replace(/[\\\/]index/, '')
 		.replace(/_default([\/\\index])?\.html$/, 'index')
 		.replace(/[\/\\]/g, '_')
@@ -274,6 +278,9 @@ function get_slug(file: string) {
 		.replace(/[^a-zA-Z0-9_$]/g, c => {
 			return c === '.' ? '_' : `$${c.charCodeAt(0)}`
 		});
+
+	if (reserved_words.has(name)) name += '_';
+	return name;
 }
 
 function get_pattern(segments: Part[][], add_trailing_slash: boolean) {

src/core/create_manifests.ts

@@ -3,11 +3,11 @@ import * as path from 'path';
 import glob from 'tiny-glob/sync.js';
 import { posixify, write_if_changed } from './utils';
 import { dev, locations } from '../config';
-import { Page, PageComponent, ServerRoute } from '../interfaces';
+import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
 
-export function create_main_manifests({ bundler, routes, dev_port }: {
+export function create_main_manifests({ bundler, manifest_data, dev_port }: {
 	bundler: string,
-	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
+	manifest_data: ManifestData;
 	dev_port?: number;
 }) {
 	const manifest_dir = path.join(locations.app(), 'manifest');
@@ -15,8 +15,8 @@ export function create_main_manifests({ bundler, routes, dev_port }: {
 
 	const path_to_routes = path.relative(manifest_dir, locations.routes());
 
-	const client_manifest = generate_client(routes, path_to_routes, bundler, dev_port);
+	const client_manifest = generate_client(manifest_data, path_to_routes, bundler, dev_port);
-	const server_manifest = generate_server(routes, path_to_routes);
+	const server_manifest = generate_server(manifest_data, path_to_routes);
 
 	write_if_changed(
 		`${manifest_dir}/default-layout.html`,
@@ -26,8 +26,8 @@ export function create_main_manifests({ bundler, routes, dev_port }: {
 	write_if_changed(`${manifest_dir}/server.js`, server_manifest);
 }
 
-export function create_serviceworker_manifest({ routes, client_files }: {
+export function create_serviceworker_manifest({ manifest_data, client_files }: {
-	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
+	manifest_data: ManifestData;
 	client_files: string[];
 }) {
 	const assets = glob('**', { cwd: 'assets', filesOnly: true });
@@ -40,44 +40,47 @@ export function create_serviceworker_manifest({ routes, client_files }: {
 
 		export const shell = [\n\t${client_files.map((x: string) => `"${x}"`).join(',\n\t')}\n];
 
-		export const routes = [\n\t${routes.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
+		export const routes = [\n\t${manifest_data.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
 	`.replace(/^\t\t/gm, '').trim();
 
 	write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
 }
 
 function generate_client(
-	routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
+	manifest_data: ManifestData,
 	path_to_routes: string,
 	bundler: string,
 	dev_port?: number
 ) {
-	const page_ids = new Set(routes.pages.map(page =>
+	const page_ids = new Set(manifest_data.pages.map(page =>
 		page.pattern.toString()));
 
-	const server_routes_to_ignore = routes.server_routes.filter(route =>
+	const server_routes_to_ignore = manifest_data.server_routes.filter(route =>
 		!page_ids.has(route.pattern.toString()));
 
 	let code = `
 		// This file is generated by Sapper — do not edit it!
-		import root from '${get_file(path_to_routes, routes.root)}';
+		import root from '${get_file(path_to_routes, manifest_data.root)}';
 		import error from '${posixify(`${path_to_routes}/_error.html`)}';
 
-		${routes.components.map(component => {
+		${manifest_data.components.map(component => {
 			const annotation = bundler === 'webpack'
 				? `/* webpackChunkName: "${component.name}" */ `
 				: '';
 
 			const source = get_file(path_to_routes, component);
 
-			return `const ${component.name} = () => import(${annotation}'${source}');`;
+			return `const ${component.name} = {
+			js: () => import(${annotation}'${source}'),
+			css: "__SAPPER_CSS_PLACEHOLDER:${component.file}__"
+		};`;
 		}).join('\n')}
 
 		export const manifest = {
 			ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
 
 			pages: [
-				${routes.pages.map(page => `{
+				${manifest_data.pages.map(page => `{
 					// ${page.parts[page.parts.length - 1].component.file}
 					pattern: ${page.pattern},
 					parts: [
@@ -119,15 +122,15 @@ function generate_client(
 }
 
 function generate_server(
-	routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
+	manifest_data: ManifestData,
 	path_to_routes: string
 ) {
 	const imports = [].concat(
-		routes.server_routes.map(route =>
+		manifest_data.server_routes.map(route =>
 			`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
-		routes.components.map(component =>
+		manifest_data.components.map(component =>
 			`import ${component.name} from '${get_file(path_to_routes, component)}';`),
-		`import root from '${get_file(path_to_routes, routes.root)}';`,
+		`import root from '${get_file(path_to_routes, manifest_data.root)}';`,
 		`import error from '${posixify(`${path_to_routes}/_error.html`)}';`
 	);
 
@@ -137,7 +140,7 @@ function generate_server(
 
 		export const manifest = {
 			server_routes: [
-				${routes.server_routes.map(route => `{
+				${manifest_data.server_routes.map(route => `{
 					// ${route.file}
 					pattern: ${route.pattern},
 					handlers: ${route.name},
@@ -148,7 +151,7 @@ function generate_server(
 			],
 
 			pages: [
-				${routes.pages.map(page => `{
+				${manifest_data.pages.map(page => `{
 					// ${page.parts[page.parts.length - 1].component.file}
 					pattern: ${page.pattern},
 					parts: [
@@ -157,6 +160,7 @@ function generate_server(
 
 							const props = [
 								`name: "${part.component.name}"`,
+								`file: "${part.component.file}"`,
 								`component: ${part.component.name}`
 							];
 

src/core/utils.ts

@@ -23,3 +23,54 @@ export function fudge_mtime(file: string) {
 		new Date(mtime.getTime() - 999999)
 	);
 }
+
+export const reserved_words = new Set([
+	'arguments',
+	'await',
+	'break',
+	'case',
+	'catch',
+	'class',
+	'const',
+	'continue',
+	'debugger',
+	'default',
+	'delete',
+	'do',
+	'else',
+	'enum',
+	'eval',
+	'export',
+	'extends',
+	'false',
+	'finally',
+	'for',
+	'function',
+	'if',
+	'implements',
+	'import',
+	'in',
+	'instanceof',
+	'interface',
+	'let',
+	'new',
+	'null',
+	'package',
+	'private',
+	'protected',
+	'public',
+	'return',
+	'static',
+	'super',
+	'switch',
+	'this',
+	'throw',
+	'true',
+	'try',
+	'typeof',
+	'var',
+	'void',
+	'while',
+	'with',
+	'yield',
+]);

src/interfaces.ts

@@ -40,3 +40,18 @@ export type ServerRoute = {
 	file: string;
 	params: string[];
 };
+
+export type Dirs = {
+	dest: string,
+	app: string,
+	routes: string,
+	webpack: string,
+	rollup: string
+};
+
+export type ManifestData = {
+	root: PageComponent;
+	components: PageComponent[];
+	pages: Page[];
+	server_routes: ServerRoute[];
+};

src/middleware.ts

@@ -185,7 +185,8 @@ function serve({ prefix, pathname, cache_control }: {
 			const type = lookup(req.path);
 
 			try {
-				const data = read(req.path.slice(1));
+				const file = decodeURIComponent(req.path.slice(1));
+				const data = read(file);
 
 				res.setHeader('Content-Type', type);
 				res.setHeader('Cache-Control', cache_control);
@@ -499,12 +500,36 @@ function get_page_handler(
 				script += `</script><script src="${main}">`;
 			}
 
+			let styles: string;
+
+			// TODO make this consistent across apps
+			if (build_info.css && build_info.css.main) {
+				const css_chunks = new Set();
+				if (build_info.css.main) css_chunks.add(build_info.css.main);
+				page.parts.forEach(part => {
+					if (!part) return;
+					const css_chunks_for_part = build_info.css.chunks[part.file];
+
+					if (css_chunks_for_part) {
+						css_chunks_for_part.forEach(file => {
+							css_chunks.add(file);
+						});
+					}
+				});
+
+				styles = Array.from(css_chunks)
+					.map(href => `<link rel="stylesheet" href="client/${href}">`)
+					.join('')
+			} else {
+				styles = (css && css.code ? `<style>${css.code}</style>` : '');
+			}
+
 			const body = template()
 				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
 				.replace('%sapper.scripts%', () => `<script>${script}</script>`)
 				.replace('%sapper.html%', () => html)
 				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
-				.replace('%sapper.styles%', () => (css && css.code ? `<style>${css.code}</style>` : ''));
+				.replace('%sapper.styles%', () => styles);
 
 			res.statusCode = status;
 			res.end(body);

src/rollup.ts

@@ -16,7 +16,8 @@ export default {
 				dir,
 				entryFileNames: '[name].[hash].js',
 				chunkFileNames: '[name].[hash].js',
-				format: 'esm'
+				format: 'esm',
+				sourcemap: dev()
 			};
 		}
 	},

src/runtime/index.ts

@@ -1,5 +1,5 @@
 import { detach, findAnchor, scroll_state, which } from './utils';
-import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target } from './interfaces';
+import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target, ComponentLoader } from './interfaces';
 
 const initial_data = typeof window !== 'undefined' && window.__SAPPER__;
 
@@ -131,6 +131,30 @@ function changed(a: Record<string, string | true>, b: Record<string, string | tr
 let root_preload: Promise<any>;
 let root_data: any;
 
+function load_css(chunk: string) {
+	const href = `${initial_data.baseUrl}client/${chunk}`;
+	if (document.querySelector(`link[href="${href}"]`)) return;
+
+	return new Promise((fulfil, reject) => {
+		const link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.href = href;
+
+		link.onload = () => fulfil();
+		link.onerror = reject;
+
+		document.head.appendChild(link);
+	});
+}
+
+function load_component(component: ComponentLoader): Promise<ComponentConstructor> {
+	// TODO this is temporary — once placeholders are
+	// always rewritten, scratch the ternary
+	const promises: Array<Promise<any>> = (typeof component.css === 'string' ? [] : component.css.map(load_css));
+	promises.unshift(component.js());
+	return Promise.all(promises).then(values => values[0].default);
+}
+
 function prepare_page(target: Target): Promise<{
 	redirect?: Redirect;
 	data?: any;
@@ -177,7 +201,8 @@ function prepare_page(target: Target): Promise<{
 		if (i < changed_from) return null;
 		if (!part) return null;
 
-		const { default: Component } = await part.component();
+		const Component = await load_component(part.component);
+
 		const req = {
 			path,
 			query,
@@ -311,6 +336,8 @@ function handle_click(event: MouseEvent) {
 	const a: HTMLAnchorElement | SVGAElement = <HTMLAnchorElement | SVGAElement>findAnchor(<Node>event.target);
 	if (!a) return;
 
+	if (!a.href) return;
+
 	// check if link is inside an svg
 	// in this case, both href and target are always inside an object
 	const svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
@@ -468,9 +495,9 @@ export function prefetchRoutes(pathnames: string[]) {
 			if (!pathnames) return true;
 			return pathnames.some(pathname => route.pattern.test(pathname));
 		})
-		.reduce((promise: Promise<any>, route) => {
+		.reduce((promise: Promise<any>, route) => promise.then(() => {
-			return promise.then(route.load);
+			return Promise.all(route.parts.map(part => part && load_component(part.component)));
-		}, Promise.resolve());
+		}), Promise.resolve());
 }
 
 // remove this in 0.9

src/runtime/interfaces.ts

@@ -15,10 +15,15 @@ export interface Component {
 	destroy: () => void;
 }
 
+export type ComponentLoader = {
+	js: () => Promise<{ default: ComponentConstructor }>,
+	css: string[]
+};
+
 export type Page = {
 	pattern: RegExp;
 	parts: Array<{
-		component: () => Promise<{ default: ComponentConstructor }>;
+		component: ComponentLoader;
 		params?: (match: RegExpExecArray) => Record<string, string>;
 	}>;
 };

test/app/routes/const.html

@@ -0,0 +1 @@
+<h1>reserved words are okay as routes</h1>

test/app/routes/fünke.html

@@ -1 +1,11 @@
-<h1>I'm afraid I just blue myself</h1>
+<h1>{phrase}</h1>
+
+<script>
+	export default {
+		preload() {
+			return this.fetch('fünke.json').then(r => r.json()).then(phrase => {
+				return { phrase };
+			});
+		}
+	};
+</script>

test/app/routes/fünke.json.js

@@ -0,0 +1,9 @@
+export function get(req, res) {
+	res.writeHead(200, {
+		'Content-Type': 'application/json'
+	});
+
+	res.end(JSON.stringify(
+		"I'm afraid I just blue myself"
+	));
+}

test/app/routes/index.html

@@ -14,6 +14,7 @@
 <a href='blog/throw-an-error'>error link</a>
 <a href='credentials?creds=include'>credentials</a>
 <a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
+<a href="const">const</a>
 
 <div class='hydrate-test'></div>
 

test/common/test.js

@@ -743,6 +743,14 @@ function run({ mode, basepath = '' }) {
 						assert.equal(title, 'root preload function ran: true');
 					});
 			});
+
+			it('allows reserved words as route names', () => {
+				return nightmare.goto(`${base}/const`).init()
+					.page.title()
+					.then(title => {
+						assert.equal(title, 'reserved words are okay as routes');
+					});
+			});
 		});
 
 		describe('headers', () => {

test/unit/create_manifest_data/index.ts

@@ -1,10 +1,10 @@
 import * as path from 'path';
 import * as assert from 'assert';
-import create_routes from '../../../src/core/create_routes';
+import create_manifest_data from '../../../src/core/create_manifest_data';
 
-describe('create_routes', () => {
+describe('manifest_data', () => {
 	it('creates routes', () => {
-		const { components, pages, server_routes } = create_routes(path.join(__dirname, 'samples/basic'));
+		const { components, pages, server_routes } = create_manifest_data(path.join(__dirname, 'samples/basic'));
 
 		const index = { name: 'index', file: 'index.html' };
 		const about = { name: 'about', file: 'about.html' };
@@ -68,7 +68,7 @@ describe('create_routes', () => {
 	});
 
 	it('encodes invalid characters', () => {
-		const { components, pages } = create_routes(path.join(__dirname, 'samples/encoding'));
+		const { components, pages } = create_manifest_data(path.join(__dirname, 'samples/encoding'));
 
 		// had to remove ? and " because windows
 
@@ -90,7 +90,7 @@ describe('create_routes', () => {
 	});
 
 	it('allows regex qualifiers', () => {
-		const { pages } = create_routes(path.join(__dirname, 'samples/qualifiers'));
+		const { pages } = create_manifest_data(path.join(__dirname, 'samples/qualifiers'));
 
 		assert.deepEqual(pages.map(p => p.pattern), [
 			/^\/([0-9-a-z]{3,})\/?$/,
@@ -100,7 +100,7 @@ describe('create_routes', () => {
 	});
 
 	it('sorts routes correctly', () => {
-		const { pages } = create_routes(path.join(__dirname, 'samples/sorting'));
+		const { pages } = create_manifest_data(path.join(__dirname, 'samples/sorting'));
 
 		assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
 			['index.html'],
@@ -116,7 +116,7 @@ describe('create_routes', () => {
 	});
 
 	it('ignores files and directories with leading underscores', () => {
-		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-underscore'));
+		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-underscore'));
 
 		assert.deepEqual(server_routes.map(r => r.file), [
 			'index.js',
@@ -125,7 +125,7 @@ describe('create_routes', () => {
 	});
 
 	it('ignores files and directories with leading dots except .well-known', () => {
-		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-dot'));
+		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-dot'));
 
 		assert.deepEqual(server_routes.map(r => r.file), [
 			'.well-known/dnt-policy.txt.js'
@@ -134,24 +134,35 @@ describe('create_routes', () => {
 
 	it('fails on clashes', () => {
 		assert.throws(() => {
-			const { pages } = create_routes(path.join(__dirname, 'samples/clash-pages'));
+			const { pages } = create_manifest_data(path.join(__dirname, 'samples/clash-pages'));
 		}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
 
 		assert.throws(() => {
-			const { server_routes } = create_routes(path.join(__dirname, 'samples/clash-routes'));
+			const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/clash-routes'));
 			console.log(server_routes);
 		}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
 	});
 
 	it('fails if dynamic params are not separated', () => {
 		assert.throws(() => {
-			create_routes(path.join(__dirname, 'samples/invalid-params'));
+			create_manifest_data(path.join(__dirname, 'samples/invalid-params'));
 		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
 	});
 
 	it('errors when trying to use reserved characters in route regexp', () => {
 		assert.throws(() => {
-			create_routes(path.join(__dirname, 'samples/invalid-qualifier'));
+			create_manifest_data(path.join(__dirname, 'samples/invalid-qualifier'));
 		}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
 	});
+
+	it('ignores things that look like lockfiles' , () => {
+		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/lockfiles'));
+
+		assert.deepEqual(server_routes, [{
+			file: 'foo.js',
+			name: 'route_foo',
+			params: [],
+			pattern: /^\/foo$/
+		}]);
+	});
 });