root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11603 from MayaWolf/master 

Fix require handling with electron; fixes #11599
This commit is contained in:
Tobias Koppers 2020-10-10 13:40:33 +02:00 committed by GitHub
parent 76e8cbd91f 906a447fab
commit bfc35d6fbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/defaults.js
View File

@ -581,9 +581,9 @@ const applyOutputDefaults = (
}); });
F(output, "chunkFormat", () => { F(output, "chunkFormat", () => {
if (tp) { if (tp) {
if (tp.document) return "array-push";
if (tp.require) return "commonjs"; if (tp.require) return "commonjs";
if (tp.nodeBuiltins) return "commonjs"; if (tp.nodeBuiltins) return "commonjs";
if (tp.document) return "array-push";
if (tp.importScripts) return "array-push"; if (tp.importScripts) return "array-push";
if (tp.dynamicImport && output.module) return "module"; if (tp.dynamicImport && output.module) return "module";
} }
@ -591,9 +591,9 @@ const applyOutputDefaults = (
}); });
F(output, "chunkLoading", () => { F(output, "chunkLoading", () => {
if (tp) { if (tp) {
if (tp.document) return "jsonp";
if (tp.require) return "require"; if (tp.require) return "require";
if (tp.nodeBuiltins) return "async-node"; if (tp.nodeBuiltins) return "async-node";
if (tp.document) return "jsonp";
if (tp.importScripts) return "import-scripts"; if (tp.importScripts) return "import-scripts";
if (tp.dynamicImport && output.module) return "import"; if (tp.dynamicImport && output.module) return "import";
if ( if (

2
lib/electron/ElectronTargetPlugin.js
View File

@ -31,7 +31,7 @@ class ElectronTargetPlugin {
"original-fs", "original-fs",
"screen", "screen",
"shell" "shell"
]); ]).apply(compiler);
switch (this._context) { switch (this._context) {
case "main": case "main":
new ExternalsPlugin("commonjs", [ new ExternalsPlugin("commonjs", [