-> v0.2.3

posixify import paths

.eslintrc.json

@@ -0,0 +1,39 @@
+{
+    "root": true,
+    "rules": {
+        "indent": [ 2, "tab", { "SwitchCase": 1 } ],
+        "semi": [ 2, "always" ],
+        "space-before-blocks": [ 2, "always" ],
+        "no-mixed-spaces-and-tabs": [ 2, "smart-tabs" ],
+        "no-cond-assign": 0,
+        "no-unused-vars": 2,
+        "object-shorthand":  [ 2, "always" ],
+        "no-const-assign": 2,
+        "no-class-assign": 2,
+        "no-this-before-super": 2,
+        "no-var": 2,
+        "no-unreachable": 2,
+        "valid-typeof": 2,
+        "quote-props": [ 2, "as-needed" ],
+        "one-var": [ 2, "never" ],
+        "prefer-arrow-callback": 2,
+        "prefer-const": [ 2, { "destructuring": "all" } ],
+        "arrow-spacing": 2,
+        "no-inner-declarations": 0
+    },
+    "env": {
+        "es6": true,
+        "browser": true,
+        "node": true,
+        "mocha": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:import/errors",
+        "plugin:import/warnings"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    }
+}

.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
-node_modules
+node_modules
+cypress/screenshots
+test/app/.sapper

.travis.yml

@@ -0,0 +1,10 @@
+sudo: false
+language: node_js
+node_js:
+  - "stable"
+env:
+  global:
+    - BUILD_TIMEOUT=10000
+install:
+  - npm install
+  - (cd test/app && npm install)

CHANGELOG.md

