-> v0.24.0

redirect to external URLs

CHANGELOG.md

@@ -1,5 +1,37 @@
 # sapper changelog
 
+## 0.24.0
+
+* Handle external URLs in `this.redirect` ([#490](https://github.com/sveltejs/sapper/issues/490))
+* Strip leading `/` from basepath ([#495](https://github.com/sveltejs/sapper/issues/495))
+* Treat duplicate query string parameters as arrays ([#497](https://github.com/sveltejs/sapper/issues/497))
+* Don't buffer `stdout` and `stderr` ([#305](https://github.com/sveltejs/sapper/issues/305))
+* Posixify `build_dir` ([#498](https://github.com/sveltejs/sapper/pull/498))
+* Use `page[XY]Offset` instead of `scroll[XY]` ([#480](https://github.com/sveltejs/sapper/issues/480))
+
+## 0.23.5
+
+* Include lazily-imported CSS in main CSS chunk ([#492](https://github.com/sveltejs/sapper/pull/492))
+* Make search param decoding spec-compliant ([#493](https://github.com/sveltejs/sapper/pull/493))
+* Handle async route errors ([#488](https://github.com/sveltejs/sapper/pull/488))
+
+## 0.23.4
+
+* Ignore empty anchors when exporting ([#491](https://github.com/sveltejs/sapper/pull/491))
+
+## 0.23.3
+
+* Clear `error` and `status` on successful render ([#477](https://github.com/sveltejs/sapper/pull/477))
+
+## 0.23.2
+
+* Fix entry point CSS ([#471](https://github.com/sveltejs/sapper/pull/471))
+
+## 0.23.1
+
+* Scroll to deeplink that matches current URL ([#472](https://github.com/sveltejs/sapper/pull/472))
+* Scroll to deeplink on another page ([#341](https://github.com/sveltejs/sapper/issues/341))
+
 ## 0.23.0
 
 * Overhaul internal APIs ([#468](https://github.com/sveltejs/sapper/pull/468))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "Military-grade apps, engineered by Svelte",
   "bin": {
     "sapper": "./sapper"
@@ -17,53 +17,53 @@
     "test": "test"
   },
   "dependencies": {
-    "html-minifier": "^3.5.16",
+    "html-minifier": "^3.5.20",
     "shimport": "0.0.11",
-    "source-map-support": "^0.5.6",
-    "sourcemap-codec": "^1.4.1",
+    "source-map-support": "^0.5.9",
+    "sourcemap-codec": "^1.4.3",
     "string-hash": "^1.1.3",
-    "tslib": "^1.9.1"
+    "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.7.1",
+    "@types/node": "^10.12.0",
     "@types/puppeteer": "^1.9.0",
     "@types/rimraf": "^2.0.2",
     "agadoo": "^1.0.1",
-    "cheap-watch": "^0.3.0",
+    "cheap-watch": "^1.0.0",
     "cookie": "^0.3.1",
     "devalue": "^1.0.4",
-    "eslint": "^4.13.1",
-    "eslint-plugin-import": "^2.12.0",
-    "kleur": "^2.0.1",
+    "eslint": "^5.7.0",
+    "eslint-plugin-import": "^2.14.0",
+    "kleur": "^2.0.2",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
-    "node-fetch": "^2.1.1",
+    "node-fetch": "^2.2.0",
     "npm-run-all": "^4.1.3",
-    "polka": "^0.4.0",
+    "polka": "^0.5.1",
     "port-authority": "^1.0.5",
-    "pretty-bytes": "^5.0.0",
+    "pretty-bytes": "^5.1.0",
     "puppeteer": "^1.9.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": "^0.66.6",
+    "rollup-plugin-commonjs": "^9.2.0",
+    "rollup-plugin-json": "^3.1.0",
     "rollup-plugin-node-resolve": "^3.4.0",
-    "rollup-plugin-replace": "^2.0.0",
+    "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-svelte": "^4.3.2",
-    "rollup-plugin-typescript": "^0.8.1",
+    "rollup-plugin-typescript": "^1.0.0",
     "sade": "^1.4.1",
     "sander": "^0.6.0",
     "sirv": "^0.2.2",
-    "svelte": "^2.6.3",
-    "svelte-loader": "^2.9.0",
+    "svelte": "^2.13.5",
+    "svelte-loader": "^2.11.0",
     "ts-node": "^7.0.1",
-    "typescript": "^2.8.3",
-    "webpack": "^4.8.3",
-    "webpack-format-messages": "^2.0.1"
+    "typescript": "^3.1.3",
+    "webpack": "^4.20.2",
+    "webpack-format-messages": "^2.0.3"
   },
   "scripts": {
     "test": "mocha --opts mocha.opts",

src/api/dev.ts

@@ -214,12 +214,9 @@ class Watcher extends EventEmitter {
 		// TODO watch the configs themselves?
 		const compilers: Compilers = await create_compilers(this.bundler, cwd, src, dest, false);
 
-		let log = '';
-
 		const emitFatal = () => {
 			this.emit('fatal', <FatalEvent>{
-				message: `Server crashed`,
-				log
+				message: `Server crashed`
 			});
 
 			this.crashed = true;
@@ -236,7 +233,6 @@ class Watcher extends EventEmitter {
 			handle_result: (result: CompileResult) => {
 				deferred.promise.then(() => {
 					const restart = () => {
-						log = '';
 						this.crashed = false;
 
 						ports.wait(this.port)
@@ -260,8 +256,7 @@ class Watcher extends EventEmitter {
 								if (this.crashed) return;
 
 								this.emit('fatal', <FatalEvent>{
-									message: `Server is not listening on port ${this.port}`,
-									log
+									message: `Server is not listening on port ${this.port}`
 								});
 							});
 					};
@@ -292,12 +287,10 @@ class Watcher extends EventEmitter {
 					});
 
 					this.proc.stdout.on('data', chunk => {
-						log += chunk;
 						this.emit('stdout', chunk);
 					});
 
 					this.proc.stderr.on('data', chunk => {
-						log += chunk;
 						this.emit('stderr', chunk);
 					});
 

src/api/export.ts

@@ -38,6 +38,8 @@ async function _export({
 	oninfo = noop,
 	onfile = noop
 }: Opts = {}) {
+	basepath = basepath.replace(/^\//, '')
+
 	cwd = path.resolve(cwd);
 	static_files = path.resolve(cwd, static_files);
 	build_dir = path.resolve(cwd, build_dir);
@@ -187,6 +189,6 @@ async function _export({
 }
 
 function get_href(attrs: string) {
-	const match = /href\s*=\s*(?:"(.+?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
+	const match = /href\s*=\s*(?:"(.*?)"|'(.+?)'|([^\s>]+))/.exec(attrs);
 	return match[1] || match[2] || match[3];
 }

src/cli.ts

@@ -64,6 +64,14 @@ prog.command('dev')
 
 			let first = true;
 
+			watcher.on('stdout', data => {
+				process.stdout.write(data);
+			});
+
+			watcher.on('stderr', data => {
+				process.stderr.write(data);
+			});
+
 			watcher.on('ready', async (event: ReadyEvent) => {
 				if (first) {
 					console.log(colors.bold.cyan(`> Listening on http://localhost:${event.port}`));
@@ -73,16 +81,6 @@ prog.command('dev')
 					}
 					first = false;
 				}
-
-				// TODO clear screen?
-
-				event.process.stdout.on('data', data => {
-					process.stdout.write(data);
-				});
-
-				event.process.stderr.on('data', data => {
-					process.stderr.write(data);
-				});
 			});
 
 			watcher.on('invalid', (event: InvalidEvent) => {

src/core/create_compilers/extract_css.ts

@@ -3,7 +3,7 @@ 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';
+import { CompileResult, Chunk } from './interfaces';
 import { posixify } from '../../utils'
 
 const inline_sourcemap_header = 'data:application/json;charset=utf-8;base64,';
@@ -46,6 +46,65 @@ type SourceMap = {
 	mappings: string;
 };
 
+function get_css_from_modules(modules: string[], css_map: Map<string, string>, dirs: Dirs) {
+	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;
+}
+
 export default function extract_css(client_result: CompileResult, components: PageComponent[], dirs: Dirs) {
 	const result: {
 		main: string | null;
@@ -57,151 +116,94 @@ export default function extract_css(client_result: CompileResult, components: Pa
 
 	if (!client_result.css_files) return; // Rollup-only for now
 
-	const unaccounted_for = new Set();
+	let asset_dir = `${dirs.dest}/client`;
+	if (process.env.SAPPER_LEGACY_BUILD) asset_dir += '/legacy';
 
-	const css_map = new Map();
-	client_result.css_files.forEach(css => {
-		unaccounted_for.add(css.id);
-		css_map.set(css.id, css.code);
+	const unclaimed = new Set(client_result.css_files.map(x => x.id));
+
+	const lookup = new Map();
+	client_result.chunks.forEach(chunk => {
+		lookup.set(chunk.file, chunk);
 	});
 
-	const chunk_map = new Map();
-	client_result.chunks.forEach(chunk => {
-		chunk_map.set(chunk.file, chunk);
+	const css_map = new Map();
+	client_result.css_files.forEach(css_module => {
+		css_map.set(css_module.id, css_module.code);
 	});
 
 	const chunks_with_css = new Set();
 
-	// figure out which chunks belong to which components...
-	const component_owners = new Map();
+	// concatenate and emit CSS
 	client_result.chunks.forEach(chunk => {
-		chunk.modules.forEach(module => {
-			const component = posixify(path.relative(dirs.routes, module));
-			component_owners.set(component, chunk);
-		});
+		const css_modules = chunk.modules.filter(m => css_map.has(m));
+		if (!css_modules.length) return;
+
+		const css = get_css_from_modules(css_modules, css_map, dirs);
+
+		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(`${asset_dir}`, source));
+
+		fs.writeFileSync(`${asset_dir}/${output_file_name}`, `${code}\n/* sourceMappingURL=./${output_file_name}.map */`);
+		fs.writeFileSync(`${asset_dir}/${output_file_name}.map`, JSON.stringify(map, null, '  '));
+
+		chunks_with_css.add(chunk);
 	});
 
-	const chunks_depended_upon_by_component = new Map();
+	const entry = path.resolve(dirs.src, 'client.js');
+	const entry_chunk = client_result.chunks.find(chunk => chunk.modules.indexOf(entry) !== -1);
 
-	// ...so we can figure out which chunks don't belong
+	const entry_chunk_dependencies: Set<Chunk> = new Set([entry_chunk]);
+	const entry_css_modules: string[] = [];
+
+	// recursively find the chunks this component depends on
+	entry_chunk_dependencies.forEach(chunk => {
+		chunk.imports.forEach(file => {
+			entry_chunk_dependencies.add(lookup.get(file));
+		});
+
+		if (chunks_with_css.has(chunk)) {
+			chunk.modules.forEach(file => {
+				unclaimed.delete(file);
+				if (css_map.has(file)) {
+					entry_css_modules.push(file);
+				}
+			});
+		}
+	});
+
+	// figure out which (css-having) chunks each component depends on
 	components.forEach(component => {
-		const chunk = component_owners.get(component.file);
+		const resolved = path.resolve(dirs.routes, component.file);
+		const chunk: Chunk = client_result.chunks.find(chunk => chunk.modules.indexOf(resolved) !== -1);
+
 		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);
+		const chunk_dependencies: Set<Chunk> = new Set([chunk]);
+		const css_dependencies: string[] = [];
+
+		// recursively find the chunks this component depends on
+		chunk_dependencies.forEach(chunk => {
+			chunk.imports.forEach(file => {
+				chunk_dependencies.add(lookup.get(file));
 			});
-		});
 
-		chunks.forEach(chunk => {
-			chunk.modules.forEach((module: string) => {
-				unaccounted_for.delete(module);
-			});
-		});
+			if (chunks_with_css.has(chunk)) {
+				css_dependencies.push(chunk.file.replace(/\.js$/, '.css'));
 
-		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);
+				chunk.modules.forEach(file => {
+					unclaimed.delete(file);
+				});
 			}
 		});
 
-		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;
-	}
-
-	let asset_dir = `${dirs.dest}/client`;
-	if (process.env.SAPPER_LEGACY_BUILD) asset_dir += '/legacy';
-
-	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(`${asset_dir}`, source));
-
-				fs.writeFileSync(`${asset_dir}/${output_file_name}`, `${code}\n/* sourceMappingURL=./${output_file_name}.map */`);
-				fs.writeFileSync(`${asset_dir}/${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;
+		result.chunks[component.file] = css_dependencies;
 	});
 
 	fs.readdirSync(asset_dir).forEach(file => {
@@ -210,13 +212,17 @@ export default function extract_css(client_result: CompileResult, components: Pa
 		const source = fs.readFileSync(`${asset_dir}/${file}`, 'utf-8');
 
 		const replaced = source.replace(/["']__SAPPER_CSS_PLACEHOLDER:(.+?)__["']/g, (m, route) => {
-			return JSON.stringify(replacements.get(route));
+			return JSON.stringify(result.chunks[route]);
 		});
 
 		fs.writeFileSync(`${asset_dir}/${file}`, replaced);
 	});
 
-	const leftover = get_css_from_modules(Array.from(unaccounted_for));
+	unclaimed.forEach(file => {
+		entry_css_modules.push(file);
+	});
+
+	const leftover = get_css_from_modules(entry_css_modules, css_map, dirs);
 	if (leftover) {
 		const { code, map } = leftover;
 

src/core/create_manifests.ts

@@ -226,8 +226,8 @@ function generate_server(
 			error
 		};`.replace(/^\t\t/gm, '').trim();
 
-	const build_dir = path.relative(cwd, dest);
-	const src_dir = path.relative(cwd, src);
+	const build_dir = posixify(path.relative(cwd, dest));
+	const src_dir = posixify(path.relative(cwd, src));
 
 	return `// This file is generated by Sapper — do not edit it!\n` + template
 		.replace('__BUILD__DIR__', JSON.stringify(build_dir))
@@ -242,4 +242,4 @@ function get_file(path_to_routes: string, component: PageComponent) {
 	}
 
 	return posixify(`${path_to_routes}/${component.file}`);
-}
+}

src/interfaces.ts

@@ -69,7 +69,6 @@ export type ErrorEvent = {
 
 export type FatalEvent = {
 	message: string;
-	log?: string;
 };
 
 export type InvalidEvent = {

templates/src/client/app.ts

@@ -87,11 +87,14 @@ export function select_route(url: URL): Target {
 
 		const match = page.pattern.exec(path);
 		if (match) {
-			const query: Record<string, string | true> = {};
+			const query: Record<string, string | string[]> = Object.create(null);
 			if (url.search.length > 0) {
 				url.search.slice(1).split('&').forEach(searchParam => {
-					const [, key, value] = /([^=]+)(?:=(.*))?/.exec(searchParam);
-					query[key] = decodeURIComponent((value || '').replace(/\+/g, ' '));
+					let [, key, value] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam));
+					value = (value || '').replace(/\+/g, ' ');
+					if (typeof query[key] === 'string') query[key] = [<string>query[key]];
+					if (typeof query[key] === 'object') query[key].push(value);
+					else query[key] = value;
 				});
 			}
 			return { url, path, page, match, query };
@@ -101,12 +104,13 @@ export function select_route(url: URL): Target {
 
 export function scroll_state() {
 	return {
-		x: scrollX,
-		y: scrollY
+		x: pageXOffset,
+		y: pageYOffset
 	};
 }
 
-export function navigate(target: Target, id: number, noscroll = false): Promise<any> {
+export function navigate(target: Target, id: number, noscroll?: boolean, hash?: string): Promise<any> {
+	let scroll: ScrollPosition;
 	if (id) {
 		// popstate or initial navigation
 		cid = id;
@@ -137,13 +141,12 @@ export function navigate(target: Target, id: number, noscroll = false): Promise<
 		if (redirect) {
 			return goto(redirect.location, { replaceState: true });
 		}
-
-		render(data, nullable_depth, scroll_history[id], token);
+		render(data, nullable_depth, scroll_history[id], noscroll, hash, token);
 		if (document.activeElement) document.activeElement.blur();
 	});
 }
 
-function render(data: any, nullable_depth: number, scroll: ScrollPosition, token: {}) {
+function render(data: any, nullable_depth: number, scroll: ScrollPosition, noscroll: boolean, hash: string, token: {}) {
 	if (current_token !== token) return;
 
 	if (root_component) {
@@ -182,8 +185,20 @@ function render(data: any, nullable_depth: number, scroll: ScrollPosition, token
 		});
 	}
 
-	if (scroll) {
-		scrollTo(scroll.x, scroll.y);
+	if (!noscroll) {
+		if (hash) {
+			// scroll is an element id (from a hash), we need to compute y.
+			const deep_linked = document.querySelector(hash);
+			if (deep_linked) {
+				scroll = {
+					x: 0,
+					y: deep_linked.getBoundingClientRect().top
+				};
+			}
+		}
+
+		scroll_history[cid] = scroll;
+		if (scroll) scrollTo(scroll.x, scroll.y);
 	}
 
 	Object.assign(root_props, data);
@@ -298,7 +313,7 @@ export function prepare_page(target: Target): Promise<{
 			};
 		}
 
-		const props = { path, query };
+		const props = { path, query, error: null, status: null };
 		const data = {
 			path,
 			preloading: false,

templates/src/client/start/index.ts

@@ -13,7 +13,7 @@ import {
 	set_cid
 } from '../app';
 import prefetch from '../prefetch/index';
-import { Store } from '../types';
+import { Store, ScrollPosition } from '../types';
 
 export default function start(opts: {
 	target: Node,
@@ -36,16 +36,11 @@ export default function start(opts: {
 	return Promise.resolve().then(() => {
 		const { hash, href } = location;
 
-		const deep_linked = hash && document.getElementById(hash.slice(1));
-		scroll_history[uid] = deep_linked ?
-			{ x: 0, y: deep_linked.getBoundingClientRect().top } :
-			scroll_state();
-
 		history.replaceState({ id: uid }, '', href);
 
 		if (!initial_data.error) {
 			const target = select_route(new URL(location.href));
-			if (target) return navigate(target, uid);
+			if (target) return navigate(target, uid, false, hash);
 		}
 	});
 }
@@ -84,7 +79,7 @@ function handle_click(event: MouseEvent) {
 	const href = String(svg ? (<SVGAElement>a).href.baseVal : a.href);
 
 	if (href === location.href) {
-		event.preventDefault();
+		if (!location.hash) event.preventDefault();
 		return;
 	}
 
@@ -104,7 +99,7 @@ function handle_click(event: MouseEvent) {
 	const target = select_route(url);
 	if (target) {
 		const noscroll = a.hasAttribute('sapper-noscroll');
-		navigate(target, null, noscroll);
+		navigate(target, null, noscroll, url.hash);
 		event.preventDefault();
 		history.pushState({ id: cid }, '', url.href);
 	}

templates/src/client/types.ts

@@ -55,7 +55,7 @@ export type Target = {
 	path: string;
 	page: Page;
 	match: RegExpExecArray;
-	query: Record<string, string | true>;
+	query: Record<string, string | string[]>;
 };
 
 export type Redirect = {

templates/src/server/middleware/get_page_handler.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import cookie from 'cookie';
 import devalue from 'devalue';
 import fetch from 'node-fetch';
-import { URL } from 'url';
+import { URL, resolve } from 'url';
 import { build_dir, dev, src_dir, IGNORE } from '../placeholders';
 import { Manifest, Page, Props, Req, Res, Store } from './types';
 
@@ -160,7 +160,7 @@ export function get_page_handler(
 
 		try {
 			if (redirect) {
-				const location = `${req.baseUrl}/${redirect.location}`;
+				const location = resolve(req.baseUrl || '/', redirect.location);
 
 				res.statusCode = redirect.statusCode;
 				res.setHeader('Location', location);

templates/src/server/middleware/get_server_route_handler.ts

@@ -2,7 +2,7 @@ import { IGNORE } from '../placeholders';
 import { Req, Res, ServerRoute } from './types';
 
 export function get_server_route_handler(routes: ServerRoute[]) {
-	function handle_route(route: ServerRoute, req: Req, res: Res, next: () => void) {
+	async function handle_route(route: ServerRoute, req: Req, res: Res, next: () => void) {
 		req.params = route.params(route.pattern.exec(req.path));
 
 		const method = req.method.toLowerCase();
@@ -53,7 +53,7 @@ export function get_server_route_handler(routes: ServerRoute[]) {
 			};
 
 			try {
-				handle_method(req, res, handle_next);
+				await handle_method(req, res, handle_next);
 			} catch (err) {
 				handle_next(err);
 			}

test/apps/AppRunner.ts

@@ -50,6 +50,20 @@ export class AppRunner {
 			}
 		});
 
+		await this.page.setRequestInterception(true);
+
+		this.page.on('request', interceptedRequest => {
+			if (/example\.com/.test(interceptedRequest.url())) {
+				interceptedRequest.respond({
+					status: 200,
+					contentType: 'text/html',
+					body: `<h1>external</h1>`
+				});
+			} else {
+				interceptedRequest.continue();
+			}
+		});
+
 		return {
 			page: this.page,
 			base: `http://localhost:${this.port}`,
@@ -58,7 +72,8 @@ export class AppRunner {
 			start: () => this.page.evaluate(() => start()),
 			prefetchRoutes: () => this.page.evaluate(() => prefetchRoutes()),
 			prefetch: (href: string) => this.page.evaluate((href: string) => prefetch(href), href),
-			goto: (href: string) => this.page.evaluate((href: string) => goto(href), href)
+			goto: (href: string) => this.page.evaluate((href: string) => goto(href), href),
+			title: () => this.page.$eval('h1', node => node.textContent)
 		};
 	}
 

test/apps/basics/src/routes/echo-query/index.html

@@ -1,9 +1 @@
-<h1>message: "{message}"</h1>
-
-<script>
-	export default {
-		preload({ query }) {
-			return query;
-		}
-	};
-</script>
+<h1>{JSON.stringify(query)}</h1>

test/apps/basics/src/routes/index.html

@@ -3,5 +3,6 @@
 <a href="a">a</a>
 <a href="ambiguous/ok.json">ok</a>
 <a href="echo-query?message">ok</a>
+<a href="echo-query?p=one&p=two">ok</a>
 
 <div class='hydrate-test'></div>

test/apps/basics/test.ts

@@ -204,7 +204,7 @@ describe('basics', function() {
 
 		assert.equal(
 			await title(),
-			'message: ""'
+			'{"message":""}'
 		);
 	});
 
@@ -217,7 +217,29 @@ describe('basics', function() {
 
 		assert.equal(
 			await title(),
-			'message: ""'
+			'{"message":""}'
+		);
+	});
+
+	it('accepts duplicated query string parameter on server', async () => {
+		await page.goto(`${base}/echo-query?p=one&p=two`);
+
+		assert.equal(
+			await title(),
+			'{"p":["one","two"]}'
+		);
+	});
+
+	it('accepts duplicated query string parameter on client', async () => {
+		await page.goto(base);
+		await start();
+		await prefetchRoutes();
+
+		await page.click('a[href="echo-query?p=one&p=two"]')
+
+		assert.equal(
+			await title(),
+			'{"p":["one","two"]}'
 		);
 	});
 

test/apps/css/rollup.config.js

@@ -0,0 +1,64 @@
+import resolve from 'rollup-plugin-node-resolve';
+import replace from 'rollup-plugin-replace';
+import svelte from 'rollup-plugin-svelte';
+
+const mode = process.env.NODE_ENV;
+const dev = mode === 'development';
+
+const config = require('../../../config/rollup.js');
+
+export default {
+	client: {
+		input: config.client.input(),
+		output: config.client.output(),
+		plugins: [
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				dev,
+				hydratable: true,
+				emitCss: true
+			}),
+			resolve()
+		],
+
+		// temporary, pending Rollup 1.0
+		experimentalCodeSplitting: true
+	},
+
+	server: {
+		input: config.server.input(),
+		output: config.server.output(),
+		plugins: [
+			replace({
+				'process.browser': false,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+			svelte({
+				generate: 'ssr',
+				dev
+			}),
+			resolve({
+				preferBuiltins: true
+			})
+		],
+		external: ['sirv', 'polka'],
+
+		// temporary, pending Rollup 1.0
+		experimentalCodeSplitting: true
+	},
+
+	serviceworker: {
+		input: config.serviceworker.input(),
+		output: config.serviceworker.output(),
+		plugins: [
+			resolve(),
+			replace({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			})
+		]
+	}
+};

test/apps/css/src/client.js

@@ -0,0 +1,9 @@
+import * as sapper from '../__sapper__/client.js';
+
+window.start = () => sapper.start({
+	target: document.querySelector('#sapper')
+});
+
+window.prefetchRoutes = () => sapper.prefetchRoutes();
+window.prefetch = href => sapper.prefetch(href);
+window.goto = href => sapper.goto(href);

test/apps/css/src/routes/_components/Title.html

@@ -0,0 +1,7 @@
+<h1>Title</h1>
+
+<style>
+	h1 {
+		color: green;
+	}
+</style>

test/apps/css/src/routes/_error.html

@@ -0,0 +1,3 @@
+<h1>{status}</h1>
+
+<p>{error.message}</p>

test/apps/css/src/routes/bar.html

@@ -0,0 +1,11 @@
+<svelte:component this={Title}/>
+
+<script>
+	export default {
+		oncreate() {
+			import('./_components/Title.html').then(({ default: Title }) => {
+				this.set({ Title });
+			});
+		}
+	};
+</script>

test/apps/css/src/routes/foo.html

@@ -0,0 +1,7 @@
+<h1>Foo</h1>
+
+<style>
+	h1 {
+		color: blue;
+	}
+</style>

test/apps/css/src/routes/index.html

@@ -0,0 +1,10 @@
+<h1>Great success!</h1>
+
+<a href="foo">foo</a>
+<a href="bar">bar</a>
+
+<style>
+	h1 {
+		color: red;
+	}
+</style>

test/apps/css/src/server.js

@@ -0,0 +1,8 @@
+import polka from 'polka';
+import * as sapper from '../__sapper__/server.js';
+
+const { PORT } = process.env;
+
+polka()
+	.use(sapper.middleware())
+	.listen(PORT);

test/apps/css/src/service-worker.js

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

test/apps/css/src/template.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset='utf-8'>
+
+	%sapper.base%
+	%sapper.styles%
+	%sapper.head%
+</head>
+<body>
+	<div id='sapper'>%sapper.html%</div>
+	%sapper.scripts%
+</body>
+</html>

test/apps/css/test.ts

@@ -0,0 +1,78 @@
+import * as assert from 'assert';
+import * as puppeteer from 'puppeteer';
+import { build } from '../../../api';
+import { AppRunner } from '../AppRunner';
+import { wait } from '../../utils';
+
+describe('css', function() {
+	this.timeout(10000);
+
+	let runner: AppRunner;
+	let page: puppeteer.Page;
+	let base: string;
+
+	// helpers
+	let start: () => Promise<void>;
+	let prefetchRoutes: () => Promise<void>;
+	let prefetch: (href: string) => Promise<void>;
+	let goto: (href: string) => Promise<void>;
+	let title: () => Promise<string>;
+
+	// hooks
+	before(async () => {
+		await build({ cwd: __dirname });
+
+		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
+		({ base, page, start, prefetchRoutes, prefetch, goto, title } = await runner.start());
+	});
+
+	after(() => runner.end());
+
+	it('includes critical CSS with server render', async () => {
+		await page.goto(base);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(255, 0, 0)'
+		);
+	});
+
+	it('loads CSS when navigating client-side', async () => {
+		await page.goto(base);
+
+		await start();
+		await prefetchRoutes();
+
+		await page.click(`[href="foo"]`);
+		await wait(50);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(0, 0, 255)'
+		);
+	});
+
+	it('loads CSS for a lazily-rendered component', async () => {
+		await page.goto(base);
+
+		await start();
+		await prefetchRoutes();
+
+		await page.click(`[href="bar"]`);
+		await wait(50);
+
+		assert.equal(
+			await page.evaluate(() => {
+				const h1 = document.querySelector('h1');
+				return getComputedStyle(h1).color;
+			}),
+			'rgb(0, 128, 0)'
+		);
+	});
+});

test/apps/encoding/src/routes/echo/page/[slug].html

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

test/apps/encoding/src/routes/index.html

@@ -1,3 +1,3 @@
 <h1>Great success!</h1>
 
-<a href="echo/page/encöded?message=hëllö+wörld">link</a>
+<a href="echo/page/encöded?message=hëllö+wörld&föo=bar&=baz">link</a>

test/apps/encoding/test.ts

@@ -35,11 +35,11 @@ describe('encoding', function() {
 	});
 
 	it('encodes req.params and req.query for server-rendered pages', async () => {
-		await page.goto(`${base}/echo/page/encöded?message=hëllö+wörld`);
+		await page.goto(`${base}/echo/page/encöded?message=hëllö+wörld&föo=bar&=baz`);
 
 		assert.equal(
 			await page.$eval('h1', node => node.textContent),
-			'encöded (hëllö wörld)'
+			'encöded {"message":"hëllö wörld","föo":"bar","":"baz"}'
 		);
 	});
 
@@ -48,12 +48,12 @@ describe('encoding', function() {
 		await start();
 		await prefetchRoutes();
 
-		await page.click('a[href="echo/page/encöded?message=hëllö+wörld"]');
+		await page.click('a[href="echo/page/encöded?message=hëllö+wörld&föo=bar&=baz"]');
 		await wait(50);
 
 		assert.equal(
 			await page.$eval('h1', node => node.textContent),
-			'encöded (hëllö wörld)'
+			'encöded {"message":"hëllö wörld","föo":"bar","":"baz"}'
 		);
 	});
 

test/apps/errors/src/routes/async-throw.json.js

@@ -0,0 +1,3 @@
+export function get(req, res) {
+  return Promise.reject(new Error('oops'));
+}

test/apps/errors/src/routes/enhance-your-calm.html

@@ -0,0 +1,7 @@
+<script>
+	export default {
+		preload() {
+			this.error(420, 'Enhance your calm');
+		}
+	};
+</script>

test/apps/errors/src/routes/no-error.html

@@ -0,0 +1,3 @@
+<h1>{error ? error.message : 'No error here'}</h1>
+
+<a href="enhance-your-calm">Enhance your calm</a>

test/apps/errors/test.ts

@@ -14,13 +14,14 @@ describe('errors', function() {
 	// helpers
 	let start: () => Promise<void>;
 	let prefetchRoutes: () => Promise<void>;
+	let title: () => Promise<string>;
 
 	// hooks
 	before(async () => {
 		await build({ cwd: __dirname });
 
 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
-		({ base, page, start, prefetchRoutes } = await runner.start());
+		({ base, page, start, prefetchRoutes, title } = await runner.start());
 	});
 
 	after(() => runner.end());
@@ -110,4 +111,27 @@ describe('errors', function() {
 			'oops'
 		);
 	});
+
+	it('does not serve error page for async non-page error', async () => {
+		await page.goto(`${base}/async-throw.json`);
+
+		assert.equal(
+			await page.evaluate(() => document.body.textContent),
+			'oops'
+		);
+	});
+
+	it('clears props.error on successful render', async () => {
+		await page.goto(`${base}/no-error`);
+		await start();
+		await prefetchRoutes();
+
+		await page.click('[href="enhance-your-calm"]');
+		await wait(50);
+		assert.equal(await title(), '420');
+
+		await page.goBack();
+		await wait(50);
+		assert.equal(await title(), 'No error here');
+	});
 });

test/apps/export/src/routes/index.html

@@ -1,3 +1,4 @@
 <h1>Great success!</h1>
 
-<a href="blog">blog</a>
+<a href="blog">blog</a>
+<a href="">empty anchor</a>

test/apps/redirects/src/routes/index.html

@@ -1,4 +1,5 @@
 <h1>root</h1>
 
 <a href="redirect-from">redirect from</a>
-<a href="redirect-to-root">redirect to root</a>
+<a href="redirect-to-root">redirect to root</a>
+<a href="redirect-to-external">redirect to external</a>

test/apps/redirects/src/routes/redirect-to-external.html

@@ -0,0 +1,9 @@
+<h1>unredirected</h1>
+
+<script>
+	export default {
+		preload() {
+			this.redirect(301, 'https://example.com');
+		}
+	};
+</script>

test/apps/redirects/test.ts

@@ -14,13 +14,14 @@ describe('redirects', function() {
 	// helpers
 	let start: () => Promise<void>;
 	let prefetchRoutes: () => Promise<void>;
+	let title: () => Promise<string>;
 
 	// hooks
 	before(async () => {
 		await build({ cwd: __dirname });
 
 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');
-		({ base, page, start, prefetchRoutes } = await runner.start());
+		({ base, page, start, prefetchRoutes, title } = await runner.start());
 	});
 
 	after(() => runner.end());
@@ -34,7 +35,7 @@ describe('redirects', function() {
 		);
 
 		assert.equal(
-			await page.$eval('h1', node => node.textContent),
+			await title(),
 			'redirected'
 		);
 	});
@@ -53,7 +54,7 @@ describe('redirects', function() {
 		);
 
 		assert.equal(
-			await page.$eval('h1', node => node.textContent),
+			await title(),
 			'redirected'
 		);
 	});
@@ -67,7 +68,7 @@ describe('redirects', function() {
 		);
 
 		assert.equal(
-			await page.$eval('h1', node => node.textContent),
+			await title(),
 			'root'
 		);
 	});
@@ -86,8 +87,41 @@ describe('redirects', function() {
 		);
 
 		assert.equal(
-			await page.$eval('h1', node => node.textContent),
+			await title(),
 			'root'
 		);
 	});
+
+	it('redirects to external URL on server', async () => {
+		await page.goto(`${base}/redirect-to-external`);
+
+		assert.equal(
+			page.url(),
+			`https://example.com/`
+		);
+
+		assert.equal(
+			await title(),
+			'external'
+		);
+	});
+
+	it('redirects to external URL in client', async () => {
+		await page.goto(base);
+		await start();
+		await prefetchRoutes();
+
+		await page.click('[href="redirect-to-external"]');
+		await wait(50);
+
+		assert.equal(
+			page.url(),
+			`https://example.com/`
+		);
+
+		assert.equal(
+			await title(),
+			'external'
+		);
+	});
 });

test/apps/scroll/src/routes/another-tall-page.html

@@ -1 +1,2 @@
-<div style="height: 9999px"></div>
+<div style="height: 9999px"></div>
+<p id="bar">element</p>

test/apps/scroll/src/routes/tall-page.html

@@ -1,6 +1,24 @@
+<a href="tall-page#foo">scroll to foo</a>
 <div style="height: 9999px"></div>
 
 <div id="foo">
 	<a href="another-tall-page">link</a>
 	<a href="another-tall-page" sapper-noscroll>link</a>
-</div>
+	{#if barLink}
+		<a href="another-tall-page#bar">link</a>
+	{/if}
+</div>
+
+<script>
+	export default {
+		data() {
+			return {
+				barLink: false
+			};
+		},
+
+		oncreate() {
+			this.set({ barLink: true })
+		}
+	}
+</script>

test/apps/scroll/test.ts

@@ -33,6 +33,24 @@ describe('scroll', function() {
 		assert.ok(scrollY > 0, scrollY);
 	});
 
+	it('scrolls to any deeplink if it was already active', async () => {
+		await page.goto(`${base}/tall-page#foo`);
+		await start();
+
+		let scrollY = await page.evaluate(() => window.scrollY);
+		assert.ok(scrollY > 0, scrollY);
+
+		scrollY = await page.evaluate(() => {
+			window.scrollTo(0, 0)
+			return window.scrollY
+		});
+		assert.ok(scrollY === 0, scrollY);
+
+		await page.click('[href="tall-page#foo"]');
+		scrollY = await page.evaluate(() => window.scrollY);
+		assert.ok(scrollY > 0, scrollY);
+	});
+
 	it('resets scroll when a link is clicked', async () => {
 		await page.goto(`${base}/tall-page#foo`);
 		await start();
@@ -59,4 +77,15 @@ describe('scroll', function() {
 
 		assert.ok(scrollY > 0);
 	});
+
+	it('scrolls into a deeplink on a new page', async () => {
+		await page.goto(`${base}/tall-page#foo`);
+		await start();
+		await prefetchRoutes();
+
+		await page.click('[href="another-tall-page#bar"]');
+		await wait(50);
+		const scrollY = await page.evaluate(() => window.scrollY);
+		assert.ok(scrollY > 0);
+	});
 });

test/apps/with-basepath/test.ts

@@ -17,7 +17,7 @@ describe('with-basepath', function() {
 
 		await api.export({
 			cwd: __dirname,
-			basepath: 'custom-basepath'
+			basepath: '/custom-basepath'
 		});
 
 		runner = new AppRunner(__dirname, '__sapper__/build/server/server.js');