Merge pull request #13270 from webpack/bugfix/parser-options-validation

catch errors thrown during parser/generation creation
webpack · Apr 30, 2021 · e123bc0 · e123bc0
2 parents e9de77a + eea0aee
commit e123bc0
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 23 deletions.
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -520,29 +520,33 @@ class NormalModuleFactory extends ModuleFactory {
 								)
 							);
 						}
-						Object.assign(data.createData, {
-							layer:
-								layer === undefined ? contextInfo.issuerLayer || null : layer,
-							request: stringifyLoadersAndResource(
-								allLoaders,
-								resourceData.resource
-							),
-							userRequest,
-							rawRequest: request,
-							loaders: allLoaders,
-							resource: resourceData.resource,
-							matchResource: matchResourceData
-								? matchResourceData.resource
-								: undefined,
-							resourceResolveData: resourceData.data,
-							settings,
-							type,
-							parser: this.getParser(type, settings.parser),
-							parserOptions: settings.parser,
-							generator: this.getGenerator(type, settings.generator),
-							generatorOptions: settings.generator,
-							resolveOptions
-						});
+						try {
+							Object.assign(data.createData, {
+								layer:
+									layer === undefined ? contextInfo.issuerLayer || null : layer,
+								request: stringifyLoadersAndResource(
+									allLoaders,
+									resourceData.resource
+								),
+								userRequest,
+								rawRequest: request,
+								loaders: allLoaders,
+								resource: resourceData.resource,
+								matchResource: matchResourceData
+									? matchResourceData.resource
+									: undefined,
+								resourceResolveData: resourceData.data,
+								settings,
+								type,
+								parser: this.getParser(type, settings.parser),
+								parserOptions: settings.parser,
+								generator: this.getGenerator(type, settings.generator),
+								generatorOptions: settings.generator,
+								resolveOptions
+							});
+						} catch (e) {
+							return callback(e);
+						}
 						callback();
 					});
 					this.resolveRequestArray(

diff --git a/test/configCases/errors/asset-options-validation/errors.js b/test/configCases/errors/asset-options-validation/errors.js
@@ -0,0 +1,6 @@
+module.exports = [
+	[
+		/Invalid generator object\. Asset Modules Plugin has been initialized using a generator object that does not match the API schema/,
+		/generator has an unknown property 'filename'/
+	]
+];
diff --git a/test/configCases/errors/asset-options-validation/index.js b/test/configCases/errors/asset-options-validation/index.js
@@ -0,0 +1 @@
+import url from "./text.txt";
diff --git a/test/configCases/errors/asset-options-validation/text.txt b/test/configCases/errors/asset-options-validation/text.txt
@@ -0,0 +1 @@
+Hello World
diff --git a/test/configCases/errors/asset-options-validation/webpack.config.js b/test/configCases/errors/asset-options-validation/webpack.config.js
@@ -0,0 +1,14 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /\.txt$/,
+				type: "asset/inline",
+				generator: {
+					filename: "[name].txt"
+				}
+			}
+		]
+	}
+};