From 200c5fcbd26549ff0d7c9617d66ad65104e4ac25 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 25 Aug 2018 14:01:07 -0400
Subject: [PATCH] get tests passing again

---
 src/api/build.ts             | 2 +-
 src/api/dev.ts               | 2 +-
 src/core/create_compilers.ts | 4 ++--
 src/core/create_manifests.ts | 2 --
 src/middleware.ts            | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/api/build.ts b/src/api/build.ts
index 5f43d18..79289d1 100644
--- a/src/api/build.ts
+++ b/src/api/build.ts
@@ -76,7 +76,7 @@ async function execute(emitter: EventEmitter, {
 	if (serviceworker) {
 		create_serviceworker_manifest({
 			routes: route_objects,
-			client_files: client_result.assets.map((chunk: { name: string }) => `client/${chunk.name}`)
+			client_files: client_result.assets.map((file: string) => `client/${file}`)
 		});
 
 		serviceworker_stats = await serviceworker.compile();
diff --git a/src/api/dev.ts b/src/api/dev.ts
index 3b38521..44a9ef9 100644
--- a/src/api/dev.ts
+++ b/src/api/dev.ts
@@ -268,7 +268,7 @@ class Watcher extends EventEmitter {
 				fs.writeFileSync(path.join(dest, 'client_assets.json'), JSON.stringify(result.assetsByChunkName, null, '  '));
 				this.deferreds.client.fulfil();
 
-				const client_files = result.assets.map((chunk: { name: string }) => `client/${chunk.name}`);
+				const client_files = result.assets.map((file: string) => `client/${file}`);
 
 				create_serviceworker_manifest({
 					routes: create_routes(),
diff --git a/src/core/create_compilers.ts b/src/core/create_compilers.ts
index 1ee96c5..210b71f 100644
--- a/src/core/create_compilers.ts
+++ b/src/core/create_compilers.ts
@@ -17,7 +17,7 @@ export class CompileResult {
 	duration: number;
 	errors: CompileError[];
 	warnings: CompileError[];
-	assets: Array<{ name: string }>;
+	assets: string[];
 	assetsByChunkName: Record<string, string>;
 }
 
@@ -64,7 +64,7 @@ class WebpackResult extends CompileResult {
 
 		this.duration = info.time;
 
-		this.assets = info.assets.map((chunk: { name: string }) => `client/${chunk.name}`);
+		this.assets = info.assets.map((chunk: { name: string }) => chunk.name);
 		this.assetsByChunkName = info.assetsByChunkName;
 	}
 
diff --git a/src/core/create_manifests.ts b/src/core/create_manifests.ts
index da760a0..8152312 100644
--- a/src/core/create_manifests.ts
+++ b/src/core/create_manifests.ts
@@ -56,8 +56,6 @@ function generate_client(
 	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, routes.root)}';
diff --git a/src/middleware.ts b/src/middleware.ts
index b031af0..8d999cb 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -484,7 +484,7 @@ function get_page_handler(
 			let scripts = []
 				.concat(chunks.main) // chunks main might be an array. it might not! thanks, webpack
 				.filter(file => !file.match(/\.map$/))
-				.map(file => `<script type="module" src='${req.baseUrl}/client/${file}'></script>`)
+				.map(file => `<script src='${req.baseUrl}/client/${file}'></script>`)
 				.join('');
 
 			let inline_script = `__SAPPER__={${[