Merge branch 'master' into test-in-node-6

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);
+					});
 			});
 		});
 

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 = {
 			};
 		}
 	}
-};
+};