Merge pull request #8250 from Aladdin-ADD/patch-3

fix: disable ProvidePlugin for javascript/esm (fixes #7032)
webpack · Nov 5, 2018 · 355590e · 355590e
2 parents 0293c3a + 770edef
commit 355590e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/lib/ProvidePlugin.js b/lib/ProvidePlugin.js
@@ -76,9 +76,8 @@ class ProvidePlugin {
 				normalModuleFactory.hooks.parser
 					.for("javascript/dynamic")
 					.tap("ProvidePlugin", handler);
-				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("ProvidePlugin", handler);
+
+				// Disable ProvidePlugin for javascript/esm, see https://github.com/webpack/webpack/issues/7032
 			}
 		);
 	}

diff --git a/test/configCases/plugins/provide-plugin/foo.mjs b/test/configCases/plugins/provide-plugin/foo.mjs
@@ -0,0 +1,3 @@
+export default function foo() {
+    return typeof esm;
+}
diff --git a/test/configCases/plugins/provide-plugin/index.js b/test/configCases/plugins/provide-plugin/index.js
@@ -56,3 +56,8 @@ it("should provide ES2015 modules", function() {
 	expect((es2015_alias)).toBe("ECMAScript Harmony");
 	expect((es2015_year)).toBe(2015);
 });
+
+it("should not provide for mjs", function(){
+	var foo = require("./foo.mjs").default;
+	expect(foo()).toBe("undefined");
+});
diff --git a/test/configCases/plugins/provide-plugin/webpack.config.js b/test/configCases/plugins/provide-plugin/webpack.config.js
@@ -10,7 +10,8 @@ module.exports = {
 			es2015_name: ["./harmony", "default"],
 			es2015_alias: ["./harmony", "alias"],
 			es2015_year: ["./harmony", "year"],
-			"this.aaa": "./aaa"
+			"this.aaa": "./aaa",
+			esm: "fail"
 		})
 	]
 };