Merge pull request #11603 from MayaWolf/master

sokra · web-flow · commit bfc35d6fbe44 · 2020-10-10T13:40:33.000+02:00
Fix require handling with electron; fixes #11599
diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -581,19 +581,19 @@ const applyOutputDefaults = (
 	});
 	F(output, "chunkFormat", () => {
 		if (tp) {
+			if (tp.document) return "array-push";
 			if (tp.require) return "commonjs";
 			if (tp.nodeBuiltins) return "commonjs";
-			if (tp.document) return "array-push";
 			if (tp.importScripts) return "array-push";
 			if (tp.dynamicImport && output.module) return "module";
 		}
 		return false;
 	});
 	F(output, "chunkLoading", () => {
 		if (tp) {
+			if (tp.document) return "jsonp";
 			if (tp.require) return "require";
 			if (tp.nodeBuiltins) return "async-node";
-			if (tp.document) return "jsonp";
 			if (tp.importScripts) return "import-scripts";
 			if (tp.dynamicImport && output.module) return "import";
 			if (
diff --git a/lib/electron/ElectronTargetPlugin.js b/lib/electron/ElectronTargetPlugin.js
@@ -31,7 +31,7 @@ class ElectronTargetPlugin {
 			"original-fs",
 			"screen",
 			"shell"
-		]);
+		]).apply(compiler);
 		switch (this._context) {
 			case "main":
 				new ExternalsPlugin("commonjs", [
