Merge branch 'master' into gh-325

CHANGELOG.md

@@ -1,5 +1,11 @@
 # sapper changelog
 
+## 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))

src/api/build.ts

@@ -61,7 +61,6 @@ async function execute(emitter: EventEmitter, {
 	});
 
 	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));
 
 	const server_stats = await compile(server);

src/api/dev.ts

@@ -169,8 +169,6 @@ class Watcher extends EventEmitter {
 			},
 
 			result: info => {
-				fs.writeFileSync(path.join(dest, 'server_info.json'), JSON.stringify(info, null, '  '));
-
 				this.deferreds.client.promise.then(() => {
 					const restart = () => {
 						log = '';
@@ -253,7 +251,6 @@ class Watcher extends EventEmitter {
 			},
 
 			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();
 

src/runtime/index.ts

@@ -298,7 +298,7 @@ async function navigate(target: Target, id: number): Promise<any> {
 		await goto(redirect.location, { replaceState: true });
 	} else {
 		render(data, nullable_depth, scroll_history[id], token);
-		document.activeElement.blur();
+		if (document.activeElement) document.activeElement.blur();
 	}
 }