webpack 5.106.1 → 5.107.0

package/lib/javascript/JavascriptGenerator.js

@@ -30,6 +30,7 @@ const DEFAULT_SOURCE = {
 		return new RawSource("throw new Error('No source available');");
 	},
 	/**
+	 * Returns the estimated size for the requested source type.
 	 * @returns {number} size of the DEFAULT_SOURCE.source()
 	 */
 	size() {
@@ -42,6 +43,7 @@ const DEFAULT_SOURCE = {
 
 const deprecatedGetInitFragments = util.deprecate(
 	/**
+	 * Handles the callback logic for this hook.
 	 * @param {DependencyTemplate} template template
 	 * @param {Dependency} dependency dependency
 	 * @param {DependencyTemplateContext} templateContext template context
@@ -56,6 +58,7 @@ const deprecatedGetInitFragments = util.deprecate(
 
 class JavascriptGenerator extends Generator {
 	/**
+	 * Returns the source types available for this module.
 	 * @param {NormalModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
@@ -64,6 +67,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Returns the estimated size for the requested source type.
 	 * @param {NormalModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
@@ -77,6 +81,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Returns the reason this module cannot be concatenated, when one exists.
 	 * @param {NormalModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
@@ -103,6 +108,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Processes the provided module.
 	 * @param {Module} module the current module
 	 * @param {Dependency} dependency the dependency to generate
 	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
@@ -173,6 +179,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Processes the provided module.
 	 * @param {Module} module the module to generate
 	 * @param {DependenciesBlock} block the dependencies block which will be processed
 	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
@@ -203,6 +210,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Processes the provided module.
 	 * @param {Module} module the module to generate
 	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
@@ -244,6 +252,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Generates generated code for this runtime module.
 	 * @param {NormalModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
@@ -264,6 +273,7 @@ class JavascriptGenerator extends Generator {
 	}
 
 	/**
+	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
 	 * @param {NormalModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate

package/lib/javascript/JavascriptModulesPlugin.js

@@ -17,7 +17,6 @@ const {
 	ReplaceSource
 } = require("webpack-sources");
 const Compilation = require("../Compilation");
-const { tryRunOrWebpackError } = require("../HookWebpackError");
 const HotUpdateChunk = require("../HotUpdateChunk");
 const InitFragment = require("../InitFragment");
 const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
@@ -30,6 +29,7 @@ const {
 const NormalModule = require("../NormalModule");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const { tryRunOrWebpackError } = require("../errors/HookWebpackError");
 const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByFullName } = require("../util/comparators");
@@ -48,10 +48,24 @@ const { intersectRuntime } = require("../util/runtime");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptParser = require("./JavascriptParser");
 
-/** @typedef {import("eslint-scope").Reference} Reference */
-/** @typedef {import("eslint-scope").Scope} Scope */
-/** @typedef {import("eslint-scope").Variable} Variable */
 /** @typedef {import("estree").Program} Program */
+/** @typedef {import("estree").Node} Node */
+/** @typedef {import("estree").Identifier} Identifier */
+/** @typedef {import("estree").CatchClause} CatchClause */
+/** @typedef {import("estree").ClassDeclaration} ClassDeclaration */
+/** @typedef {import("estree").ClassExpression} ClassExpression */
+/** @typedef {import("estree").FunctionDeclaration} FunctionDeclaration */
+/** @typedef {import("estree").FunctionExpression} FunctionExpression */
+/** @typedef {import("estree").ArrowFunctionExpression} ArrowFunctionExpression */
+/** @typedef {import("estree").VariableDeclarator} VariableDeclarator */
+/** @typedef {import("estree").VariableDeclaration} VariableDeclaration */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
+/** @typedef {import("estree").ImportSpecifier} ImportSpecifier */
+/** @typedef {import("estree").ImportDefaultSpecifier} ImportDefaultSpecifier */
+/** @typedef {import("estree").ImportNamespaceSpecifier} ImportNamespaceSpecifier */
+/** @typedef {import("estree").AssignmentExpression} AssignmentExpression */
+/** @typedef {import("estree").ForInStatement} ForInStatement */
+/** @typedef {import("estree").ForOfStatement} ForOfStatement */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("../Chunk")} Chunk */
@@ -70,16 +84,72 @@ const JavascriptParser = require("./JavascriptParser");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/concatenate").ScopeSet} ScopeSet */
 /** @typedef {import("../util/concatenate").UsedNamesInScopeInfo} UsedNamesInScopeInfo */
 
+// TODO remove these types when we will update `eslint-scope` to the latest version and import them from `eslint-scope`
+/**
+ * @typedef {object} Scope
+ * @property {"block" | "catch" | "class" | "class-field-initializer" | "class-static-block" | "for" | "function" | "function-expression-name" | "global" | "module" | "switch" | "with" | "TDZ"} type
+ * @property {boolean} isStrict
+ * @property {Scope | null} upper
+ * @property {Scope[]} childScopes
+ * @property {Scope} variableScope
+ * @property {Node} block
+ * @property {Variable[]} variables
+ * @property {Map<string, Variable>} set
+ * @property {Reference[]} references
+ * @property {Reference[]} through
+ * @property {boolean} functionExpressionScope
+ * @property {{ variables: Variable[], set: Map<string, Variable> }=} implicit
+ */
+
+/**
+ * @typedef {
+ * | { type: "CatchClause", node: CatchClause, parent: null }
+ * | { type: "ClassName", node: ClassDeclaration | ClassExpression, parent: null }
+ * | { type: "FunctionName", node: FunctionDeclaration | FunctionExpression, parent: null }
+ * | { type: "ImplicitGlobalVariable", node: AssignmentExpression | ForInStatement | ForOfStatement, parent: null }
+ * | { type: "ImportBinding", node: ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier, parent: ImportDeclaration }
+ * | { type: "Parameter", node: FunctionDeclaration | FunctionExpression | ArrowFunctionExpression, parent: null }
+ * | { type: "TDZ", node: any, parent: null }
+ * | { type: "Variable", node: VariableDeclarator, parent: VariableDeclaration }
+ * } DefinitionType
+ */
+
+/** @typedef {DefinitionType & { name: Identifier }} Definition */
+
+/**
+ * @typedef {object} Variable
+ * @property {string} name
+ * @property {Scope} scope
+ * @property {Identifier[]} identifiers
+ * @property {Reference[]} references
+ * @property {Definition[]} defs
+ */
+
+/**
+ * @typedef {object} Reference
+ * @property {Identifier} identifier
+ * @property {Scope} from
+ * @property {Variable | null} resolved
+ * @property {Node | null} writeExpr
+ * @property {boolean} init
+ * @property {() => boolean} isWrite
+ * @property {() => boolean} isRead
+ * @property {() => boolean} isWriteOnly
+ * @property {() => boolean} isReadOnly
+ * @property {() => boolean} isReadWrite
+ */
+
 /** @type {WeakMap<ChunkGraph, WeakMap<Chunk, boolean>>} */
 const chunkHasJsCache = new WeakMap();
 
 /**
+ * Returns true, when a JS file is needed for this chunk.
  * @param {Chunk} chunk a chunk
  * @param {ChunkGraph} chunkGraph the chunk graph
  * @returns {boolean} true, when a JS file is needed for this chunk
@@ -99,6 +169,7 @@ const _chunkHasJs = (chunk, chunkGraph) => {
 };
 
 /**
+ * Returns true, when a JS file is needed for this chunk.
  * @param {Chunk} chunk a chunk
  * @param {ChunkGraph} chunkGraph the chunk graph
  * @returns {boolean} true, when a JS file is needed for this chunk
@@ -121,6 +192,7 @@ const chunkHasJs = (chunk, chunkGraph) => {
 };
 
 /**
+ * Chunk has runtime or js.
  * @param {Chunk} chunk a chunk
  * @param {ChunkGraph} chunkGraph the chunk graph
  * @returns {boolean} true, when a JS file is needed for this chunk
@@ -148,6 +220,7 @@ const chunkHasRuntimeOrJs = (chunk, chunkGraph) => {
 };
 
 /**
+ * Print generated code for stack.
  * @param {Module} module a module
  * @param {string} code the code
  * @returns {string} generated code for the stack
@@ -158,6 +231,7 @@ const printGeneratedCodeForStack = (module, code) => {
 	return `\n\nGenerated code for ${module.identifier()}\n${lines
 		.map(
 			/**
+			 * Handles the callback logic for this hook.
 			 * @param {string} line the line
 			 * @param {number} i the index
 			 * @param {string[]} _lines the lines
@@ -172,6 +246,7 @@ const printGeneratedCodeForStack = (module, code) => {
 };
 
 /**
+ * Defines the render context type used by this module.
  * @typedef {object} RenderContext
  * @property {Chunk} chunk the chunk
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -183,6 +258,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the main render context type used by this module.
  * @typedef {object} MainRenderContext
  * @property {Chunk} chunk the chunk
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -195,6 +271,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the chunk render context type used by this module.
  * @typedef {object} ChunkRenderContext
  * @property {Chunk} chunk the chunk
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -207,6 +284,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the render bootstrap context type used by this module.
  * @typedef {object} RenderBootstrapContext
  * @property {Chunk} chunk the chunk
  * @property {CodeGenerationResults} codeGenerationResults results of code generation
@@ -217,6 +295,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the startup render context type used by this module.
  * @typedef {object} StartupRenderContext
  * @property {Chunk} chunk the chunk
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -231,6 +310,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the module render context type used by this module.
  * @typedef {object} ModuleRenderContext
  * @property {Chunk} chunk the chunk
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -246,6 +326,7 @@ const printGeneratedCodeForStack = (module, code) => {
  */
 
 /**
+ * Defines the compilation hooks type used by this module.
  * @typedef {object} CompilationHooks
  * @property {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>} renderModuleContent
  * @property {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>} renderModuleContainer
@@ -272,6 +353,7 @@ const PLUGIN_NAME = "JavascriptModulesPlugin";
 
 class JavascriptModulesPlugin {
 	/**
+	 * Returns the attached hooks.
 	 * @param {Compilation} compilation the compilation
 	 * @returns {CompilationHooks} the attached hooks
 	 */
@@ -327,7 +409,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
-	 * Apply the plugin
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
@@ -347,16 +429,21 @@ class JavascriptModulesPlugin {
 						.tap(PLUGIN_NAME, (options) => {
 							switch (type) {
 								case JAVASCRIPT_MODULE_TYPE_AUTO: {
-									return new JavascriptParser("auto", { parse: options.parse });
+									return new JavascriptParser("auto", {
+										parse: options.parse,
+										typescript: options.typescript
+									});
 								}
 								case JAVASCRIPT_MODULE_TYPE_DYNAMIC: {
 									return new JavascriptParser("script", {
-										parse: options.parse
+										parse: options.parse,
+										typescript: options.typescript
 									});
 								}
 								case JAVASCRIPT_MODULE_TYPE_ESM: {
 									return new JavascriptParser("module", {
-										parse: options.parse
+										parse: options.parse,
+										typescript: options.typescript
 									});
 								}
 							}
@@ -642,6 +729,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Gets chunk filename template.
 	 * @param {Chunk} chunk chunk
 	 * @param {OutputOptions} outputOptions output options
 	 * @returns {TemplatePath} used filename template
@@ -658,6 +746,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Renders the newly generated source from rendering.
 	 * @param {Module} module the rendered module
 	 * @param {ModuleRenderContext} renderContext options object
 	 * @param {CompilationHooks} hooks hooks
@@ -797,6 +886,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Renders the rendered source.
 	 * @param {RenderContext} renderContext the render context
 	 * @param {CompilationHooks} hooks hooks
 	 * @returns {Source} the rendered source
@@ -875,6 +965,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Renders the newly generated source from rendering.
 	 * @param {MainRenderContext} renderContext options object
 	 * @param {CompilationHooks} hooks hooks
 	 * @param {Compilation} compilation the compilation
@@ -1240,6 +1331,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Updates hash with bootstrap.
 	 * @param {Hash} hash the hash to be updated
 	 * @param {RenderBootstrapContext} renderContext options object
 	 * @param {CompilationHooks} hooks hooks
@@ -1260,6 +1352,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Renders the generated source of the bootstrap code.
 	 * @param {RenderBootstrapContext} renderContext options object
 	 * @param {CompilationHooks} hooks hooks
 	 * @returns {Bootstrap} the generated source of the bootstrap code
@@ -1334,6 +1427,13 @@ class JavascriptModulesPlugin {
 			// is evaluated.
 			buf.push("// The deferred module cache");
 			buf.push("var __webpack_module_deferred_exports__ = {};");
+			// Per the TC39 import-defer spec, every defer-import call site for
+			// the same module must yield the same Deferred Module Namespace
+			// Exotic Object (and a distinct one from any eager namespace).
+			// Cache the deferred namespace proxy here so calls from different
+			// files share identity.
+			buf.push("// The deferred namespace cache");
+			buf.push("var __webpack_module_deferred_namespace_cache__ = {};");
 			buf.push("");
 		}
 
@@ -1605,6 +1705,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Renders the generated source of the require function.
 	 * @param {RenderBootstrapContext} renderContext options object
 	 * @param {CompilationHooks} hooks hooks
 	 * @returns {string} the generated source of the require function
@@ -1618,6 +1719,7 @@ class JavascriptModulesPlugin {
 		const runtimeRequirements = chunkGraph.getTreeRuntimeRequirements(chunk);
 
 		/**
+		 * Renders missing module error.
 		 * @param {string} condition guard expression
 		 * @returns {string[]} source
 		 */
@@ -1742,6 +1844,7 @@ class JavascriptModulesPlugin {
 	}
 
 	/**
+	 * Get renamed inline module.
 	 * @param {Compilation} compilation compilation
 	 * @param {Module[]} allModules allModules
 	 * @param {MainRenderContext} renderContext renderContext