fixed faceyspacey#56

Author: sokra

ExtractedModule.js

@@ -5,11 +5,12 @@
 var SourceMapSource = require("webpack/lib/SourceMapSource");
 var RawSource = require("webpack/lib/RawSource");
 
-function ExtractedModule(identifier, originalModule, source, sourceMap, addtitionalInformation) {
+function ExtractedModule(identifier, originalModule, source, sourceMap, addtitionalInformation, prevModules) {
 	this._identifier = identifier;
 	this._originalModule = originalModule;
 	this._source = source;
 	this._sourceMap = sourceMap;
+	this._prevModules = prevModules;
 	this.addtitionalInformation = addtitionalInformation;
 	this.chunks = [];
 }
@@ -39,3 +40,18 @@ ExtractedModule.prototype.source = function() {
 	else
 		return new RawSource(this._source);
 };
+
+ExtractedModule.prototype.getOriginalModule = function() {
+	return this._originalModule;
+};
+
+ExtractedModule.prototype.getPrevModules = function() {
+	return this._prevModules;
+}
+
+ExtractedModule.prototype.addPrevModules = function(prevModules) {
+	prevModules.forEach(function(m) {
+		if(this._prevModules.indexOf(m) < 0)
+			this._prevModules.push(m);
+	}, this);
+};

OrderUndefinedError.js

@@ -0,0 +1,14 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function OrderUndefinedError(module) {
+	Error.call(this);
+	Error.captureStackTrace(this, OrderUndefinedError);
+	this.name = "OrderUndefinedError";
+	this.message = "Order in extracted chunk undefined";
+	this.module = module;
+}
+module.exports = OrderUndefinedError;
+
+OrderUndefinedError.prototype = Object.create(Error.prototype);

index.js

@@ -10,6 +10,7 @@ var SourceMapConsumer = require("source-map").SourceMapConsumer;
 var ModuleFilenameHelpers = require("webpack/lib/ModuleFilenameHelpers");
 var ExtractedModule = require("./ExtractedModule");
 var Chunk = require("webpack/lib/Chunk");
+var OrderUndefinedError = require("./OrderUndefinedError");
 var loaderUtils = require("loader-utils");
 
 var nextId = 0;
@@ -197,6 +198,13 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 			extractedChunks.forEach(function(extractedChunk) {
 				if(extractedChunk.modules.length) {
 					extractedChunk.modules.sort(function(a, b) {
+						var order = getOrder(a, b);
+						if(isNaN(order)) {
+							compilation.errors.push(new OrderUndefinedError(a.getOriginalModule()));
+							compilation.errors.push(new OrderUndefinedError(b.getOriginalModule()));
+						}
+						if(order !== 0 && !isNaN(order))
+							return order;
 						var ai = a.identifier();
 						var bi = b.identifier();
 						if(ai < bi)
@@ -246,24 +254,28 @@ ExtractTextPlugin.prototype.mergeNonInitialChunks = function(chunk, intoChunk, c
 	}
 };
 
-ExtractTextPluginCompilation.prototype.addModule = function(identifier, originalModule, source, additionalInformation, sourceMap) {
+ExtractTextPluginCompilation.prototype.addModule = function(identifier, originalModule, source, additionalInformation, sourceMap, prevModules) {
 	if(!this.modulesByIdentifier[identifier])
-		return this.modulesByIdentifier[identifier] = new ExtractedModule(identifier, originalModule, source, sourceMap, additionalInformation);
-	return this.modulesByIdentifier[identifier];
+		return this.modulesByIdentifier[identifier] = new ExtractedModule(identifier, originalModule, source, sourceMap, additionalInformation, prevModules);
+	var m = this.modulesByIdentifier[identifier];
+	m.addPrevModules(prevModules);
+	return m;
 };
 
 ExtractTextPluginCompilation.prototype.addResultToChunk = function(identifier, result, originalModule, extractedChunk) {
 	if(!Array.isArray(result)) {
 		result = [[identifier, result]];
 	}
 	var counterMap = {};
+	var prevModules = [];
 	result.forEach(function(item) {
 		var c = counterMap[item[0]];
 		var i = item.slice();
-		var module = this.addModule.call(this, item[0] + (c || ""), originalModule, item[1], item[2], item[3]);
+		var module = this.addModule.call(this, item[0] + (c || ""), originalModule, item[1], item[2], item[3], prevModules.slice());
 		extractedChunk.addModule(module);
 		module.addChunk(extractedChunk);
 		counterMap[item[0]] = (c || 0) + 1;
+		prevModules.push(module);
 	}, this);
 };
 
@@ -274,3 +286,15 @@ ExtractTextPlugin.prototype.renderExtractedChunk = function(chunk) {
 	}, this);
 	return source;
 };
+
+function getOrder(a, b) {
+	var bBeforeA = a.getPrevModules().indexOf(b) >= 0;
+	var aBeforeB = b.getPrevModules().indexOf(a) >= 0;
+	if(aBeforeB && bBeforeA)
+		return NaN;
+	if(bBeforeA)
+		return 1;
+	if(aBeforeB)
+		return -1;
+	return 0;
+}