-> v0.10.6

fix missing service worker

CHANGELOG.md

@@ -1,5 +1,13 @@
 # sapper changelog
 
+## 0.10.6
+
+* Fix error reporting in `sapper start`
+
+## 0.10.5
+
+* Fix missing service worker ([#231](https://github.com/sveltejs/sapper/pull/231))
+
 ## 0.10.4
 
 * Upgrade chokidar, this time with a fix ([#227](https://github.com/sveltejs/sapper/pull/227))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "Military-grade apps, engineered by Svelte",
   "main": "dist/middleware.ts.js",
   "bin": {

src/cli/start.ts

@@ -11,13 +11,13 @@ export async function start(dir: string, opts: { port: number, open: boolean })
 	const server = path.resolve(dir, 'server.js');
 
 	if (!fs.existsSync(server)) {
-		console.log(clorox.bold.red(`> ${dir}/server.js does not exist — type ${clorox.bold.cyan(dir === 'build' ? `npx sapper build` : `npx sapper build ${dir}`)} to create it`));
+		console.log(`${clorox.bold.red(`> ${dir}/server.js does not exist — type ${clorox.bold.cyan(dir === 'build' ? `npx sapper build` : `npx sapper build ${dir}`)} to create it`)}`);
 		return;
 	}
 
 	if (port) {
 		if (!await ports.check(port)) {
-			console.log(clorox.bold.red(`> Port ${port} is unavailable`));
+			console.log(`${clorox.bold.red(`> Port ${port} is unavailable`)}`);
 			return;
 		}
 	} else {

src/middleware.ts

@@ -245,11 +245,11 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
 					`baseUrl: "${req.baseUrl}"`,
 					serialized.preloaded && `preloaded: ${serialized.preloaded}`,
 					serialized.store && `store: ${serialized.store}`
-				].filter(Boolean).join(',')}}`
+				].filter(Boolean).join(',')}};`;
 
 				const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));
 				if (has_service_worker) {
-					`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 page = template()

test/common/test.js

@@ -559,6 +559,12 @@ function run({ mode, basepath = '' }) {
 						assert.equal(title, 'woohoo!');
 					});
 			});
+
+			it('includes service worker', () => {
+				return nightmare.goto(base).page.html().then(html => {
+					assert.ok(html.indexOf('service-worker.js') !== -1);
+				});
+			});
 		});
 
 		describe('headers', () => {