Merge pull request #1065 from webpack/fix/patch

fix: support both webpack versions

Author: evenstensberg

bin/utils/convert-argv.js

@@ -3,10 +3,8 @@ const fs = require("fs");
 fs.existsSync = fs.existsSync || path.existsSync;
 const interpret = require("interpret");
 const prepareOptions = require("./prepareOptions");
-const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
-const validateSchema = require("webpack").validateSchema;
-const WebpackOptionsValidationError = require("webpack").WebpackOptionsValidationError;
 const findup = require("findup-sync");
+const validateOptions = require("./validate-options");
 
 module.exports = function(...args) {
 	const argv = args[1] || args[0];
@@ -137,12 +135,7 @@ module.exports = function(...args) {
 
 	function processConfiguredOptions(options) {
 		if (options) {
-			const webpackConfigurationValidationErrors = validateSchema(webpackConfigurationSchema, options);
-			if (webpackConfigurationValidationErrors.length) {
-				const error = new WebpackOptionsValidationError(webpackConfigurationValidationErrors);
-				console.error(error.message, `\nReceived: ${typeof options} : ${JSON.stringify(options, null, 2)}`);
-				process.exit(-1); // eslint-disable-line
-			}
+			validateOptions(options);
 		} else {
 			options = {};
 		}

bin/utils/validate-options.js

@@ -0,0 +1,21 @@
+const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
+const validateSchema = require("webpack").validateSchema;
+
+module.exports = function validateOptions(options) {
+	let error;
+	try {
+		const errors = validateSchema(webpackConfigurationSchema, options);
+		if (errors && errors.length > 0) {
+			const { WebpackOptionsValidationError } = require("webpack");
+			error = new WebpackOptionsValidationError(errors);
+		}
+	} catch (err) {
+		error = err;
+	}
+
+	if (error) {
+		console.error(error.message);
+		// eslint-disable-next-line no-process-exit
+		process.exit(-1);
+	}
+};

package-lock.json

@@ -143,6 +143,7 @@
     "babel-preset-jest": "24.6.0",
     "codecov": "3.5.0",
     "commitizen": "4.0.3",
+    "commitlint": "^8.1.0",
     "commitlint-config-cz": "0.12.0",
     "conventional-changelog-cli": "2.0.21",
     "cz-customizable": "6.2.0",

package.json

@@ -0,0 +1,3 @@
+module.exports = {
+	entry: "hey"
+};

packages/generate-loader/package-lock.json

@@ -0,0 +1,17 @@
+"use strict";
+
+const validation = require("../../../../bin/utils/validate-options");
+const { run } = require("../../../testUtils");
+
+test("validation", () => {
+	const mockExit = jest.spyOn(process, "exit").mockImplementation(() => {});
+	validation(null);
+	expect(mockExit).toHaveBeenCalledWith(-1);
+	mockExit.mockRestore();
+});
+
+test("validation-success", () => {
+	const { stdout, code } = run(__dirname, ["--config", "./options.js"]);
+	expect(stdout).toContain("Can't resolve 'hey'");
+	expect(code).toBe(2);
+});