fixes webpack#2455, fixes webpack#2460

Author: sokra

lib/dependencies/HarmonyAcceptDependency.js

@@ -22,6 +22,6 @@ HarmonyAcceptDependency.Template.prototype.apply = function(dep, source, outputO
 	var content = dep.dependencies.map(function(d) {
 		return HarmonyImportDependency.makeStatement(false, d, outputOptions, requestShortener);
 	}).join("");
-	source.insert(dep.range[0], "function(callback) { " + content + " (");
-	source.insert(dep.range[1], "()); }");
+	source.insert(dep.range[0], "function(__WEBPACK_OUTDATED_DEPENDENCIES__) { " + content + " (");
+	source.insert(dep.range[1], ")(__WEBPACK_OUTDATED_DEPENDENCIES__); }");
 };

lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -35,11 +35,13 @@ module.exports = AbstractPlugin.create({
 	},
 	"call imported var": function(expr) {
 		var args = expr.arguments;
+		var fullExpr = expr;
 		expr = expr.callee;
 		var name = expr.name;
 		var settings = this.state.harmonySpecifier["$" + name];
 		var dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range);
-		dep.call = true;
+		dep.callArgs = args;
+		dep.call = fullExpr;
 		dep.loc = expr.loc;
 		this.state.current.addDependency(dep);
 		if(args)

lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -50,8 +50,11 @@ HarmonyImportSpecifierDependency.Template.prototype.apply = function(dep, source
 	} else {
 		content = "/* harmony namespace import */ " + dep.importedVar;
 	}
-	if(dep.call) {
-		content = "" + content + ".bind()";
+	if(!dep.call) {
+		source.replace(dep.range[0], dep.range[1] - 1, content);
+	} else if(dep.callArgs.length > 0) {
+		source.replace(dep.range[0], dep.callArgs[0].range[0] - 1, content + ".call(undefined, ");
+	} else {
+		source.replace(dep.call.range[0], dep.call.range[1] - 1, content + ".call()");
 	}
-	source.replace(dep.range[0], dep.range[1] - 1, content);
 };

lib/dependencies/RequireEnsureDependency.js

@@ -20,7 +20,6 @@ RequireEnsureDependency.Template = function RequireEnsureDependencyTemplate() {}
 RequireEnsureDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
 	var depBlock = dep.block;
 	var wrapper = DepBlockHelpers.getLoadDepBlockWrapper(depBlock, outputOptions, requestShortener, /*require.e*/ "nsure");
-	wrapper[1] = ".bind(null, __webpack_require__)" + wrapper[1];
-	source.replace(depBlock.expr.range[0], depBlock.expr.arguments[1].range[0] - 1, wrapper[0]);
-	source.replace(depBlock.expr.arguments[1].range[1], depBlock.expr.range[1] - 1, wrapper[1]);
+	source.replace(depBlock.expr.range[0], depBlock.expr.arguments[1].range[0] - 1, wrapper[0] + "(");
+	source.replace(depBlock.expr.arguments[1].range[1], depBlock.expr.range[1] - 1, ").bind(null, __webpack_require__)" + wrapper[1]);
 };

test/cases/parsing/es6.nominimize/async.js

@@ -0,0 +1 @@
+module.exports = "async";

test/cases/parsing/es6.nominimize/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import a from "./a";
+
 it("should parse classes", function() {
 	class MyClass {
 		constructor() {
@@ -32,6 +34,17 @@ it("should parse arrow function", function() {
 	(() => {
 		return require("./a");
 	})().should.be.eql("a");
+	require.ensure([], () => {
+		require("./a");
+	});
+	require.ensure([], () => {
+		require("./async");
+	});
+	if(module.hot) {
+		module.hot.accept("./a", () => {
+			var x = 1;
+		});
+	}
 });
 
 it("should parse template literals", function() {

test/statsCases/chunks/expected.txt

@@ -2,7 +2,7 @@ Hash: 55b4e00b04fd0c502b1f
 Time: Xms
       Asset       Size  Chunks             Chunk Names
   bundle.js    4.55 kB       0  [emitted]  main
-1.bundle.js  250 bytes       1  [emitted]  
+1.bundle.js  252 bytes       1  [emitted]  
 2.bundle.js  107 bytes       2  [emitted]  
 3.bundle.js  202 bytes       3  [emitted]  
 chunk    {0} bundle.js (main) 73 bytes [rendered]

test/statsCases/optimize-chunks/expected.txt

@@ -1,13 +1,13 @@
 Hash: e3dc693bc52a75b4a39b
 Time: Xms
   Asset       Size  Chunks             Chunk Names
-   0.js  243 bytes       0  [emitted]  cir1
+   0.js  245 bytes       0  [emitted]  cir1
    1.js  215 bytes    1, 2  [emitted]  abd
    2.js  131 bytes       2  [emitted]  ab
-main.js    5.27 kB       3  [emitted]  main
-   4.js  258 bytes       4  [emitted]  cir2
+main.js    5.28 kB       3  [emitted]  main
+   4.js  260 bytes       4  [emitted]  cir2
    5.js  138 bytes    5, 7  [emitted]  chunk
-   6.js  317 bytes    6, 4  [emitted]  cir2 from cir1
+   6.js  319 bytes    6, 4  [emitted]  cir2 from cir1
    7.js   79 bytes       7  [emitted]  ac in ab
 chunk    {0} 0.js (cir1) 81 bytes {3} {6} {4} [rendered]
     > cir1 [7] (webpack)/test/statsCases/optimize-chunks/index.js 13:0-54

test/statsCases/preset-verbose/expected.txt

@@ -2,7 +2,7 @@ Hash: 8ca45b6d16d1f1e8be32
 Time: Xms
   Asset       Size  Chunks             Chunk Names
 main.js    4.54 kB       0  [emitted]  main
-   1.js  250 bytes       1  [emitted]  
+   1.js  252 bytes       1  [emitted]  
    2.js  107 bytes       2  [emitted]  
    3.js  202 bytes       3  [emitted]  
 chunk    {0} main.js (main) 73 bytes [rendered]