Merge pull request faceyspacey#232 from insin/patch-1

Fix handling of loaders as objects without a query prop

Author: sokra

index.js

@@ -130,7 +130,8 @@ module.exports = ExtractTextPlugin;
 
 // modified from webpack/lib/LoadersList.js
 function getLoaderWithQuery(loader) {
-	if(isString(loader) || !loader.query) return loader;
+	if(isString(loader)) return loader;
+	if(!loader.query) return loader.loader;
 	var query = isString(loader.query) ? loader.query : JSON.stringify(loader.query);
 	return loader.loader + "?" + query;
 }

test/cases/simple-queryless-object/a.css

@@ -0,0 +1,3 @@
+body {
+	correct: a;
+}

test/cases/simple-queryless-object/b.css

@@ -0,0 +1,3 @@
+body {
+	correct: b;
+}

test/cases/simple-queryless-object/expected/file.css

@@ -0,0 +1,2 @@
+require("./a.css");
+require("./b.css");

test/cases/simple-queryless-object/index.js

@@ -0,0 +1,18 @@
+var ExtractTextPlugin = require("../../../");
+module.exports = {
+	entry: "./index",
+	module: {
+		loaders: [
+			{ test: /\.css$/, loader: ExtractTextPlugin.extract({
+				fallbackLoader: { loader: "style-loader" },
+				loader: { loader: "css-loader", query: {
+					sourceMap: true
+				} }
+			}) }
+		]
+	},
+	devtool: "source-map",
+	plugins: [
+		new ExtractTextPlugin("file.css")
+	]
+};