Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: resolve opts when no-config
  • Loading branch information
evenstensberg committed Aug 14, 2019
1 parent a56e916 commit fb31cc4
Show file tree
Hide file tree
Showing 3 changed files with 206 additions and 175 deletions.
20 changes: 12 additions & 8 deletions bin/utils/convert-argv.js
Expand Up @@ -128,28 +128,32 @@ module.exports = function(...args) {
}

if (!configFileLoaded) {
return processConfiguredOptions({});
return processConfiguredOptions(null);
} 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
if (typeof options.then === "function") {
if (options && typeof options.then === "function") {
return options.then(processConfiguredOptions);
}

// process ES6 default
if (typeof options === "object" && typeof options.default === "object") {
if (options && typeof options === "object" && typeof options.default === "object") {
return processConfiguredOptions(options.default);
}

Expand Down

0 comments on commit fb31cc4

Please sign in to comment.