-> v0.18.4

implement --dev-port flag

CHANGELOG.md

@@ -1,5 +1,53 @@
 # sapper changelog
 
+## 0.18.4
+
+* Handle non-Sapper responses when exporting ([#382](https://github.com/sveltejs/sapper/issues/392))
+* Add `--dev-port` flag to `sapper dev` ([#381](https://github.com/sveltejs/sapper/issues/381))
+
+## 0.18.3
+
+* Fix service worker Rollup build config
+
+## 0.18.2
+
+* Update `pkg.files`
+
+## 0.18.1
+
+* Add live reloading ([#385](https://github.com/sveltejs/sapper/issues/385))
+
+## 0.18.0
+
+* Rollup support ([#379](https://github.com/sveltejs/sapper/pull/379))
+* Fail `export` if a page times out (configurable with `--timeout`) ([#378](https://github.com/sveltejs/sapper/pull/378))
+
+## 0.17.1
+
+* Print which file is causing build errors/warnings ([#371](https://github.com/sveltejs/sapper/pull/371))
+
+## 0.17.0
+
+* Use `cheap-watch` instead of `chokidar` ([#364](https://github.com/sveltejs/sapper/issues/364))
+
+## 0.16.1
+
+* Fix file watching regression in previous version
+
+## 0.16.0
+
+* Slim down installed package ([#363](https://github.com/sveltejs/sapper/pull/363))
+
+## 0.15.8
+
+* Only set `preloading: true` on navigation, not prefetch ([#352](https://github.com/sveltejs/sapper/issues/352))
+* Provide fallback for missing preload errors ([#361](https://github.com/sveltejs/sapper/pull/361))
+
+## 0.15.7
+
+* Strip leading slash from redirects ([#291](https://github.com/sveltejs/sapper/issues/291))
+* Pass `(req, res)` to store getter ([#344](https://github.com/sveltejs/sapper/issues/344))
+
 ## 0.15.6
 
 * Fix exporting with custom basepath ([#342](https://github.com/sveltejs/sapper/pull/342))

api.js

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

config/rollup.js

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

config/webpack.js

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

mocha.opts

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

package.json

@@ -1,16 +1,16 @@
 {
   "name": "sapper",
-  "version": "0.15.6",
+  "version": "0.18.4",
   "description": "Military-grade apps, engineered by Svelte",
-  "main": "dist/middleware.ts.js",
+  "main": "dist/middleware.js",
   "bin": {
     "sapper": "./sapper"
   },
   "files": [
     "*.js",
-    "*.ts.js",
     "runtime",
     "webpack",
+    "config",
     "sapper",
     "components",
     "dist"
@@ -19,50 +19,53 @@
     "test": "test"
   },
   "dependencies": {
-    "ansi-colors": "^2.0.1",
-    "cheerio": "^1.0.0-rc.2",
-    "chokidar": "^2.0.3",
+    "html-minifier": "^3.5.16",
+    "shimport": "^0.0.9",
+    "source-map-support": "^0.5.6",
+    "tslib": "^1.9.1"
+  },
+  "devDependencies": {
+    "@types/glob": "^5.0.34",
+    "@types/mkdirp": "^0.5.2",
+    "@types/mocha": "^5.2.5",
+    "@types/node": "^10.7.1",
+    "@types/rimraf": "^2.0.2",
+    "cheap-watch": "^0.3.0",
+    "compression": "^1.7.1",
     "cookie": "^0.3.1",
     "devalue": "^1.0.4",
-    "glob": "^7.1.2",
-    "html-minifier": "^3.5.16",
+    "eslint": "^4.13.1",
+    "eslint-plugin-import": "^2.12.0",
+    "express": "^4.16.3",
+    "kleur": "^2.0.1",
     "mkdirp": "^0.5.1",
+    "mocha": "^5.2.0",
+    "nightmare": "^3.0.0",
     "node-fetch": "^2.1.1",
+    "npm-run-all": "^4.1.3",
+    "polka": "^0.4.0",
     "port-authority": "^1.0.5",
     "pretty-bytes": "^5.0.0",
     "pretty-ms": "^3.1.0",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
-    "sade": "^1.4.1",
-    "sander": "^0.6.0",
-    "source-map-support": "^0.5.6",
-    "tslib": "^1.9.1",
-    "url-parse": "^1.2.0",
-    "webpack-format-messages": "^2.0.1"
-  },
-  "devDependencies": {
-    "@types/glob": "^5.0.34",
-    "@types/mkdirp": "^0.5.2",
-    "@types/rimraf": "^2.0.2",
-    "compression": "^1.7.1",
-    "eslint": "^4.13.1",
-    "eslint-plugin-import": "^2.12.0",
-    "express": "^4.16.3",
-    "mocha": "^5.2.0",
-    "nightmare": "^3.0.0",
-    "npm-run-all": "^4.1.3",
-    "polka": "^0.4.0",
-    "rollup": "^0.59.2",
+    "rollup": "^0.65.0",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-json": "^3.0.0",
+    "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-typescript": "^0.8.1",
+    "sade": "^1.4.1",
+    "sander": "^0.6.0",
     "serve-static": "^1.13.2",
     "svelte": "^2.6.3",
     "svelte-loader": "^2.9.0",
+    "tiny-glob": "^0.2.2",
+    "ts-node": "^7.0.1",
     "typescript": "^2.8.3",
     "walk-sync": "^0.3.2",
-    "webpack": "^4.8.3"
+    "webpack": "^4.8.3",
+    "webpack-format-messages": "^2.0.1"
   },
   "scripts": {
     "cy:open": "cypress open",

rollup.config.js

@@ -1,6 +1,7 @@
 import typescript from 'rollup-plugin-typescript';
 import string from 'rollup-plugin-string';
 import json from 'rollup-plugin-json';
+import resolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';
 
@@ -31,6 +32,7 @@ export default [
 			`src/cli.ts`,
 			`src/core.ts`,
 			`src/middleware.ts`,
+			`src/rollup.ts`,
 			`src/webpack.ts`
 		],
 		output: {
@@ -44,12 +46,12 @@ export default [
 				include: '**/*.md'
 			}),
 			json(),
+			resolve(),
 			commonjs(),
 			typescript({
 				typescript: require('typescript')
 			})
 		],
-		experimentalCodeSplitting: true,
-		experimentalDynamicImport: true
+		experimentalCodeSplitting: true
 	}
 ];

sapper

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

sapper-dev-client.js

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

src/api/build.ts

@@ -3,9 +3,12 @@ import * as path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import { EventEmitter } from 'events';
-import { minify_html } from './utils/minify_html';
+import minify_html from './utils/minify_html';
 import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core';
+import { Compilers, Compiler } from '../core/create_compilers';
 import * as events from './interfaces';
+import validate_bundler from '../cli/utils/validate_bundler';
+import { copy_shimport } from './utils/copy_shimport';
 
 export function build(opts: {}) {
 	const emitter = new EventEmitter();
@@ -27,11 +30,14 @@ export function build(opts: {}) {
 async function execute(emitter: EventEmitter, {
 	dest = 'build',
 	app = 'app',
+	bundler,
 	webpack = 'webpack',
+	rollup = 'rollup',
 	routes = 'routes'
 } = {}) {
-	mkdirp.sync(dest);
 	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(...)
@@ -49,25 +55,28 @@ async function execute(emitter: EventEmitter, {
 	const route_objects = create_routes();
 
 	// create app/manifest/client.js and app/manifest/server.js
-	create_main_manifests({ routes: route_objects });
+	create_main_manifests({ bundler, routes: route_objects });
 
-	const { client, server, serviceworker } = create_compilers({ webpack });
+	const { client, server, serviceworker } = create_compilers(validate_bundler(bundler), { webpack, rollup });
 
-	const client_stats = await compile(client);
+	const client_result = await client.compile();
 	emitter.emit('build', <events.BuildEvent>{
 		type: 'client',
 		// TODO duration/warnings
-		webpack_stats: client_stats
+		result: client_result
 	});
 
-	const client_info = client_stats.toJson();
-	fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(client_info.assetsByChunkName));
+	fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
+		bundler,
+		shimport: bundler === 'rollup' && require('shimport/package.json').version,
+		assets: client_result.assets
+	}));
 
-	const server_stats = await compile(server);
+	const server_stats = await server.compile();
 	emitter.emit('build', <events.BuildEvent>{
 		type: 'server',
 		// TODO duration/warnings
-		webpack_stats: server_stats
+		result: server_stats
 	});
 
 	let serviceworker_stats;
@@ -75,35 +84,15 @@ async function execute(emitter: EventEmitter, {
 	if (serviceworker) {
 		create_serviceworker_manifest({
 			routes: route_objects,
-			client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `client/${chunk.name}`)
+			client_files: client_result.chunks.map((file: string) => `client/${file}`)
 		});
 
-		serviceworker_stats = await compile(serviceworker);
+		serviceworker_stats = await serviceworker.compile();
 
 		emitter.emit('build', <events.BuildEvent>{
 			type: 'serviceworker',
 			// TODO duration/warnings
-			webpack_stats: serviceworker_stats
+			result: serviceworker_stats
 		});
 	}
-}
-
-function compile(compiler: any) {
-	return new Promise((fulfil, reject) => {
-		compiler.run((err: Error, stats: any) => {
-			if (err) {
-				reject(err);
-				process.exit(1);
-			}
-
-			if (stats.hasErrors()) {
-				console.error(stats.toString({ colors: true }));
-				reject(new Error(`Encountered errors while building app`));
-			}
-
-			else {
-				fulfil(stats);
-			}
-		});
-	});
-}
+}

src/api/dev.ts

@@ -5,34 +5,39 @@ import * as child_process from 'child_process';
 import * as ports from 'port-authority';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import format_messages from 'webpack-format-messages';
 import { locations } from '../config';
 import { EventEmitter } from 'events';
 import { create_routes, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
+import { Compiler, Compilers, CompileResult, CompileError } from '../core/create_compilers';
 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';
 
 export function dev(opts) {
 	return new Watcher(opts);
 }
 
 class Watcher extends EventEmitter {
+	bundler: string;
 	dirs: {
 		app: string;
 		dest: string;
 		routes: string;
+		rollup: string;
 		webpack: string;
 	}
 	port: number;
 	closed: boolean;
 
+	dev_port: number;
+	live: boolean;
+	hot: boolean;
+
 	dev_server: DevServer;
 	proc: child_process.ChildProcess;
 	filewatchers: Array<{ close: () => void }>;
-	deferreds: {
-		client: Deferred;
-		server: Deferred;
-	};
+	deferred: Deferred;
 
 	crashed: boolean;
 	restarting: boolean;
@@ -47,21 +52,36 @@ class Watcher extends EventEmitter {
 		app = locations.app(),
 		dest = locations.dest(),
 		routes = locations.routes(),
+		'dev-port': dev_port,
+		live,
+		hot,
+		bundler,
 		webpack = 'webpack',
+		rollup = 'rollup',
 		port = +process.env.PORT
 	}: {
 		app: string,
 		dest: string,
 		routes: string,
+		'dev-port': number,
+		live: boolean,
+		hot: boolean,
+		bundler?: string,
 		webpack: string,
+		rollup: string,
 		port: number
 	}) {
 		super();
 
-		this.dirs = { app, dest, routes, webpack };
+		this.bundler = validate_bundler(bundler);
+		this.dirs = { app, dest, routes, webpack, rollup };
 		this.port = port;
 		this.closed = false;
 
+		this.dev_port = dev_port;
+		this.live = live;
+		this.hot = hot;
+
 		this.filewatchers = [];
 
 		this.current_build = {
@@ -102,13 +122,14 @@ class Watcher extends EventEmitter {
 
 		const { dest } = this.dirs;
 		rimraf.sync(dest);
-		mkdirp.sync(dest);
+		mkdirp.sync(`${dest}/client`);
+		if (this.bundler === 'rollup') copy_shimport(dest);
 
-		const dev_port = await ports.find(10000);
+		if (!this.dev_port) this.dev_port = await ports.find(10000);
 
 		try {
 			const routes = create_routes();
-			create_main_manifests({ routes, dev_port });
+			create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
 		} catch (err) {
 			this.emit('fatal', <events.FatalEvent>{
 				message: err.message
@@ -116,37 +137,46 @@ class Watcher extends EventEmitter {
 			return;
 		}
 
-		this.dev_server = new DevServer(dev_port);
+		this.dev_server = new DevServer(this.dev_port);
 
 		this.filewatchers.push(
-			watch_files(locations.routes(), ['add', 'unlink'], () => {
-				const routes = create_routes();
-				create_main_manifests({ routes, dev_port });
-
-				try {
+			watch_dir(
+				locations.routes(),
+				({ path: file, stats }) => {
+					if (stats.isDirectory()) {
+						return path.basename(file)[0] !== '_';
+					}
+					return true;
+				},
+				() => {
 					const routes = create_routes();
-					create_main_manifests({ routes, dev_port });
-				} catch (err) {
-					this.emit('error', <events.ErrorEvent>{
-						message: err.message
-					});
-				}
-			}),
+					create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
 
-			watch_files(`${locations.app()}/template.html`, ['change'], () => {
+					try {
+						const routes = create_routes();
+						create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
+					} catch (err) {
+						this.emit('error', <events.ErrorEvent>{
+							message: err.message
+						});
+					}
+				}
+			),
+
+			fs.watch(`${locations.app()}/template.html`, () => {
 				this.dev_server.send({
 					action: 'reload'
 				});
 			})
 		);
 
-		this.deferreds = {
-			server: new Deferred(),
-			client: new Deferred()
-		};
+		let deferred = new Deferred();
 
 		// TODO watch the configs themselves?
-		const compilers = create_compilers({ webpack: this.dirs.webpack });
+		const compilers: Compilers = create_compilers(this.bundler, {
+			webpack: this.dirs.webpack,
+			rollup: this.dirs.rollup
+		});
 
 		let log = '';
 
@@ -165,11 +195,10 @@ class Watcher extends EventEmitter {
 
 			invalid: filename => {
 				this.restart(filename, 'server');
-				this.deferreds.server = new Deferred();
 			},
 
-			result: info => {
-				this.deferreds.client.promise.then(() => {
+			handle_result: (result: CompileResult) => {
+				deferred.promise.then(() => {
 					const restart = () => {
 						log = '';
 						this.crashed = false;
@@ -181,11 +210,15 @@ class Watcher extends EventEmitter {
 									process: this.proc
 								});
 
-								this.deferreds.server.fulfil();
-
-								this.dev_server.send({
-									status: 'completed'
-								});
+								if (this.hot && this.bundler === 'webpack') {
+									this.dev_server.send({
+										status: 'completed'
+									});
+								} else {
+									this.dev_server.send({
+										action: 'reload'
+									});
+								}
 							}))
 							.catch(err => {
 								if (this.crashed) return;
@@ -236,31 +269,34 @@ class Watcher extends EventEmitter {
 			}
 		});
 
-		let first = true;
-
 		this.watch(compilers.client, {
 			name: 'client',
 
 			invalid: filename => {
 				this.restart(filename, 'client');
-				this.deferreds.client = new Deferred();
+				deferred = new Deferred();
 
 				// TODO we should delete old assets. due to a webpack bug
 				// i don't even begin to comprehend, this is apparently
 				// quite difficult
 			},
 
-			result: info => {
-				fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(info.assetsByChunkName, null, '  '));
-				this.deferreds.client.fulfil();
+			handle_result: (result: CompileResult) => {
+				fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
+					bundler: this.bundler,
+					shimport: this.bundler === 'rollup' && require('shimport/package.json').version,
+					assets: result.assets
+				}, null, '  '));
 
-				const client_files = info.assets.map((chunk: { name: string }) => `client/${chunk.name}`);
+				const client_files = result.assets.map((file: string) => `client/${file}`);
 
 				create_serviceworker_manifest({
 					routes: create_routes(),
 					client_files
 				});
 
+				deferred.fulfil();
+
 				// we need to wait a beat before watching the service
 				// worker, because of some webpack nonsense
 				setTimeout(watch_serviceworker, 100);
@@ -272,11 +308,7 @@ class Watcher extends EventEmitter {
 				watch_serviceworker = noop;
 
 				this.watch(compilers.serviceworker, {
-					name: 'service worker',
-
-					result: info => {
-						fs.writeFileSync(path.join(dest, 'serviceworker_info.json'), JSON.stringify(info, null, '  '));
-					}
+					name: 'service worker'
 				});
 			}
 			: noop;
@@ -323,82 +355,34 @@ class Watcher extends EventEmitter {
 		}
 	}
 
-	watch(compiler: any, { name, invalid = noop, result }: {
+	watch(compiler: Compiler, { name, invalid = noop, handle_result = noop }: {
 		name: string,
 		invalid?: (filename: string) => void;
-		result: (stats: any) => void;
+		handle_result?: (result: CompileResult) => void;
 	}) {
-		compiler.hooks.invalid.tap('sapper', (filename: string) => {
-			invalid(filename);
-		});
+		compiler.oninvalid(invalid);
 
-		compiler.watch({}, (err: Error, stats: any) => {
+		compiler.watch((err?: Error, result?: CompileResult) => {
 			if (err) {
 				this.emit('error', <events.ErrorEvent>{
 					type: name,
 					message: err.message
 				});
 			} else {
-				const messages = format_messages(stats);
-				const info = stats.toJson();
-
 				this.emit('build', {
 					type: name,
 
-					duration: info.time,
-
-					errors: messages.errors.map((message: string) => {
-						const duplicate = this.current_build.unique_errors.has(message);
-						this.current_build.unique_errors.add(message);
-
-						return mungeWebpackError(message, duplicate);
-					}),
-
-					warnings: messages.warnings.map((message: string) => {
-						const duplicate = this.current_build.unique_warnings.has(message);
-						this.current_build.unique_warnings.add(message);
-
-						return mungeWebpackError(message, duplicate);
-					}),
+					duration: result.duration,
+					errors: result.errors,
+					warnings: result.warnings
 				});
 
-				result(info);
+				handle_result(result);
 			}
 		});
 	}
 }
 
-const locPattern = /\((\d+):(\d+)\)$/;
-
-function mungeWebpackError(message: string, duplicate: boolean) {
-	// 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,
-		line,
-		column,
-		message: lines.join('\n'),
-		originalMessage: message,
-		duplicate
-	};
-}
-
 const INTERVAL = 10000;
 
 class DevServer {
@@ -453,20 +437,32 @@ class DevServer {
 
 function noop() {}
 
-function watch_files(pattern: string, events: string[], callback: () => void) {
-	const chokidar = require('chokidar');
+function watch_dir(
+	dir: string,
+	filter: ({ path, stats }: { path: string, stats: fs.Stats }) => boolean,
+	callback: () => void
+) {
+	let watch;
+	let closed = false;
 
-	const watcher = chokidar.watch(pattern, {
-		persistent: true,
-		ignoreInitial: true,
-		disableGlobbing: true
-	});
+	import('cheap-watch').then(CheapWatch => {
+		if (closed) return;
 
-	events.forEach(event => {
-		watcher.on(event, callback);
+		watch = new CheapWatch({ dir, filter, debounce: 50 });
+
+		watch.on('+', ({ isNew }) => {
+			if (isNew) callback();
+		});
+
+		watch.on('-', callback);
+
+		watch.init();
 	});
 
 	return {
-		close: () => watcher.close()
+		close: () => {
+			if (watch) watch.close();
+			closed = true;
+		}
 	};
-}
+}

src/api/export.ts

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

src/api/find_page.ts

@@ -1,4 +1,3 @@
-import * as glob from 'glob';
 import { locations } from '../config';
 import { create_routes } from '../core';
 

src/api/interfaces.ts

@@ -1,4 +1,5 @@
 import * as child_process from 'child_process';
+import { CompileResult } from '../core/create_compilers';
 
 export type ReadyEvent = {
 	port: number;
@@ -26,10 +27,10 @@ export type InvalidEvent = {
 
 export type BuildEvent = {
 	type: string;
-	errors: Array<{ message: string, duplicate: boolean }>;
-	warnings: Array<{ message: string, duplicate: boolean }>;
+	errors: Array<{ file: string, message: string, duplicate: boolean }>;
+	warnings: Array<{ file: string, message: string, duplicate: boolean }>;
 	duration: number;
-	webpack_stats: any;
+	result: CompileResult;
 }
 
 export type FileEvent = {

src/api/utils/clean_html.ts

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

src/api/utils/copy_shimport.ts

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

src/api/utils/minify_html.ts

@@ -1,6 +1,6 @@
 import { minify } from 'html-minifier';
 
-export function minify_html(html: string) {
+export default function minify_html(html: string) {
 	return minify(html, {
 		collapseBooleanAttributes: true,
 		collapseWhitespace: true,

src/cli.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import sade from 'sade';
-import * as colors from 'ansi-colors';
+import colors from 'kleur';
 import prettyMs from 'pretty-ms';
 import * as pkg from '../package.json';
 
@@ -11,7 +11,18 @@ prog.command('dev')
 	.describe('Start a development server')
 	.option('-p, --port', 'Specify a port')
 	.option('-o, --open', 'Open a browser window')
-	.action(async (opts: { port: number, open: boolean }) => {
+	.option('--dev-port', 'Specify a port for development server')
+	.option('--hot', 'Use hot module replacement (requires webpack)', true)
+	.option('--live', 'Reload on changes if not using --hot', true)
+	.option('--bundler', 'Specify a bundler (rollup or webpack)')
+	.action(async (opts: {
+		port: number,
+		open: boolean,
+		'dev-port': number,
+		live: boolean,
+		hot: boolean,
+		bundler?: string
+	}) => {
 		const { dev } = await import('./cli/dev');
 		dev(opts);
 	});
@@ -19,8 +30,9 @@ prog.command('dev')
 prog.command('build [dest]')
 	.describe('Create a production-ready version of your app')
 	.option('-p, --port', 'Default of process.env.PORT', '3000')
+	.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
 	.example(`build custom-dir -p 4567`)
-	.action(async (dest = 'build', opts: { port: string }) => {
+	.action(async (dest = 'build', opts: { port: string, bundler?: string }) => {
 		console.log(`> Building...`);
 
 		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
@@ -30,7 +42,7 @@ prog.command('build [dest]')
 
 		try {
 			const { build } = await import('./cli/build');
-			await build();
+			await build(opts);
 
 			const launcher = path.resolve(dest, 'index.js');
 
@@ -46,7 +58,7 @@ prog.command('build [dest]')
 
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);
 		} catch (err) {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+			console.log(`${colors.bold.red(`> ${err.message}`)}`);
 			process.exit(1);
 		}
 	});
@@ -65,7 +77,15 @@ prog.command('export [dest]')
 	.option('--build', '(Re)build app before exporting', true)
 	.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
 	.option('--basepath', 'Specify a base path')
-	.action(async (dest = 'export', opts: { build: boolean, 'build-dir': string, basepath?: string }) => {
+	.option('--timeout', 'Milliseconds to wait for a page (--no-timeout to disable)', 5000)
+	.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
+	.action(async (dest = 'export', opts: {
+		build: boolean,
+		bundler?: string,
+		'build-dir': string,
+		basepath?: string,
+		timeout: number | false
+	}) => {
 		process.env.NODE_ENV = 'production';
 		process.env.SAPPER_DEST = opts['build-dir'];
 
@@ -75,7 +95,7 @@ prog.command('export [dest]')
 			if (opts.build) {
 				console.log(`> Building...`);
 				const { build } = await import('./cli/build');
-				await build();
+				await build(opts);
 				console.error(`\n> Built in ${elapsed(start)}`);
 			}
 
@@ -83,7 +103,7 @@ prog.command('export [dest]')
 			await exporter(dest, opts);
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`npx serve ${dest}`)} to run the app.`);
 		} catch (err) {
-			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+			console.error(colors.bold.red(`> ${err.message}`));
 			process.exit(1);
 		}
 	});

src/cli/build.ts

@@ -1,20 +1,39 @@
 import { build as _build } from '../api/build';
-import * as colors from 'ansi-colors';
+import colors from 'kleur';
 import { locations } from '../config';
+import validate_bundler from './utils/validate_bundler';
+import { repeat } from '../utils';
+
+export function build(opts: { bundler?: string }) {
+	const bundler = validate_bundler(opts.bundler);
 
-export function build() {
 	return new Promise((fulfil, reject) => {
 		try {
 			const emitter = _build({
 				dest: locations.dest(),
 				app: locations.app(),
 				routes: locations.routes(),
-				webpack: 'webpack'
+				bundler,
+				webpack: 'webpack',
+				rollup: 'rollup'
 			});
 
 			emitter.on('build', event => {
-				console.log(colors.inverse(`\nbuilt ${event.type}`));
-				console.log(event.webpack_stats.toString({ colors: true }));
+				let banner = `built ${event.type}`;
+				let c = colors.cyan;
+
+				const { warnings } = event.result;
+				if (warnings.length > 0) {
+					banner += ` with ${warnings.length} ${warnings.length === 1 ? 'warning' : 'warnings'}`;
+					c = colors.yellow;
+				}
+
+				console.log();
+				console.log(c(`┌─${repeat('─', banner.length)}─┐`));
+				console.log(c(`│ ${colors.bold(banner)       } │`));
+				console.log(c(`└─${repeat('─', banner.length)}─┘`));
+
+				console.log(event.result.print());
 			});
 
 			emitter.on('error', event => {
@@ -25,8 +44,7 @@ export function build() {
 				fulfil();
 			});
 		} catch (err) {
-			console.log(`${colors.bold.red(`> ${err.message}`)}`);
-			process.exit(1);
+			reject(err);
 		}
 	});
 }

src/cli/dev.ts

@@ -1,11 +1,11 @@
 import * as path from 'path';
-import * as colors from 'ansi-colors';
+import colors from 'kleur';
 import * as child_process from 'child_process';
 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 }) {
+export function dev(opts: { port: number, open: boolean, bundler?: string }) {
 	try {
 		const watcher = _dev(opts);
 
@@ -13,7 +13,7 @@ export function dev(opts: { port: number, open: boolean }) {
 
 		watcher.on('ready', (event: events.ReadyEvent) => {
 			if (first) {
-				console.log(`${colors.bold.cyan(`> Listening on http://localhost:${event.port}`)}`);
+				console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
 				if (opts.open) child_process.exec(`open http://localhost:${event.port}`);
 				first = false;
 			}
@@ -35,20 +35,21 @@ export function dev(opts: { port: number, open: boolean }) {
 		});
 
 		watcher.on('error', (event: events.ErrorEvent) => {
-			console.log(`${colors.red(`✗ ${event.type}`)}`);
-			console.log(`${colors.red(event.message)}`);
+			console.log(colors.red(`✗ ${event.type}`));
+			console.log(colors.red(event.message));
 		});
 
 		watcher.on('fatal', (event: events.FatalEvent) => {
-			console.log(`${colors.bold.red(`> ${event.message}`)}`);
+			console.log(colors.bold.red(`> ${event.message}`));
 			if (event.log) console.log(event.log);
 		});
 
 		watcher.on('build', (event: events.BuildEvent) => {
 			if (event.errors.length) {
-				console.log(`${colors.bold.red(`✗ ${event.type}`)}`);
+				console.log(colors.bold.red(`✗ ${event.type}`));
 
 				event.errors.filter(e => !e.duplicate).forEach(error => {
+					if (error.file) console.log(colors.bold(error.file));
 					console.log(error.message);
 				});
 
@@ -57,9 +58,10 @@ export function dev(opts: { port: number, open: boolean }) {
 					console.log(`${hidden} duplicate ${hidden === 1 ? 'error' : 'errors'} hidden\n`);
 				}
 			} else if (event.warnings.length) {
-				console.log(`${colors.bold.yellow(`• ${event.type}`)}`);
+				console.log(colors.bold.yellow(`• ${event.type}`));
 
 				event.warnings.filter(e => !e.duplicate).forEach(warning => {
+					if (warning.file) console.log(colors.bold(warning.file));
 					console.log(warning.message);
 				});
 
@@ -72,7 +74,7 @@ export function dev(opts: { port: number, open: boolean }) {
 			}
 		});
 	} catch (err) {
-		console.log(`${colors.bold.red(`> ${err.message}`)}`);
+		console.log(colors.bold.red(`> ${err.message}`));
 		process.exit(1);
 	}
 }

src/cli/export.ts

@@ -1,26 +1,28 @@
 import { exporter as _exporter } from '../api/export';
-import * as colors from 'ansi-colors';
-import prettyBytes from 'pretty-bytes';
+import colors from 'kleur';
+import pb from 'pretty-bytes';
 import { locations } from '../config';
+import { left_pad } from '../utils';
 
-function left_pad(str: string, len: number) {
-	while (str.length < len) str = ` ${str}`;
-	return str;
-}
-
-export function exporter(export_dir: string, { basepath = '' }) {
+export function exporter(export_dir: string, {
+	basepath = '',
+	timeout
+}: {
+	basepath: string,
+	timeout: number | false
+}) {
 	return new Promise((fulfil, reject) => {
 		try {
 			const emitter = _exporter({
 				build: locations.dest(),
 				dest: export_dir,
-				basepath
+				basepath,
+				timeout
 			});
 
 			emitter.on('file', event => {
-				const pb = prettyBytes(event.size);
 				const size_color = event.size > 150000 ? colors.bold.red : event.size > 50000 ? colors.bold.yellow : colors.bold.gray;
-				const size_label = size_color(left_pad(prettyBytes(event.size), 10));
+				const size_label = size_color(left_pad(pb(event.size), 10));
 
 				const file_label = event.status === 200
 					? event.file

src/cli/start.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as child_process from 'child_process';
-import * as colors from 'ansi-colors';
+import colors from 'kleur';
 import * as ports from 'port-authority';
 
 export async function start(dir: string, opts: { port: number, open: boolean }) {

src/cli/upgrade.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as colors from 'ansi-colors';
+import colors from 'kleur';
 
 export default async function upgrade() {
 	const upgraded = [

src/cli/utils/validate_bundler.ts

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

src/core/create_compilers.ts

@@ -1,29 +1,378 @@
+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 { left_pad } from '../utils';
 
-export default function create_compilers({ webpack }: { webpack: string }) {
-	const wp = relative('webpack', process.cwd());
+let r: any;
+let wp: any;
 
-	const serviceworker_config = try_require(path.resolve(`${webpack}/service-worker.config.js`));
+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();
+
+		// TODO use import()
+		const format_messages = require('webpack-format-messages');
+		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 {
-		client: wp(
-			require(path.resolve(`${webpack}/client.config.js`))
-		),
-
-		server: wp(
-			require(path.resolve(`${webpack}/server.config.js`))
-		),
-
-		serviceworker: serviceworker_config && wp(serviceworker_config)
+		file,
+		message: lines.join('\n')
 	};
 }
 
-function try_require(specifier: string) {
-	try {
-		return require(specifier);
-	} catch (err) {
-		if (err.code === 'MODULE_NOT_FOUND') return null;
-		throw err;
-	}
+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_manifests.ts

@@ -1,32 +1,36 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as glob from 'glob';
+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';
 
-export function create_main_manifests({ routes, dev_port }: {
+export function create_main_manifests({ bundler, routes, dev_port }: {
+	bundler: string,
 	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	dev_port?: number;
 }) {
-	const path_to_routes = path.relative(`${locations.app()}/manifest`, locations.routes());
+	const manifest_dir = path.join(locations.app(), 'manifest');
+	if (!fs.existsSync(manifest_dir)) fs.mkdirSync(manifest_dir);
 
-	const client_manifest = generate_client(routes, path_to_routes, dev_port);
+	const path_to_routes = path.relative(manifest_dir, locations.routes());
+
+	const client_manifest = generate_client(routes, path_to_routes, bundler, dev_port);
 	const server_manifest = generate_server(routes, path_to_routes);
 
 	write_if_changed(
-		`${locations.app()}/manifest/default-layout.html`,
+		`${manifest_dir}/default-layout.html`,
 		`<svelte:component this={child.component} {...child.props}/>`
 	);
-	write_if_changed(`${locations.app()}/manifest/client.js`, client_manifest);
-	write_if_changed(`${locations.app()}/manifest/server.js`, server_manifest);
+	write_if_changed(`${manifest_dir}/client.js`, client_manifest);
+	write_if_changed(`${manifest_dir}/server.js`, server_manifest);
 }
 
 export function create_serviceworker_manifest({ routes, client_files }: {
 	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	client_files: string[];
 }) {
-	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
+	const assets = glob('**', { cwd: 'assets', filesOnly: true });
 
 	let code = `
 		// This file is generated by Sapper — do not edit it!
@@ -42,14 +46,10 @@ export function create_serviceworker_manifest({ routes, client_files }: {
 	write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
 }
 
-function right_pad(str: string, len: number) {
-	while (str.length < len) str += ' ';
-	return str;
-}
-
 function generate_client(
 	routes: { root: PageComponent, components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
 	path_to_routes: string,
+	bundler: string,
 	dev_port?: number
 ) {
 	const page_ids = new Set(routes.pages.map(page =>
@@ -58,17 +58,20 @@ function generate_client(
 	const server_routes_to_ignore = routes.server_routes.filter(route =>
 		!page_ids.has(route.pattern.toString()));
 
-	const len = Math.max(...routes.components.map(c => c.name.length));
-
 	let code = `
 		// This file is generated by Sapper — do not edit it!
 		import root from '${get_file(path_to_routes, routes.root)}';
 		import error from '${posixify(`${path_to_routes}/_error.html`)}';
 
-		${routes.components.map(component =>
-		`const ${component.name} = () =>
-			import(/* webpackChunkName: "${component.name}" */ '${get_file(path_to_routes, component)}');`)
-		.join('\n')}
+		${routes.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}');`;
+		}).join('\n')}
 
 		export const manifest = {
 			ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
@@ -107,11 +110,9 @@ function generate_client(
 
 		code += `
 
-			if (module.hot) {
-				import('${sapper_dev_client}').then(client => {
-					client.connect(${dev_port});
-				});
-			}`.replace(/^\t{3}/gm, '');
+			import('${sapper_dev_client}').then(client => {
+				client.connect(${dev_port});
+			});`.replace(/^\t{3}/gm, '');
 	}
 
 	return code;

src/core/create_routes.ts

@@ -4,11 +4,6 @@ import { locations } from '../config';
 import { Page, PageComponent, ServerRoute } from '../interfaces';
 import { posixify } from './utils';
 
-const default_layout_file = posixify(path.resolve(
-	__dirname,
-	'../components/default-layout.html'
-));
-
 export default function create_routes(cwd = locations.routes()) {
 	const components: PageComponent[] = [];
 	const pages: Page[] = [];
@@ -133,12 +128,12 @@ export default function create_routes(cwd = locations.routes()) {
 				components.push(component);
 				if (item.basename === 'index.html') {
 					pages.push({
-						pattern: get_pattern(parent_segments),
+						pattern: get_pattern(parent_segments, true),
 						parts
 					});
 				} else {
 					pages.push({
-						pattern: get_pattern(segments),
+						pattern: get_pattern(segments, true),
 						parts
 					});
 				}
@@ -147,7 +142,7 @@ export default function create_routes(cwd = locations.routes()) {
 			else {
 				server_routes.push({
 					name: `route_${get_slug(item.file)}`,
-					pattern: get_pattern(segments),
+					pattern: get_pattern(segments, false),
 					file: item.file,
 					params: params
 				});
@@ -281,7 +276,7 @@ function get_slug(file: string) {
 		});
 }
 
-function get_pattern(segments: Part[][]) {
+function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
 	return new RegExp(
 		`^` +
 		segments.map(segment => {
@@ -295,6 +290,6 @@ function get_pattern(segments: Part[][]) {
 						.replace(/%5D/g, ']');
 			}).join('');
 		}).join('') +
-		'\\\/?$'
+		(add_trailing_slash ? '\\\/?$' : '$')
 	);
 }

src/core/utils.ts

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

src/middleware.ts

@@ -83,7 +83,7 @@ function toIgnore(uri: string, val: any) {
 
 export default function middleware(opts: {
 	manifest: Manifest,
-	store: (req: Req) => Store,
+	store: (req: Req, res: ServerResponse) => Store,
 	ignore?: any,
 	routes?: any // legacy
 }) {
@@ -151,7 +151,7 @@ export default function middleware(opts: {
 
 		serve({
 			prefix: '/client/',
-			cache_control: 'max-age=31536000'
+			cache_control: dev() ? 'no-cache' : 'max-age=31536000'
 		}),
 
 		get_server_route_handler(manifest.server_routes),
@@ -217,7 +217,7 @@ function get_server_route_handler(routes: ServerRoute[]) {
 
 				// intercept data so that it can be exported
 				res.write = function(chunk: any) {
-					chunks.push(new Buffer(chunk));
+					chunks.push(Buffer.from(chunk));
 					write.apply(res, arguments);
 				};
 
@@ -227,7 +227,7 @@ function get_server_route_handler(routes: ServerRoute[]) {
 				};
 
 				res.end = function(chunk?: any) {
-					if (chunk) chunks.push(new Buffer(chunk));
+					if (chunk) chunks.push(Buffer.from(chunk));
 					end.apply(res, arguments);
 
 					process.send({
@@ -276,12 +276,15 @@ function get_server_route_handler(routes: ServerRoute[]) {
 	};
 }
 
-function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store) {
+function get_page_handler(
+	manifest: Manifest,
+	store_getter: (req: Req, res: ServerResponse) => Store
+) {
 	const output = locations.dest();
 
-	const get_chunks = dev()
-		? () => JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8'))
-		: (assets => () => assets)(JSON.parse(fs.readFileSync(path.join(output, 'client_assets.json'), 'utf-8')));
+	const get_build_info = dev()
+		? () => JSON.parse(fs.readFileSync(path.join(output, 'build.json'), 'utf-8'))
+		: (assets => () => assets)(JSON.parse(fs.readFileSync(path.join(output, 'build.json'), 'utf-8')));
 
 	const template = dev()
 		? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
@@ -296,37 +299,38 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 			parts: [
 				{ name: null, component: error_route }
 			]
-		}, req, res, statusCode, error);
+		}, req, res, statusCode, error || new Error('Unknown error in preload function'));
 	}
 
 	function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
-		const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
-		const match = error ? null : page.pattern.exec(req.path);
-
-		const chunks: Record<string, string | string[]> = get_chunks();
+		const build_info: {
+			bundler: 'rollup' | 'webpack',
+			shimport: string | null,
+			assets: Record<string, string | string[]>
+		 } = get_build_info();
 
 		res.setHeader('Content-Type', 'text/html');
 
 		// preload main.js and current route
 		// TODO detect other stuff we can preload? images, CSS, fonts?
-		let preloaded_chunks = Array.isArray(chunks.main) ? chunks.main : [chunks.main];
+		let preloaded_chunks = Array.isArray(build_info.assets.main) ? build_info.assets.main : [build_info.assets.main];
 		if (!error) {
 			page.parts.forEach(part => {
 				if (!part) return;
 
 				// using concat because it could be a string or an array. thanks webpack!
-				preloaded_chunks = preloaded_chunks.concat(chunks[part.name]);
+				preloaded_chunks = preloaded_chunks.concat(build_info.assets[part.name]);
 			});
 		}
 
 		const link = preloaded_chunks
-			.filter(file => !file.match(/\.map$/))
+			.filter(file => file && !file.match(/\.map$/))
 			.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
 			.join(', ');
 
 		res.setHeader('Link', link);
 
-		const store = store_getter ? store_getter(req) : null;
+		const store = store_getter ? store_getter(req, res) : null;
 
 		let redirect: { statusCode: number, location: string };
 		let preload_error: { statusCode: number, message: Error | string };
@@ -336,6 +340,7 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 				if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
 					throw new Error(`Conflicting redirects`);
 				}
+				location = location.replace(/^\//g, ''); // leading slash (only)
 				redirect = { statusCode, location };
 			},
 			error: (statusCode: number, message: Error | string) => {
@@ -353,7 +358,6 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 					);
 
 					if (include_cookies) {
-						const cookies: Record<string, string> = {};
 						if (!opts.headers) opts.headers = {};
 
 						const str = []
@@ -387,6 +391,8 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 			})
 			: {};
 
+		const match = error ? null : page.pattern.exec(req.path);
+
 		Promise.all([root_preloaded].concat(page.parts.map(part => {
 			if (!part) return null;
 
@@ -408,18 +414,6 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 				res.setHeader('Location', location);
 				res.end();
 
-				if (process.send) {
-					process.send({
-						__sapper__: true,
-						event: 'file',
-						url: req.url,
-						method: req.method,
-						status: redirect.statusCode,
-						type: 'text/html',
-						body: `<script>window.location.href = "${location}"</script>`
-					});
-				}
-
 				return;
 			}
 
@@ -478,11 +472,12 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 				store
 			});
 
-			let scripts = []
-				.concat(chunks.main) // chunks main might be an array. it might not! thanks, webpack
-				.filter(file => !file.match(/\.map$/))
-				.map(file => `<script src='${req.baseUrl}/client/${file}'></script>`)
-				.join('');
+			const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
+			const main = `${req.baseUrl}/client/${file}`;
+
+			const script = build_info.bundler === 'rollup'
+				? `<script>try{new Function("import('${main}')")();}catch(e){var s=document.createElement("script");s.src="${req.baseUrl}/client/shimport@${build_info.shimport}.js";s.setAttribute("data-main","${main}");document.head.appendChild(s);}</script>`
+				: `<script src="${main}"></script>`;
 
 			let inline_script = `__SAPPER__={${[
 				error && `error:1`,
@@ -498,25 +493,13 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 
 			const body = template()
 				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
-				.replace('%sapper.scripts%', () => `<script>${inline_script}</script>${scripts}`)
+				.replace('%sapper.scripts%', () => `<script>${inline_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>` : ''));
 
 			res.statusCode = status;
 			res.end(body);
-
-			if (process.send) {
-				process.send({
-					__sapper__: true,
-					event: 'file',
-					url: req.url,
-					method: req.method,
-					status,
-					type: 'text/html',
-					body
-				});
-			}
 		}).catch(err => {
 			if (error) {
 				// we encountered an error while rendering the error page — oops
@@ -582,4 +565,4 @@ function escape_html(html: string) {
 	};
 
 	return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
-}
+}

src/rollup.ts

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

src/runtime/index.ts

@@ -136,10 +136,6 @@ function prepare_page(target: Target): Promise<{
 	data?: any;
 	nullable_depth?: number;
 }> {
-	if (root) {
-		root.set({ preloading: true });
-	}
-
 	const { page, path, query } = target;
 	const new_segments = path.split('/').filter(Boolean);
 	let changed_from = 0;
@@ -285,6 +281,9 @@ async function navigate(target: Target, id: number): Promise<any> {
 
 	cid = id;
 
+	if (root) {
+		root.set({ preloading: true });
+	}
 	const loaded = prefetching && prefetching.href === target.url.href ?
 		prefetching.promise :
 		prepare_page(target);

src/utils.ts

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

test/app/app/server.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import { resolve } from 'url';
 import express from 'express';
 import serve from 'serve-static';
-import sapper from '../../../dist/middleware.ts.js';
+import sapper from '../../../dist/middleware.js';
 import { Store } from 'svelte/store.js';
 import { manifest } from './manifest/server.js';
 
@@ -85,11 +85,18 @@ const middlewares = [
 		next();
 	},
 
+	// set up some values for the store
+	(req, res, next) => {
+		req.hello = 'hello';
+		res.locals = { name: 'world' };
+		next();
+	},
+
 	sapper({
 		manifest,
-		store: () => {
+		store: (req, res) => {
 			return new Store({
-				title: 'Stored title'
+				title: `${req.hello} ${res.locals.name}`
 			});
 		},
 		ignore: [
@@ -101,6 +108,13 @@ const middlewares = [
 	}),
 ];
 
+app.get(`${BASEPATH}/non-sapper-redirect-from`, (req, res) => {
+	res.writeHead(301, {
+		Location: `${BASEPATH}/non-sapper-redirect-to`
+	});
+	res.end();
+});
+
 if (BASEPATH) {
 	app.use(BASEPATH, ...middlewares);
 } else {

test/app/routes/index.html

@@ -7,7 +7,9 @@
 <a href='.'>home</a>
 <a href='about'>about</a>
 <a href='slow-preload'>slow preload</a>
+<a href='non-sapper-redirect-from'>redirect</a>
 <a href='redirect-from'>redirect</a>
+<a href='redirect-root'>redirect (root)</a>
 <a href='blog/nope'>broken link</a>
 <a href='blog/throw-an-error'>error link</a>
 <a href='credentials?creds=include'>credentials</a>

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

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

test/app/routes/redirect-root.html

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

test/app/webpack/client.config.js

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

test/app/webpack/server.config.js

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

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

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

test/common/test.js

@@ -2,9 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 const Nightmare = require('nightmare');
-const serve = require('serve-static');
 const walkSync = require('walk-sync');
-const fetch = require('node-fetch');
 const rimraf = require('rimraf');
 const ports = require('port-authority');
 
@@ -83,6 +81,11 @@ function testExport({ basepath = '' }) {
 				'about/index.html',
 				'slow-preload/index.html',
 
+				'redirect-from/index.html',
+				'redirect-to/index.html',
+				'non-sapper-redirect-from/index.html',
+				'non-sapper-redirect-to/index.html',
+
 				'blog/index.html',
 				'blog/a-very-long-post/index.html',
 				'blog/how-can-i-get-involved/index.html',
@@ -107,7 +110,7 @@ function testExport({ basepath = '' }) {
 				'svelte-logo-192.png',
 				'svelte-logo-512.png',
 			].map(file => {
-				return basepath ? path.join(basepath.replace(/^\//, ''), file) : file;
+				return basepath ? `${basepath.replace(/^[\/\\]/, '')}/${file}` : file;
 			});
 
 			// Client scripts that should show up in the extraction directory.
@@ -436,6 +439,33 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
+			it('redirects on server (root)', () => {
+				return nightmare.goto(`${base}/redirect-root`)
+					.path()
+					.then(path => {
+						assert.equal(path, `${basepath}/`);
+					})
+					.then(() => nightmare.page.title())
+					.then(title => {
+						assert.equal(title, 'Great success!');
+					});
+			});
+
+			it('redirects in client (root)', () => {
+				return nightmare.goto(base)
+					.wait('[href="redirect-root"]')
+					.click('[href="redirect-root"]')
+					.wait(200)
+					.path()
+					.then(path => {
+						assert.equal(path, `${basepath}/`);
+					})
+					.then(() => nightmare.page.title())
+					.then(title => {
+						assert.equal(title, 'Great success!');
+					});
+			});
+
 			it('handles 4xx error on server', () => {
 				return nightmare.goto(`${base}/blog/nope`)
 					.path()
@@ -581,11 +611,11 @@ function run({ mode, basepath = '' }) {
 				return nightmare.goto(`${base}/store`)
 					.page.title()
 					.then(title => {
-						assert.equal(title, 'Stored title');
+						assert.equal(title, 'hello world');
 						return nightmare.init().page.title();
 					})
 					.then(title => {
-						assert.equal(title, 'Stored title');
+						assert.equal(title, 'hello world');
 					});
 			});
 

test/unit/clean_html/index.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

test/unit/create_routes/index.ts

@@ -1,6 +1,6 @@
-const path = require('path');
-const assert = require('assert');
-const { create_routes } = require('../../../dist/core.ts.js');
+import * as path from 'path';
+import * as assert from 'assert';
+import create_routes from '../../../src/core/create_routes';
 
 describe('create_routes', () => {
 	it('creates routes', () => {
@@ -53,14 +53,14 @@ describe('create_routes', () => {
 		assert.deepEqual(server_routes, [
 			{
 				name: 'route_blog_json',
-				pattern: /^\/blog.json\/?$/,
+				pattern: /^\/blog.json$/,
 				file: 'blog/index.json.js',
 				params: []
 			},
 
 			{
 				name: 'route_blog_$slug_json',
-				pattern: /^\/blog\/([^\/]+?).json\/?$/,
+				pattern: /^\/blog\/([^\/]+?).json$/,
 				file: 'blog/[slug].json.js',
 				params: ['slug']
 			}

webpack.js

@@ -1,2 +1,2 @@
-// TODO write to this file, instead of webpack.ts.js
-module.exports = require('./dist/webpack.ts.js');
+console.error(`[DEPRECATION] As of Sapper 0.18, webpack config should be loaded from sapper/config/webpack.js`);
+module.exports = require('./dist/webpack.js');

webpack/config.js

@@ -1,2 +1,2 @@
-// TODO deprecate this file in favour of sapper/webpack.js
-module.exports = require('../dist/webpack.ts.js');
+console.error(`[DEPRECATION] As of Sapper 0.18, webpack config should be loaded from sapper/config/webpack.js`);
+module.exports = require('../dist/webpack.js');