Upgrade to webpack 2.2.0

Author: tmair

index.js

@@ -128,12 +128,12 @@ function ExtractTextPlugin(options) {
 }
 module.exports = ExtractTextPlugin;
 
-// modified from webpack/lib/LoadersList.js
-function getLoaderWithQuery(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;
+function getLoaderWithObject(loader) {
+	if (isString(loader)) {
+		return {loader: loader};
+	}
+
+	return loader;
 }
 
 function mergeOptions(a, b) {
@@ -198,8 +198,7 @@ ExtractTextPlugin.prototype.extract = function(options) {
 	delete options.fallbackLoader;
 	return [this.loader(options)]
 		.concat(before, loader)
-		.map(getLoaderWithQuery)
-		.join("!");
+		.map(getLoaderWithObject);
 }
 
 ExtractTextPlugin.extract = ExtractTextPlugin.prototype.extract.bind(ExtractTextPlugin);