Merge pull request #13143 from webpack/bugfix/falsy-entry-options

handle falsy entry options correctly
webpack · Apr 14, 2021 · 45fac7d · 45fac7d
2 parents 7a7d3be + 2df8267
commit 45fac7d
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 10 deletions.
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -4035,7 +4035,7 @@ This prevents using hashes of each other and should be avoided.`);
 
 				const entrypoint = new Entrypoint({
 					runtime,
-					chunkLoading: "none",
+					chunkLoading: false,
 					...options.entryOptions
 				});
 				chunkGraph.connectChunkAndEntryModule(chunk, module, entrypoint);

diff --git a/lib/RuntimePlugin.js b/lib/RuntimePlugin.js
@@ -179,7 +179,9 @@ class RuntimePlugin {
 					const { publicPath: globalPublicPath, scriptType } = outputOptions;
 					const entryOptions = chunk.getEntryOptions();
 					const publicPath =
-						(entryOptions && entryOptions.publicPath) || globalPublicPath;
+						entryOptions && entryOptions.publicPath !== undefined
+							? entryOptions.publicPath
+							: globalPublicPath;
 
 					if (publicPath === "auto") {
 						const module = new AutoPublicPathRuntimeModule();

diff --git a/lib/node/CommonJsChunkLoadingPlugin.js b/lib/node/CommonJsChunkLoadingPlugin.js
@@ -39,7 +39,9 @@ class CommonJsChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === chunkLoadingValue;
 				};
 				const onceForChunkSet = new WeakSet();

diff --git a/lib/node/ReadFileCompileAsyncWasmPlugin.js b/lib/node/ReadFileCompileAsyncWasmPlugin.js
@@ -25,7 +25,9 @@ class ReadFileCompileAsyncWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "async-node";
 				};
 				const generateLoadBinaryCode = path =>

diff --git a/lib/node/ReadFileCompileWasmPlugin.js b/lib/node/ReadFileCompileWasmPlugin.js
@@ -31,7 +31,9 @@ class ReadFileCompileWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "async-node";
 				};
 				const generateLoadBinaryCode = path =>

diff --git a/lib/runtime/StartupChunkDependenciesPlugin.js b/lib/runtime/StartupChunkDependenciesPlugin.js
@@ -32,7 +32,9 @@ class StartupChunkDependenciesPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === this.chunkLoading;
 				};
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(

diff --git a/lib/web/FetchCompileAsyncWasmPlugin.js b/lib/web/FetchCompileAsyncWasmPlugin.js
@@ -24,7 +24,9 @@ class FetchCompileAsyncWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "fetch";
 				};
 				const generateLoadBinaryCode = path =>

diff --git a/lib/web/FetchCompileWasmPlugin.js b/lib/web/FetchCompileWasmPlugin.js
@@ -30,7 +30,9 @@ class FetchCompileWasmPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const wasmLoading =
-						(options && options.wasmLoading) || globalWasmLoading;
+						options && options.wasmLoading !== undefined
+							? options.wasmLoading
+							: globalWasmLoading;
 					return wasmLoading === "fetch";
 				};
 				const generateLoadBinaryCode = path =>

diff --git a/lib/web/JsonpChunkLoadingPlugin.js b/lib/web/JsonpChunkLoadingPlugin.js
@@ -24,7 +24,9 @@ class JsonpChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === "jsonp";
 				};
 				const onceForChunkSet = new WeakSet();

diff --git a/lib/webworker/ImportScriptsChunkLoadingPlugin.js b/lib/webworker/ImportScriptsChunkLoadingPlugin.js
@@ -29,7 +29,9 @@ class ImportScriptsChunkLoadingPlugin {
 				const isEnabledForChunk = chunk => {
 					const options = chunk.getEntryOptions();
 					const chunkLoading =
-						(options && options.chunkLoading) || globalChunkLoading;
+						options && options.chunkLoading !== undefined
+							? options.chunkLoading
+							: globalChunkLoading;
 					return chunkLoading === "import-scripts";
 				};
 				const onceForChunkSet = new WeakSet();