Merge pull request #14813 from webpack/bugfix/pre-compiled-schema

fix pre-compiled schema validation for Infinity and arrays

lib/util/create-schema-validation.js

@@ -9,11 +9,18 @@ const memoize = require("./memoize");
 
 const getValidate = memoize(() => require("schema-utils").validate);
 
-const createSchemaValidation = (check = v => false, getSchema, options) => {
+const createSchemaValidation = (check, getSchema, options) => {
 	getSchema = memoize(getSchema);
 	return value => {
-		if (!check(value)) {
+		if (check && !check(value)) {
 			getValidate()(getSchema(), value, options);
+			if (check) {
+				require("util").deprecate(
+					() => {},
+					"webpack bug: Pre-compiled schema reports error while real schema is happy. This has performance drawbacks.",
+					"DEP_WEBPACK_PRE_COMPILED_SCHEMA_INVALID"
+				)();
+			}
 		}
 	};
 };

lib/webpack.js

@@ -96,6 +96,9 @@ const createCompiler = rawOptions => {
  * @returns {MultiCompiler} the multi compiler object
  */
 
+const asArray = options =>
+	Array.isArray(options) ? Array.from(options) : [options];
+
 const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	/**
 	 * @param {WebpackOptions | (ReadonlyArray<WebpackOptions> & MultiCompilerOptions)} options options
@@ -104,8 +107,13 @@ const webpack = /** @type {WebpackFunctionSingle & WebpackFunctionMulti} */ (
 	 */
 	(options, callback) => {
 		const create = () => {
-			if (!webpackOptionsSchemaCheck(options)) {
+			if (!asArray(options).every(webpackOptionsSchemaCheck)) {
 				getValidateSchema()(webpackOptionsSchema, options);
+				util.deprecate(
+					() => {},
+					"webpack bug: Pre-compiled schema reports error while real schema is happy. This has performance drawbacks.",
+					"DEP_WEBPACK_PRE_COMPILED_SCHEMA_INVALID"
+				)();
 			}
 			/** @type {MultiCompiler|Compiler} */
 			let compiler;

package.json

@@ -98,7 +98,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.7.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.20.0",
+    "tooling": "webpack/tooling#v1.20.1",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-beta",
     "url-loader": "^4.1.0",