dont create fallback components

.travis.yml

@@ -18,4 +18,4 @@ addons:
 install:
   - export DISPLAY=':99.0'
   - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-  - npm ci || npm i
+  - npm install

CHANGELOG.md

@@ -1,142 +1,5 @@
 # sapper changelog
 
-## 0.20.4
-
-* Fix legacy build CSS ([#439](https://github.com/sveltejs/sapper/issues/439))
-* Enable debugging in Chrome and VSCode ([#435](https://github.com/sveltejs/sapper/issues/435))
-
-## 0.20.3
-
-* Inject `nonce` attribute if `res.locals.nonce` is present ([#424](https://github.com/sveltejs/sapper/pull/424))
-* Prevent service worker caching ([#428](https://github.com/sveltejs/sapper/pull/428))
-* Consistent caching for HTML responses ([#429](https://github.com/sveltejs/sapper/pull/429))
-
-## 0.20.2
-
-* Add `immutable` cache control header for hashed assets ([#425](https://github.com/sveltejs/sapper/pull/425))
-* Handle value-less query string params ([#426](https://github.com/sveltejs/sapper/issues/426))
-
-## 0.20.1
-
-* Update shimport
-
-## 0.20.0
-
-* Decode `req.params` and `req.query` ([#417](https://github.com/sveltejs/sapper/issues/417))
-* Decode URLs before writing files in `sapper export` ([#414](https://github.com/sveltejs/sapper/pull/414))
-* Generate server sourcemaps for Rollup apps in dev mode ([#418](https://github.com/sveltejs/sapper/pull/418))
-
-## 0.19.3
-
-* Better unicode route handling ([#347](https://github.com/sveltejs/sapper/issues/347))
-
-## 0.19.2
-
-* Ignore editor tmp files ([#220](https://github.com/sveltejs/sapper/issues/220))
-* Ignore clicks an `<a>` element without `href` ([#235](https://github.com/sveltejs/sapper/issues/235))
-* Allow routes that are reserved JavaScript words ([#315](https://github.com/sveltejs/sapper/issues/315))
-* Print out webpack errors ([#403](https://github.com/sveltejs/sapper/issues/403))
-
-## 0.19.1
-
-* Don't include local origin in export redirects ([#409](https://github.com/sveltejs/sapper/pull/409))
-
-## 0.19.0
-
-* Extract styles out of JS into .css files, for Rollup apps ([#388](https://github.com/sveltejs/sapper/issues/388))
-* Fix `prefetchRoutes` ([#380](https://github.com/sveltejs/sapper/issues/380))
-
-## 0.18.7
-
-* Support differential bundling for Rollup apps via a `--legacy` flag ([#280](https://github.com/sveltejs/sapper/issues/280))
-
-## 0.18.6
-
-* Bundle missing dependency
-
-## 0.18.5
-
-* Bugfix
-
-## 0.18.4
-
-* Handle non-Sapper responses when exporting ([#382](https://github.com/sveltejs/sapper/issues/392))
-* Add `--dev-port` flag to `sapper dev` ([#381](https://github.com/sveltejs/sapper/issues/381))
-
-## 0.18.3
-
-* Fix service worker Rollup build config
-
-## 0.18.2
-
-* Update `pkg.files`
-
-## 0.18.1
-
-* Add live reloading ([#385](https://github.com/sveltejs/sapper/issues/385))
-
-## 0.18.0
-
-* Rollup support ([#379](https://github.com/sveltejs/sapper/pull/379))
-* Fail `export` if a page times out (configurable with `--timeout`) ([#378](https://github.com/sveltejs/sapper/pull/378))
-
-## 0.17.1
-
-* Print which file is causing build errors/warnings ([#371](https://github.com/sveltejs/sapper/pull/371))
-
-## 0.17.0
-
-* Use `cheap-watch` instead of `chokidar` ([#364](https://github.com/sveltejs/sapper/issues/364))
-
-## 0.16.1
-
-* Fix file watching regression in previous version
-
-## 0.16.0
-
-* Slim down installed package ([#363](https://github.com/sveltejs/sapper/pull/363))
-
-## 0.15.8
-
-* Only set `preloading: true` on navigation, not prefetch ([#352](https://github.com/sveltejs/sapper/issues/352))
-* Provide fallback for missing preload errors ([#361](https://github.com/sveltejs/sapper/pull/361))
-
-## 0.15.7
-
-* Strip leading slash from redirects ([#291](https://github.com/sveltejs/sapper/issues/291))
-* Pass `(req, res)` to store getter ([#344](https://github.com/sveltejs/sapper/issues/344))
-
-## 0.15.6
-
-* Fix exporting with custom basepath ([#342](https://github.com/sveltejs/sapper/pull/342))
-
-## 0.15.5
-
-* Faster `export` with more explanatory output ([#335](https://github.com/sveltejs/sapper/pull/335))
-* Only blur `activeElement` if it exists ([#332](https://github.com/sveltejs/sapper/issues/332))
-* Don't emit `client_info.json` or `server_info.json` ([#318](https://github.com/sveltejs/sapper/issues/318))
-
-## 0.15.4
-
-* Add `ignore` option ([#326](https://github.com/sveltejs/sapper/pull/326))
-
-## 0.15.3
-
-* Crawl pages in parallel when exporting ([#329](https://github.com/sveltejs/sapper/pull/329))
-* Don't minify inline JS when exporting ([#328](https://github.com/sveltejs/sapper/pull/328))
-
-## 0.15.2
-
-* Collapse component chains where no intermediate layout component is specified ([#312](https://github.com/sveltejs/sapper/issues/312))
-
-## 0.15.1
-
-* Prevent confusing error when no root layout is specified
-
-## 0.15.0
-
-* Nested routes (consult [migration guide](https://sapper.svelte.technology/guide#0-14-to-0-15) and docs on [layouts](https://sapper.svelte.technology/guide#layouts)) ([#262](https://github.com/sveltejs/sapper/issues/262))
-
 ## 0.14.2
 
 * Prevent unsafe replacements ([#307](https://github.com/sveltejs/sapper/pull/307))

README.md

@@ -31,44 +31,6 @@ npm run build
 npm start
 ```
 
-## Development
-
-Pull requests are encouraged and always welcome. [Pick an issue](https://github.com/sveltejs/sapper/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and help us out!
-
-To install and work on Sapper locally:
-
-```bash
-git clone git@github.com:sveltejs/sapper.git
-cd sapper
-npm install
-npm run dev
-```
-
-### Linking to a Live Project
-
-You can make changes locally to Sapper and test it against a local Sapper project. For a quick project that takes almost no setup, use the default [sapper-template](https://github.com/sveltejs/sapper-template) project. Instruction on setup are found in that project repository.
-
-To link Sapper to your project, from the root of your local Sapper git checkout:
-
-```bash
-cd sapper
-npm link
-```
-
-Then, to link from `sapper-template` (or any other given project):
-
-```bash
-cd sapper-template
-npm link sapper
-```
-
-You should be good to test changes locally.
-
-### Running Tests
-
-```bash
-npm run test
-```
 
 ## License
 

api.js

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

appveyor.yml

@@ -14,7 +14,7 @@ environment:
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm ci
+  - npm install
 
 test_script:
   - node --version && npm --version

config/rollup.js

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

config/webpack.js

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

fallback.html

@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>

mocha.opts

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

package.json

@@ -1,80 +1,73 @@
 {
   "name": "sapper",
-  "version": "0.20.4",
+  "version": "0.14.2",
   "description": "Military-grade apps, engineered by Svelte",
-  "main": "dist/middleware.js",
+  "main": "dist/middleware.ts.js",
   "bin": {
     "sapper": "./sapper"
   },
   "files": [
     "*.js",
+    "*.ts.js",
     "runtime",
     "webpack",
-    "config",
     "sapper",
-    "components",
-    "dist/*.js"
+    "dist"
   ],
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "html-minifier": "^3.5.16",
-    "shimport": "0.0.11",
-    "source-map-support": "^0.5.6",
-    "sourcemap-codec": "^1.4.1",
-    "string-hash": "^1.1.3",
-    "tslib": "^1.9.1"
-  },
-  "devDependencies": {
-    "@types/glob": "^5.0.34",
-    "@types/mkdirp": "^0.5.2",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^10.7.1",
-    "@types/rimraf": "^2.0.2",
-    "cheap-watch": "^0.3.0",
-    "compression": "^1.7.1",
+    "ansi-colors": "^2.0.1",
+    "cheerio": "^1.0.0-rc.2",
+    "chokidar": "^2.0.3",
     "cookie": "^0.3.1",
-    "devalue": "^1.0.4",
-    "eslint": "^4.13.1",
-    "eslint-plugin-import": "^2.12.0",
-    "express": "^4.16.3",
-    "kleur": "^2.0.1",
+    "devalue": "^1.0.1",
+    "glob": "^7.1.2",
+    "html-minifier": "^3.5.16",
     "mkdirp": "^0.5.1",
-    "mocha": "^5.2.0",
-    "nightmare": "^3.0.0",
     "node-fetch": "^2.1.1",
-    "npm-run-all": "^4.1.3",
-    "polka": "^0.4.0",
-    "port-authority": "^1.0.5",
+    "port-authority": "^1.0.2",
     "pretty-bytes": "^5.0.0",
     "pretty-ms": "^3.1.0",
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.2",
-    "rollup": "^0.65.0",
-    "rollup-plugin-commonjs": "^9.1.3",
-    "rollup-plugin-json": "^3.0.0",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-plugin-string": "^2.0.2",
-    "rollup-plugin-typescript": "^0.8.1",
     "sade": "^1.4.1",
     "sander": "^0.6.0",
+    "source-map-support": "^0.5.6",
+    "tslib": "^1.9.1",
+    "url-parse": "^1.2.0",
+    "webpack-format-messages": "^2.0.1"
+  },
+  "devDependencies": {
+    "@types/glob": "^5.0.34",
+    "@types/mkdirp": "^0.5.2",
+    "@types/rimraf": "^2.0.2",
+    "compression": "^1.7.1",
+    "eslint": "^4.13.1",
+    "eslint-plugin-import": "^2.12.0",
+    "express": "^4.16.3",
+    "mocha": "^5.2.0",
+    "nightmare": "^3.0.0",
+    "npm-run-all": "^4.1.3",
+    "polka": "^0.4.0",
+    "rollup": "^0.59.2",
+    "rollup-plugin-commonjs": "^9.1.3",
+    "rollup-plugin-json": "^3.0.0",
+    "rollup-plugin-string": "^2.0.2",
+    "rollup-plugin-typescript": "^0.8.1",
     "serve-static": "^1.13.2",
     "svelte": "^2.6.3",
     "svelte-loader": "^2.9.0",
-    "tiny-glob": "^0.2.2",
-    "ts-node": "^7.0.1",
     "typescript": "^2.8.3",
     "walk-sync": "^0.3.2",
-    "webpack": "^4.8.3",
-    "webpack-format-messages": "^2.0.1"
+    "webpack": "^4.8.3"
   },
   "scripts": {
     "cy:open": "cypress open",
     "test": "mocha --opts mocha.opts",
     "pretest": "npm run build",
-    "build": "rm -rf dist && rollup -c",
-    "prepare": "npm run build",
+    "build": "rollup -c",
     "dev": "rollup -cw",
     "prepublishOnly": "npm test",
     "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > src/middleware/mime-types.md"

rollup.config.js

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

sapper

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

sapper-dev-client.js

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

src/api/build.ts

@@ -3,24 +3,15 @@ import * as path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import { EventEmitter } from 'events';
-import * as codec from 'sourcemap-codec';
-import hash from 'string-hash';
-import minify_html from './utils/minify_html';
-import { create_compilers, create_main_manifests, create_manifest_data, create_serviceworker_manifest } from '../core';
+import { minify_html } from './utils/minify_html';
+import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core'
+import { locations } from '../config';
 import * as events from './interfaces';
-import { copy_shimport } from './utils/copy_shimport';
-import { Dirs, PageComponent } from '../interfaces';
-import { CompileResult } from '../core/create_compilers/interfaces';
 
-type Opts = {
-	legacy: boolean;
-	bundler: string;
-};
-
-export function build(opts: Opts, dirs: Dirs) {
+export function build(opts: {}) {
 	const emitter = new EventEmitter();
 
-	execute(emitter, opts, dirs).then(
+	execute(emitter, opts).then(
 		() => {
 			emitter.emit('done', <events.DoneEvent>{}); // TODO do we need to pass back any info?
 		},
@@ -34,14 +25,18 @@ export function build(opts: Opts, dirs: Dirs) {
 	return emitter;
 }
 
-async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
-	rimraf.sync(path.join(dirs.dest, '**/*'));
-	mkdirp.sync(`${dirs.dest}/client`);
-	copy_shimport(dirs.dest);
+async function execute(emitter: EventEmitter, {
+	dest = 'build',
+	app = 'app',
+	webpack = 'webpack',
+	routes = 'routes'
+} = {}) {
+	mkdirp.sync(dest);
+	rimraf.sync(path.join(dest, '**/*'));
 
 	// minify app/template.html
 	// TODO compile this to a function? could be quicker than str.replace(...).replace(...).replace(...)
-	const template = fs.readFileSync(`${dirs.app}/template.html`, 'utf-8');
+	const template = fs.readFileSync(`${app}/template.html`, 'utf-8');
 
 	// remove this in a future version
 	if (template.indexOf('%sapper.base%') === -1) {
@@ -50,64 +45,67 @@ async function execute(emitter: EventEmitter, opts: Opts, dirs: Dirs) {
 		throw error;
 	}
 
-	fs.writeFileSync(`${dirs.dest}/template.html`, minify_html(template));
+	fs.writeFileSync(`${dest}/template.html`, minify_html(template));
 
-	const manifest_data = create_manifest_data();
+	const route_objects = create_routes();
 
 	// create app/manifest/client.js and app/manifest/server.js
-	create_main_manifests({ bundler: opts.bundler, manifest_data });
+	create_main_manifests({ routes: route_objects });
 
-	const { client, server, serviceworker } = create_compilers(opts.bundler, dirs);
+	const { client, server, serviceworker } = create_compilers({ webpack });
 
-	const client_result = await client.compile();
+	const client_stats = await compile(client);
 	emitter.emit('build', <events.BuildEvent>{
 		type: 'client',
 		// TODO duration/warnings
-		result: client_result
+		webpack_stats: client_stats
 	});
 
-	const build_info = client_result.to_json(manifest_data, dirs);
+	const client_info = client_stats.toJson();
+	fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(client_info));
+	fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(client_info.assetsByChunkName));
 
-	if (opts.legacy) {
-		process.env.SAPPER_LEGACY_BUILD = 'true';
-		const { client } = create_compilers(opts.bundler, dirs);
-
-		const client_result = await client.compile();
-
-		emitter.emit('build', <events.BuildEvent>{
-			type: 'client (legacy)',
-			// TODO duration/warnings
-			result: client_result
-		});
-		
-		client_result.to_json(manifest_data, dirs);
-		build_info.legacy_assets = client_result.assets;
-		delete process.env.SAPPER_LEGACY_BUILD;
-	}
-
-	fs.writeFileSync(path.join(dirs.dest, 'build.json'), JSON.stringify(build_info));
-
-	const server_stats = await server.compile();
+	const server_stats = await compile(server);
 	emitter.emit('build', <events.BuildEvent>{
 		type: 'server',
 		// TODO duration/warnings
-		result: server_stats
+		webpack_stats: server_stats
 	});
 
 	let serviceworker_stats;
 
 	if (serviceworker) {
 		create_serviceworker_manifest({
-			manifest_data,
-			client_files: client_result.chunks.map(chunk => `client/${chunk.file}`)
+			routes: route_objects,
+			client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `client/${chunk.name}`)
 		});
 
-		serviceworker_stats = await serviceworker.compile();
+		serviceworker_stats = await compile(serviceworker);
 
 		emitter.emit('build', <events.BuildEvent>{
 			type: 'serviceworker',
 			// TODO duration/warnings
-			result: serviceworker_stats
+			webpack_stats: 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,43 +5,33 @@ 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_manifest_data, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
-import { Compiler, Compilers } from '../core/create_compilers';
-import { CompileResult, CompileError } from '../core/create_compilers/interfaces';
-import Deferred from './utils/Deferred';
+import { create_routes, create_main_manifests, create_compilers, create_serviceworker_manifest } from '../core';
 import * as events from './interfaces';
-import validate_bundler from '../cli/utils/validate_bundler';
-import { copy_shimport } from './utils/copy_shimport';
-import { ManifestData } from '../interfaces';
 
 export function dev(opts) {
 	return new Watcher(opts);
 }
 
 class Watcher extends EventEmitter {
-	bundler: string;
 	dirs: {
 		app: string;
 		dest: string;
 		routes: string;
-		rollup: string;
 		webpack: string;
 	}
 	port: number;
 	closed: boolean;
 
-	dev_port: number;
-	live: boolean;
-	hot: boolean;
-
-	devtools_port: number;
-
 	dev_server: DevServer;
 	proc: child_process.ChildProcess;
 	filewatchers: Array<{ close: () => void }>;
-	deferred: Deferred;
+	deferreds: {
+		client: Deferred;
+		server: Deferred;
+	};
 
 	crashed: boolean;
 	restarting: boolean;
@@ -56,40 +46,21 @@ class Watcher extends EventEmitter {
 		app = locations.app(),
 		dest = locations.dest(),
 		routes = locations.routes(),
-		'dev-port': dev_port,
-		live,
-		hot,
-		'devtools-port': devtools_port,
-		bundler,
 		webpack = 'webpack',
-		rollup = 'rollup',
 		port = +process.env.PORT
 	}: {
 		app: string,
 		dest: string,
 		routes: string,
-		'dev-port': number,
-		live: boolean,
-		hot: boolean,
-		'devtools-port': number,
-		bundler?: string,
 		webpack: string,
-		rollup: string,
 		port: number
 	}) {
 		super();
 
-		this.bundler = validate_bundler(bundler);
-		this.dirs = { app, dest, routes, webpack, rollup };
+		this.dirs = { app, dest, routes, webpack };
 		this.port = port;
 		this.closed = false;
 
-		this.dev_port = dev_port;
-		this.live = live;
-		this.hot = hot;
-
-		this.devtools_port = devtools_port;
-
 		this.filewatchers = [];
 
 		this.current_build = {
@@ -130,19 +101,13 @@ class Watcher extends EventEmitter {
 
 		const { dest } = this.dirs;
 		rimraf.sync(dest);
-		mkdirp.sync(`${dest}/client`);
-		if (this.bundler === 'rollup') copy_shimport(dest);
+		mkdirp.sync(dest);
 
-		if (!this.dev_port) this.dev_port = await ports.find(10000);
-
-		// Chrome looks for debugging targets on ports 9222 and 9229 by default
-		if (!this.devtools_port) this.devtools_port = await ports.find(9222);
-
-		let manifest_data: ManifestData;
+		const dev_port = await ports.find(10000);
 
 		try {
-			manifest_data = create_manifest_data();
-			create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
+			const routes = create_routes();
+			create_main_manifests({ routes, dev_port });
 		} catch (err) {
 			this.emit('fatal', <events.FatalEvent>{
 				message: err.message
@@ -150,42 +115,37 @@ class Watcher extends EventEmitter {
 			return;
 		}
 
-		this.dev_server = new DevServer(this.dev_port);
+		this.dev_server = new DevServer(dev_port);
 
 		this.filewatchers.push(
-			watch_dir(
-				locations.routes(),
-				({ path: file, stats }) => {
-					if (stats.isDirectory()) {
-						return path.basename(file)[0] !== '_';
-					}
-					return true;
-				},
-				() => {
-					try {
-						const new_manifest_data = create_manifest_data();
-						create_main_manifests({ bundler: this.bundler, manifest_data, dev_port: this.dev_port });
+			watch_files(locations.routes(), ['add', 'unlink'], () => {
+				const routes = create_routes();
+				create_main_manifests({ routes, dev_port });
 
-						manifest_data = new_manifest_data;
-					} catch (err) {
-						this.emit('error', <events.ErrorEvent>{
-							message: err.message
-						});
-					}
+				try {
+					const routes = create_routes();
+					create_main_manifests({ routes, dev_port });
+				} catch (err) {
+					this.emit('error', <events.ErrorEvent>{
+						message: err.message
+					});
 				}
-			),
+			}),
 
-			fs.watch(`${locations.app()}/template.html`, () => {
+			watch_files(`${locations.app()}/template.html`, ['change'], () => {
 				this.dev_server.send({
 					action: 'reload'
 				});
 			})
 		);
 
-		let deferred = new Deferred();
+		this.deferreds = {
+			server: new Deferred(),
+			client: new Deferred()
+		};
 
 		// TODO watch the configs themselves?
-		const compilers: Compilers = create_compilers(this.bundler, this.dirs);
+		const compilers = create_compilers({ webpack: this.dirs.webpack });
 
 		let log = '';
 
@@ -204,10 +164,13 @@ class Watcher extends EventEmitter {
 
 			invalid: filename => {
 				this.restart(filename, 'server');
+				this.deferreds.server = new Deferred();
 			},
 
-			handle_result: (result: CompileResult) => {
-				deferred.promise.then(() => {
+			result: info => {
+				fs.writeFileSync(path.join(dest, 'server_info.json'), JSON.stringify(info, null, '  '));
+
+				this.deferreds.client.promise.then(() => {
 					const restart = () => {
 						log = '';
 						this.crashed = false;
@@ -219,15 +182,11 @@ class Watcher extends EventEmitter {
 									process: this.proc
 								});
 
-								if (this.hot && this.bundler === 'webpack') {
-									this.dev_server.send({
-										status: 'completed'
-									});
-								} else {
-									this.dev_server.send({
-										action: 'reload'
-									});
-								}
+								this.deferreds.server.fulfil();
+
+								this.dev_server.send({
+									status: 'completed'
+								});
 							}))
 							.catch(err => {
 								if (this.crashed) return;
@@ -247,21 +206,12 @@ class Watcher extends EventEmitter {
 						restart();
 					}
 
-					// we need to give the child process its own DevTools port,
-					// otherwise Node will try to use the parent's (and fail)
-					const debugArgRegex = /--inspect(?:-brk|-port)?|--debug-port/;
-					const execArgv = process.execArgv.slice();
-					if (execArgv.some((arg: string) => !!arg.match(debugArgRegex))) {
-						execArgv.push(`--inspect-port=${this.devtools_port}`);
-					}
-
 					this.proc = child_process.fork(`${dest}/server.js`, [], {
 						cwd: process.cwd(),
 						env: Object.assign({
 							PORT: this.port
 						}, process.env),
-						stdio: ['ipc'],
-						execArgv
+						stdio: ['ipc']
 					});
 
 					this.proc.stdout.on('data', chunk => {
@@ -287,35 +237,32 @@ class Watcher extends EventEmitter {
 			}
 		});
 
+		let first = true;
+
 		this.watch(compilers.client, {
 			name: 'client',
 
 			invalid: filename => {
 				this.restart(filename, 'client');
-				deferred = new Deferred();
+				this.deferreds.client = new Deferred();
 
 				// TODO we should delete old assets. due to a webpack bug
 				// i don't even begin to comprehend, this is apparently
 				// quite difficult
 			},
 
-			handle_result: (result: CompileResult) => {
-				fs.writeFileSync(
-					path.join(dest, 'build.json'),
+			result: info => {
+				fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(info));
+				fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(info.assetsByChunkName, null, '  '));
+				this.deferreds.client.fulfil();
 
-					// TODO should be more explicit that to_json has effects
-					JSON.stringify(result.to_json(manifest_data, this.dirs), null, '  ')
-				);
-
-				const client_files = result.chunks.map(chunk => `client/${chunk.file}`);
+				const client_files = info.assets.map((chunk: { name: string }) => `client/${chunk.name}`);
 
 				create_serviceworker_manifest({
-					manifest_data,
+					routes: create_routes(),
 					client_files
 				});
 
-				deferred.fulfil();
-
 				// we need to wait a beat before watching the service
 				// worker, because of some webpack nonsense
 				setTimeout(watch_serviceworker, 100);
@@ -327,7 +274,11 @@ class Watcher extends EventEmitter {
 				watch_serviceworker = noop;
 
 				this.watch(compilers.serviceworker, {
-					name: 'service worker'
+					name: 'service worker',
+
+					result: info => {
+						fs.writeFileSync(path.join(dest, 'serviceworker_info.json'), JSON.stringify(info, null, '  '));
+					}
 				});
 			}
 			: noop;
@@ -374,34 +325,95 @@ class Watcher extends EventEmitter {
 		}
 	}
 
-	watch(compiler: Compiler, { name, invalid = noop, handle_result = noop }: {
+	watch(compiler: any, { name, invalid = noop, result }: {
 		name: string,
 		invalid?: (filename: string) => void;
-		handle_result?: (result: CompileResult) => void;
+		result: (stats: any) => void;
 	}) {
-		compiler.oninvalid(invalid);
+		compiler.hooks.invalid.tap('sapper', (filename: string) => {
+			invalid(filename);
+		});
 
-		compiler.watch((err?: Error, result?: CompileResult) => {
+		compiler.watch({}, (err: Error, stats: any) => {
 			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: result.duration,
-					errors: result.errors,
-					warnings: result.warnings
+					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);
+					}),
 				});
 
-				handle_result(result);
+				result(info);
 			}
 		});
 	}
 }
 
+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
+	};
+}
+
+class Deferred {
+	promise: Promise<any>;
+	fulfil: (value?: any) => void;
+	reject: (error: Error) => void;
+
+	constructor() {
+		this.promise = new Promise((fulfil, reject) => {
+			this.fulfil = fulfil;
+			this.reject = reject;
+		});
+	}
+}
+
 const INTERVAL = 10000;
 
 class DevServer {
@@ -456,32 +468,20 @@ class DevServer {
 
 function noop() {}
 
-function watch_dir(
-	dir: string,
-	filter: ({ path, stats }: { path: string, stats: fs.Stats }) => boolean,
-	callback: () => void
-) {
-	let watch;
-	let closed = false;
+function watch_files(pattern: string, events: string[], callback: () => void) {
+	const chokidar = require('chokidar');
 
-	import('cheap-watch').then(CheapWatch => {
-		if (closed) return;
+	const watcher = chokidar.watch(pattern, {
+		persistent: true,
+		ignoreInitial: true,
+		disableGlobbing: true
+	});
 
-		watch = new CheapWatch({ dir, filter, debounce: 50 });
-
-		watch.on('+', ({ isNew }) => {
-			if (isNew) callback();
-		});
-
-		watch.on('-', callback);
-
-		watch.init();
+	events.forEach(event => {
+		watcher.on(event, callback);
 	});
 
 	return {
-		close: () => {
-			if (watch) watch.close();
-			closed = true;
-		}
+		close: () => watcher.close()
 	};
-}
+}

src/api/export.ts

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

src/api/find_page.ts

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

src/api/interfaces.ts

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

src/api/utils/Deferred.ts

@@ -1,12 +0,0 @@
-export default class Deferred {
-	promise: Promise<any>;
-	fulfil: (value?: any) => void;
-	reject: (error: Error) => void;
-
-	constructor() {
-		this.promise = new Promise((fulfil, reject) => {
-			this.fulfil = fulfil;
-			this.reject = reject;
-		});
-	}
-}

src/api/utils/clean_html.ts

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

src/api/utils/copy_shimport.ts

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

src/api/utils/minify_html.ts

@@ -1,6 +1,6 @@
 import { minify } from 'html-minifier';
 
-export default function minify_html(html: string) {
+export function minify_html(html: string) {
 	return minify(html, {
 		collapseBooleanAttributes: true,
 		collapseWhitespace: true,
@@ -8,7 +8,7 @@ export default function minify_html(html: string) {
 		decodeEntities: true,
 		html5: true,
 		minifyCSS: true,
-		minifyJS: false,
+		minifyJS: true,
 		removeAttributeQuotes: true,
 		removeComments: true,
 		removeOptionalTags: true,

src/cli.ts

@@ -1,8 +1,11 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import * as child_process from 'child_process';
 import sade from 'sade';
-import colors from 'kleur';
+import * as colors from 'ansi-colors';
 import prettyMs from 'pretty-ms';
+// import upgrade from './cli/upgrade';
+import * as ports from 'port-authority';
 import * as pkg from '../package.json';
 
 const prog = sade('sapper').version(pkg.version);
@@ -11,18 +14,7 @@ prog.command('dev')
 	.describe('Start a development server')
 	.option('-p, --port', 'Specify a port')
 	.option('-o, --open', 'Open a browser window')
-	.option('--dev-port', 'Specify a port for development server')
-	.option('--hot', 'Use hot module replacement (requires webpack)', true)
-	.option('--live', 'Reload on changes if not using --hot', true)
-	.option('--bundler', 'Specify a bundler (rollup or webpack)')
-	.action(async (opts: {
-		port: number,
-		open: boolean,
-		'dev-port': number,
-		live: boolean,
-		hot: boolean,
-		bundler?: string
-	}) => {
+	.action(async (opts: { port: number, open: boolean }) => {
 		const { dev } = await import('./cli/dev');
 		dev(opts);
 	});
@@ -30,14 +22,8 @@ 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)')
-	.option('--legacy', 'Create separate legacy build')
 	.example(`build custom-dir -p 4567`)
-	.action(async (dest = 'build', opts: {
-		port: string,
-		legacy: boolean,
-		bundler?: string
-	}) => {
+	.action(async (dest = 'build', opts: { port: string }) => {
 		console.log(`> Building...`);
 
 		process.env.NODE_ENV = process.env.NODE_ENV || 'production';
@@ -47,7 +33,7 @@ prog.command('build [dest]')
 
 		try {
 			const { build } = await import('./cli/build');
-			await build(opts);
+			await build();
 
 			const launcher = path.resolve(dest, 'index.js');
 
@@ -63,7 +49,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.log(`${colors.bold.red(`> ${err.message}`)}`);
+			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
 			process.exit(1);
 		}
 	});
@@ -79,38 +65,25 @@ prog.command('start [dir]')
 
 prog.command('export [dest]')
 	.describe('Export your app as static files (if possible)')
-	.option('--build', '(Re)build app before exporting', true)
-	.option('--build-dir', 'Specify a custom temporary build directory', '.sapper/prod')
 	.option('--basepath', 'Specify a base path')
-	.option('--timeout', 'Milliseconds to wait for a page (--no-timeout to disable)', 5000)
-	.option('--legacy', 'Create separate legacy build')
-	.option('--bundler', 'Specify a bundler (rollup or webpack, blank for auto)')
-	.action(async (dest = 'export', opts: {
-		build: boolean,
-		legacy: boolean,
-		bundler?: string,
-		'build-dir': string,
-		basepath?: string,
-		timeout: number | false
-	}) => {
+	.action(async (dest = 'export', opts: { basepath?: string }) => {
+		console.log(`> Building...`);
+
 		process.env.NODE_ENV = 'production';
-		process.env.SAPPER_DEST = opts['build-dir'];
+		process.env.SAPPER_DEST = '.sapper/.export';
 
 		const start = Date.now();
 
 		try {
-			if (opts.build) {
-				console.log(`> Building...`);
-				const { build } = await import('./cli/build');
-				await build(opts);
-				console.error(`\n> Built in ${elapsed(start)}`);
-			}
+			const { build } = await import('./cli/build');
+			await build();
+			console.error(`\n> Built in ${elapsed(start)}. Crawling site...`);
 
 			const { exporter } = await import('./cli/export');
 			await exporter(dest, opts);
 			console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`npx serve ${dest}`)} to run the app.`);
 		} catch (err) {
-			console.error(colors.bold.red(`> ${err.message}`));
+			console.error(err ? err.details || err.stack || err.message || err : 'Unknown error');
 			process.exit(1);
 		}
 	});

src/cli/build.ts

@@ -1,45 +1,20 @@
 import { build as _build } from '../api/build';
-import colors from 'kleur';
+import * as colors from 'ansi-colors';
 import { locations } from '../config';
-import validate_bundler from './utils/validate_bundler';
-import { repeat } from '../utils';
-
-export function build(opts: { bundler?: string, legacy?: boolean }) {
-	const bundler = validate_bundler(opts.bundler);
-
-	if (opts.legacy && bundler === 'webpack') {
-		throw new Error(`Legacy builds are not supported for projects using webpack`);
-	}
 
+export function build() {
 	return new Promise((fulfil, reject) => {
 		try {
 			const emitter = _build({
-				legacy: opts.legacy,
-				bundler
-			}, {
 				dest: locations.dest(),
 				app: locations.app(),
 				routes: locations.routes(),
-				webpack: 'webpack',
-				rollup: 'rollup'
+				webpack: 'webpack'
 			});
 
 			emitter.on('build', event => {
-				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());
+				console.log(colors.inverse(`\nbuilt ${event.type}`));
+				console.log(event.webpack_stats.toString({ colors: true }));
 			});
 
 			emitter.on('error', event => {
@@ -50,7 +25,8 @@ export function build(opts: { bundler?: string, legacy?: boolean }) {
 				fulfil();
 			});
 		} catch (err) {
-			reject(err);
+			console.log(`${colors.bold.red(`> ${err.message}`)}`);
+			process.exit(1);
 		}
 	});
 }

src/cli/dev.ts

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

src/cli/export.ts

@@ -1,38 +1,23 @@
 import { exporter as _exporter } from '../api/export';
-import colors from 'kleur';
-import pb from 'pretty-bytes';
+import * as colors from 'ansi-colors';
+import prettyBytes from 'pretty-bytes';
 import { locations } from '../config';
-import { left_pad } from '../utils';
 
-export function exporter(export_dir: string, {
-	basepath = '',
-	timeout
-}: {
-	basepath: string,
-	timeout: number | false
-}) {
+export function exporter(export_dir: string, { basepath = '' }) {
 	return new Promise((fulfil, reject) => {
 		try {
 			const emitter = _exporter({
 				build: locations.dest(),
 				dest: export_dir,
-				basepath,
-				timeout
+				basepath
 			});
 
 			emitter.on('file', event => {
-				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(pb(event.size), 10));
-
-				const file_label = event.status === 200
-					? event.file
-					: colors.bold[event.status >= 400 ? 'red' : 'yellow'](`(${event.status}) ${event.file}`);
-
-				console.log(`${size_label}   ${file_label}`);
+				console.log(`${colors.bold.cyan(event.file)} ${colors.gray(`(${prettyBytes(event.size)})`)}`);
 			});
 
-			emitter.on('info', event => {
-				console.log(colors.bold.cyan(`> ${event.message}`));
+			emitter.on('failure', event => {
+				console.log(`${colors.red(`> Received ${event.status} response when fetching ${event.pathname}`)}`);
 			});
 
 			emitter.on('error', event => {

src/cli/start.ts

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

src/cli/upgrade.ts

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

src/cli/utils/validate_bundler.ts

@@ -1,21 +0,0 @@
-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/config.ts

@@ -6,5 +6,5 @@ export const locations = {
 	base:   () => path.resolve(process.env.SAPPER_BASE || ''),
 	app:    () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_APP    || 'app'),
 	routes: () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_ROUTES || 'routes'),
-	dest:   () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST   || `.sapper/${dev() ? 'dev' : 'prod'}`)
+	dest:   () => path.resolve(process.env.SAPPER_BASE || '', process.env.SAPPER_DEST   || '.sapper')
 };

src/core.ts

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

src/core/create_compilers.ts

@@ -0,0 +1,29 @@
+import * as path from 'path';
+import relative from 'require-relative';
+
+export default function create_compilers({ webpack }: { webpack: string }) {
+	const wp = relative('webpack', process.cwd());
+
+	const serviceworker_config = try_require(path.resolve(`${webpack}/service-worker.config.js`));
+
+	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)
+	};
+}
+
+function try_require(specifier: string) {
+	try {
+		return require(specifier);
+	} catch (err) {
+		if (err.code === 'MODULE_NOT_FOUND') return null;
+		throw err;
+	}
+}

src/core/create_compilers/RollupCompiler.ts

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

src/core/create_compilers/RollupResult.ts

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

src/core/create_compilers/WebpackCompiler.ts

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

src/core/create_compilers/WebpackResult.ts

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

src/core/create_compilers/extract_css.ts

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

src/core/create_compilers/index.ts

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

src/core/create_compilers/interfaces.ts

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

src/core/create_manifests.ts

@@ -1,36 +1,28 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import glob from 'tiny-glob/sync.js';
+import * as glob from 'glob';
 import { posixify, write_if_changed } from './utils';
 import { dev, locations } from '../config';
-import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
+import { Page, PageComponent, ServerRoute } from '../interfaces';
 
-export function create_main_manifests({ bundler, manifest_data, dev_port }: {
-	bundler: string,
-	manifest_data: ManifestData;
+export function create_main_manifests({ routes, dev_port }: {
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	dev_port?: number;
 }) {
-	const manifest_dir = path.join(locations.app(), 'manifest');
-	if (!fs.existsSync(manifest_dir)) fs.mkdirSync(manifest_dir);
+	const path_to_routes = path.relative(`${locations.app()}/manifest`, locations.routes());
 
-	const path_to_routes = path.relative(manifest_dir, locations.routes());
+	const client_manifest = generate_client(routes, path_to_routes, dev_port);
+	const server_manifest = generate_server(routes, path_to_routes);
 
-	const client_manifest = generate_client(manifest_data, path_to_routes, bundler, dev_port);
-	const server_manifest = generate_server(manifest_data, path_to_routes);
-
-	write_if_changed(
-		`${manifest_dir}/default-layout.html`,
-		`<svelte:component this={child.component} {...child.props}/>`
-	);
-	write_if_changed(`${manifest_dir}/client.js`, client_manifest);
-	write_if_changed(`${manifest_dir}/server.js`, server_manifest);
+	write_if_changed(`${locations.app()}/manifest/client.js`, client_manifest);
+	write_if_changed(`${locations.app()}/manifest/server.js`, server_manifest);
 }
 
-export function create_serviceworker_manifest({ manifest_data, client_files }: {
-	manifest_data: ManifestData;
+export function create_serviceworker_manifest({ routes, client_files }: {
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] };
 	client_files: string[];
 }) {
-	const assets = glob('**', { cwd: 'assets', filesOnly: true });
+	const assets = glob.sync('**', { cwd: 'assets', nodir: true });
 
 	let code = `
 		// This file is generated by Sapper — do not edit it!
@@ -40,57 +32,51 @@ export function create_serviceworker_manifest({ manifest_data, client_files }: {
 
 		export const shell = [\n\t${client_files.map((x: string) => `"${x}"`).join(',\n\t')}\n];
 
-		export const routes = [\n\t${manifest_data.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
+		export const routes = [\n\t${routes.pages.map((r: Page) => `{ pattern: ${r.pattern} }`).join(',\n\t')}\n];
 	`.replace(/^\t\t/gm, '').trim();
 
 	write_if_changed(`${locations.app()}/manifest/service-worker.js`, code);
 }
 
+function right_pad(str: string, len: number) {
+	while (str.length < len) str += ' ';
+	return str;
+}
+
 function generate_client(
-	manifest_data: ManifestData,
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
 	path_to_routes: string,
-	bundler: string,
 	dev_port?: number
 ) {
-	const page_ids = new Set(manifest_data.pages.map(page =>
+	const page_ids = new Set(routes.pages.map(page =>
 		page.pattern.toString()));
 
-	const server_routes_to_ignore = manifest_data.server_routes.filter(route =>
+	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, manifest_data.root)}';
+		import root from '${posixify(`${path_to_routes}/index.html`)}';
 		import error from '${posixify(`${path_to_routes}/_error.html`)}';
 
-		const d = decodeURIComponent;
+		${routes.components.map(component =>
+		`const ${component.name} = () =>
+			import(/* webpackChunkName: "${component.name}" */ '${posixify(`${path_to_routes}/${component.file}`)}');`)
+		.join('\n')}
 
-		${manifest_data.components.map(component => {
-			const annotation = bundler === 'webpack'
-				? `/* webpackChunkName: "${component.name}" */ `
-				: '';
-
-			const source = get_file(path_to_routes, component);
-
-			return `const ${component.name} = {
-			js: () => import(${annotation}'${source}'),
-			css: "__SAPPER_CSS_PLACEHOLDER:${component.file}__"
-		};`;
-		}).join('\n')}
-
-		export const manifest = {
+		export const routes = {
 			ignore: [${server_routes_to_ignore.map(route => route.pattern).join(', ')}],
 
 			pages: [
-				${manifest_data.pages.map(page => `{
+				${routes.pages.map(page => `{
 					// ${page.parts[page.parts.length - 1].component.file}
 					pattern: ${page.pattern},
 					parts: [
 						${page.parts.map(part => {
-							if (part === null) return 'null';
-
 							if (part.params.length > 0) {
-								const props = part.params.map((param, i) => `${param}: d(match[${i + 1}])`);
+								const props = part.params.map((param, i) => `${param}: match[${i + 1}]`);
 								return `{ component: ${part.component.name}, params: match => ({ ${props.join(', ')} }) }`;
 							}
 
@@ -103,10 +89,7 @@ function generate_client(
 			root,
 
 			error
-		};
-
-		// this is included for legacy reasons
-		export const routes = {};`.replace(/^\t\t/gm, '').trim();
+		};`.replace(/^\t\t/gm, '').trim();
 
 	if (dev()) {
 		const sapper_dev_client = posixify(
@@ -115,24 +98,26 @@ function generate_client(
 
 		code += `
 
-			import('${sapper_dev_client}').then(client => {
-				client.connect(${dev_port});
-			});`.replace(/^\t{3}/gm, '');
+			if (module.hot) {
+				import('${sapper_dev_client}').then(client => {
+					client.connect(${dev_port});
+				});
+			}`.replace(/^\t{3}/gm, '');
 	}
 
 	return code;
 }
 
 function generate_server(
-	manifest_data: ManifestData,
+	routes: { components: PageComponent[], pages: Page[], server_routes: ServerRoute[] },
 	path_to_routes: string
 ) {
 	const imports = [].concat(
-		manifest_data.server_routes.map(route =>
+		routes.server_routes.map(route =>
 			`import * as ${route.name} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
-		manifest_data.components.map(component =>
-			`import ${component.name} from '${get_file(path_to_routes, component)}';`),
-		`import root from '${get_file(path_to_routes, manifest_data.root)}';`,
+		routes.components.map(component =>
+			`import ${component.name} from '${posixify(`${path_to_routes}/${component.file}`)}';`),
+		`import root from '${posixify(`${path_to_routes}/index.html`)}';`,
 		`import error from '${posixify(`${path_to_routes}/_error.html`)}';`
 	);
 
@@ -140,36 +125,31 @@ function generate_server(
 		// This file is generated by Sapper — do not edit it!
 		${imports.join('\n')}
 
-		const d = decodeURIComponent;
-
-		export const manifest = {
+		export const routes = {
 			server_routes: [
-				${manifest_data.server_routes.map(route => `{
+				${routes.server_routes.map(route => `{
 					// ${route.file}
 					pattern: ${route.pattern},
 					handlers: ${route.name},
 					params: ${route.params.length > 0
-						? `match => ({ ${route.params.map((param, i) => `${param}: d(match[${i + 1}])`).join(', ')} })`
+						? `match => ({ ${route.params.map((param, i) => `${param}: match[${i + 1}]`).join(', ')} })`
 						: `() => ({})`}
 				}`).join(',\n\n\t\t\t\t')}
 			],
 
 			pages: [
-				${manifest_data.pages.map(page => `{
+				${routes.pages.map(page => `{
 					// ${page.parts[page.parts.length - 1].component.file}
 					pattern: ${page.pattern},
 					parts: [
 						${page.parts.map(part => {
-							if (part === null) return 'null';
-
 							const props = [
 								`name: "${part.component.name}"`,
-								`file: "${part.component.file}"`,
 								`component: ${part.component.name}`
 							];
 
 							if (part.params.length > 0) {
-								const params = part.params.map((param, i) => `${param}: d(match[${i + 1}])`);
+								const params = part.params.map((param, i) => `${param}: match[${i + 1}]`);
 								props.push(`params: match => ({ ${params.join(', ')} })`);
 							}
 
@@ -182,18 +162,7 @@ function generate_server(
 			root,
 
 			error
-		};
-
-		// this is included for legacy reasons
-		export const routes = {};`.replace(/^\t\t/gm, '').trim();
+		};`.replace(/^\t\t/gm, '').trim();
 
 	return code;
-}
-
-function get_file(path_to_routes: string, component: PageComponent) {
-	if (component.default) {
-		return `./default-layout.html`;
-	}
-
-	return posixify(`${path_to_routes}/${component.file}`);
 }

src/core/create_routes.ts

@@ -1,20 +1,14 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { locations } from '../config';
-import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
-import { posixify, reserved_words } from './utils';
+import { Page, PageComponent, ServerRoute } from '../interfaces';
+import { posixify } from './utils';
 
-export default function create_manifest_data(cwd = locations.routes()): ManifestData {
+export default function create_routes(cwd = locations.routes()) {
 	const components: PageComponent[] = [];
 	const pages: Page[] = [];
 	const server_routes: ServerRoute[] = [];
 
-	const default_layout: PageComponent = {
-		default: true,
-		name: '_default_layout',
-		file: null
-	};
-
 	function walk(
 		dir: string,
 		parent_segments: Part[][],
@@ -30,16 +24,13 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 				const file = path.relative(cwd, resolved);
 				const is_dir = fs.statSync(resolved).isDirectory();
 
-				const ext = path.extname(basename);
-				if (!is_dir && !/^\.[a-z]+$/i.test(ext)) return null; // filter out tmp files etc
-
 				const segment = is_dir
 					? basename
 					: basename.slice(0, -path.extname(basename).length);
 
 				const parts = get_parts(segment);
 				const is_index = is_dir ? false : basename.startsWith('index.');
-				const is_page = ext === '.html';
+				const is_page = path.extname(basename) === '.html';
 
 				parts.forEach(part => {
 					if (/\]\[/.test(part.content)) {
@@ -60,11 +51,12 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 					is_page
 				};
 			})
-			.filter(Boolean)
 			.sort(comparator);
 
 		items.forEach(item => {
-			if (item.basename[0] === '_') return;
+			if (item.basename[0] === '_') {
+				if (item.basename !== (item.is_dir ? '_default' : '_default.html')) return;
+			}
 
 			if (item.basename[0] === '.') {
 				if (item.file !== '.well-known') return;
@@ -99,28 +91,58 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 			params.push(...item.parts.filter(p => p.dynamic).map(p => p.content));
 
 			if (item.is_dir) {
-				const index = path.join(dir, item.basename, '_layout.html');
+				const index = path.join(dir, item.basename, 'index.html');
+				const component = fs.existsSync(index)
+					? {
+						name: `page_${get_slug(item.file)}`,
+						file: `${item.file}/index.html`
+					}
+					: null;
 
-				const component = fs.existsSync(index) && {
-					name: `${get_slug(item.file)}__layout`,
-					file: `${item.file}/_layout.html`
-				};
-
-				if (component) components.push(component);
+				if (component) {
+					components.push(component);
+				}
 
 				walk(
 					path.join(dir, item.basename),
 					segments,
 					params,
-					component
-						? stack.concat({ component, params })
-						: stack.concat(null)
+					stack.concat({
+						component: component || {
+							missing: true,
+							name: null,
+							file: path.join(item.file, 'index.html')
+						},
+						params
+					})
 				);
 			}
 
+			else if (item.basename === 'index.html') {
+				const is_branch = items.some(other_item => {
+					if (other_item === item) return false;
+					if (other_item.basename[0] === '_') {
+						return other_item.basename === (other_item.is_dir ? '_default' : '_default.html');
+					}
+
+					if (other_item.is_dir) {
+						return fs.existsSync(path.join(dir, other_item.basename, 'index.html'));
+					}
+
+					return other_item.is_page;
+				});
+
+				if (!is_branch) {
+					pages.push({
+						pattern: get_pattern(parent_segments),
+						parts: stack
+					});
+				}
+			}
+
 			else if (item.is_page) {
 				const component = {
-					name: get_slug(item.file),
+					name: `page_${get_slug(item.file)}`,
 					file: item.file
 				};
 
@@ -130,14 +152,14 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 				});
 
 				components.push(component);
-				if (item.basename === 'index.html') {
+				if (item.basename === '_default.html') {
 					pages.push({
-						pattern: get_pattern(parent_segments, true),
+						pattern: get_pattern(parent_segments),
 						parts
 					});
 				} else {
 					pages.push({
-						pattern: get_pattern(segments, true),
+						pattern: get_pattern(segments),
 						parts
 					});
 				}
@@ -146,7 +168,7 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 			else {
 				server_routes.push({
 					name: `route_${get_slug(item.file)}`,
-					pattern: get_pattern(segments, false),
+					pattern: get_pattern(segments),
 					file: item.file,
 					params: params
 				});
@@ -154,19 +176,21 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 		});
 	}
 
-	const root_file = path.join(cwd, '_layout.html');
-	const root = fs.existsSync(root_file)
-		? {
-			name: 'main',
-			file: '_layout.html'
-		}
-		: default_layout;
-
 	walk(cwd, [], [], []);
 
-	// check for clashes
 	const seen_pages: Map<string, Page> = new Map();
 	pages.forEach(page => {
+		// check for missing intermediate index.html files
+		let i = page.parts.length;
+		const last_part = page.parts[i - 1];
+		while (i--) {
+			const part = page.parts[i];
+			if (part.component.missing) {
+				throw new Error(`Missing ${part.component.file}, which is required for ${last_part.component.file} to be valid`);
+			}
+		}
+
+		// check for clashes
 		const pattern = page.pattern.toString();
 		if (seen_pages.has(pattern)) {
 			const file = page.parts.pop().component.file;
@@ -191,7 +215,6 @@ export default function create_manifest_data(cwd = locations.routes()): Manifest
 	});
 
 	return {
-		root,
 		components,
 		pages,
 		server_routes
@@ -205,11 +228,9 @@ type Part = {
 };
 
 function comparator(
-	a: { basename: string, parts: Part[], file: string, is_index: boolean },
-	b: { basename: string, parts: Part[], file: string, is_index: boolean }
+	a: { basename: string, parts: Part[], file: string, is_dir: boolean },
+	b: { basename: string, parts: Part[], file: string, is_dir: boolean }
 ) {
-	if (a.is_index !== b.is_index) return a.is_index ? -1 : 1;
-
 	const max = Math.max(a.parts.length, b.parts.length);
 
 	for (let i = 0; i < max; i += 1) {
@@ -269,7 +290,7 @@ function get_parts(part: string): Part[] {
 }
 
 function get_slug(file: string) {
-	let name = file
+	return file
 		.replace(/[\\\/]index/, '')
 		.replace(/_default([\/\\index])?\.html$/, 'index')
 		.replace(/[\/\\]/g, '_')
@@ -278,12 +299,9 @@ function get_slug(file: string) {
 		.replace(/[^a-zA-Z0-9_$]/g, c => {
 			return c === '.' ? '_' : `$${c.charCodeAt(0)}`
 		});
-
-	if (reserved_words.has(name)) name += '_';
-	return name;
 }
 
-function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
+function get_pattern(segments: Part[][]) {
 	return new RegExp(
 		`^` +
 		segments.map(segment => {
@@ -297,6 +315,6 @@ function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
 						.replace(/%5D/g, ']');
 			}).join('');
 		}).join('') +
-		(add_trailing_slash ? '\\\/?$' : '$')
+		'\\\/?$'
 	);
 }

src/core/utils.ts

@@ -1,11 +1,11 @@
-import * as fs from 'fs';
+import * as sander from 'sander';
 
 const previous_contents = new Map();
 
 export function write_if_changed(file: string, code: string) {
 	if (code !== previous_contents.get(file)) {
 		previous_contents.set(file, code);
-		fs.writeFileSync(file, code);
+		sander.writeFileSync(file, code);
 		fudge_mtime(file);
 	}
 }
@@ -16,61 +16,10 @@ export function posixify(file: string) {
 
 export function fudge_mtime(file: string) {
 	// need to fudge the mtime so that webpack doesn't go doolally
-	const { atime, mtime } = fs.statSync(file);
-	fs.utimesSync(
+	const { atime, mtime } = sander.statSync(file);
+	sander.utimesSync(
 		file,
 		new Date(atime.getTime() - 999999),
 		new Date(mtime.getTime() - 999999)
 	);
-}
-
-export const reserved_words = new Set([
-	'arguments',
-	'await',
-	'break',
-	'case',
-	'catch',
-	'class',
-	'const',
-	'continue',
-	'debugger',
-	'default',
-	'delete',
-	'do',
-	'else',
-	'enum',
-	'eval',
-	'export',
-	'extends',
-	'false',
-	'finally',
-	'for',
-	'function',
-	'if',
-	'implements',
-	'import',
-	'in',
-	'instanceof',
-	'interface',
-	'let',
-	'new',
-	'null',
-	'package',
-	'private',
-	'protected',
-	'public',
-	'return',
-	'static',
-	'super',
-	'switch',
-	'this',
-	'throw',
-	'true',
-	'try',
-	'typeof',
-	'var',
-	'void',
-	'while',
-	'with',
-	'yield',
-]);
+}

src/interfaces.ts

@@ -21,7 +21,7 @@ export type Store = {
 };
 
 export type PageComponent = {
-	default?: boolean;
+	missing?: boolean;
 	name: string;
 	file: string;
 };
@@ -39,19 +39,4 @@ export type ServerRoute = {
 	pattern: RegExp;
 	file: string;
 	params: string[];
-};
-
-export type Dirs = {
-	dest: string,
-	app: string,
-	routes: string,
-	webpack: string,
-	rollup: string
-};
-
-export type ManifestData = {
-	root: PageComponent;
-	components: PageComponent[];
-	pages: Page[];
-	server_routes: ServerRoute[];
 };

src/middleware.ts

@@ -26,7 +26,7 @@ type Page = {
 	}>
 };
 
-type Manifest = {
+type RouteObject = {
 	server_routes: ServerRoute[];
 	pages: Page[];
 	root: Component;
@@ -39,20 +39,6 @@ type Store = {
 	get: () => any
 };
 
-type Props = {
-	path: string;
-	query: Record<string, string>;
-	params: Record<string, string>;
-	error?: { message: string };
-	status?: number;
-	child: {
-		segment: string;
-		component: Component;
-		props: Props;
-	};
-	[key: string]: any;
-};
-
 interface Req extends ClientRequest {
 	url: string;
 	baseUrl: string;
@@ -73,39 +59,16 @@ interface Component {
 	preload: (data: any) => any | Promise<any>
 }
 
-const IGNORE = '__SAPPER__IGNORE__';
-function toIgnore(uri: string, val: any) {
-	if (Array.isArray(val)) return val.some(x => toIgnore(uri, x));
-	if (val instanceof RegExp) return val.test(uri);
-	if (typeof val === 'function') return val(uri);
-	return uri.startsWith(val.charCodeAt(0) === 47 ? val : `/${val}`);
-}
-
-export default function middleware(opts: {
-	manifest: Manifest,
-	store: (req: Req, res: ServerResponse) => Store,
-	ignore?: any,
-	routes?: any // legacy
+export default function middleware({ routes, store }: {
+	routes: RouteObject,
+	store: (req: Req) => Store
 }) {
-	if (opts.routes) {
-		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
-	}
-
 	const output = locations.dest();
 
-	const { manifest, store, ignore } = opts;
-
 	let emitted_basepath = false;
 
 	const middleware = compose_handlers([
-		ignore && ((req: Req, res: ServerResponse, next: () => void) => {
-			req[IGNORE] = toIgnore(req.path, ignore);
-			next();
-		}),
-
 		(req: Req, res: ServerResponse, next: () => void) => {
-			if (req[IGNORE]) return next();
-
 			if (req.baseUrl === undefined) {
 				let { originalUrl } = req;
 				if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
@@ -136,26 +99,26 @@ export default function middleware(opts: {
 
 		fs.existsSync(path.join(output, 'index.html')) && serve({
 			pathname: '/index.html',
-			cache_control: dev() ? 'no-cache' : 'max-age=600'
+			cache_control: 'max-age=600'
 		}),
 
 		fs.existsSync(path.join(output, 'service-worker.js')) && serve({
 			pathname: '/service-worker.js',
-			cache_control: 'no-cache, no-store, must-revalidate'
+			cache_control: 'max-age=600'
 		}),
 
 		fs.existsSync(path.join(output, 'service-worker.js.map')) && serve({
 			pathname: '/service-worker.js.map',
-			cache_control: 'no-cache, no-store, must-revalidate'
+			cache_control: 'max-age=600'
 		}),
 
 		serve({
 			prefix: '/client/',
-			cache_control: dev() ? 'no-cache' : 'max-age=31536000, immutable'
+			cache_control: 'max-age=31536000'
 		}),
 
-		get_server_route_handler(manifest.server_routes),
-		get_page_handler(manifest, store)
+		get_server_route_handler(routes.server_routes),
+		get_page_handler(routes, store)
 	].filter(Boolean));
 
 	return middleware;
@@ -179,14 +142,11 @@ function serve({ prefix, pathname, cache_control }: {
 		: (file: string) => (cache.has(file) ? cache : cache.set(file, fs.readFileSync(path.resolve(output, file)))).get(file)
 
 	return (req: Req, res: ServerResponse, next: () => void) => {
-		if (req[IGNORE]) return next();
-
 		if (filter(req)) {
 			const type = lookup(req.path);
 
 			try {
-				const file = decodeURIComponent(req.path.slice(1));
-				const data = read(file);
+				const data = read(req.path.slice(1));
 
 				res.setHeader('Content-Type', type);
 				res.setHeader('Cache-Control', cache_control);
@@ -218,7 +178,7 @@ function get_server_route_handler(routes: ServerRoute[]) {
 
 				// intercept data so that it can be exported
 				res.write = function(chunk: any) {
-					chunks.push(Buffer.from(chunk));
+					chunks.push(new Buffer(chunk));
 					write.apply(res, arguments);
 				};
 
@@ -228,7 +188,7 @@ function get_server_route_handler(routes: ServerRoute[]) {
 				};
 
 				res.end = function(chunk?: any) {
-					if (chunk) chunks.push(Buffer.from(chunk));
+					if (chunk) chunks.push(new Buffer(chunk));
 					end.apply(res, arguments);
 
 					process.send({
@@ -264,8 +224,6 @@ function get_server_route_handler(routes: ServerRoute[]) {
 	}
 
 	return function find_route(req: Req, res: ServerResponse, next: () => void) {
-		if (req[IGNORE]) return next();
-
 		for (const route of routes) {
 			if (route.pattern.test(req.path)) {
 				handle_route(route, req, res, next);
@@ -277,280 +235,212 @@ function get_server_route_handler(routes: ServerRoute[]) {
 	};
 }
 
-function get_page_handler(
-	manifest: Manifest,
-	store_getter: (req: Req, res: ServerResponse) => Store
-) {
+function get_page_handler(routes: RouteObject, store_getter: (req: Req) => Store) {
 	const output = locations.dest();
 
-	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 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 template = dev()
 		? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
 		: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
 
-	const { server_routes, pages } = manifest;
-	const error_route = manifest.error;
-
-	function handle_error(req: Req, res: ServerResponse, statusCode: number, error: Error | string) {
-		handle_page({
-			pattern: null,
-			parts: [
-				{ name: null, component: error_route }
-			]
-		}, req, res, statusCode, error || new Error('Unknown error in preload function'));
-	}
+	const { server_routes, pages } = routes;
+	const error_route = routes.error;
 
 	function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
-		const build_info: {
-			bundler: 'rollup' | 'webpack',
-			shimport: string | null,
-			assets: Record<string, string | string[]>,
-			legacy_assets?: Record<string, string>
-		 } = get_build_info();
+		const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
+		const match = error ? null : page.pattern.exec(req.path);
+
+		req.params = error
+			? {}
+			: get_params(match);
+
+		const chunks: Record<string, string | string[]> = get_chunks();
 
 		res.setHeader('Content-Type', 'text/html');
-		res.setHeader('Cache-Control', dev() ? 'no-cache' : 'max-age=600');
 
 		// preload main.js and current route
 		// TODO detect other stuff we can preload? images, CSS, fonts?
-		let preloaded_chunks = Array.isArray(build_info.assets.main) ? build_info.assets.main : [build_info.assets.main];
+		let preloaded_chunks = Array.isArray(chunks.main) ? chunks.main : [chunks.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(build_info.assets[part.name]);
+				preloaded_chunks = preloaded_chunks.concat(chunks[part.name]);
 			});
 		}
 
 		const link = preloaded_chunks
-			.filter(file => file && !file.match(/\.map$/))
+			.filter(file => !file.match(/\.map$/))
 			.map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`)
 			.join(', ');
 
 		res.setHeader('Link', link);
 
-		const store = store_getter ? store_getter(req, res) : null;
+		const store = store_getter ? store_getter(req) : null;
+		const props = { query: req.query, path: req.path };
+
+		if (error) {
+			props.error = error instanceof Error ? error : { message: error };
+			props.status = status;
+		}
 
 		let redirect: { statusCode: number, location: string };
 		let preload_error: { statusCode: number, message: Error | string };
 
-		const preload_context = {
-			redirect: (statusCode: number, location: string) => {
-				if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
-					throw new Error(`Conflicting redirects`);
-				}
-				location = location.replace(/^\//g, ''); // leading slash (only)
-				redirect = { statusCode, location };
-			},
-			error: (statusCode: number, message: Error | string) => {
-				preload_error = { statusCode, message };
-			},
-			fetch: (url: string, opts?: any) => {
-				const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`);
-
-				if (opts) {
-					opts = Object.assign({}, opts);
-
-					const include_cookies = (
-						opts.credentials === 'include' ||
-						opts.credentials === 'same-origin' && parsed.origin === `http://127.0.0.1:${process.env.PORT}`
-					);
-
-					if (include_cookies) {
-						if (!opts.headers) opts.headers = {};
-
-						const str = []
-							.concat(
-								cookie.parse(req.headers.cookie || ''),
-								cookie.parse(opts.headers.cookie || ''),
-								cookie.parse(res.getHeader('Set-Cookie') || '')
-							)
-							.map(cookie => {
-								return Object.keys(cookie)
-									.map(name => `${name}=${encodeURIComponent(cookie[name])}`)
-									.join('; ');
-							})
-							.filter(Boolean)
-							.join(', ');
-
-						opts.headers.cookie = str;
-					}
-				}
-
-				return fetch(parsed.href, opts);
-			},
-			store
-		};
-
-		const root_preloaded = manifest.root.preload
-			? manifest.root.preload.call(preload_context, {
-				path: req.path,
-				query: req.query,
-				params: {}
-			})
-			: {};
-
-		const match = error ? null : page.pattern.exec(req.path);
-
-		Promise.all([root_preloaded].concat(page.parts.map(part => {
-			if (!part) return null;
-
+		Promise.all(page.parts.map(part => {
 			return part.component.preload
-				? part.component.preload.call(preload_context, {
-					path: req.path,
-					query: req.query,
-					params: part.params ? part.params(match) : {}
-				})
+				? part.component.preload.call({
+					redirect: (statusCode: number, location: string) => {
+						if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
+							throw new Error(`Conflicting redirects`);
+						}
+						redirect = { statusCode, location };
+					},
+					error: (statusCode: number, message: Error | string) => {
+						preload_error = { statusCode, message };
+					},
+					fetch: (url: string, opts?: any) => {
+						const parsed = new URL(url, `http://127.0.0.1:${process.env.PORT}${req.baseUrl ? req.baseUrl + '/' :''}`);
+
+						if (opts) {
+							opts = Object.assign({}, opts);
+
+							const include_cookies = (
+								opts.credentials === 'include' ||
+								opts.credentials === 'same-origin' && parsed.origin === `http://127.0.0.1:${process.env.PORT}`
+							);
+
+							if (include_cookies) {
+								const cookies: Record<string, string> = {};
+								if (!opts.headers) opts.headers = {};
+
+								const str = []
+									.concat(
+										cookie.parse(req.headers.cookie || ''),
+										cookie.parse(opts.headers.cookie || ''),
+										cookie.parse(res.getHeader('Set-Cookie') || '')
+									)
+									.map(cookie => {
+										return Object.keys(cookie)
+											.map(name => `${name}=${encodeURIComponent(cookie[name])}`)
+											.join('; ');
+									})
+									.filter(Boolean)
+									.join(', ');
+
+								opts.headers.cookie = str;
+							}
+						}
+
+						return fetch(parsed.href, opts);
+					},
+					store
+				}, req)
 				: {};
-		}))).catch(err => {
+		})).catch(err => {
 			preload_error = { statusCode: 500, message: err };
 			return []; // appease TypeScript
 		}).then(preloaded => {
 			if (redirect) {
-				const location = `${req.baseUrl}/${redirect.location}`;
-
 				res.statusCode = redirect.statusCode;
-				res.setHeader('Location', location);
+				res.setHeader('Location', `${req.baseUrl}/${redirect.location}`);
 				res.end();
 
 				return;
 			}
 
 			if (preload_error) {
-				handle_error(req, res, preload_error.statusCode, preload_error.message);
+				handle_page({
+					pattern: null,
+					parts: [
+						{ name: null, component: error_route }
+					]
+				}, req, res, preload_error.statusCode, preload_error.message);
+
 				return;
 			}
 
 			const serialized = {
-				preloaded: `[${preloaded.map(data => try_serialize(data)).join(',')}]`,
+				preloaded: page.parts.map((part, i) => {
+					return part.component.preload ? try_serialize(preloaded[i]) : null;
+				}),
 				store: store && try_serialize(store.get())
 			};
 
 			const segments = req.path.split('/').filter(Boolean);
 
-			const props: Props = {
-				path: req.path,
-				query: req.query,
-				params: {},
-				child: null
-			};
-
-			if (error) {
-				props.error = error instanceof Error ? error : { message: error };
-				props.status = status;
-			}
-
-			const data = Object.assign({}, props, preloaded[0], {
-				params: {},
-				child: {
-					segment: segments[0]
-				}
+			const data = Object.assign({}, props, { params: req.params }, {
+				child: {}
 			});
-
 			let level = data.child;
 			for (let i = 0; i < page.parts.length; i += 1) {
 				const part = page.parts[i];
-				if (!part) continue;
-
 				const get_params = part.params || (() => ({}));
 
 				Object.assign(level, {
+					segment: segments[i],
 					component: part.component,
 					props: Object.assign({}, props, {
-						params: get_params(match)
-					}, preloaded[i + 1])
+						params: get_params(match),
+						query: req.query
+					}, preloaded[i])
 				});
 
-				level.props.child = <Props["child"]>{
-					segment: segments[i + 1]
-				};
+				level.props.child = {};
 				level = level.props.child;
 			}
 
-			const { html, head, css } = manifest.root.render(data, {
+			const { html, head, css } = routes.root.render(data, {
 				store
 			});
 
-			let script = `__SAPPER__={${[
-				error && `error:1`,
-				`baseUrl:"${req.baseUrl}"`,
-				serialized.preloaded && `preloaded:${serialized.preloaded}`,
-				serialized.store && `store:${serialized.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('');
+
+			let inline_script = `__SAPPER__={${[
+				`baseUrl: "${req.baseUrl}"`,
+				serialized.preloaded && `preloaded: [${serialized.preloaded}]`,
+				serialized.store && `store: ${serialized.store}`
 			].filter(Boolean).join(',')}};`;
 
 			const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
 			if (has_service_worker) {
-				script += `if('serviceWorker' in navigator)navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
+				inline_script += `if ('serviceWorker' in navigator) navigator.serviceWorker.register('${req.baseUrl}/service-worker.js');`;
 			}
 
-			const file = [].concat(build_info.assets.main).filter(file => file && /\.js$/.test(file))[0];
-			const main = `${req.baseUrl}/client/${file}`;
-
-			if (build_info.bundler === 'rollup') {
-				if (build_info.legacy_assets) {
-					const legacy_main = `${req.baseUrl}/client/legacy/${build_info.legacy_assets.main}`;
-					script += `(function(){try{eval("async function x(){}");var main="${main}"}catch(e){main="${legacy_main}"};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);}}());`;
-				} else {
-					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);}`;
-				}
-			} else {
-				script += `</script><script src="${main}">`;
-			}
-
-			let styles: string;
-
-			// TODO make this consistent across apps
-			if (build_info.css && build_info.css.main) {
-				const css_chunks = new Set();
-				if (build_info.css.main) css_chunks.add(build_info.css.main);
-				page.parts.forEach(part => {
-					if (!part) return;
-					const css_chunks_for_part = build_info.css.chunks[part.file];
-
-					if (css_chunks_for_part) {
-						css_chunks_for_part.forEach(file => {
-							css_chunks.add(file);
-						});
-					}
-				});
-
-				styles = Array.from(css_chunks)
-					.map(href => `<link rel="stylesheet" href="client/${href}">`)
-					.join('')
-			} else {
-				styles = (css && css.code ? `<style>${css.code}</style>` : '');
-			}
-
-			// users can set a CSP nonce using res.locals.nonce
-			const nonce_attr = (res.locals && res.locals.nonce) ? ` nonce="${res.locals.nonce}"` : '';
-
 			const body = template()
 				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
-				.replace('%sapper.scripts%', () => `<script${nonce_attr}>${script}</script>`)
+				.replace('%sapper.scripts%', () => `<script>${inline_script}</script>${scripts}`)
 				.replace('%sapper.html%', () => html)
 				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
-				.replace('%sapper.styles%', () => styles);
+				.replace('%sapper.styles%', () => (css && css.code ? `<style>${css.code}</style>` : ''));
 
 			res.statusCode = status;
 			res.end(body);
-		}).catch(err => {
-			if (error) {
-				// we encountered an error while rendering the error page — oops
-				res.statusCode = 500;
-				res.end(`<pre>${escape_html(err.message)}</pre>`);
-			} else {
-				handle_error(req, res, 500, err);
+
+			if (process.send) {
+				process.send({
+					__sapper__: true,
+					event: 'file',
+					url: req.url,
+					method: req.method,
+					status: 200,
+					type: 'text/html',
+					body
+				});
 			}
+		}).catch(err => {
+			res.statusCode = 500;
+			res.end(err.message);
 		});
 	}
 
-	return function find_route(req: Req, res: ServerResponse, next: () => void) {
-		if (req[IGNORE]) return next();
-
+	return function find_route(req: Req, res: ServerResponse) {
 		if (!server_routes.some(route => route.pattern.test(req.path))) {
 			for (const page of pages) {
 				if (page.pattern.test(req.path)) {
@@ -560,7 +450,12 @@ function get_page_handler(
 			}
 		}
 
-		handle_error(req, res, 404, 'Not found');
+		handle_page({
+			pattern: null,
+			parts: [
+				{ name: null, component: error_route }
+			]
+		}, req, res, 404, 'Not found');
 	};
 }
 
@@ -591,15 +486,3 @@ function try_serialize(data: any) {
 		return null;
 	}
 }
-
-function escape_html(html: string) {
-	const chars: Record<string, string> = {
-		'"' : 'quot',
-		"'": '#39',
-		'&': 'amp',
-		'<' : 'lt',
-		'>' : 'gt'
-	};
-
-	return html.replace(/["'&<>]/g, c => `&${chars[c]};`);
-}

src/rollup.ts

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

src/runtime/index.ts

@@ -1,12 +1,12 @@
 import { detach, findAnchor, scroll_state, which } from './utils';
-import { Component, ComponentConstructor, Params, Query, Redirect, Manifest, RouteData, ScrollPosition, Store, Target, ComponentLoader } from './interfaces';
+import { Component, ComponentConstructor, Params, Query, Redirect, Routes, RouteData, ScrollPosition, Store, Target } from './interfaces';
 
 const initial_data = typeof window !== 'undefined' && window.__SAPPER__;
 
 export let root: Component;
 let target: Node;
 let store: Store;
-let manifest: Manifest;
+let routes: Routes;
 let segments: string[] = [];
 
 type RootProps = {
@@ -56,18 +56,18 @@ function select_route(url: URL): Target {
 	const path = url.pathname.slice(initial_data.baseUrl.length);
 
 	// avoid accidental clashes between server routes and pages
-	if (manifest.ignore.some(pattern => pattern.test(path))) return;
+	if (routes.ignore.some(pattern => pattern.test(path))) return;
 
-	for (let i = 0; i < manifest.pages.length; i += 1) {
-		const page = manifest.pages[i];
+	for (let i = 0; i < routes.pages.length; i += 1) {
+		const page = routes.pages[i];
 
 		const match = page.pattern.exec(path);
 		if (match) {
 			const query: Record<string, string | true> = {};
 			if (url.search.length > 0) {
 				url.search.slice(1).split('&').forEach(searchParam => {
-					const [, key, value] = /([^=]+)(?:=(.*))?/.exec(searchParam);
-					query[key] = decodeURIComponent((value || '').replace(/\+/g, ' '));
+					const [, key, value] = /([^=]+)=(.*)/.exec(searchParam);
+					query[key] = value || true;
 				});
 			}
 			return { url, path, page, match, query };
@@ -77,14 +77,14 @@ function select_route(url: URL): Target {
 
 let current_token: {};
 
-function render(data: any, nullable_depth: number, scroll: ScrollPosition, token: {}) {
+function render(data: any, changed_from: number, scroll: ScrollPosition, token: {}) {
 	if (current_token !== token) return;
 
 	if (root) {
 		// first, clear out highest-level root component
 		let level = data.child;
-		for (let i = 0; i < nullable_depth; i += 1) {
-			if (i === nullable_depth) break;
+		for (let i = 0; i < changed_from; i += 1) {
+			if (i === changed_from) break;
 			level = level.props.child;
 		}
 
@@ -106,9 +106,7 @@ function render(data: any, nullable_depth: number, scroll: ScrollPosition, token
 			detach(end);
 		}
 
-		Object.assign(data, root_data);
-
-		root = new manifest.root({
+		root = new routes.root({
 			target,
 			data,
 			store,
@@ -128,38 +126,15 @@ function changed(a: Record<string, string | true>, b: Record<string, string | tr
 	return JSON.stringify(a) !== JSON.stringify(b);
 }
 
-let root_preload: Promise<any>;
-let root_data: any;
-
-function load_css(chunk: string) {
-	const href = `${initial_data.baseUrl}client/${chunk}`;
-	if (document.querySelector(`link[href="${href}"]`)) return;
-
-	return new Promise((fulfil, reject) => {
-		const link = document.createElement('link');
-		link.rel = 'stylesheet';
-		link.href = href;
-
-		link.onload = () => fulfil();
-		link.onerror = reject;
-
-		document.head.appendChild(link);
-	});
-}
-
-function load_component(component: ComponentLoader): Promise<ComponentConstructor> {
-	// TODO this is temporary — once placeholders are
-	// always rewritten, scratch the ternary
-	const promises: Array<Promise<any>> = (typeof component.css === 'string' ? [] : component.css.map(load_css));
-	promises.unshift(component.js());
-	return Promise.all(promises).then(values => values[0].default);
-}
-
 function prepare_page(target: Target): Promise<{
 	redirect?: Redirect;
 	data?: any;
-	nullable_depth?: number;
+	changed_from?: number;
 }> {
+	if (root) {
+		root.set({ preloading: true });
+	}
+
 	const { page, path, query } = target;
 	const new_segments = path.split('/').filter(Boolean);
 	let changed_from = 0;
@@ -187,39 +162,25 @@ function prepare_page(target: Target): Promise<{
 		}
 	};
 
-	if (!root_preload) {
-		root_preload = manifest.root.preload
-			? initial_data.preloaded[0] || manifest.root.preload.call(preload_context, {
-				path,
-				query,
-				params: {}
-			})
-			: {};
-	}
-
 	return Promise.all(page.parts.map(async (part, i) => {
 		if (i < changed_from) return null;
-		if (!part) return null;
-
-		const Component = await load_component(part.component);
 
+		const { default: Component } = await part.component();
 		const req = {
 			path,
 			query,
 			params: part.params ? part.params(target.match) : {}
 		};
 
-		const preloaded = ready || !initial_data.preloaded[i + 1]
+		const preloaded = ready || !initial_data.preloaded[i]
 			? Component.preload ? await Component.preload.call(preload_context, req) : {}
-			: initial_data.preloaded[i + 1];
+			: initial_data.preloaded[i];
 
 		return { Component, preloaded };
 	})).catch(err => {
 		error = { statusCode: 500, message: err };
 		return [];
-	}).then(async results => {
-		if (!root_data) root_data = await root_preload;
-
+	}).then(results => {
 		if (redirect) {
 			return { redirect };
 		}
@@ -242,7 +203,7 @@ function prepare_page(target: Target): Promise<{
 				data: Object.assign({}, props, {
 					preloading: false,
 					child: {
-						component: manifest.error,
+						component: routes.error,
 						props
 					}
 				})
@@ -253,42 +214,33 @@ function prepare_page(target: Target): Promise<{
 		const data = {
 			path,
 			preloading: false,
-			child: Object.assign({}, root_props.child, {
-				segment: segments[0]
-			})
+			child: Object.assign({}, root_props.child)
 		};
 		if (changed(query, root_props.query)) data.query = query;
 		if (changed(params, root_props.params)) data.params = params;
 
 		let level = data.child;
-		let nullable_depth = 0;
-
 		for (let i = 0; i < page.parts.length; i += 1) {
 			const part = page.parts[i];
-			if (!part) continue;
-
 			const get_params = part.params || (() => ({}));
 
 			if (i < changed_from) {
 				level.props.path = path;
 				level.props.query = query;
 				level.props.child = Object.assign({}, level.props.child);
-
-				nullable_depth += 1;
 			} else {
+				level.segment = new_segments[i];
 				level.component = results[i].Component;
 				level.props = Object.assign({}, level.props, props, {
 					params: get_params(target.match),
 				}, results[i].preloaded);
-
 				level.props.child = {};
 			}
 
 			level = level.props.child;
-			level.segment = segments[i + 1];
 		}
 
-		return { data, nullable_depth };
+		return { data, changed_from };
 	});
 }
 
@@ -306,9 +258,6 @@ async function navigate(target: Target, id: number): Promise<any> {
 
 	cid = id;
 
-	if (root) {
-		root.set({ preloading: true });
-	}
 	const loaded = prefetching && prefetching.href === target.url.href ?
 		prefetching.promise :
 		prepare_page(target);
@@ -316,13 +265,13 @@ async function navigate(target: Target, id: number): Promise<any> {
 	prefetching = null;
 
 	const token = current_token = {};
-	const { redirect, data, nullable_depth } = await loaded;
+	const { redirect, data, changed_from } = await loaded;
 
 	if (redirect) {
 		await goto(redirect.location, { replaceState: true });
 	} else {
-		render(data, nullable_depth, scroll_history[id], token);
-		if (document.activeElement) document.activeElement.blur();
+		render(data, changed_from, scroll_history[id], token);
+		document.activeElement.blur();
 	}
 }
 
@@ -336,8 +285,6 @@ function handle_click(event: MouseEvent) {
 	const a: HTMLAnchorElement | SVGAElement = <HTMLAnchorElement | SVGAElement>findAnchor(<Node>event.target);
 	if (!a) return;
 
-	if (!a.href) return;
-
 	// check if link is inside an svg
 	// in this case, both href and target are always inside an object
 	const svg = typeof a.href === 'object' && a.href.constructor.name === 'SVGAnimatedString';
@@ -389,7 +336,7 @@ function handle_popstate(event: PopStateEvent) {
 
 let prefetching: {
 	href: string;
-	promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number }>;
+	promise: Promise<{ redirect?: Redirect, data?: any, changed_from?: number }>;
 } = null;
 
 export function prefetch(href: string) {
@@ -422,23 +369,13 @@ function trigger_prefetch(event: MouseEvent | TouchEvent) {
 let inited: boolean;
 let ready = false;
 
-export function init(opts: {
-	App: ComponentConstructor,
-	target: Node,
-	manifest: Manifest,
-	store?: (data: any) => Store,
-	routes?: any // legacy
-}) {
+export function init(opts: { App: ComponentConstructor, target: Node, routes: Routes, store?: (data: any) => Store }) {
 	if (opts instanceof HTMLElement) {
 		throw new Error(`The signature of init(...) has changed — see https://sapper.svelte.technology/guide#0-11-to-0-12 for more information`);
 	}
 
-	if (opts.routes) {
-		throw new Error(`As of Sapper 0.15, opts.routes should be opts.manifest`);
-	}
-
 	target = opts.target;
-	manifest = opts.manifest;
+	routes = opts.routes;
 
 	if (opts && opts.store) {
 		store = opts.store(initial_data.store);
@@ -465,10 +402,8 @@ export function init(opts: {
 
 		history.replaceState({ id: uid }, '', href);
 
-		if (!initial_data.error) {
-			const target = select_route(new URL(window.location.href));
-			if (target) return navigate(target, uid);
-		}
+		const target = select_route(new URL(window.location.href));
+		if (target) return navigate(target, uid);
 	});
 }
 
@@ -488,16 +423,16 @@ export function goto(href: string, opts = { replaceState: false }) {
 }
 
 export function prefetchRoutes(pathnames: string[]) {
-	if (!manifest) throw new Error(`You must call init() first`);
+	if (!routes) throw new Error(`You must call init() first`);
 
-	return manifest.pages
+	return routes.pages
 		.filter(route => {
 			if (!pathnames) return true;
 			return pathnames.some(pathname => route.pattern.test(pathname));
 		})
-		.reduce((promise: Promise<any>, route) => promise.then(() => {
-			return Promise.all(route.parts.map(part => part && load_component(part.component)));
-		}), Promise.resolve());
+		.reduce((promise: Promise<any>, route) => {
+			return promise.then(route.load);
+		}, Promise.resolve());
 }
 
 // remove this in 0.9

src/runtime/interfaces.ts

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

src/utils.ts

@@ -1,10 +0,0 @@
-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/client.js

@@ -1,14 +1,13 @@
-import { init, goto, prefetchRoutes } from '../../../runtime.js';
+import { init, prefetchRoutes } from '../../../runtime.js';
 import { Store } from 'svelte/store.js';
-import { manifest } from './manifest/client.js';
+import { routes } from './manifest/client.js';
 
 window.init = () => {
 	return init({
 		target: document.querySelector('#sapper'),
-		manifest,
+		routes,
 		store: data => new Store(data)
 	});
 };
 
-window.prefetchRoutes = prefetchRoutes;
-window.goto = goto;
+window.prefetchRoutes = prefetchRoutes;

test/app/app/server.js

@@ -2,9 +2,9 @@ import fs from 'fs';
 import { resolve } from 'url';
 import express from 'express';
 import serve from 'serve-static';
-import sapper from '../../../dist/middleware.js';
+import sapper from '../../../dist/middleware.ts.js';
 import { Store } from 'svelte/store.js';
-import { manifest } from './manifest/server.js';
+import { routes } from './manifest/server.js';
 
 let pending;
 let ended;
@@ -85,44 +85,20 @@ const middlewares = [
 		next();
 	},
 
-	// set up some values for the store
-	(req, res, next) => {
-		req.hello = 'hello';
-		res.locals = { name: 'world' };
-		next();
-	},
-
 	sapper({
-		manifest,
-		store: (req, res) => {
+		routes,
+		store: () => {
 			return new Store({
-				title: `${req.hello} ${res.locals.name}`
+				title: 'Stored title'
 			});
-		},
-		ignore: [
-			/foobar/i,
-			'/buzz',
-			'fizz',
-			x => x === '/hello'
-		]
-	}),
+		}
+	})
 ];
 
-app.get(`${BASEPATH}/non-sapper-redirect-from`, (req, res) => {
-	res.writeHead(301, {
-		Location: `${BASEPATH}/non-sapper-redirect-to`
-	});
-	res.end();
-});
-
 if (BASEPATH) {
 	app.use(BASEPATH, ...middlewares);
 } else {
 	app.use(...middlewares);
 }
 
-['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => {
-	app.get('/'+uri, (req, res) => res.end(uri));
-});
-
-app.listen(PORT);
+app.listen(PORT);

test/app/routes/[x]/[y]/index.html

@@ -1,8 +1,6 @@
 <span>y: {segment} {count}</span>
 <svelte:component this={child.component} {...child.props}/>
 
-<span>child segment: {child.segment}</span>
-
 <script>
 	import counts from '../_counts.js';
 

test/app/routes/[x]/index.html

@@ -0,0 +1,20 @@
+<span>x: {segment} {count}</span>
+<svelte:component this={child.component} {...child.props}/>
+
+<script>
+	import counts from './_counts.js';
+
+	export default {
+		preload() {
+			return {
+				count: counts.x += 1
+			};
+		},
+
+		oncreate() {
+			this.set({
+				segment: this.get().params.x
+			});
+		}
+	};
+</script>

test/app/routes/_default.html

@@ -0,0 +1,26 @@
+<svelte:head>
+	<title>Sapper project template</title>
+</svelte:head>
+
+<h1>Great success!</h1>
+
+<a href='.'>home</a>
+<a href='about'>about</a>
+<a href='slow-preload'>slow preload</a>
+<a href='redirect-from'>redirect</a>
+<a href='blog/nope'>broken link</a>
+<a href='blog/throw-an-error'>error link</a>
+<a href='credentials?creds=include'>credentials</a>
+<a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
+
+<div class='hydrate-test'></div>
+
+<style>
+	h1 {
+		text-align: center;
+		font-size: 2.8em;
+		text-transform: uppercase;
+		font-weight: 700;
+		margin: 0 0 0.5em 0;
+	}
+</style>

test/app/routes/_layout.html

@@ -1,15 +0,0 @@
-{#if preloading}
-	<progress class='preloading-progress' value=0.5/>
-{/if}
-
-<svelte:component this={child.component} {rootPreloadFunctionRan} {...child.props}/>
-
-<script>
-	export default {
-		preload() {
-			return {
-				rootPreloadFunctionRan: true
-			};
-		}
-	};
-</script>

test/app/routes/blog/_default.html

@@ -0,0 +1,25 @@
+<svelte:head>
+	<title>Blog</title>
+</svelte:head>
+
+<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>
+
+<script>
+	export default {
+		preload({ params, query }) {
+			return fetch(`blog.json`).then(r => r.json()).then(posts => {
+				return { posts };
+			});
+		}
+	};
+</script>

test/app/routes/blog/_posts.js

@@ -106,14 +106,6 @@ const posts = [
 			<p>If you didn't have adult onset diabetes, I wouldn't mind giving you a little sugar. Everybody dance NOW. And the soup of the day is bread. Great, now I'm gonna smell to high heaven like a tuna melt!</p>
 			<p>That's how Tony Wonder lost a nut. She calls it a Mayonegg. Go ahead, touch the Cornballer. There's a new daddy in town. A discipline daddy.</p>
 		`
-	},
-
-	{
-		title: 'Encödïng test',
-		slug: 'encödïng-test',
-		html: `
-			<p>It works</p>
-		`
 	}
 ];
 

test/app/routes/blog/index.html

@@ -1,25 +1 @@
-<svelte:head>
-	<title>Blog</title>
-</svelte:head>
-
-<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>
-
-<script>
-	export default {
-		preload({ params, query }) {
-			return fetch(`blog.json`).then(r => r.json()).then(posts => {
-				return { posts };
-			});
-		}
-	};
-</script>
+<svelte:component this={child.component} {...child.props}/>

test/app/routes/const.html

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

test/app/routes/echo/page/[slug].html

@@ -1,12 +0,0 @@
-<h1>{slug} ({message})</h1>
-
-<script>
-	export default {
-		preload({ params, query }) {
-			return {
-				slug: params.slug,
-				message: query.message
-			};
-		}
-	};
-</script>

test/app/routes/echo/server-route/[slug].js

@@ -1,15 +0,0 @@
-export function get(req, res) {
-	res.writeHead(200, {
-		'Content-Type': 'text/html'
-	});
-
-	res.end(`
-		<!doctype html>
-		<html>
-			<head><meta charset="utf-8"></head>
-			<body>
-				<h1>${req.params.slug}</h1>
-			</body>
-		</html>
-	`);
-}

test/app/routes/fünke.html

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

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

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

test/app/routes/index.html

@@ -1,31 +1,6 @@
-<svelte:head>
-	<title>Sapper project template</title>
-</svelte:head>
+{#if preloading}
+	<progress class='preloading-progress' value=0.5/>
+{/if}
 
-<h1>Great success!</h1>
+<svelte:component this={child.component} {...child.props}/>
 
-<a href='.'>home</a>
-<a href='about'>about</a>
-<a href='slow-preload'>slow preload</a>
-<a href='non-sapper-redirect-from'>redirect</a>
-<a href='redirect-from'>redirect</a>
-<a href='redirect-root'>redirect (root)</a>
-<a href='blog/nope'>broken link</a>
-<a href='blog/throw-an-error'>error link</a>
-<a href='credentials?creds=include'>credentials</a>
-<a rel=prefetch class='{page === "blog"  ? "selected" : ""}' href='blog'>blog</a>
-<a href="const">const</a>
-<a href="echo/page/encöded?message=hëllö+wörld">echo/page/encöded?message=hëllö+wörld</a>
-<a href="echo/page/empty?message">echo/page/empty?message</a>
-
-<div class='hydrate-test'></div>
-
-<style>
-	h1 {
-		text-align: center;
-		font-size: 2.8em;
-		text-transform: uppercase;
-		font-weight: 700;
-		margin: 0 0 0.5em 0;
-	}
-</style>

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

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

test/app/routes/preload-root/index.html

@@ -1 +0,0 @@
-<h1>root preload function ran: {rootPreloadFunctionRan}</h1>

test/app/routes/redirect-root.html

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

test/app/routes/show-url.html

@@ -0,0 +1,9 @@
+<p>URL is {url}</p>
+
+<script>
+	export default {
+		preload({ url }) {
+			if (url) return { url };
+		}
+	};
+</script>

test/app/webpack/client.config.js

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

test/app/webpack/server.config.js

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

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

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

test/common/test.js

@@ -2,10 +2,11 @@ const fs = require('fs');
 const path = require('path');
 const assert = require('assert');
 const Nightmare = require('nightmare');
+const serve = require('serve-static');
 const walkSync = require('walk-sync');
+const fetch = require('node-fetch');
 const rimraf = require('rimraf');
 const ports = require('port-authority');
-const fetch = require('node-fetch');
 
 Nightmare.action('page', {
 	title(done) {
@@ -58,19 +59,9 @@ describe('sapper', function() {
 		basepath: '/custom-basepath'
 	});
 
-	testExport({});
-
-	testExport({ basepath: '/custom-basepath' });
-});
-
-function testExport({ basepath = '' }) {
-	describe(basepath ? `export --basepath ${basepath}` : 'export', () => {
+	describe('export', () => {
 		before(() => {
-			if (basepath) {
-				process.env.BASEPATH = basepath;
-			}
-
-			return exec(`node ${cli} export ${basepath ? `--basepath ${basepath}` : ''}`);
+			return exec(`node ${cli} export`);
 		});
 
 		it('export all pages', () => {
@@ -82,11 +73,6 @@ function testExport({ basepath = '' }) {
 				'about/index.html',
 				'slow-preload/index.html',
 
-				'redirect-from/index.html',
-				'redirect-to/index.html',
-				'non-sapper-redirect-from/index.html',
-				'non-sapper-redirect-to/index.html',
-
 				'blog/index.html',
 				'blog/a-very-long-post/index.html',
 				'blog/how-can-i-get-involved/index.html',
@@ -94,7 +80,6 @@ function testExport({ basepath = '' }) {
 				'blog/how-to-use-sapper/index.html',
 				'blog/what-is-sapper/index.html',
 				'blog/why-the-name/index.html',
-				'blog/encödïng-test/index.html',
 
 				'blog.json',
 				'blog/a-very-long-post.json',
@@ -103,7 +88,6 @@ function testExport({ basepath = '' }) {
 				'blog/how-to-use-sapper.json',
 				'blog/what-is-sapper.json',
 				'blog/why-the-name.json',
-				'blog/encödïng-test.json',
 
 				'favicon.png',
 				'global.css',
@@ -112,18 +96,16 @@ function testExport({ basepath = '' }) {
 				'service-worker.js',
 				'svelte-logo-192.png',
 				'svelte-logo-512.png',
-			].map(file => {
-				return basepath ? `${basepath.replace(/^[\/\\]/, '')}/${file}` : file;
-			});
-
+			];
 			// Client scripts that should show up in the extraction directory.
 			const expectedClientRegexes = [
 				/client\/[^/]+\/main(\.\d+)?\.js/,
-				/client\/[^/]+\/index(\.\d+)?\.js/,
-				/client\/[^/]+\/about(\.\d+)?\.js/,
-				/client\/[^/]+\/blog_\$slug(\.\d+)?\.js/,
-				/client\/[^/]+\/blog(\.\d+)?\.js/,
-				/client\/[^/]+\/slow\$45preload(\.\d+)?\.js/,
+				/client\/[^/]+\/page_index(\.\d+)?\.js/,
+				/client\/[^/]+\/page_about(\.\d+)?\.js/,
+				/client\/[^/]+\/page_blog_\$slug(\.\d+)?\.js/,
+				/client\/[^/]+\/page_blog(\.\d+)?\.js/,
+				/client\/[^/]+\/page_show\$45url(\.\d+)?\.js/,
+				/client\/[^/]+\/page_slow\$45preload(\.\d+)?\.js/,
 			];
 			const allPages = walkSync(dest);
 
@@ -145,7 +127,7 @@ function testExport({ basepath = '' }) {
 			});
 		});
 	});
-}
+});
 
 function run({ mode, basepath = '' }) {
 	describe(`mode=${mode}`, function () {
@@ -388,6 +370,16 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
+			it('passes entire request object to preload', () => {
+				return nightmare
+					.goto(`${base}/show-url`)
+					.init()
+					.evaluate(() => document.querySelector('p').innerHTML)
+					.then(html => {
+						assert.equal(html, `URL is /show-url`);
+					});
+			});
+
 			it('calls a delete handler', () => {
 				return nightmare
 					.goto(`${base}/delete-test`)
@@ -442,33 +434,6 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
-			it('redirects on server (root)', () => {
-				return nightmare.goto(`${base}/redirect-root`)
-					.path()
-					.then(path => {
-						assert.equal(path, `${basepath}/`);
-					})
-					.then(() => nightmare.page.title())
-					.then(title => {
-						assert.equal(title, 'Great success!');
-					});
-			});
-
-			it('redirects in client (root)', () => {
-				return nightmare.goto(base)
-					.wait('[href="redirect-root"]')
-					.click('[href="redirect-root"]')
-					.wait(200)
-					.path()
-					.then(path => {
-						assert.equal(path, `${basepath}/`);
-					})
-					.then(() => nightmare.page.title())
-					.then(title => {
-						assert.equal(title, 'Great success!');
-					});
-			});
-
 			it('handles 4xx error on server', () => {
 				return nightmare.goto(`${base}/blog/nope`)
 					.path()
@@ -523,42 +488,6 @@ function run({ mode, basepath = '' }) {
 					});
 			});
 
-			// Ignores are meant for top-level escape.
-			// ~> Sapper **should** own the entire {basepath} when designated.
-			if (!basepath) {
-				it('respects `options.ignore` values (RegExp)', () => {
-					return nightmare.goto(`${base}/foobar`)
-						.evaluate(() => document.documentElement.textContent)
-						.then(text => {
-							assert.equal(text, 'foobar');
-						});
-				});
-
-				it('respects `options.ignore` values (String #1)', () => {
-					return nightmare.goto(`${base}/buzz`)
-						.evaluate(() => document.documentElement.textContent)
-						.then(text => {
-							assert.equal(text, 'buzz');
-						});
-				});
-
-				it('respects `options.ignore` values (String #2)', () => {
-					return nightmare.goto(`${base}/fizzer`)
-						.evaluate(() => document.documentElement.textContent)
-						.then(text => {
-							assert.equal(text, 'fizzer');
-						});
-				});
-
-				it('respects `options.ignore` values (Function)', () => {
-					return nightmare.goto(`${base}/hello`)
-						.evaluate(() => document.documentElement.textContent)
-						.then(text => {
-							assert.equal(text, 'hello');
-						});
-				});
-			}
-
 			it('does not attempt client-side navigation to server routes', () => {
 				return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`)
 					.init()
@@ -614,11 +543,11 @@ function run({ mode, basepath = '' }) {
 				return nightmare.goto(`${base}/store`)
 					.page.title()
 					.then(title => {
-						assert.equal(title, 'hello world');
+						assert.equal(title, 'Stored title');
 						return nightmare.init().page.title();
 					})
 					.then(title => {
-						assert.equal(title, 'hello world');
+						assert.equal(title, 'Stored title');
 					});
 			});
 
@@ -711,9 +640,9 @@ function run({ mode, basepath = '' }) {
 					.evaluate(() => document.querySelector('#sapper').textContent)
 					.then(text => {
 						assert.deepEqual(text.split('\n').filter(Boolean), [
+							'x: foo 1',
 							'y: bar 1',
-							'z: baz 1',
-							'child segment: baz'
+							'z: baz 1'
 						]);
 
 						return nightmare.click(`a`)
@@ -724,9 +653,9 @@ function run({ mode, basepath = '' }) {
 					})
 					.then(text => {
 						assert.deepEqual(text.split('\n').filter(Boolean), [
+							'x: foo 1',
 							'y: bar 1',
-							'z: qux 2',
-							'child segment: qux'
+							'z: qux 2'
 						]);
 					});
 			});
@@ -738,83 +667,18 @@ function run({ mode, basepath = '' }) {
 						assert.equal(title, 'it works');
 					});
 			});
-
-			it('runs preload in root component', () => {
-				return nightmare.goto(`${base}/preload-root`)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'root preload function ran: true');
-					});
-			});
-
-			it('allows reserved words as route names', () => {
-				return nightmare.goto(`${base}/const`).init()
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'reserved words are okay as routes');
-					});
-			});
-
-			it('encodes req.params and req.query for server-rendered pages', () => {
-				return nightmare.goto(`${base}/echo/page/encöded?message=hëllö+wörld`)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'encöded (hëllö wörld)');
-					});
-			});
-
-			it('encodes req.params and req.query for client-rendered pages', () => {
-				return nightmare.goto(base).init()
-					.click('a[href="echo/page/encöded?message=hëllö+wörld"]')
-					.wait(100)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'encöded (hëllö wörld)');
-					});
-			});
-
-			it('accepts value-less query string parameter on server', () => {
-				return nightmare.goto(`${base}/echo/page/empty?message`)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'empty ()');
-					});
-			});
-
-			it('accepts value-less query string parameter on client', () => {
-				return nightmare.goto(base).init()
-					.click('a[href="echo/page/empty?message"]')
-					.wait(100)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'empty ()');
-					});
-			});
-
-			it('encodes req.params for server routes', () => {
-				return nightmare.goto(`${base}/echo/server-route/encöded`)
-					.page.title()
-					.then(title => {
-						assert.equal(title, 'encöded');
-					});
-			});
 		});
 
 		describe('headers', () => {
-			it('sets Content-Type, Link...preload, and Cache-Control headers', () => {
-				return capture(() => fetch(base)).then(responses => {
-					const { headers } = responses[0];
+			it('sets Content-Type and Link...preload headers', () => {
+				return capture(() => nightmare.goto(base)).then(requests => {
+					const { headers } = requests[0];
 
 					assert.equal(
 						headers['content-type'],
 						'text/html'
 					);
 
-					assert.equal(
-						headers['cache-control'],
-						'max-age=600'
-					);
-
 					const str = ['main', '.+?\\.\\d+']
 						.map(file => {
 							return `<${basepath}/client/[^/]+/${file}\\.js>;rel="preload";as="script"`;

test/unit/clean_html/index.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

test/unit/create_manifest_data/index.ts

@@ -1,168 +0,0 @@
-import * as path from 'path';
-import * as assert from 'assert';
-import create_manifest_data from '../../../src/core/create_manifest_data';
-
-describe('manifest_data', () => {
-	it('creates routes', () => {
-		const { components, pages, server_routes } = create_manifest_data(path.join(__dirname, 'samples/basic'));
-
-		const index = { name: 'index', file: 'index.html' };
-		const about = { name: 'about', file: 'about.html' };
-		const blog = { name: 'blog', file: 'blog/index.html' };
-		const blog_$slug = { name: 'blog_$slug', file: 'blog/[slug].html' };
-
-		assert.deepEqual(components, [
-			index,
-			about,
-			blog,
-			blog_$slug
-		]);
-
-		assert.deepEqual(pages, [
-			{
-				pattern: /^\/?$/,
-				parts: [
-					{ component: index, params: [] }
-				]
-			},
-
-			{
-				pattern: /^\/about\/?$/,
-				parts: [
-					{ component: about, params: [] }
-				]
-			},
-
-			{
-				pattern: /^\/blog\/?$/,
-				parts: [
-					null,
-					{ component: blog, params: [] }
-				]
-			},
-
-			{
-				pattern: /^\/blog\/([^\/]+?)\/?$/,
-				parts: [
-					null,
-					{ component: blog_$slug, params: ['slug'] }
-				]
-			}
-		]);
-
-		assert.deepEqual(server_routes, [
-			{
-				name: 'route_blog_json',
-				pattern: /^\/blog.json$/,
-				file: 'blog/index.json.js',
-				params: []
-			},
-
-			{
-				name: 'route_blog_$slug_json',
-				pattern: /^\/blog\/([^\/]+?).json$/,
-				file: 'blog/[slug].json.js',
-				params: ['slug']
-			}
-		]);
-	});
-
-	it('encodes invalid characters', () => {
-		const { components, pages } = create_manifest_data(path.join(__dirname, 'samples/encoding'));
-
-		// had to remove ? and " because windows
-
-		// const quote = { name: '$34', file: '".html' };
-		const hash = { name: '$35', file: '#.html' };
-		// const question_mark = { name: '$63', file: '?.html' };
-
-		assert.deepEqual(components, [
-			// quote,
-			hash,
-			// question_mark
-		]);
-
-		assert.deepEqual(pages.map(p => p.pattern), [
-			// /^\/%22\/?$/,
-			/^\/%23\/?$/,
-			// /^\/%3F\/?$/
-		]);
-	});
-
-	it('allows regex qualifiers', () => {
-		const { pages } = create_manifest_data(path.join(__dirname, 'samples/qualifiers'));
-
-		assert.deepEqual(pages.map(p => p.pattern), [
-			/^\/([0-9-a-z]{3,})\/?$/,
-			/^\/([a-z]{2})\/?$/,
-			/^\/([^\/]+?)\/?$/
-		]);
-	});
-
-	it('sorts routes correctly', () => {
-		const { pages } = create_manifest_data(path.join(__dirname, 'samples/sorting'));
-
-		assert.deepEqual(pages.map(p => p.parts.map(part => part && part.component.file)), [
-			['index.html'],
-			['about.html'],
-			[null, 'post/index.html'],
-			[null, 'post/bar.html'],
-			[null, 'post/foo.html'],
-			[null, 'post/f[xx].html'],
-			[null, 'post/[id([0-9-a-z]{3,})].html'],
-			[null, 'post/[id].html'],
-			['[wildcard].html']
-		]);
-	});
-
-	it('ignores files and directories with leading underscores', () => {
-		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-underscore'));
-
-		assert.deepEqual(server_routes.map(r => r.file), [
-			'index.js',
-			'e/f/g/h.js'
-		]);
-	});
-
-	it('ignores files and directories with leading dots except .well-known', () => {
-		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/hidden-dot'));
-
-		assert.deepEqual(server_routes.map(r => r.file), [
-			'.well-known/dnt-policy.txt.js'
-		]);
-	});
-
-	it('fails on clashes', () => {
-		assert.throws(() => {
-			const { pages } = create_manifest_data(path.join(__dirname, 'samples/clash-pages'));
-		}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
-
-		assert.throws(() => {
-			const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/clash-routes'));
-			console.log(server_routes);
-		}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
-	});
-
-	it('fails if dynamic params are not separated', () => {
-		assert.throws(() => {
-			create_manifest_data(path.join(__dirname, 'samples/invalid-params'));
-		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
-	});
-
-	it('errors when trying to use reserved characters in route regexp', () => {
-		assert.throws(() => {
-			create_manifest_data(path.join(__dirname, 'samples/invalid-qualifier'));
-		}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
-	});
-
-	it('ignores things that look like lockfiles' , () => {
-		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/lockfiles'));
-
-		assert.deepEqual(server_routes, [{
-			file: 'foo.js',
-			name: 'route_foo',
-			params: [],
-			pattern: /^\/foo$/
-		}]);
-	});
-});

test/unit/create_routes/index.js

@@ -0,0 +1,159 @@
+const path = require('path');
+const assert = require('assert');
+const { create_routes } = require('../../../dist/core.ts.js');
+
+describe('create_routes', () => {
+	it('creates routes', () => {
+		const { components, pages, server_routes } = create_routes(path.join(__dirname, 'samples/basic'));
+
+		const page_index = { name: 'page_index', file: '_default.html' };
+		const page_about = { name: 'page_about', file: 'about.html' };
+		const page_blog = { name: 'page_blog', file: 'blog/index.html' };
+		const page_blog_index = { name: 'page_blog_index', file: 'blog/_default.html' };
+		const page_blog_$slug = { name: 'page_blog_$slug', file: 'blog/[slug].html' };
+
+		assert.deepEqual(components, [
+			page_index,
+			page_about,
+			page_blog,
+			page_blog_index,
+			page_blog_$slug
+		]);
+
+		assert.deepEqual(pages, [
+			{
+				pattern: /^\/?$/,
+				parts: [
+					{ component: page_index, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/about\/?$/,
+				parts: [
+					{ component: page_about, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/blog\/?$/,
+				parts: [
+					{ component: page_blog, params: [] },
+					{ component: page_blog_index, params: [] }
+				]
+			},
+
+			{
+				pattern: /^\/blog\/([^\/]+?)\/?$/,
+				parts: [
+					{ component: page_blog, params: [] },
+					{ component: page_blog_$slug, params: ['slug'] }
+				]
+			}
+		]);
+
+		assert.deepEqual(server_routes, [
+			{
+				name: 'route_blog_json',
+				pattern: /^\/blog.json\/?$/,
+				file: 'blog/index.json.js',
+				params: []
+			},
+
+			{
+				name: 'route_blog_$slug_json',
+				pattern: /^\/blog\/([^\/]+?).json\/?$/,
+				file: 'blog/[slug].json.js',
+				params: ['slug']
+			}
+		]);
+	});
+
+	it('encodes invalid characters', () => {
+		const { components, pages } = create_routes(path.join(__dirname, 'samples/encoding'));
+
+		// had to remove ? and " because windows
+
+		// const quote = { name: 'page_$34', file: '".html' };
+		const hash = { name: 'page_$35', file: '#.html' };
+		// const question_mark = { name: 'page_$63', file: '?.html' };
+
+		assert.deepEqual(components, [
+			// quote,
+			hash,
+			// question_mark
+		]);
+
+		assert.deepEqual(pages.map(p => p.pattern), [
+			// /^\/%22\/?$/,
+			/^\/%23\/?$/,
+			// /^\/%3F\/?$/
+		]);
+	});
+
+	it('allows regex qualifiers', () => {
+		const { pages } = create_routes(path.join(__dirname, 'samples/qualifiers'));
+
+		assert.deepEqual(pages.map(p => p.pattern), [
+			/^\/([0-9-a-z]{3,})\/?$/,
+			/^\/([a-z]{2})\/?$/,
+			/^\/([^\/]+?)\/?$/
+		]);
+	});
+
+	it('sorts routes correctly', () => {
+		const { pages } = create_routes(path.join(__dirname, 'samples/sorting'));
+
+		assert.deepEqual(pages.map(p => p.parts.map(part => part.component.file)), [
+			['_default.html'],
+			['about.html'],
+			['post/index.html', 'post/_default.html'],
+			['post/index.html', 'post/bar.html'],
+			['post/index.html', 'post/foo.html'],
+			['post/index.html', 'post/f[xx].html'],
+			['post/index.html', 'post/[id([0-9-a-z]{3,})].html'],
+			['post/index.html', 'post/[id].html'],
+			['[wildcard].html']
+		]);
+	});
+
+	it('ignores files and directories with leading underscores', () => {
+		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-underscore'));
+
+		assert.deepEqual(server_routes.map(r => r.file), [
+			'index.js',
+			'e/f/g/h.js'
+		]);
+	});
+
+	it('ignores files and directories with leading dots except .well-known', () => {
+		const { server_routes } = create_routes(path.join(__dirname, 'samples/hidden-dot'));
+
+		assert.deepEqual(server_routes.map(r => r.file), [
+			'.well-known/dnt-policy.txt.js'
+		]);
+	});
+
+	it('fails on clashes', () => {
+		assert.throws(() => {
+			const { pages } = create_routes(path.join(__dirname, 'samples/clash-pages'));
+		}, /The \[bar\]\/index\.html and \[foo\]\.html pages clash/);
+
+		assert.throws(() => {
+			const { server_routes } = create_routes(path.join(__dirname, 'samples/clash-routes'));
+			console.log(server_routes);
+		}, /The \[bar\]\/index\.js and \[foo\]\.js routes clash/);
+	});
+
+	it('fails if dynamic params are not separated', () => {
+		assert.throws(() => {
+			create_routes(path.join(__dirname, 'samples/invalid-params'));
+		}, /Invalid route \[foo\]\[bar\]\.js — parameters must be separated/);
+	});
+
+	it('errors when trying to use reserved characters in route regexp', () => {
+		assert.throws(() => {
+			create_routes(path.join(__dirname, 'samples/invalid-qualifier'));
+		}, /Invalid route \[foo\(\[a-z\]\(\[0-9\]\)\)\].js — cannot use \(, \), \? or \: in route qualifiers/);
+	});
+});