various stability improvements

package.json

@@ -12,7 +12,7 @@
     "middleware.js",
     "runtime",
     "runtime.js",
-    "hmr-client.js",
+    "sapper-dev-client.js",
     "webpack"
   ],
   "directories": {
@@ -28,7 +28,6 @@
     "get-port": "^3.2.0",
     "glob": "^7.1.2",
     "locate-character": "^2.0.5",
-    "mime": "^2.2.0",
     "mkdirp": "^0.5.1",
     "mri": "^1.1.0",
     "node-fetch": "^1.7.3",
@@ -73,7 +72,8 @@
     "pretest": "npm run build",
     "build": "rollup -c",
     "dev": "rollup -cw",
-    "prepublish": "npm test"
+    "prepublish": "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"
   },
   "repository": "https://github.com/sveltejs/sapper",
   "keywords": [

hmr-client.js → sapper-dev-client.js

@@ -3,24 +3,34 @@ let source;
 function check() {
 	if (module.hot.status() === 'idle') {
 		module.hot.check(true).then(modules => {
-			console.log(`HMR updated`);
+			console.log(`[SAPPER] applied HMR update`);
 		});
 	}
 }
 
 export function connect(port) {
 	if (source || !window.EventSource) return;
 
-	source = new EventSource(`http://localhost:${port}/hmr`);
+	source = new EventSource(`http://localhost:${port}/__sapper__`);
+
+	window.source = source;
 
 	source.onopen = function(event) {
-		console.log(`HMR connected`);
+		console.log(`[SAPPER] dev client connected`);
+	};
+
+	source.onerror = function(error) {
+		console.error(error);
 	};
 
 	source.onmessage = function(event) {
 		const data = JSON.parse(event.data);
 		if (!data) return; // just a heartbeat
 
+		if (data.action === 'reload') {
+			window.location.reload();
+		}
+
 		if (data.status === 'completed') {
 			check();
 		}

src/cli/dev.ts

@@ -8,7 +8,7 @@ import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
 import { wait_for_port } from './utils';
 import { dest } from '../config';
-import { create_compilers, create_app, create_routes, create_serviceworker, create_template } from 'sapper/core.js';
+import { create_compilers, create_app, create_routes, create_serviceworker } from 'sapper/core.js';
 
 type Deferred = {
 	promise?: Promise<any>;
@@ -31,11 +31,12 @@ function create_hot_update_server(port: number, interval = 10000) {
 	const clients = new Set();
 
 	const server = http.createServer((req, res) => {
-		if (req.url !== '/hmr') return;
+		if (req.url !== '/__sapper__') return;
 
 		req.socket.setKeepAlive(true);
 		res.writeHead(200, {
 			'Access-Control-Allow-Origin': '*',
+			'Access-Control-Allow-Headers': 'Cache-Control',
 			'Content-Type': 'text/event-stream;charset=utf-8',
 			'Cache-Control': 'no-cache, no-transform',
 			'Connection': 'keep-alive',
@@ -103,8 +104,9 @@ export default async function dev() {
 	});
 
 	watch_files('app/template.html', ['change'], () => {
-		const template = create_template();
-		// TODO reload current page?
+		hot_update_server.send({
+			action: 'reload'
+		});
 	});
 
 	let proc: child_process.ChildProcess;

src/core/create_app.ts

@@ -56,14 +56,14 @@ function generate_client(routes: Route[], dev_port?: number) {
 		];`.replace(/^\t\t/gm, '').trim();
 
 	if (dev()) {
-		const hmr_client = posixify(
-			path.resolve(__dirname, 'hmr-client.js')
+		const sapper_dev_client = posixify(
+			path.resolve(__dirname, 'sapper-dev-client.js')
 		);
 
 		code += `
 
 			if (module.hot) {
-				import('${hmr_client}').then(client => {
+				import('${sapper_dev_client}').then(client => {
 					client.connect(${dev_port});
 				});
 			}`.replace(/^\t{3}/gm, '');

src/core/index.ts

@@ -1,5 +1,4 @@
 export { default as create_app } from './create_app';
 export { default as create_serviceworker } from './create_serviceworker';
 export { default as create_compilers } from './create_compilers';
-export { default as create_routes } from './create_routes';
-export { default as create_template } from './create_template';
+export { default as create_routes } from './create_routes';