Skip to content

Commit fb31cc4

Browse files
committed
fix: resolve opts when no-config
1 parent a56e916 commit fb31cc4

3 files changed

Lines changed: 206 additions & 175 deletions

File tree

‎bin/utils/convert-argv.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,28 +128,32 @@ module.exports = function(...args) {
128128
}
129129

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

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

146150
// process Promise
147-
if(typeofoptions.then==="function"){
151+
if(options&&typeofoptions.then==="function"){
148152
returnoptions.then(processConfiguredOptions);
149153
}
150154

151155
// process ES6 default
152-
if(typeofoptions==="object"&&typeofoptions.default==="object"){
156+
if(options&&typeofoptions==="object"&&typeofoptions.default==="object"){
153157
returnprocessConfiguredOptions(options.default);
154158
}
155159

0 commit comments

Comments
 (0)