report dependencies

fixed watch issue

Author: sokra

index.js

@@ -28,15 +28,14 @@ ExtractTextPlugin.loader = function(options) {
 ExtractTextPlugin.extract = function(before, loader) {
 	if(loader) {
 		return [
-			ExtractTextPlugin.loader({remove: true, extract: false}),
+			ExtractTextPlugin.loader({omit: before.split("!").length, extract: true, remove: true}),
 			before,
-			ExtractTextPlugin.loader(),
 			loader
 		].join("!");
 	} else {
 		loader = before;
 		return [
-			ExtractTextPlugin.loader(),
+			ExtractTextPlugin.loader({remove: true}),
 			loader
 		].join("!");
 	}
@@ -51,23 +50,22 @@ ExtractTextPlugin.prototype.loader = function(options) {
 ExtractTextPlugin.prototype.extract = function(before, loader) {
 	if(loader) {
 		return [
-			this.loader({remove: true, extract: false}),
+			this.loader({move: before.split("!").length, extract: true, remove: true}),
 			before,
-			this.loader(),
 			loader
 		].join("!");
 	} else {
 		loader = before;
 		return [
-			this.loader(),
+			this.loader({remove: true}),
 			loader
 		].join("!");
 	}
 };
 
 ExtractTextPlugin.prototype.apply = function(compiler) {
 	var options = this.options;
-	compiler.plugin("compilation", function(compilation) {
+	compiler.plugin("this-compilation", function(compilation) {
 		compilation.plugin("normal-module-loader", function(loaderContext, module) {
 			loaderContext[__dirname] = function(text, opt) {
 				if(typeof text !== "string" && text !== null)
@@ -99,7 +97,9 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 								}
 								meta = module.meta[__dirname];
 								if(typeof meta.text !== "string") {
-									return callback(new Error(module.identifier() + " doesn't export text"));
+									var err = new Error(module.identifier() + " doesn't export text");
+									compilation.errors.push(err);
+									return callback();
 								}
 								text.push(meta.text);
 								callback();

loader.js

@@ -15,7 +15,12 @@ module.exports = function(source) {
 module.exports.pitch = function(request, preReq, data) {
 	this.cacheable && this.cacheable();
 	var query = loaderUtils.parseQuery(this.query);
+	this.addDependency(this.resourcePath);
 	if(this[__dirname](null, query)) {
+		if(query.omit) {
+			this.loaderIndex += +query.omit + 1;
+			request = request.split("!").slice(+query.omit).join("!");
+		}
 		if(query.remove) {
 			var resultSource = "// removed by extract-text-webpack-plugin";
 		} else {
@@ -56,13 +61,19 @@ module.exports.pitch = function(request, preReq, data) {
 				if(!source) {
 					return callback(new Error("Didn't get a result from child compiler"));
 				}
+				compilation.fileDependencies.forEach(function(dep) {
+					this.addDependency(dep);
+				}, this);
+				compilation.contextDependencies.forEach(function(dep) {
+					this.addContextDependency(dep);
+				}, this);
 				try {
 					var text = this.exec(source, request);
 					this[__dirname](text, query);
-					callback(null, resultSource);
 				} catch(e) {
-					callback(e);
+					return callback(e);
 				}
+				callback(null, resultSource);
 			}.bind(this));
 		} else {
 			this[__dirname]("", query);