Merge pull request webpack#3544 from webpack/bugfix/add_require_ensure_arrow_function_expression_support

sokra · web-flow · commit 00a4fa6ad639 · 2016-12-22T08:41:14.000+01:00
fix(require.ensure): add ArrowFunctionExpression support: Fixes webpack#959
diff --git a/lib/dependencies/getFunctionExpression.js b/lib/dependencies/getFunctionExpression.js
@@ -4,13 +4,14 @@
 */
 module.exports = function(expr) {
 	// <FunctionExpression>
-	if(expr.type === "FunctionExpression") {
+	if(expr.type === "FunctionExpression" || expr.type === "ArrowFunctionExpression") {
 		return {
 			fn: expr,
 			expressions: [],
 			needThis: false
 		};
 	}
+
 	// <FunctionExpression>.bind(<Expression>)
 	if(expr.type === "CallExpression" &&
 		expr.callee.type === "MemberExpression" &&
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "source-map": "^0.5.3",
     "supports-color": "^3.1.0",
     "tapable": "~0.2.5",
-    "uglify-js": "~2.7.3",
+    "uglify-js": "^2.7.5",
     "watchpack": "^1.0.0",
     "webpack-sources": "^0.1.0",
     "yargs": "^6.0.0"
diff --git a/test/cases/parsing/chunks/index.js b/test/cases/parsing/chunks/index.js
@@ -19,4 +19,19 @@ it("should parse a string in require.ensure", function(done) {
 		require("./file").should.be.eql("ok");
 		done();
 	});
-});
+});
+
+it("should parse a string in require.ensure with arrow function expression", function(done) {
+	require.ensure("./file", require => {
+		require("./file").should.be.eql("ok");
+		done();
+	});
+});
+
+
+it("should parse a string in require.ensure with arrow function array expression", function(done) {
+	require.ensure("./file", require => (require("./file").should.be.eql("ok"), done()));
+});
+
+
+
diff --git a/test/cases/parsing/chunks/test.filter.js b/test/cases/parsing/chunks/test.filter.js
@@ -0,0 +1,5 @@
+var supportsES6 = require("../../../helpers/supportsES6");
+
+module.exports = function(config) {
+	return !config.minimize && supportsES6();
+};
diff --git a/test/configCases/target/node-dynamic-import/dir/one.js b/test/configCases/target/node-dynamic-import/dir/one.js
@@ -0,0 +1 @@
+module.exports = 1;
diff --git a/test/configCases/target/node-dynamic-import/dir/three.js b/test/configCases/target/node-dynamic-import/dir/three.js
@@ -0,0 +1 @@
+module.exports = 3;
diff --git a/test/configCases/target/node-dynamic-import/dir/two.js b/test/configCases/target/node-dynamic-import/dir/two.js
@@ -0,0 +1 @@
+module.exports = 2;
diff --git a/test/configCases/target/node-dynamic-import/dir2/one.js b/test/configCases/target/node-dynamic-import/dir2/one.js
@@ -0,0 +1 @@
+module.exports = 1;
diff --git a/test/configCases/target/node-dynamic-import/dir2/three.js b/test/configCases/target/node-dynamic-import/dir2/three.js
@@ -0,0 +1 @@
+module.exports = 3;
diff --git a/test/configCases/target/node-dynamic-import/dir2/two.js b/test/configCases/target/node-dynamic-import/dir2/two.js
@@ -0,0 +1 @@
+module.exports = 2;
diff --git a/test/configCases/target/node-dynamic-import/index.js b/test/configCases/target/node-dynamic-import/index.js
@@ -0,0 +1,65 @@
+function testCase(load, done) {
+	load("two", 2, function() {
+		var sync = true;
+		load("one", 1, function() {
+			sync.should.be.eql(false);
+			load("three", 3, function() {
+				var sync = true;
+				load("two", 2, function() {
+					sync.should.be.eql(true);
+					done();
+				});
+				Promise.resolve().then(function() {}).then(function() {}).then(function() {
+					sync = false;
+				});
+			});
+		});
+		Promise.resolve().then(function() {
+			sync = false;
+		});
+	});
+}
+
+it("should be able to use expressions in import", function(done) {
+	function load(name, expected, callback) {
+		import("./dir/" + name + '.js')
+			.then((result) => {result.should.be.eql(expected); callback()})
+			.catch((err) => {done(err)});
+	}
+	testCase(load, done);
+});
+
+it("should be able to use expressions in System.import", function(done) {
+	function load(name, expected, callback) {
+		System.import("./dir2/" + name).then((result) => {
+			result.should.be.eql(expected);
+			callback();
+		}).catch((err) => {
+			done(err);
+		});
+	}
+	testCase(load, done);
+});
+
+it("should convert to function in node", function() {
+	(typeof __webpack_require__.e).should.be.eql("function");
+})
+
+it("should be able to use import", function(done) {
+	import("./two").then((two) => {
+		two.should.be.eql(2);
+		done();
+	}).catch(function(err) {
+		done(err);
+	});
+});
+
+it("should be able to use System.import", function(done) {
+	System.import("./two").then((two) => {
+		two.should.be.eql(2);
+		done();
+	}).catch(function(err) {
+		done(err);
+	});
+});
+
diff --git a/test/configCases/target/node-dynamic-import/two.js b/test/configCases/target/node-dynamic-import/two.js
@@ -0,0 +1 @@
+module.exports = 2;
diff --git a/test/configCases/target/node-dynamic-import/webpack.config.js b/test/configCases/target/node-dynamic-import/webpack.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	target: "node",
+	performance: {
+		hints: false
+	}
+};
