Merge pull request webpack#7216 from jordwest/webpack-3

sokra · web-flow · commit 074cff81d8e5 · 2018-05-07T08:22:34.000+02:00
Fix regression in Compilation.sortModules
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -32,6 +32,12 @@ function byId(a, b) {
 	return 0;
 }
 
+function byIndex(a, b) {
+	if(a.index < b.index) return -1;
+	if(a.index > b.index) return 1;
+	return 0;
+}
+
 function iterationBlockVariable(variables, fn) {
 	for(let indexVariable = 0; indexVariable < variables.length; indexVariable++) {
 		const varDep = variables[indexVariable].dependencies;
@@ -682,7 +688,7 @@ class Compilation extends Tapable {
 	}
 
 	sortModules(modules) {
-		modules.sort(byId);
+		modules.sort(byIndex);
 	}
 
 	reportDependencyErrorsAndWarnings(module, blocks) {
diff --git a/test/Compilation.test.js b/test/Compilation.test.js
@@ -0,0 +1,42 @@
+/* globals describe, it */
+"use strict";
+
+const should = require("should");
+const sinon = require("sinon");
+
+const Compilation = require("../lib/Compilation");
+
+describe("Compilation", () => {
+	describe('sortModules', () => {
+		it('should sort modules by index', () => {
+			let modules = [{
+					index: 5
+				},
+				{
+					index: 4
+				},
+				{
+					index: 8
+				},
+				{
+					index: 1
+				},
+			];
+
+			Compilation.prototype.sortModules(modules);
+			modules.should.match([{
+					index: 1
+				},
+				{
+					index: 4
+				},
+				{
+					index: 5
+				},
+				{
+					index: 8
+				},
+			]);
+		});
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,12 @@ function byId(a, b) {`
`32`	`32`	`return 0;`
`33`	`33`	`}`
`34`	`34`
	`35`	`+function byIndex(a, b) {`
	`36`	`+ if(a.index < b.index) return -1;`
	`37`	`+ if(a.index > b.index) return 1;`
	`38`	`+ return 0;`
	`39`	`+}`
	`40`	`+`
`35`	`41`	`function iterationBlockVariable(variables, fn) {`
`36`	`42`	`for(let indexVariable = 0; indexVariable < variables.length; indexVariable++) {`
`37`	`43`	`const varDep = variables[indexVariable].dependencies;`
`@@ -682,7 +688,7 @@ class Compilation extends Tapable {`
`682`	`688`	`}`
`683`	`689`
`684`	`690`	`sortModules(modules) {`
`685`		`- modules.sort(byId);`
	`691`	`+ modules.sort(byIndex);`
`686`	`692`	`}`
`687`	`693`
`688`	`694`	`reportDependencyErrorsAndWarnings(module, blocks) {`