Skip to content

Commit

Permalink
fix: do not fallback to base config
Browse files Browse the repository at this point in the history
  • Loading branch information
anshumanv committed Jul 18, 2020
1 parent 63e9e22 commit a875a61
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions packages/webpack-cli/lib/groups/ConfigGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class ConfigGroup extends GroupHelper {
if (Object.keys(this.args).some((arg) => arg === 'merge')) {
const { merge } = this.args;

// Try to resolve the given merge config else fallback to `webpack.base.js`
// try resolving merge config
const newConfigPath = this.resolveFilePath(merge);

if (!newConfigPath) {
Expand All @@ -179,13 +179,6 @@ class ConfigGroup extends GroupHelper {
}

const configFiles = getConfigInfoFromFileName(newConfigPath);
if (!configFiles.length) {
this.opts.processingMessageBuffer.push({
lvl: 'warn',
msg: 'Could not find file to merge configuration with...',
});
return;
}
const foundConfig = configFiles[0];
const resolvedConfig = this.requireConfig(foundConfig);
const newConfigurationsObject = await this.finalize(resolvedConfig);
Expand Down

0 comments on commit a875a61

Please sign in to comment.