Merge pull request #1024 from webpack/fix/no-config-mode

fix: resolve opts when no-config & fix vulns
webpack · Aug 18, 2019 · b20ecd3 · b20ecd3
2 parents a56e916 + 45b9127
commit b20ecd3
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 173 deletions.
diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js
@@ -128,19 +128,23 @@ module.exports = function(...args) {
 	}
 
 	if (!configFileLoaded) {
-		return processConfiguredOptions({});
+		return processConfiguredOptions();
 	} else if (options.length === 1) {
 		return processConfiguredOptions(options[0]);
 	} else {
 		return processConfiguredOptions(options);
 	}
 
 	function processConfiguredOptions(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
+		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
+			}
+		} else {
+			options = {};
 		}
 
 		// process Promise