Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: resolve opts when no-config & fix vulns #1024

Merged
merged 5 commits into from Aug 18, 2019
Merged

fix: resolve opts when no-config & fix vulns #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb31cc4
fix: resolve opts when no-config
evenstensberg Aug 14, 2019
635bfa3
chore: lock deps
evenstensberg Aug 14, 2019
97d5c75
chore: lock deps
evenstensberg Aug 14, 2019
43fc033
chore: update lockfile & pass nil
evenstensberg Aug 14, 2019
45b9127
chore: resolve differently
evenstensberg Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions bin/utils/convert-argv.js
View file
Open in desktop
Expand Up @@ -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 = {};
evenstensberg marked this conversation as resolved.
Show resolved Hide resolved
}

// process Promise
Expand Down