@@ -0,0 +1,36 @@
+# sapper changelog
+
+## 0.2.3
+
+* Posixify import paths, even on Windows ([#31](https://github.com/sveltejs/sapper/pull/31))
+* Pass `url` to 404 handler
+
+## 0.2.2
+
+* Create destination directory when building, don't assume it's already there from dev mode
+* We have tests now!
+
+## 0.2.1
+
+* Inject HMR logic in dev mode
+
+## 0.2.0
+
+* Separate `sapper build` from prod server ([#21](https://github.com/sveltejs/sapper/issues/21))
+
+## 0.1.3-5
+
+* Fix typo
+
+## 0.1.2
+
+* Use `atime.getTime()` and `mtime.getTime()` instead of `atimeMs` and `mtimeMs` ([#11](https://github.com/sveltejs/sapper/issues/11))
+* Make dest dir before anyone tries to write to it ([#18](https://github.com/sveltejs/sapper/pull/18))
+
+## 0.1.1
+
+* Expose resolved pathname to `sapper/runtime/app.js` as `__app__` inside main.js
+
+## 0.1.0
+
+* First public preview

appveyor.yml

@@ -0,0 +1,17 @@
+version: "{build}"
+
+shallow_clone: true
+
+init:
+  - git config --global core.autocrlf false
+
+build: off
+
+environment:
+  matrix:
+    # node.js
+    - nodejs_version: stable
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install

cli/index.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+const cmd = process.argv[2];
+
+if (cmd === 'build') {
+	process.env.NODE_ENV = 'production';
+	require('../lib/build.js')();
+}

connect.js

@@ -1,116 +0,0 @@
-require('svelte/ssr/register');
-const esm = require('@std/esm');
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
-const rimraf = require('rimraf');
-const mkdirp = require('mkdirp');
-const create_routes = require('./utils/create_routes.js');
-const create_templates = require('./utils/create_templates.js');
-const create_app = require('./utils/create_app.js');
-const create_webpack_compiler = require('./utils/create_webpack_compiler.js');
-const escape_html = require('escape-html');
-const { src, dest, dev } = require('./lib/config.js');
-
-const esmRequire = esm(module, {
-	esm: 'js'
-});
-
-module.exports = function connect(opts) {
-	mkdirp(dest);
-	rimraf.sync(path.join(dest, '**/*'));
-
-	let routes = create_routes(
-		glob.sync('**/*.+(html|js|mjs)', { cwd: src })
-	);
-
-	create_app(src, dest, routes, opts);
-
-	const webpack_compiler = create_webpack_compiler(
-		dest,
-		routes,
-		dev
-	);
-
-	const templates = create_templates();
-
-	return async function(req, res, next) {
-		const url = req.url.replace(/\?.+/, '');
-
-		if (url.startsWith('/client/')) {
-			res.set({
-				'Content-Type': 'application/javascript'
-			});
-			fs.createReadStream(`${dest}${url}`).pipe(res);
-			return;
-		}
-
-		// whatever happens, we're going to serve some HTML
-		res.set({
-			'Content-Type': 'text/html'
-		});
-
-		try {
-			for (const route of routes) {
-				if (route.test(url)) {
-					req.params = route.exec(url);
-
-					const chunk = await webpack_compiler.get_chunk(route.id);
-					const mod = require(chunk);
-
-					if (route.type === 'page') {
-						const main = await webpack_compiler.client_main;
-
-						let data = { params: req.params, query: req.query };
-						if (mod.default.preload) data = Object.assign(data, await mod.default.preload(data));
-
-						const { html, head, css } = mod.default.render(data);
-
-						const page = templates.render(200, {
-							main,
-							html,
-							head: `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`,
-							styles: (css && css.code ? `<style>${css.code}</style>` : '')
-						});
-
-						res.status(200);
-						res.end(page);
-					}
-
-					else {
-						const handler = mod[req.method.toLowerCase()];
-						if (handler) {
-							if (handler.length === 2) {
-								handler(req, res);
-							} else {
-								const data = await handler(req);
-
-								// TODO headers, error handling
-								if (typeof data === 'string') {
-									res.end(data);
-								} else {
-									res.end(JSON.stringify(data));
-								}
-							}
-						}
-					}
-
-					return;
-				}
-			}
-
-			res.status(404).end(templates.render(404, {
-				title: 'Not found',
-				status: 404,
-				method: req.method,
-				url
-			}));
-		} catch(err) {
-			res.status(500).end(templates.render(500, {
-				title: err.name || 'Internal server error',
-				url,
-				error: escape_html(err.details || err.message || err || 'Unknown error')
-			}));
-		}
-	};
-};

cypress.json

@@ -0,0 +1,9 @@
+{
+	"baseUrl": "http://localhost:3000",
+	"videoRecording": false,
+	"fixturesFolder": "test/cypress/fixtures",
+	"integrationFolder": "test/cypress/integration",
+	"pluginsFile": false,
+	"screenshotsFolder": "test/cypress/screenshots",
+	"supportFile": "test/cypress/support/index.js"
+}

lib/build.js

@@ -0,0 +1,41 @@
+const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
+const mkdirp = require('mkdirp');
+const { client, server } = require('./utils/compilers.js');
+const create_app = require('./utils/create_app.js');
+const generate_asset_cache = require('./utils/generate_asset_cache.js');
+const { dest } = require('./config.js');
+
+module.exports = () => {
+	mkdirp(dest);
+
+	// create main.js and server-routes.js
+	create_app();
+
+	function handleErrors(err, stats) {
+		if (err) {
+			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
+			process.exit(1);
+		}
+
+		if (stats.hasErrors()) {
+			console.log(stats.toString({ colors: true }));
+			process.exit(1);
+		}
+	}
+
+	client.run((err, clientStats) => {
+		handleErrors(err, clientStats);
+		const clientInfo = clientStats.toJson();
+		fs.writeFileSync(path.join(dest, 'stats.client.json'), JSON.stringify(clientInfo, null, '  '));
+
+		server.run((err, serverStats) => {
+			handleErrors(err, serverStats);
+			const serverInfo = serverStats.toJson();
+			fs.writeFileSync(path.join(dest, 'stats.server.json'), JSON.stringify(serverInfo, null, '  '));
+
+			generate_asset_cache(clientInfo, serverInfo);
+		});
+	});
+};

lib/config.js

@@ -1,4 +1,6 @@
 const path = require('path');
+const mkdirp = require('mkdirp');
+const rimraf = require('rimraf');
 
 exports.dev = process.env.NODE_ENV !== 'production';
 
@@ -9,4 +11,11 @@ exports.src = path.resolve(process.env.SAPPER_ROUTES || 'routes');
 exports.dest = path.resolve(
 	process.env.NOW ? '/tmp' :
 	process.env.SAPPER_DEST || '.sapper'
-);
+);
+
+if (exports.dev) {
+	mkdirp(exports.dest);
+	rimraf.sync(path.join(exports.dest, '**/*'));
+}
+
+exports.server_routes = path.resolve(exports.dest, 'server-routes.js');

lib/index.js

@@ -0,0 +1,208 @@
+const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
+const rimraf = require('rimraf');
+const mkdirp = require('mkdirp');
+const webpack = require('webpack');
+const route_manager = require('./route_manager.js');
+const templates = require('./templates.js');
+const create_app = require('./utils/create_app.js');
+const create_watcher = require('./utils/create_watcher.js');
+const compilers = require('./utils/compilers.js');
+const generate_asset_cache = require('./utils/generate_asset_cache.js');
+const escape_html = require('escape-html');
+const { src, dest, dev } = require('./config.js');
+
+function connect_dev() {
+	// create main.js and server-routes.js
+	// TODO update on changes
+	create_app();
+
+	const watcher = create_watcher();
+
+	let asset_cache;
+
+	return compose_handlers([
+		require('webpack-hot-middleware')(compilers.client, {
+			reload: true,
+			path: '/__webpack_hmr',
+			heartbeat: 10 * 1000
+		}),
+
+		async (req, res, next) => {
+			asset_cache = await watcher.ready;
+			next();
+		},
+
+		set_req_pathname,
+
+		get_asset_handler({
+			filter: pathname => pathname === '/index.html',
+			type: 'text/html',
+			cache: 'max-age=600',
+			fn: () => asset_cache.client.index
+		}),
+
+		get_asset_handler({
+			filter: pathname => pathname === '/service-worker.js',
+			type: 'application/javascript',
+			cache: 'max-age=600',
+			fn: () => asset_cache.client.service_worker
+		}),
+
+		get_asset_handler({
+			filter: pathname => pathname.startsWith('/client/'),
+			type: 'application/javascript',
+			cache: 'max-age=31536000',
+			fn: pathname => asset_cache.client.chunks[pathname]
+		}),
+
+		get_route_handler(() => asset_cache),
+
+		not_found
+	]);
+}
+
+function connect_prod() {
+	const asset_cache = generate_asset_cache(
+		read_json(path.join(dest, 'stats.client.json')),
+		read_json(path.join(dest, 'stats.server.json'))
+	);
+
+	return compose_handlers([
+		set_req_pathname,
+
+		get_asset_handler({
+			filter: pathname => pathname === '/index.html',
+			type: 'text/html',
+			cache: 'max-age=600',
+			fn: () => asset_cache.client.index
+		}),
+
+		get_asset_handler({
+			filter: pathname => pathname === '/service-worker.js',
+			type: 'application/javascript',
+			cache: 'max-age=600',
+			fn: () => asset_cache.client.service_worker
+		}),
+
+		get_asset_handler({
+			filter: pathname => pathname.startsWith('/client/'),
+			type: 'application/javascript',
+			cache: 'max-age=31536000',
+			fn: pathname => asset_cache.client.chunks[pathname]
+		}),
+
+		get_route_handler(() => asset_cache),
+
+		not_found
+	]);
+}
+
+module.exports = dev ? connect_dev : connect_prod;
+
+function set_req_pathname(req, res, next) {
+	req.pathname = req.url.replace(/\?.+/, '');
+	next();
+}
+
+function get_asset_handler(opts) {
+	return (req, res, next) => {
+		if (!opts.filter(req.pathname)) return next();
+
+		res.set({
+			'Content-Type': opts.type,
+			'Cache-Control': opts.cache
+		});
+		res.end(opts.fn(req.pathname));
+	};
+}
+
+function get_route_handler(fn) {
+	return async function handle_route(req, res, next) {
+		const url = req.pathname;
+
+		const { client, server } = fn();
+
+		// whatever happens, we're going to serve some HTML
+		res.set({
+			'Content-Type': 'text/html'
+		});
+
+		try {
+			for (const route of route_manager.routes) {
+				if (route.test(url)) {
+					req.params = route.exec(url);
+
+					const mod = require(server.entry)[route.id];
+
+					if (route.type === 'page') {
+						let data = { params: req.params, query: req.query };
+						if (mod.preload) data = Object.assign(data, await mod.preload(data));
+
+						const { html, head, css } = mod.render(data);
+
+						const page = templates.render(200, {
+							main: client.main_file,
+							html,
+							head: `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`,
+							styles: (css && css.code ? `<style>${css.code}</style>` : '')
+						});
+
+						res.status(200);
+						res.end(page);
+					}
+
+					else {
+						const handler = mod[req.method.toLowerCase()];
+						if (handler) handler(req, res, next);
+					}
+
+					return;
+				}
+			}
+
+			next();
+		} catch(err) {
+			res.status(500).end(templates.render(500, {
+				title: (err && err.name) || 'Internal server error',
+				url,
+				error: escape_html(err && (err.details || err.message || err) || 'Unknown error'),
+				stack: err && err.stack.split('\n').slice(1).join('\n')
+			}));
+		}
+	}
+}
+
+function not_found(req, res) {
+	res.status(404).end(templates.render(404, {
+		title: 'Not found',
+		status: 404,
+		method: req.method,
+		url: req.url
+	}));
+}
+
+function compose_handlers(handlers) {
+	return (req, res, next) => {
+		let i = 0;
+		function go() {
+			const handler = handlers[i];
+
+			if (handler) {
+				handler(req, res, () => {
+					i += 1;
+					go();
+				});
+			} else {
+				next();
+			}
+		}
+
+		go();
+	}
+}
+
+function read_json(file) {
+	return JSON.parse(fs.readFileSync(file, 'utf-8'));
+}

lib/route_manager.js

@@ -1,5 +1,5 @@
 const glob = require('glob');
-const create_routes = require('../utils/create_routes.js');
+const create_routes = require('./utils/create_routes.js');
 const { src } = require('./config.js');
 
 const route_manager = {

lib/templates.js

@@ -0,0 +1,43 @@
+const fs = require('fs');
+const glob = require('glob');
+
+const templates = glob.sync('*.html', { cwd: 'templates' })
+	.map(file => {
+		const template = fs.readFileSync(`templates/${file}`, 'utf-8');
+		const status = file.replace('.html', '').toLowerCase();
+
+		if (!/^[0-9x]{3}$/.test(status)) {
+			throw new Error(`Bad template — should be a valid status code like 404.html, or a wildcard like 2xx.html`);
+		}
+
+		const specificity = (
+			(status[0] === 'x' ? 0 : 4) +
+			(status[1] === 'x' ? 0 : 2) +
+			(status[2] === 'x' ? 0 : 1)
+		);
+
+		const pattern = new RegExp(`^${status.split('').map(d => d === 'x' ? '\\d' : d).join('')}$`);
+
+		return {
+			test: status => pattern.test(status),
+			specificity,
+			render(data) {
+				return template.replace(/%sapper\.(\w+)%/g, (match, key) => {
+					return key in data ? data[key] : '';
+				});
+			}
+		}
+	})
+	.sort((a, b) => b.specificity - a.specificity);
+
+exports.render = (status, data) => {
+	const template = templates.find(template => template.test(status));
+	if (template) return template.render(data);
+
+	return `Missing template for status code ${status}`;
+};
+
+exports.onchange = fn => {
+	// TODO in dev mode, keep this updated, and allow
+	// webpack compiler etc to hook into it
+};

lib/utils/compilers.js

@@ -0,0 +1,11 @@
+const path = require('path');
+const relative = require('require-relative');
+const webpack = relative('webpack', process.cwd());
+
+exports.client = webpack(
+	require(path.resolve('webpack.client.config.js'))
+);
+
+exports.server = webpack(
+	require(path.resolve('webpack.server.config.js'))
+);

lib/utils/create_app.js

@@ -0,0 +1,70 @@
+const fs = require('fs');
+const path = require('path');
+const route_manager = require('../route_manager.js');
+const { src, dest, server_routes, dev } = require('../config.js');
+
+function posixify(file) {
+	return file.replace(/[\/\\]/g, '/');
+}
+
+module.exports = function create_app() {
+	const { routes } = route_manager;
+
+	function create_client_main() {
+		const template = fs.readFileSync('templates/main.js', 'utf-8');
+
+		const code = `[${
+			routes
+				.filter(route => route.type === 'page')
+				.map(route => {
+					const params = route.dynamic.length === 0 ?
+						'{}' :
+						`{ ${route.dynamic.map((part, i) => `${part}: match[${i + 1}]`).join(', ') } }`;
+
+					const file = posixify(`${src}/${route.file}`);
+					return `{ pattern: ${route.pattern}, params: match => (${params}), load: () => import(/* webpackChunkName: "${route.id}" */ '${file}') }`
+				})
+				.join(', ')
+		}]`;
+
+		let main = template
+			.replace(/__app__/g, posixify(path.resolve(__dirname, '../../runtime/app.js')))
+			.replace(/__routes__/g, code)
+			.replace(/__dev__/g, String(dev));
+
+		if (dev) {
+			const hmr_client = require.resolve(`webpack-hot-middleware/client`);
+			main += `\n\nimport('${hmr_client}?path=/__webpack_hmr&timeout=20000'); if (module.hot) module.hot.accept();`
+		}
+
+		const file = path.resolve(dest, 'main.js');
+
+		fs.writeFileSync(file, main);
+
+		// need to fudge the mtime, because webpack is soft in the head
+		const { atime, mtime } = fs.statSync(file);
+		fs.utimesSync(file, new Date(atime.getTime() - 999999), new Date(mtime.getTime() - 999999));
+	}
+
+	function create_server_routes() {
+		const imports = routes
+			.map(route => {
+				const file = posixify(`${src}/${route.file}`);
+				return route.type === 'page' ?
+					`import ${route.id} from '${file}';` :
+					`import * as ${route.id} from '${file}';`;
+			})
+			.join('\n');
+
+		const exports = `export { ${routes.map(route => route.id)} };`;
+
+		fs.writeFileSync(server_routes, `${imports}\n\n${exports}`);
+
+		const { atime, mtime } = fs.statSync(server_routes);
+		fs.utimesSync(server_routes, new Date(atime.getTime() - 999999), new Date(mtime.getTime() - 999999));
+	}
+
+	// TODO in dev mode, watch files
+	create_client_main();
+	create_server_routes();
+};

lib/utils/create_routes.js

@@ -8,7 +8,9 @@ module.exports = function create_matchers(files) {
 			const parts = file.replace(/\.(html|js|mjs)$/, '').split(path.sep);
 			if (parts[parts.length - 1] === 'index') parts.pop();
 
-			const id = parts.join('_').replace(/[[\]]/g, '$') || '_';
+			const id = (
+				parts.join('_').replace(/[[\]]/g, '$').replace(/^\d/, '_$&').replace(/[^a-zA-Z0-9_$]/g, '_')
+			 ) || '_';
 
 			const dynamic = parts
 				.filter(part => part[0] === '[')

lib/utils/create_watcher.js

@@ -0,0 +1,63 @@
+const path = require('path');
+const chalk = require('chalk');
+const compilers = require('./compilers.js');
+const generate_asset_cache = require('./generate_asset_cache.js');
+
+function deferred() {
+	const d = {};
+
+	d.promise = new Promise((fulfil, reject) => {
+		d.fulfil = fulfil;
+		d.reject = reject;
+	});
+
+	return d;
+}
+
+module.exports = function create_watcher() {
+	const deferreds = {
+		client: deferred(),
+		server: deferred()
+	};
+
+	const invalidate = () => Promise.all([
+		deferreds.client.promise,
+		deferreds.server.promise
+	]).then(([client_stats, server_stats]) => {
+		return generate_asset_cache(
+			client_stats.toJson(),
+			server_stats.toJson()
+		);
+	});
+
+	watcher = {
+		ready: invalidate()
+	};
+
+	function watch_compiler(type) {
+		const compiler = compilers[type];
+
+		compiler.plugin('invalid', filename => {
+			console.log(chalk.red(`${type} bundle invalidated, file changed: ${chalk.bold(filename)}`));
+			deferreds[type] = deferred();
+			watcher.ready = invalidate();
+		});
+
+		compiler.plugin('failed', err => {
+			deferreds[type].reject(err);
+		});
+
+		compiler.watch({}, (err, stats) => {
+			if (stats.hasErrors()) {
+				deferreds[type].reject(stats.toJson().errors[0]);
+			} else {
+				deferreds[type].fulfil(stats);
+			}
+		});
+	}
+
+	watch_compiler('client');
+	watch_compiler('server');
+
+	return watcher;
+};

lib/utils/generate_asset_cache.js

@@ -0,0 +1,67 @@
+const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
+const templates = require('../templates.js');
+const route_manager = require('../route_manager.js');
+const { dest } = require('../config.js');
+
+module.exports = function generate_asset_cache(clientInfo, serverInfo) {
+	const main_file = `/client/${clientInfo.assetsByChunkName.main}`;
+	const chunk_files = clientInfo.assets.map(chunk => `/client/${chunk.name}`);
+
+	const service_worker = generate_service_worker(chunk_files);
+	const index = generate_index(main_file);
+
+	fs.writeFileSync(path.join(dest, 'service-worker.js'), service_worker);
+	fs.writeFileSync(path.join(dest, 'index.html'), index);
+
+	return {
+		client: {
+			main_file,
+			chunk_files,
+
+			main: read(`${dest}${main_file}`),
+			chunks: chunk_files.reduce((lookup, file) => {
+				lookup[file] = read(`${dest}${file}`);
+				return lookup;
+			}, {}),
+
+			index,
+			service_worker
+		},
+
+		server: {
+			entry: path.resolve(dest, 'server', serverInfo.assetsByChunkName.server_routes)
+		}
+	};
+};
+
+function generate_service_worker(chunk_files) {
+	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
+
+	const route_code = `[${
+		route_manager.routes
+			.filter(route => route.type === 'page')
+			.map(route => `{ pattern: ${route.pattern} }`)
+			.join(', ')
+	}]`;
+
+	return read('templates/service-worker.js')
+		.replace('__timestamp__', Date.now())
+		.replace('__assets__', JSON.stringify(assets))
+		.replace('__shell__', JSON.stringify(chunk_files.concat('/index.html')))
+		.replace('__routes__', route_code);
+}
+
+function generate_index(main_file) {
+	return templates.render(200, {
+		styles: '',
+		head: '',
+		html: '<noscript>Please enable JavaScript!</noscript>',
+		main: main_file
+	});
+}
+
+function read(file) {
+	return fs.readFileSync(file, 'utf-8');
+}

mocha.opts

@@ -1,2 +1,2 @@
 --recursive
-utils/**/*.test.js
+test/unit/**/*.js

package.json

@@ -1,27 +1,41 @@
 {
   "name": "sapper",
-  "version": "0.0.11",
-  "description": "Combat-ready apps, engineered by Svelte",
-  "main": "connect.js",
+  "version": "0.2.3",
+  "description": "Military-grade apps, engineered by Svelte",
+  "main": "lib/index.js",
+  "bin": {
+    "sapper": "cli/index.js"
+  },
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "@std/esm": "^0.18.0",
+    "chalk": "^2.3.0",
     "escape-html": "^1.0.3",
     "mkdirp": "^0.5.1",
+    "relative": "^3.0.2",
+    "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
-    "webpack": "^3.10.0"
+    "webpack": "^3.10.0",
+    "webpack-hot-middleware": "^2.21.0"
   },
   "devDependencies": {
+    "cypress": "^1.3.0",
+    "eslint": "^4.13.1",
     "mocha": "^4.0.1",
-    "svelte": "^1.47.1"
-  },
-  "peerDependencies": {
-    "svelte": "^1.47.1"
+    "npm-run-all": "^4.1.2",
+    "wait-on": "^2.0.2"
   },
   "scripts": {
-    "test": "mocha --opts mocha.opts"
+    "cy:open": "cypress open",
+    "test": "run-s test:unit test:dev test:prod",
+    "test:unit": "mocha --opts mocha.opts",
+    "test:dev": "run-p --race test:launch:dev cy:run:dev",
+    "test:launch:dev": "node test/launch.js --dev",
+    "cy:run:dev": "wait-on http://localhost:3000 && cypress run -s test/cypress/integration/dev.js",
+    "test:prod": "run-p --race test:launch:prod cy:run:prod",
+    "test:launch:prod": "node test/launch.js --prod",
+    "cy:run:prod": "wait-on http://localhost:3000 && cypress run -s test/cypress/integration/prod.js"
   },
   "repository": "https://github.com/sveltejs/sapper",
   "keywords": [
@@ -36,8 +50,5 @@
   "bugs": {
     "url": "https://github.com/sveltejs/sapper/issues"
   },
-  "homepage": "https://github.com/sveltejs/sapper#readme",
-  "@std/esm": {
-    "esm": "js"
-  }
+  "homepage": "https://github.com/sveltejs/sapper#readme"
 }

runtime/app.js

@@ -1,22 +1,192 @@
-const app = {
-	init(callback) {
-		window.addEventListener('click', event => {
-			let a = event.target;
-			while (a && a.nodeName !== 'A') a = a.parentNode;
-			if (!a) return;
-
-			if (callback(new URL(a.href))) {
-				event.preventDefault();
-				history.pushState({}, '', a.href);
-			}
-		});
-
-		window.addEventListener('popstate', event => {
-			callback(window.location);
-		});
-
-		callback(window.location);
-	}
+const detach = node => {
+	node.parentNode.removeChild(node);
 };
 
-export default app;
+export let component;
+let target;
+let routes;
+
+const scroll_history = {};
+let uid = 1;
+let cid;
+
+if ('scrollRestoration' in history) {
+	history.scrollRestoration = 'manual'
+}
+
+function select_route(url) {
+	if (url.origin !== window.location.origin) return null;
+
+	for (const route of routes) {
+		const match = route.pattern.exec(url.pathname);
+		if (match) {
+			const params = route.params(match);
+
+			const query = {};
+			for (const [key, value] of url.searchParams) query[key] = value || true;
+
+			return { route, data: { params, query } };
+		}
+	}
+}
+
+function render(Component, data, scroll) {
+	Promise.resolve(
+		Component.preload ? Component.preload(data) : {}
+	).then(preloaded => {
+		if (component) {
+			component.destroy();
+		} else {
+			// first load — remove SSR'd <head> contents
+			const start = document.querySelector('#sapper-head-start');
+			let end = document.querySelector('#sapper-head-end');
+
+			if (start && end) {
+				while (start.nextSibling !== end) detach(start.nextSibling);
+				detach(start);
+				detach(end);
+			}
+
+			// preload additional routes
+			routes.reduce((promise, route) => promise.then(route.load), Promise.resolve());
+		}
+
+		component = new Component({
+			target,
+			data: Object.assign(data, preloaded),
+			hydrate: !!component
+		});
+
+		if (scroll) {
+			window.scrollTo(scroll.x, scroll.y);
+		}
+	});
+}
+
+function navigate(url, id) {
+	const selected = select_route(url);
+	if (selected) {
+		if (id) {
+			// popstate or initial navigation
+			cid = id;
+		} else {
+			// clicked on a link. preserve scroll state
+			scroll_history[cid] = scroll_state();
+
+			id = cid = ++uid;
+			scroll_history[cid] = { x: 0, y: 0 };
+
+			history.pushState({ id }, '', url.href);
+		}
+
+		selected.route.load().then(mod => {
+			render(mod.default, selected.data, scroll_history[id]);
+		});
+
+		cid = id;
+		return true;
+	}
+}
+
+function handle_click(event) {
+	// Adapted from https://github.com/visionmedia/page.js
+	// MIT license https://github.com/visionmedia/page.js#license
+	if (which(event) !== 1) return;
+	if (event.metaKey || event.ctrlKey || event.shiftKey) return;
+	if (event.defaultPrevented) return;
+
+	const a = findAnchor(event.target);
+	if (!a) return;
+
+	// check if link is inside an svg
+	// in this case, both href and target are always inside an object
+	const svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
+	const href = svg ? a.href.baseVal : a.href;
+
+	if (href === window.location.href) {
+		event.preventDefault();
+		return;
+	}
+
+	// Ignore if tag has
+	// 1. 'download' attribute
+	// 2. rel='external' attribute
+	if (a.hasAttribute('download') || a.getAttribute('rel') === 'external') return;
+
+	// Ignore if <a> has a target
+	if (svg ? a.target.baseVal : a.target) return;
+
+	const url = new URL(href);
+
+	// Don't handle hash changes
+	if (url.pathname === window.location.pathname && url.search === window.location.search) return;
+
+	if (navigate(url, null)) {
+		event.preventDefault();
+	}
+}
+
+function handle_popstate(event) {
+	scroll_history[cid] = scroll_state();
+
+	if (event.state) {
+		navigate(new URL(window.location), event.state.id);
+	} else {
+		// hashchange
+		cid = ++uid;
+		history.replaceState({ id: cid }, '', window.location.href);
+	}
+}
+
+function prefetch(event) {
+	const a = findAnchor(event.target);
+	if (!a || a.rel !== 'prefetch') return;
+
+	const selected = select_route(new URL(a.href));
+
+	if (selected) {
+		selected.route.load().then(mod => {
+			if (mod.default.preload) mod.default.preload(selected.data);
+		});
+	}
+}
+
+function findAnchor(node) {
+	while (node && node.nodeName.toUpperCase() !== 'A') node = node.parentNode; // SVG <a> elements have a lowercase name
+	return node;
+}
+
+let inited;
+
+export function init(_target, _routes) {
+	target = _target;
+	routes = _routes;
+
+	if (!inited) { // this check makes HMR possible
+		window.addEventListener('click', handle_click);
+		window.addEventListener('popstate', handle_popstate);
+
+		// prefetch
+		window.addEventListener('touchstart', prefetch);
+		window.addEventListener('mouseover', prefetch);
+
+		inited = true;
+	}
+
+	const scroll = scroll_history[uid] = scroll_state();
+
+	history.replaceState({ id: uid }, '', window.location.href);
+	navigate(new URL(window.location), uid);
+}
+
+function which(event) {
+	event = event || window.event;
+	return event.which === null ? event.button : event.which;
+}
+
+function scroll_state() {
+	return {
+		x: window.scrollX,
+		y: window.scrollY
+	};
+}

templates/main.js

@@ -1,47 +0,0 @@
-import app from '__app__';
-import { detachNode } from 'svelte/shared.js';
-
-const target = document.querySelector('__selector__');
-let component;
-
-app.init(url => {
-	if (url.origin !== window.location.origin) return;
-
-	let match;
-	let params = {};
-	const query = {};
-
-	function render(mod) {
-		const route = { query, params };
-
-		Promise.resolve(
-			mod.default.preload ? mod.default.preload(route) : {}
-		).then(preloaded => {
-			if (component) {
-				component.destroy();
-			} else {
-				// remove SSR'd <head> contents
-				const start = document.querySelector('#sapper-head-start');
-				let end = document.querySelector('#sapper-head-end');
-
-				if (start && end) {
-					while (start.nextSibling !== end) detachNode(start.nextSibling);
-					detachNode(start);
-					detachNode(end);
-				}
-
-				target.innerHTML = '';
-			}
-
-			component = new mod.default({
-				target,
-				data: Object.assign(route, preloaded),
-				hydrate: !!component
-			});
-		});
-	}
-
-	// ROUTES
-
-	return true;
-});

test/app/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+node_modules
+.sapper
+yarn.lock
+cypress/screenshots

test/app/README.md

@@ -0,0 +1,81 @@
+# sapper-template
+
+The default [Sapper](https://github.com/sveltejs/sapper) template. To clone it and get started:
+
+```bash
+npx degit sveltejs/sapper-template my-app
+cd my-app
+npm install # or yarn!
+npm run dev
+```
+
+Open up [localhost:3000](http://localhost:3000) and start clicking around.
+
+
+## Structure
+
+Sapper expects to find three directories in the root of your project — `assets`, `routes` and `templates`.
+
+
+### assets
+
+The [assets](assets) directory contains any static assets that should be available. These are served using [serve-static](https://github.com/expressjs/serve-static).
+
+In your [service-worker.js](templates/service-worker.js) file, Sapper makes these files available as `__assets__` so that you can cache them (though you can choose not to, for example if you don't want to cache very large files).
+
+
+### routes
+
+This is the heart of your Sapper app. There are two kinds of routes — *pages*, and *server routes*.
+
+**Pages** are Svelte components written in `.html` files. When a user first visits the application, they will be served a server-rendered version of the route in question, plus some JavaScript that 'hydrates' the page and initialises a client-side router. From that point forward, navigating to other pages is handled entirely on the client for a fast, app-like feel. (Sapper will preload and cache the code for these subsequent pages, so that navigation is instantaneous.)
+
+**Server routes** are modules written in `.js` files, that export functions corresponding to HTTP methods. Each function receives Express `request` and `response` objects as arguments, plus a `next` function. This is useful for creating a JSON API, for example.
+
+There are three simple rules for naming the files that define your routes:
+
+* A file called `routes/about.html` corresponds to the `/about` route. A file called `routes/blog/[slug].html` corresponds to the `/blog/:slug` route, in which case `params.slug` is available to the route
+* The file `routes/index.html` (or `routes/index.js`) corresponds to the root of your app. `routes/about/index.html` is treated the same as `routes/about.html`.
+* Files and directories with a leading underscore do *not* create routes. This allows you to colocate helper modules and components with the routes that depend on them — for example you could have a file called `routes/_helpers/datetime.js` and it would *not* create a `/_helpers/datetime` route
+
+
+### templates
+
+This directory should contain the following files at a minimum:
+
+* [2xx.html](templates/2xx.html) — a template for the page to serve for valid requests
+* [4xx.html](templates/4xx.html) — a template for 4xx-range errors (such as 404 Not Found)
+* [5xx.html](templates/5xx.html) — a template for 5xx-range errors (such as 500 Internal Server Error)
+* [main.js](templates/main.js) — this module initialises Sapper
+* [service-worker.js](templates/service-worker.js) — your app's service worker
+
+Inside the HTML templates, Sapper will inject various values as indicated by `%sapper.xxxx%` tags. Inside JavaScript files, Sapper will replace strings like `__dev__` with the appropriate value.
+
+In lieu of documentation (bear with us), consult the files to see what variables are available and how they're used.
+
+
+## Webpack config
+
+Sapper uses webpack to provide code-splitting, dynamic imports and hot module reloading, as well as compiling your Svelte components. As long as you don't do anything daft, you can edit the configuration files to add whatever loaders and plugins you'd like.
+
+
+## Production mode and deployment
+
+To start a production version of your app, run `npm start`. This will disable hot module replacement, and activate the appropriate webpack plugins.
+
+You can deploy your application to any environment that supports Node 8 or above. As an example, to deploy to [Now](https://zeit.co/now), run these commands:
+
+```bash
+npm install -g now
+now
+```
+
+
+## Bugs and feedback
+
+Sapper is in early development, and may have the odd rough edge here and there. Please be vocal over on the [Sapper issue tracker](https://github.com/sveltejs/sapper/issues).
+
+
+## License
+
+[LIL](LICENSE)

test/app/assets/global.css

@@ -0,0 +1,45 @@
+body {
+	margin: 0;
+	font-family: Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+	font-size: 14px;
+	line-height: 1.5;
+	color: #333;
+}
+
+main {
+	position: relative;
+	max-width: 56em;
+	background-color: white;
+	padding: 2em;
+	margin: 0 auto;
+	box-sizing: border-box;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	margin: 0 0 0.5em 0;
+	font-weight: 400;
+	line-height: 1.2;
+}
+
+h1 {
+	font-size: 2em;
+}
+
+a {
+	color: inherit;
+}
+
+code {
+	font-family: menlo, inconsolata, monospace;
+	font-size: calc(1em - 2px);
+	color: #555;
+	background-color: #f0f0f0;
+	padding: 0.2em 0.4em;
+	border-radius: 2px;
+}
+
+@media (min-width: 400px) {
+	body {
+		font-size: 16px;
+	}
+}

test/app/assets/manifest.json

@@ -0,0 +1,20 @@
+{
+	"background_color": "#ffffff",
+	"theme_color": "#aa1e1e",
+	"name": "TODO",
+	"short_name": "TODO",
+	"display": "minimal-ui",
+	"start_url": "/",
+	"icons": [
+		{
+			"src": "svelte-logo-192.png",
+			"sizes": "192x192",
+			"type": "image/png"
+		},
+		{
+			"src": "svelte-logo-512.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		}
+	]
+}

test/app/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "TODO",
+  "description": "TODO",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "node server.js",
+    "build": "sapper build",
+    "start": "cross-env NODE_ENV=production node server.js",
+    "prestart": "npm run build"
+  },
+  "dependencies": {
+    "compression": "^1.7.1",
+    "cross-env": "^5.1.1",
+    "css-loader": "^0.28.7",
+    "express": "^4.16.2",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "glob": "^7.1.2",
+    "marked": "^0.3.7",
+    "node-fetch": "^1.7.3",
+    "npm-run-all": "^4.1.2",
+    "serve-static": "^1.13.1",
+    "style-loader": "^0.19.0",
+    "svelte": "^1.49.1",
+    "svelte-loader": "^2.2.1",
+    "uglifyjs-webpack-plugin": "^1.1.2",
+    "webpack": "^3.10.0"
+  }
+}

test/app/routes/_components/Layout.html

@@ -0,0 +1,15 @@
+<Nav page={{page}}/>
+
+<main>
+	<slot></slot>
+</main>
+
+<script>
+	import Nav from './Nav.html';
+
+	export default {
+		components: {
+			Nav
+		}
+	};
+</script>

test/app/routes/_components/Nav.html

@@ -0,0 +1,56 @@
+<nav>
+	<ul>
+		<li><a class='{{page === "home"  ? "selected" : ""}}' href='/'>home</a></li>
+		<li><a class='{{page === "about"  ? "selected" : ""}}' href='/about'>about</a></li>
+
+		<!-- for the blog link, we're using rel=prefetch so that Sapper prefetches
+		     the blog data when we hover over the link or tap it on a touchscreen -->
+		<li><a rel=prefetch class='{{page === "blog"  ? "selected" : ""}}' href='/blog'>blog</a></li>
+	</ul>
+</nav>
+
+<style>
+	nav {
+		border-bottom: 1px solid rgba(170,30,30,0.1);
+		font-weight: 300;
+		padding: 0 1em;
+	}
+
+	ul {
+		margin: 0;
+		padding: 0;
+	}
+
+	/* clearfix */
+	ul::after {
+		content: '';
+		display: block;
+		clear: both;
+	}
+
+	li {
+		display: block;
+		float: left;
+	}
+
+	.selected {
+		position: relative;
+		display: inline-block;
+	}
+
+	.selected::after {
+		position: absolute;
+		content: '';
+		width: calc(100% - 1em);
+		height: 2px;
+		background-color: rgb(170,30,30);
+		display: block;
+		bottom: -1px;
+	}
+
+	a {
+		text-decoration: none;
+		padding: 1em 0.5em;
+		display: block;
+	}
+</style>

test/app/routes/about.html

@@ -0,0 +1,19 @@
+<:Head>
+	<title>About</title>
+</:Head>
+
+<Layout page='about'>
+	<h1>About this site</h1>
+
+	<p>This is the 'about' page. There's not much here.</p>
+</Layout>
+
+<script>
+	import Layout from './_components/Layout.html';
+
+	export default {
+		components: {
+			Layout
+		}
+	};
+</script>

test/app/routes/api/blog/[slug].js

@@ -0,0 +1,23 @@
+import posts from './_posts.js';
+
+const lookup = {};
+posts.forEach(post => {
+	lookup[post.slug] = JSON.stringify(post);
+});
+
+export function get(req, res, next) {
+	// the `slug` parameter is available because this file
+	// is called [slug].js
+	const { slug } = req.params;
+
+	if (slug in lookup) {
+		res.set({
+			'Content-Type': 'application/json',
+			'Cache-Control': `max-age=${30 * 60 * 1e3}` // cache for 30 minutes
+		});
+
+		res.end(lookup[slug]);
+	} else {
+		next();
+	}
+}

test/app/routes/api/blog/_posts.js

@@ -0,0 +1,92 @@
+// Ordinarily, you'd generate this data from markdown files in your
+// repo, or fetch them from a database of some kind. But in order to
+// avoid unnecessary dependencies in the starter template, and in the
+// service of obviousness, we're just going to leave it here.
+
+// This file is called `_posts.js` rather than `posts.js`, because
+// we don't want to create an `/api/blog/posts` route — the leading
+// underscore tells Sapper not to do that.
+
+const posts = [
+	{
+		title: 'What is Sapper?',
+		slug: 'what-is-sapper',
+		html: `
+			<p>First, you have to know what <a href='https://svelte.technology'>Svelte</a> is. Svelte is a UI framework with a bold new idea: rather than providing a library that you write code with (like React or Vue, for example), it's a compiler that turns your components into highly optimized vanilla JavaScript. If you haven't already read the <a href='https://svelte.technology/blog/frameworks-without-the-framework'>introductory blog post</a>, you should!</p>
+
+			<p>Sapper is a Next.js-style framework (<a href='/blog/how-is-sapper-different-from-next'>more on that here</a>) built around Svelte. It makes it embarrassingly easy to create extremely high performance web apps. Out of the box, you get:</p>
+
+			<ul>
+				<li>Code-splitting, dynamic imports and hot module replacement, powered by webpack</li>
+				<li>Server-side rendering (SSR) with client-side hydration</li>
+				<li>Service worker for offline support, and all the PWA bells and whistles</li>
+				<li>The nicest development experience you've ever had, or your money back</li>
+			</ul>
+
+			<p>It's implemented as Express middleware. Everything is set up and waiting for you to get started, but you keep complete control over the server, service worker, webpack config and everything else, so it's as flexible as you need it to be.</p>
+		`
+	},
+
+	{
+		title: 'How to use Sapper',
+		slug: 'how-to-use-sapper',
+		html: `
+			<h2>Step one</h2>
+			<p>Create a new project, using <a href='https://github.com/Rich-Harris/degit'>degit</a>:</p>
+
+			<pre><code>npx degit sveltejs/sapper-template my-app
+			cd my-app
+			npm install # or yarn!
+			npm run dev
+			</code></pre>
+
+			<h2>Step two</h2>
+			<p>Go to <a href='http://localhost:3000'>localhost:3000</a>. Open <code>my-app</code> in your editor. Edit the files in the <code>routes</code> directory or add new ones.</p>
+
+			<h2>Step three</h2>
+			<p>...</p>
+
+			<h2>Step four</h2>
+			<p>Resist overdone joke formats.</p>
+		`
+	},
+
+	{
+		title: 'Why the name?',
+		slug: 'why-the-name',
+		html: `
+			<p>In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as <em>sappers</em>.</p>
+
+			<p>For web developers, the stakes are generally lower than those for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for <strong>S</strong>velte <strong>app</strong> mak<strong>er</strong>, is your courageous and dutiful ally.</p>
+		`
+	},
+
+	{
+		title: 'How is Sapper different from Next.js?',
+		slug: 'how-is-sapper-different-from-next',
+		html: `
+			<p><a href='https://github.com/zeit/next.js/'>Next.js</a> is a React framework from <a href='https://zeit.co'>Zeit</a>, and is the inspiration for Sapper. There are a few notable differences, however:</p>
+
+			<ul>
+				<li>It's powered by <a href='https://svelte.technology'>Svelte</a> instead of React, so it's faster and your apps are smaller</li>
+				<li>Instead of route masking, we encode route parameters in filenames. For example, the page you're looking at right now is <code>routes/blog/[slug].html</code></li>
+				<li>As well as pages (Svelte components, which render on server or client), you can create <em>server routes</em> in your <code>routes</code> directory. These are just <code>.js</code> files that export functions corresponding to HTTP methods, and receive Express <code>request</code> and <code>response</code> objects as arguments. This makes it very easy to, for example, add a JSON API such as the one powering this very page (look in <code>routes/api/blog</code>)</li>
+				<li>Links are just <code>&lt;a&gt;</code> elements, rather than framework-specific <code>&lt;Link&gt;</code> components. That means, for example, that <a href='/blog/how-can-i-get-involved'>this link right here</a>, despite being inside a blob of HTML, works with the router as you'd expect.</li>
+			</ul>
+		`
+	},
+
+	{
+		title: 'How can I get involved?',
+		slug: 'how-can-i-get-involved',
+		html: `
+			<p>We're so glad you asked! Come on over to the <a href='https://github.com/sveltejs/svelte'>Svelte</a> and <a href='https://github.com/sveltejs/sapper'>Sapper</a> repos, and join us in the <a href='https://gitter.im/sveltejs/svelte'>Gitter chatroom</a>. Everyone is welcome, especially you!</p>
+		`
+	}
+];
+
+posts.forEach(post => {
+	post.html = post.html.replace(/^\t{3}/gm, '');
+});
+
+export default posts;

test/app/routes/api/blog/index.js

@@ -0,0 +1,17 @@
+import posts from './_posts.js';
+
+const contents = JSON.stringify(posts.map(post => {
+	return {
+		title: post.title,
+		slug: post.slug
+	};
+}));
+
+export function get(req, res) {
+	res.set({
+		'Content-Type': 'application/json',
+		'Cache-Control': `max-age=${30 * 60 * 1e3}` // cache for 30 minutes
+	});
+
+	res.end(contents);
+}

test/app/routes/blog/[slug].html

@@ -0,0 +1,67 @@
+<:Head>
+	<title>{{post.title}}</title>
+</:Head>
+
+<Layout page='blog'>
+	<h1>{{post.title}}</h1>
+
+	<div class='content'>
+		{{{post.html}}}
+	</div>
+</Layout>
+
+<style>
+	/*
+		By default, CSS is locally scoped to the component,
+		and any unused styles are dead-code-eliminated.
+		In this page, Svelte can't know which elements are
+		going to appear inside the {{{post.html}}} block,
+		so we have to use the :global(...) modifier to target
+		all elements inside .content
+	*/
+	.content :global(h2) {
+		font-size: 1.4em;
+		font-weight: 500;
+	}
+
+	.content :global(pre) {
+		background-color: #f9f9f9;
+		box-shadow: inset 1px 1px 5px rgba(0,0,0,0.05);
+		padding: 0.5em;
+		border-radius: 2px;
+		overflow-x: auto;
+	}
+
+	.content :global(pre) :global(code) {
+		background-color: transparent;
+		padding: 0;
+	}
+
+	.content :global(ul) {
+		line-height: 1.5;
+	}
+
+	.content :global(li) {
+		margin: 0 0 0.5em 0;
+	}
+</style>
+
+<script>
+	import Layout from '../_components/Layout.html';
+
+	export default {
+		components: {
+			Layout
+		},
+
+		preload({ params, query }) {
+			// the `slug` parameter is available because this file
+			// is called [slug].html
+			const { slug } = params;
+
+			return fetch(`/api/blog/${slug}`).then(r => r.json()).then(post => {
+				return { post };
+			});
+		}
+	};
+</script>

test/app/routes/blog/index.html

@@ -0,0 +1,40 @@
+<:Head>
+	<title>Blog</title>
+</:Head>
+
+<Layout page='blog'>
+	<h1>Recent posts</h1>
+
+	<ul>
+		{{#each posts as post}}
+			<!-- we're using the non-standard `rel=prefetch` attribute to
+			     tell Sapper to load the data for the page as soon as
+			     the user hovers over the link or taps it, instead of
+			     waiting for the 'click' event -->
+			<li><a rel='prefetch' href='/blog/{{post.slug}}'>{{post.title}}</a></li>
+		{{/each}}
+	</ul>
+</Layout>
+
+<style>
+	ul {
+		margin: 0 0 1em 0;
+		line-height: 1.5;
+	}
+</style>
+
+<script>
+	import Layout from '../_components/Layout.html';
+
+	export default {
+		components: {
+			Layout
+		},
+
+		preload({ params, query }) {
+			return fetch(`/api/blog`).then(r => r.json()).then(posts => {
+				return { posts };
+			});
+		}
+	};
+</script>

test/app/routes/index.html

@@ -0,0 +1,58 @@
+<:Head>
+	<title>Sapper project template</title>
+</:Head>
+
+<Layout page='home'>
+	<h1>Great success!</h1>
+
+	<figure>
+		<img src='/great-success.png'>
+		<figcaption>HIGH FIVE!</figcaption>
+	</figure>
+
+	<p><strong>Try editing this file (routes/index.html) to test hot module reloading.</strong></p>
+</Layout>
+
+<style>
+	h1, figure, p {
+		text-align: center;
+		margin: 0 auto;
+	}
+
+	h1 {
+		font-size: 2.8em;
+		text-transform: uppercase;
+		font-weight: 700;
+		margin: 0 0 0.5em 0;
+	}
+
+	figure {
+		margin: 0 0 1em 0;
+	}
+
+	img {
+		width: 100%;
+		max-width: 400px;
+		margin: 0 0 1em 0;
+	}
+
+	p {
+		margin: 1em auto;
+	}
+
+	@media (min-width: 480px) {
+		h1 {
+			font-size: 4em;
+		}
+	}
+</style>
+
+<script>
+	import Layout from './_components/Layout.html';
+
+	export default {
+		components: {
+			Layout
+		}
+	};
+</script>

test/app/server.js

@@ -0,0 +1,24 @@
+const fs = require('fs');
+const app = require('express')();
+const compression = require('compression');
+const sapper = require('sapper');
+const static = require('serve-static');
+
+const { PORT = 3000 } = process.env;
+
+// this allows us to do e.g. `fetch('/api/blog')` on the server
+const fetch = require('node-fetch');
+global.fetch = (url, opts) => {
+	if (url[0] === '/') url = `http://localhost:${PORT}${url}`;
+	return fetch(url, opts);
+};
+
+app.use(compression({ threshold: 0 }));
+
+app.use(static('assets'));
+
+app.use(sapper());
+
+app.listen(PORT, () => {
+	console.log(`listening on port ${PORT}`);
+});

test/app/templates/2xx.html

@@ -0,0 +1,37 @@
+<!doctype>
+<html lang='en'>
+<head>
+	<meta charset='utf-8'>
+	<meta name='viewport' content='width=device-width'>
+	<meta name='theme-color' content='#aa1e1e'>
+
+	<link rel='stylesheet' href='/global.css'>
+	<link rel='manifest' href='/manifest.json'>
+	<link rel='icon' type='image/png' href='/favicon.png'>
+
+	<script>
+		if ('serviceWorker' in navigator) {
+			navigator.serviceWorker.register('/service-worker.js');
+		}
+	</script>
+
+	<!-- Sapper generates a <style> tag containing critical CSS
+	     for the current page. CSS for the rest of the app is
+	     lazily loaded when it precaches secondary pages -->
+	%sapper.styles%
+
+	<!-- This contains the contents of the <:Head> component, if
+	     the current page has one -->
+	%sapper.head%
+</head>
+<body>
+	<!-- The application will be rendered inside this element,
+	     because `templates/main.js` references it -->
+	<div id='sapper'>%sapper.html%</div>
+
+	<!-- Sapper creates a <script> tag containing `templates/main.js`
+	     and anything else it needs to hydrate the app and
+	     initialise the router -->
+	<script src='%sapper.main%'></script>
+</body>
+</html>

test/app/templates/4xx.html

@@ -0,0 +1,44 @@
+<!doctype>
+<html lang='en'>
+<head>
+	<meta charset='utf-8'>
+	<meta name='viewport' content='width=device-width'>
+	<meta name='theme-color' content='#aa1e1e'>
+
+	<link rel='manifest' href='/manifest.json'>
+	<link rel='icon' type='image/png' href='/favicon.png'>
+
+	<!-- %sapper.status% is the HTTP status code, e.g. 404 -->
+	<title>%sapper.status%</title>
+
+	<style>
+		body {
+			max-width: 800px;
+			padding: 1em;
+			margin: 0 auto;
+			font-family: Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+			background-color: #f4f4f4;
+			box-sizing: border-box;
+		}
+
+		h1 {
+			color: rgb(170,30,30);
+			border-bottom: 1px solid #aaa;
+			padding: 0 0 0.5em 0;
+			margin: 1em 0;
+		}
+
+		pre {
+			font-family: Menlo, monospace;
+			font-size: 14px;
+			line-height: 1.2;
+			overflow-x: auto;
+			white-space: pre-wrap;
+		}
+	</style>
+</head>
+<body>
+	<h1>%sapper.title%</h1>
+	<p>Could not %sapper.method% %sapper.url%</p>
+</body>
+</html>

test/app/templates/5xx.html

@@ -0,0 +1,47 @@
+<!doctype>
+<html lang='en'>
+<head>
+	<meta charset='utf-8'>
+	<meta name='viewport' content='width=device-width'>
+	<meta name='theme-color' content='#aa1e1e'>
+
+	<link rel='manifest' href='/manifest.json'>
+	<link rel='icon' type='image/png' href='/favicon.png'>
+
+	<title>%sapper.status%</title>
+
+	<style>
+		body {
+			max-width: 800px;
+			padding: 1em;
+			margin: 0 auto;
+			box-sizing: border-box;
+		}
+
+		h1 {
+			color: rgb(170,30,30);
+			border-bottom: 1px solid #aaa;
+			padding: 0 0 0.5em 0;
+			margin: 1em 0;
+		}
+
+		pre {
+			font-family: Menlo, monospace;
+			font-size: 14px;
+			line-height: 1.2;
+			overflow-x: auto;
+			white-space: pre-wrap;
+		}
+
+		.stack {
+			font-size: 12px;
+			color: #999;
+		}
+	</style>
+</head>
+<body>
+	<h1>%sapper.title%</h1>
+	<pre>%sapper.error%</pre>
+	<pre class='stack'>%sapper.stack%</pre>
+</body>
+</html>

test/app/templates/main.js

@@ -0,0 +1,10 @@
+import { init } from '__app__';
+
+// `routes` is an array of route objects injected by Sapper
+init(document.querySelector('#sapper'), __routes__);
+
+// if (__dev__) {
+// 	// Enable hot-module reloading
+// 	import('sapper/webpack/hmr');
+// 	if (module.hot) module.hot.accept();
+// }

test/app/templates/service-worker.js

@@ -0,0 +1,77 @@
+const ASSETS = `cache__timestamp__`;
+
+// `shell` is an array of all the files generated by webpack,
+// `assets` is an array of everything in the `assets` directory
+const to_cache = __shell__.concat(__assets__);
+const cached = new Set(to_cache);
+
+// `routes` is an array of `{ pattern: RegExp }` objects that
+// match the pages in your app
+const routes = __routes__;
+
+self.addEventListener('install', event => {
+	event.waitUntil(
+		caches
+			.open(ASSETS)
+			.then(cache => cache.addAll(to_cache))
+			.then(() => {
+				self.skipWaiting();
+			})
+	);
+});
+
+self.addEventListener('activate', event => {
+	event.waitUntil(
+		caches.keys().then(async keys => {
+			// delete old caches
+			for (const key of keys) {
+				if (key !== ASSETS) await caches.delete(key);
+			}
+
+			await self.clients.claim();
+		})
+	);
+});
+
+self.addEventListener('fetch', event => {
+	const url = new URL(event.request.url);
+
+	// don't try to handle e.g. data: URIs
+	if (!url.protocol.startsWith('http')) return;
+
+	// always serve assets and webpack-generated files from cache
+	if (cached.has(url.pathname)) {
+		event.respondWith(caches.match(event.request));
+		return;
+	}
+
+	// for pages, you might want to serve a shell `index.html` file,
+	// which Sapper has generated for you. It's not right for every
+	// app, but if it's right for yours then uncomment this section
+	/*
+	if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) {
+		event.respondWith(caches.match('/index.html'));
+		return;
+	}
+	*/
+
+	// for everything else, try the network first, falling back to
+	// cache if the user is offline. (If the pages never change, you
+	// might prefer a cache-first approach to a network-first one.)
+	event.respondWith(
+		caches
+			.open('offline')
+			.then(async cache => {
+				try {
+					const response = await fetch(event.request);
+					cache.put(event.request, response.clone());
+					return response;
+				} catch(err) {
+					const response = await cache.match(event.request);
+					if (response) return response;
+
+					throw err;
+				}
+			})
+	);
+});

test/app/webpack.client.config.js

@@ -0,0 +1,50 @@
+const config = require('../../webpack/config.js');
+const webpack = require('webpack');
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+
+module.exports = {
+	entry: config.client.entry(),
+	output: config.client.output(),
+	resolve: {
+		extensions: ['.js', '.html']
+	},
+	module: {
+		rules: [
+			{
+				test: /\.html$/,
+				exclude: /node_modules/,
+				use: {
+					loader: 'svelte-loader',
+					options: {
+						hydratable: true,
+						emitCss: !config.dev,
+						cascade: false,
+						store: true
+					}
+				}
+			},
+			config.dev && {
+				test: /\.css$/,
+				use: [
+					{ loader: "style-loader" },
+					{ loader: "css-loader" }
+				]
+			},
+			!config.dev && {
+				test: /\.css$/,
+				use: ExtractTextPlugin.extract({
+					fallback: 'style-loader',
+					use: [{ loader: 'css-loader', options: { sourceMap: config.dev } }]
+				})
+			}
+		].filter(Boolean)
+	},
+	plugins: [
+		config.dev && new webpack.HotModuleReplacementPlugin(),
+		!config.dev && new ExtractTextPlugin('main.css'),
+		!config.dev && new webpack.optimize.ModuleConcatenationPlugin(),
+		!config.dev && new UglifyJSPlugin()
+	].filter(Boolean),
+	devtool: config.dev ? 'inline-source-map' : false
+};

test/app/webpack.server.config.js

@@ -0,0 +1,30 @@
+const config = require('../../webpack/config.js');
+const webpack = require('webpack');
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+
+module.exports = {
+	entry: config.server.entry(),
+	output: config.server.output(),
+	target: 'node',
+	resolve: {
+		extensions: ['.js', '.html']
+	},
+	module: {
+		rules: [
+			{
+				test: /\.html$/,
+				exclude: /node_modules/,
+				use: {
+					loader: 'svelte-loader',
+					options: {
+						css: false,
+						cascade: false,
+						store: true,
+						generate: 'ssr'
+					}
+				}
+			}
+		]
+	}
+};

test/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

test/cypress/integration/dev.js

@@ -0,0 +1,19 @@
+describe('dev mode', () => {
+	beforeEach(() => {
+		cy.visit('/')
+	});
+
+	it('has the correct <h1>', () => {
+		cy.contains('h1', 'Great success!')
+	});
+
+	it('navigates to /about', () => {
+		cy.get('nav a').contains('about').click();
+		cy.url().should('include', '/about');
+	});
+
+	it('navigates to /blog', () => {
+		cy.get('nav a').contains('blog').click();
+		cy.url().should('include', '/blog');
+	});
+});

test/cypress/integration/prod.js

@@ -0,0 +1,19 @@
+describe('prod mode', () => {
+	beforeEach(() => {
+		cy.visit('/')
+	});
+
+	it('has the correct <h1>', () => {
+		cy.contains('h1', 'Great success!')
+	});
+
+	it('navigates to /about', () => {
+		cy.get('nav a').contains('about').click();
+		cy.url().should('include', '/about');
+	});
+
+	it('navigates to /blog', () => {
+		cy.get('nav a').contains('blog').click();
+		cy.url().should('include', '/blog');
+	});
+});

test/cypress/plugins/index.js

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

test/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This is will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

test/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

test/launch.js

@@ -0,0 +1,75 @@
+const fs = require('fs');
+const path = require('path');
+const rimraf = require('rimraf');
+const child_process = require('child_process');
+
+// ensure sapper doesn't exist in app/node_modules
+rimraf.sync(
+	path.join(__dirname, 'app/node_modules/sapper')
+);
+
+rimraf.sync(
+	path.join(__dirname, 'app/node_modules/.bin/sapper')
+);
+
+// create symlinks
+fs.symlinkSync(
+	path.join(__dirname, '..'),
+	path.join(__dirname, 'app/node_modules/sapper')
+);
+
+fs.symlinkSync(
+	path.join(__dirname, '../cli/index.js'),
+	path.join(__dirname, 'app/node_modules/.bin/sapper')
+);
+
+const app_dir = path.join(__dirname, 'app');
+
+function start_server() {
+	const server = child_process.spawn(process.execPath, ['server.js'], {
+		cwd: app_dir,
+		env: {
+			NODE_ENV: 'development'
+		},
+		stdio: 'pipe'
+	});
+
+	server.stdout.on('data', (data) => {
+		process.stdout.write(data);
+	});
+
+	server.stderr.on('data', (data) => {
+		process.stderr.write(data);
+	});
+}
+
+function launch() {
+	if (process.argv[2] === '--dev') {
+		start_server();
+	} else {
+		child_process.exec(`npm run build`, {
+			cwd: app_dir
+		}, (err, stdout, stderr) => {
+			if (err) throw err;
+
+			process.stdout.write(stdout);
+			process.stderr.write(stderr);
+			start_server();
+		});
+	}
+}
+
+// this is a terrible hack
+if (process.env.APPVEYOR) {
+	child_process.exec(`npm install`, {
+		cwd: app_dir
+	}, (err, stdout, stderr) => {
+		if (err) throw err;
+
+		process.stdout.write(stdout);
+		process.stderr.write(stderr);
+		launch();
+	});
+} else {
+	launch();
+}

test/unit/create_routes.test.js

@@ -0,0 +1,51 @@
+const path = require('path');
+const assert = require('assert');
+
+const create_routes = require('../../lib/utils/create_routes.js');
+
+describe('create_routes', () => {
+	it('sorts routes correctly', () => {
+		const routes = create_routes(['index.html', 'about.html', '[wildcard].html', 'post/[id].html']);
+
+		assert.deepEqual(
+			routes.map(r => r.file),
+			[
+				'about.html',
+				'index.html',
+				'post/[id].html',
+				'[wildcard].html'
+			]
+		);
+	});
+
+	it('generates params', () => {
+		const routes = create_routes(['index.html', 'about.html', '[wildcard].html', 'post/[id].html']);
+
+		let file;
+		let params;
+		for (let i = 0; i < routes.length; i += 1) {
+			const route = routes[i];
+			if (params = route.exec('/post/123')) {
+				file = route.file;
+				break;
+			}
+		}
+
+		assert.equal(file, 'post/[id].html');
+		assert.deepEqual(params, {
+			id: '123'
+		});
+	});
+
+	it('ignores files and directories with leading underscores', () => {
+		const routes = create_routes(['index.html', '_foo.html', 'a/_b/c/d.html', 'e/f/g/h.html', 'i/_j.html']);
+
+		assert.deepEqual(
+			routes.map(r => r.file),
+			[
+				'e/f/g/h.html',
+				'index.html'
+			]
+		);
+	});
+});

utils/create_app.js

@@ -1,42 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const template = fs.readFileSync(path.resolve(__dirname, '../templates/main.js'), 'utf-8');
-
-module.exports = function create_app(src, dest, routes, options) {
-	// TODO in dev mode, watch files
-
-	const code = routes
-		.filter(route => route.type === 'page')
-		.map(route => {
-			const condition = route.dynamic.length === 0 ?
-				`url.pathname === '/${route.parts.join('/')}'` :
-				`match = ${route.pattern}.exec(url.pathname)`;
-
-			const lines = [];
-
-			route.dynamic.forEach((part, i) => {
-				lines.push(
-					`params.${part} = match[${i + 1}];`
-				);
-			});
-
-			lines.push(
-				`import('${src}/${route.file}').then(render);`
-			);
-
-			return `
-				if (${condition}) {
-					${lines.join(`\n\t\t\t\t\t`)}
-				}
-			`.replace(/^\t{3}/gm, '').trim();
-		})
-		.join(' else ') + ' else return false;';
-
-	const main = template
-		.replace('__app__', path.resolve(__dirname, '../runtime/app.js'))
-		.replace('__selector__', options.selector || 'main')
-		.replace('// ROUTES', code);
-
-	fs.writeFileSync(path.join(dest, 'main.js'), main);
-};

utils/create_routes.test.js

@@ -1,51 +0,0 @@
-const path = require('path');
-const assert = require('assert');
-
-const create_matchers = require('./create_matchers.js');
-
-describe('create_matchers', () => {
-	it('sorts routes correctly', () => {
-		const matchers = create_matchers(['index.html', 'about.html', '[wildcard].html', 'post/[id].html']);
-
-		assert.deepEqual(
-			matchers.map(m => m.file),
-			[
-				'about.html',
-				'index.html',
-				'post/[id].html',
-				'[wildcard].html'
-			]
-		);
-	});
-
-	it('generates params', () => {
-		const matchers = create_matchers(['index.html', 'about.html', '[wildcard].html', 'post/[id].html']);
-
-		let file;
-		let params;
-		for (let i = 0; i < matchers.length; i += 1) {
-			const matcher = matchers[i];
-			if (params = matcher.exec('/post/123')) {
-				file = matcher.file;
-				break;
-			}
-		}
-
-		assert.equal(file, 'post/[id].html');
-		assert.deepEqual(params, {
-			id: '123'
-		});
-	});
-
-	it('ignores files and directories with leading underscores', () => {
-		const matches = create_matchers(['index.html', '_foo.html', 'a/_b/c/d.html', 'e/f/g/h.html', 'i/_j.html']);
-
-		assert.deepEqual(
-			matches.map(m => m.file),
-			[
-				'e/f/g/h.html',
-				'index.html'
-			]
-		);
-	});
-});

utils/create_templates.js

@@ -1,42 +0,0 @@
-const fs = require('fs');
-const glob = require('glob');
-
-module.exports = function create_templates() {
-	const templates = glob.sync('*.html', { cwd: 'templates' })
-		.map(file => {
-			const template = fs.readFileSync(`templates/${file}`, 'utf-8');
-			const status = file.replace('.html', '').toLowerCase();
-
-			if (!/^[0-9x]{3}$/.test(status)) {
-				throw new Error(`Bad template — should be a valid status code like 404.html, or a wildcard like 2xx.html`);
-			}
-
-			const specificity = (
-				(status[0] === 'x' ? 0 : 4) +
-				(status[1] === 'x' ? 0 : 2) +
-				(status[2] === 'x' ? 0 : 1)
-			);
-
-			const pattern = new RegExp(`^${status.split('').map(d => d === 'x' ? '\\d' : d).join('')}$`);
-
-			return {
-				test: status => pattern.test(status),
-				specificity,
-				render(data) {
-					return template.replace(/%sapper\.(\w+)%/g, (match, key) => {
-						return key in data ? data[key] : '';
-					});
-				}
-			}
-		})
-		.sort((a, b) => b.specificity - a.specificity);
-
-	return {
-		render: (status, data) => {
-			const template = templates.find(template => template.test(status));
-			if (template) return template.render(data);
-
-			return `Missing template for status code ${status}`;
-		}
-	};
-};

utils/create_webpack_compiler.js

@@ -1,63 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
-
-module.exports = function create_webpack_compiler(out, routes, dev) {
-	const compiler = {};
-
-	const client = webpack(
-		require(path.resolve('webpack.client.config.js'))
-	);
-
-	const server = webpack(
-		require(path.resolve('webpack.server.config.js'))
-	);
-
-	if (false) { // TODO watch in dev
-		// TODO how can we invalidate compiler.client_main when watcher restarts?
-		compiler.client_main = new Promise((fulfil, reject) => {
-			client.watch({}, (err, stats) => {
-				if (err || stats.hasErrors()) {
-					// TODO handle errors
-				}
-
-				const filename = stats.toJson().assetsByChunkName.main;
-				fulfil(`/client/${filename}`);
-			});
-		});
-
-		// TODO server
-	} else {
-		compiler.client_main = new Promise((fulfil, reject) => {
-			client.run((err, stats) => {
-				console.log(stats.toString({ colors: true }));
-
-				if (err || stats.hasErrors()) {
-					reject(err || stats.toJson().errors[0]);
-				}
-
-				const filename = stats.toJson().assetsByChunkName.main;
-				fulfil(`/client/${filename}`);
-			});
-		});
-
-		const chunks = new Promise((fulfil, reject) => {
-			server.run((err, stats) => {
-				console.log(stats.toString({ colors: true }));
-
-				if (err || stats.hasErrors()) {
-					reject(err || stats.toJson().errors[0]);
-				}
-
-				fulfil(stats.toJson().assetsByChunkName);
-			});
-		});
-
-		compiler.get_chunk = async id => {
-			const assetsByChunkName = await chunks;
-			return path.resolve(out, 'server', assetsByChunkName[id]);
-		};
-	}
-
-	return compiler;
-};

webpack/config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const route_manager = require('../lib/route_manager.js');
-const { src, dest, dev } = require('../lib/config.js');
+const { src, dest, dev, server_routes } = require('../lib/config.js');
 
 module.exports = {
 	dev,
@@ -16,7 +16,7 @@ module.exports = {
 			return {
 				path: `${dest}/client`,
 				filename: '[name].[hash].js',
-				chunkFilename: '[name].[id].js',
+				chunkFilename: '[name].[id].[hash].js',
 				publicPath: '/client/'
 			};
 		}
@@ -24,18 +24,16 @@ module.exports = {
 
 	server: {
 		entry: () => {
-			const entries = {};
-			route_manager.routes.forEach(route => {
-				entries[route.id] = path.resolve(src, route.file);
-			});
-			return entries;
+			return {
+				server_routes
+			}
 		},
 
 		output: () => {
 			return {
 				path: `${dest}/server`,
 				filename: '[name].[hash].js',
-				chunkFilename: '[name].[id].js',
+				chunkFilename: '[name].[id].[hash].js',
 				libraryTarget: 'commonjs2'
 			};
 		}

webpack/hmr.js

@@ -0,0 +1 @@
+import 'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000';