Merge branch 'CtrlZvi-extract_loaders_array'

Author: sokra

index.js

@@ -127,19 +127,19 @@ ExtractTextPlugin.loader = function(options) {
 };
 
 ExtractTextPlugin.extract = function(before, loader, options) {
-	if(typeof loader === "string") {
+	if(typeof loader === "string" || Array.isArray(loader)) {
+		if(typeof before === "string") {
+			before = before.split("!");
+		}
 		return [
-			ExtractTextPlugin.loader(mergeOptions({omit: before.split("!").length, extract: true, remove: true}, options)),
-			before,
-			loader
-		].join("!");
+			ExtractTextPlugin.loader(mergeOptions({omit: before.length, extract: true, remove: true}, options))
+		].concat(before, loader).join("!");
 	} else {
 		options = loader;
 		loader = before;
 		return [
-			ExtractTextPlugin.loader(mergeOptions({remove: true}, options)),
-			loader
-		].join("!");
+			ExtractTextPlugin.loader(mergeOptions({remove: true}, options))
+		].concat(loader).join("!");
 	}
 };
 
@@ -161,19 +161,19 @@ ExtractTextPlugin.prototype.loader = function(options) {
 };
 
 ExtractTextPlugin.prototype.extract = function(before, loader, options) {
-	if(typeof loader === "string") {
+	if(typeof loader === "string" || Array.isArray(loader)) {
+		if(typeof before === "string") {
+			before = before.split("!");
+		}
 		return [
-			this.loader(mergeOptions({omit: before.split("!").length, extract: true, remove: true}, options)),
-			before,
-			loader
-		].join("!");
+			this.loader(mergeOptions({omit: before.length, extract: true, remove: true}, options))
+		].concat(before, loader).join("!");
 	} else {
 		options = loader;
 		loader = before;
 		return [
-			this.loader(mergeOptions({remove: true}, options)),
-			loader
-		].join("!");
+			this.loader(mergeOptions({remove: true}, options))
+		].concat(loader).join("!");
 	}
 };