Merge pull request #379 from sveltejs/gh-130

Rollup support

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

package.json

@@ -2,13 +2,12 @@
   "name": "sapper",
   "version": "0.17.1",
   "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",
     "sapper",
@@ -20,6 +19,7 @@
   },
   "dependencies": {
     "html-minifier": "^3.5.16",
+    "shimport": "^0.0.9",
     "source-map-support": "^0.5.6",
     "tslib": "^1.9.1"
   },
@@ -48,7 +48,7 @@
     "pretty-ms": "^3.1.0",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
-    "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.config.js

@@ -32,6 +32,7 @@ export default [
 			`src/cli.ts`,
 			`src/core.ts`,
 			`src/middleware.ts`,
+			`src/rollup.ts`,
 			`src/webpack.ts`
 		],
 		output: {
@@ -51,7 +52,6 @@ export default [
 				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

@@ -5,7 +5,10 @@ import rimraf from 'rimraf';
 import { EventEmitter } from 'events';
 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(...)
@@ -51,23 +57,26 @@ async function execute(emitter: EventEmitter, {
 	// create app/manifest/client.js and app/manifest/server.js
 	create_main_manifests({ 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.assetsByChunkName
+	}));
 
-	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.assets.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,22 +5,26 @@ 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;
@@ -47,18 +51,23 @@ class Watcher extends EventEmitter {
 		app = locations.app(),
 		dest = locations.dest(),
 		routes = locations.routes(),
+		bundler,
 		webpack = 'webpack',
+		rollup = 'rollup',
 		port = +process.env.PORT
 	}: {
 		app: string,
 		dest: string,
 		routes: string,
+		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;
 
@@ -102,7 +111,8 @@ 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);
 
@@ -155,7 +165,10 @@ class Watcher extends EventEmitter {
 		};
 
 		// 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 = '';
 
@@ -177,7 +190,7 @@ class Watcher extends EventEmitter {
 				this.deferreds.server = new Deferred();
 			},
 
-			result: info => {
+			handle_result: (result: CompileResult) => {
 				this.deferreds.client.promise.then(() => {
 					const restart = () => {
 						log = '';
@@ -245,8 +258,6 @@ class Watcher extends EventEmitter {
 			}
 		});
 
-		let first = true;
-
 		this.watch(compilers.client, {
 			name: 'client',
 
@@ -259,11 +270,15 @@ class Watcher extends EventEmitter {
 				// quite difficult
 			},
 
-			result: info => {
-				fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(info.assetsByChunkName, null, '  '));
+			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.assetsByChunkName
+				}, null, '  '));
 				this.deferreds.client.fulfil();
 
-				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(),
@@ -281,11 +296,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;
@@ -332,82 +343,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 {

src/api/export.ts

@@ -13,7 +13,7 @@ import * as events from './interfaces';
 type Opts = {
 	build: string,
 	dest: string,
-	basepath: string,
+	basepath?: string,
 	timeout: number | false
 };
 

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;
@@ -29,7 +30,7 @@ export type BuildEvent = {
 	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/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/cli.ts

@@ -11,7 +11,8 @@ 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('--bundler', 'Specify a bundler (rollup or webpack)')
+	.action(async (opts: { port: number, open: boolean, bundler?: string }) => {
 		const { dev } = await import('./cli/dev');
 		dev(opts);
 	});
@@ -19,8 +20,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 +32,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 +48,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);
 		}
 	});
@@ -66,8 +68,10 @@ prog.command('export [dest]')
 	.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
 	.option('--basepath', 'Specify a base path')
 	.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
@@ -81,7 +85,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)}`);
 			}
 

src/cli/build.ts

@@ -1,20 +1,39 @@
 import { build as _build } from '../api/build';
 import colors from 'kleur';
 import { locations } from '../config';
+import validate_bundler from './utils/validate_bundler';
+import { repeat } from '../utils';
+
+export 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

@@ -5,7 +5,7 @@ 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);
 

src/cli/export.ts

@@ -1,12 +1,8 @@
 import { exporter as _exporter } from '../api/export';
 import colors from 'kleur';
-import prettyBytes from 'pretty-bytes';
+import pb from 'pretty-bytes';
 import { locations } from '../config';
-
-function left_pad(str: string, len: number) {
-	while (str.length < len) str = ` ${str}`;
-	return str;
-}
+import { left_pad } from '../utils';
 
 export function exporter(export_dir: string, {
 	basepath = '',
@@ -25,9 +21,8 @@ export function exporter(export_dir: string, {
 			});
 
 			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/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[];
+	assets: string[];
+	assetsByChunkName: 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.assets = 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.assetsByChunkName = {};
+
+		compiler.chunks.forEach(chunk => {
+			if (compiler.input in chunk.modules) {
+				this.assetsByChunkName.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.assets = info.assets.map((chunk: { name: string }) => chunk.name);
+		this.assetsByChunkName = 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

@@ -56,8 +56,6 @@ 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)}';
@@ -105,11 +103,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/middleware.ts

@@ -282,9 +282,9 @@ function get_page_handler(
 ) {
 	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')
@@ -303,24 +303,28 @@ function get_page_handler(
 	}
 
 	function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
-		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(', ');
 
@@ -354,7 +358,6 @@ function get_page_handler(
 					);
 
 					if (include_cookies) {
-						const cookies: Record<string, string> = {};
 						if (!opts.headers) opts.headers = {};
 
 						const str = []
@@ -481,11 +484,12 @@ function get_page_handler(
 				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`,
@@ -501,7 +505,7 @@ function get_page_handler(
 
 			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>` : ''));

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 {
+				dir: locations.dest(),
+				format: 'iife'
+			}
+		}
+	}
+};

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

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(),

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