From ca51372150853703c32e47540fe35ec311c53b9f Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 6 Jan 2018 17:21:40 -0800
Subject: [PATCH 1/2] Explicitly load style-loader/css-loader deps

This appears to fix sveltejs/sapper-template#27
---
 webpack/config.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webpack/config.js b/webpack/config.js
index e9248c0..ae0aed2 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -6,7 +6,12 @@ module.exports = {
 	client: {
 		entry: () => {
 			return {
-				main: entry.client
+				main: [
+					entry.client,
+					// workaround for https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/456
+					'style-loader/lib/addStyles',
+					'css-loader/lib/css-base'
+				]
 			};
 		},
 
@@ -36,4 +41,4 @@ module.exports = {
 			};
 		}
 	}
-};
\ No newline at end of file
+};

From 7c0f32662d58fe2c32b4e67c533012d3c965abf4 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 14 Jan 2018 00:10:20 -0500
Subject: [PATCH 2/2] remove async from new test

---
 test/common/test.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/common/test.js b/test/common/test.js
index d880c5d..06407a4 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -311,17 +311,16 @@ function run(env) {
 					});
 			});
 
-			it('calls a delete handler', async () => {
-				await nightmare
+			it('calls a delete handler', () => {
+				return nightmare
 					.goto(`${base}/delete-test`)
 					.wait(() => window.READY)
 					.click('.del')
-					.wait(() => window.deleted);
-
-				assert.equal(
-					await nightmare.evaluate(() => window.deleted.id),
-					42
-				);
+					.wait(() => window.deleted)
+					.evaluate(() => window.deleted.id)
+					.then(id => {
+						assert.equal(id, 42);
+					});
 			});
 		});