Skip to content

Commit b20ecd3

Browse files
authoredAug 18, 2019
Merge pull request #1024 from webpack/fix/no-config-mode
fix: resolve opts when no-config & fix vulns
2 parents a56e916 + 45b9127 commit b20ecd3

File tree

3 files changed

+204
-173
lines changed

3 files changed

+204
-173
lines changed
 

‎bin/utils/convert-argv.js

+10-6
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,23 @@ module.exports = function(...args) {
128128
}
129129

130130
if (!configFileLoaded) {
131-
return processConfiguredOptions({});
131+
return processConfiguredOptions();
132132
} else if (options.length === 1) {
133133
return processConfiguredOptions(options[0]);
134134
} else {
135135
return processConfiguredOptions(options);
136136
}
137137

138138
function processConfiguredOptions(options) {
139-
const webpackConfigurationValidationErrors = validateSchema(webpackConfigurationSchema, options);
140-
if (webpackConfigurationValidationErrors.length) {
141-
const error = new WebpackOptionsValidationError(webpackConfigurationValidationErrors);
142-
console.error(error.message, `\nReceived: ${typeof options} : ${JSON.stringify(options, null, 2)}`);
143-
process.exit(-1); // eslint-disable-line
139+
if (options) {
140+
const webpackConfigurationValidationErrors = validateSchema(webpackConfigurationSchema, options);
141+
if (webpackConfigurationValidationErrors.length) {
142+
const error = new WebpackOptionsValidationError(webpackConfigurationValidationErrors);
143+
console.error(error.message, `\nReceived: ${typeof options} : ${JSON.stringify(options, null, 2)}`);
144+
process.exit(-1); // eslint-disable-line
145+
}
146+
} else {
147+
options = {};
144148
}
145149

146150
// process Promise

‎package-lock.json

+192-165
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"devDependencies": {
132132
"@babel/preset-env": "7.4.5",
133133
"@babel/register": "7.4.4",
134-
"@commitlint/cli": "8.0.0",
134+
"@commitlint/cli": "8.1.0",
135135
"@commitlint/config-lerna-scopes": "8.0.0",
136136
"@commitlint/travis-cli": "8.0.0",
137137
"@strictsoftware/typedoc-plugin-monorepo": "0.2.1",
@@ -142,7 +142,7 @@
142142
"babel-preset-env": "1.7.0",
143143
"babel-preset-jest": "24.6.0",
144144
"codecov": "3.5.0",
145-
"commitizen": "3.1.1",
145+
"commitizen": "4.0.3",
146146
"commitlint-config-cz": "0.12.0",
147147
"conventional-changelog-cli": "2.0.21",
148148
"cz-customizable": "6.2.0",

0 commit comments

Comments
 (0)
Please sign in to comment.