Merge branch 'iotch-patch-1'

sokra · sokra · commit 8f54cbcaa78d · 2016-05-05T08:53:27.000+02:00
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -74,15 +74,6 @@ function MainTemplate(outputOptions) {
 			"exports: {}"
 		]);
 	});
-	this.plugin("require-extensions", function(source, chunk) {
-		if(chunk.chunks.length === 0) return source;
-		return this.asString([
-			source,
-			"",
-			"// on error function for async loading",
-			this.requireFn + ".oe = function(err) { console.error(err); throw err; };"
-		]);
-	});
 	this.plugin("require-extensions", function(source, chunk, hash) {
 		var buf = [];
 		if(chunk.chunks.length > 0) {
@@ -108,6 +99,15 @@ function MainTemplate(outputOptions) {
 		buf.push(this.requireFn + ".p = " + JSON.stringify(publicPath) + ";");
 		return this.asString(buf);
 	});
+	this.plugin("require-extensions", function(source, chunk) {
+		if(chunk.chunks.length === 0) return source;
+		return this.asString([
+			source,
+			"",
+			"// on error function for async loading",
+			this.requireFn + ".oe = function(err) { console.error(err); throw err; };"
+		]);
+	});
 }
 module.exports = MainTemplate;
 
diff --git a/test/cases/runtime/issue-2391-chunk/file.js b/test/cases/runtime/issue-2391-chunk/file.js
diff --git a/test/cases/runtime/issue-2391-chunk/index.js b/test/cases/runtime/issue-2391-chunk/index.js
@@ -0,0 +1,4 @@
+it("should have a require.onError function by default", function() {
+	(typeof require.onError).should.be.eql("function");
+	require(["./file"]);
+});
diff --git a/test/cases/runtime/issue-2391/index.js b/test/cases/runtime/issue-2391/index.js
@@ -0,0 +1,3 @@
+it("should not have a require.onError function by default", function() {
+	(typeof require.onError).should.be.eql("undefined");
+});
diff --git a/test/statsCases/chunks/expected.txt b/test/statsCases/chunks/expected.txt
@@ -1,7 +1,7 @@
 Hash: 55b4e00b04fd0c502b1f
 Time: Xms
       Asset       Size  Chunks             Chunk Names
-  bundle.js    4.41 kB       0  [emitted]  main
+  bundle.js    4.55 kB       0  [emitted]  main
 1.bundle.js  250 bytes       1  [emitted]  
 2.bundle.js  107 bytes       2  [emitted]  
 3.bundle.js  202 bytes       3  [emitted]  
diff --git a/test/statsCases/optimize-chunks/expected.txt b/test/statsCases/optimize-chunks/expected.txt
@@ -4,7 +4,7 @@ Time: Xms
    0.js  243 bytes       0  [emitted]  cir1
    1.js  215 bytes    1, 2  [emitted]  abd
    2.js  131 bytes       2  [emitted]  ab
-main.js    5.13 kB       3  [emitted]  main
+main.js    5.27 kB       3  [emitted]  main
    4.js  258 bytes       4  [emitted]  cir2
    5.js  138 bytes    5, 7  [emitted]  chunk
    6.js  317 bytes    6, 4  [emitted]  cir2 from cir1
diff --git a/test/statsCases/preset-verbose/expected.txt b/test/statsCases/preset-verbose/expected.txt
@@ -1,7 +1,7 @@
 Hash: 8ca45b6d16d1f1e8be32
 Time: Xms
   Asset       Size  Chunks             Chunk Names
-main.js    4.41 kB       0  [emitted]  main
+main.js    4.54 kB       0  [emitted]  main
    1.js  250 bytes       1  [emitted]  
    2.js  107 bytes       2  [emitted]  
    3.js  202 bytes       3  [emitted]  

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+it("should not have a require.onError function by default", function() {`
	`2`	`+ (typeof require.onError).should.be.eql("undefined");`
	`3`	`+});`