Merge pull request #6814 from webpack/fix/issue-6811

Read 'browser' main field when target is 'electron-renderer'

lib/WebpackOptionsDefaulter.js

@@ -59,7 +59,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 				type: "javascript/esm",
 				resolve: {
 					mainFields:
-						options.target === "web" || options.target === "webworker"
+						options.target === "web" ||
+						options.target === "webworker" ||
+						options.target === "electron-renderer"
 							? ["browser", "main"]
 							: ["main"]
 				}
@@ -297,9 +299,15 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			else return [];
 		});
 		this.set("resolve.mainFields", "make", options => {
-			if (options.target === "web" || options.target === "webworker")
+			if (
+				options.target === "web" ||
+				options.target === "webworker" ||
+				options.target === "electron-renderer"
+			) {
 				return ["browser", "module", "main"];
-			else return ["module", "main"];
+			} else {
+				return ["module", "main"];
+			}
 		});
 		this.set("resolve.cacheWithContext", "make", options => {
 			return (

test/configCases/target/electron-renderer/index.js

@@ -0,0 +1,5 @@
+const foo = require("foo");
+
+it("should use browser main field", () => {
+	foo.should.be.eql("browser");
+});

test/configCases/target/electron-renderer/webpack.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	target: "electron-renderer",
+	optimization: {
+		minimize: false
+	}
+};