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: overwrite configEnv.mode if the user explicitly set mode option (fix #4441) #4437

Merged
merged 3 commits into from
Jul 31, 2021
Merged

fix: overwrite configEnv.mode if the user explicitly set mode option (fix #4441) #4437

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d610d2
fix: overwrite configEnv.mode if the user explicitly set mode option
hyf0 Jul 29, 2021
4216d05
fix: remove unrelated codes
hyf0 Jul 29, 2021
026f570
fix: unexpected overwrite behaviors for the inline mode option.
hyf0 Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,9 @@ export async function resolveConfig(
allowClearScreen: config.clearScreen
})

// user config may provide an alternative mode
mode = config.mode || mode
// user config may provide an alternative mode. But --mode has a higher prority
mode = inlineConfig.mode || config.mode || mode
configEnv.mode = mode
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks ok here. But I'm a bit confused by the logic of the previous line.
According to https://github.com/iheyunfei/vite/blob/a7a9a361cf13670c2e241620ddaf15021eda26b5/packages/vite/src/node/config.ts#L103, the inline config mode should be the one winning over the config file mode, and that is not the case here AFAICS. @AlexandreBonaventure I think you were using this feature, does it works correctly for you when overriding --mode in the CLI? It should win over the one you used in your config file.

@iheyunfei as a note, it would be good to have an issue for this kind of PR with a reproduction for reference. It is easier to merge PRs when we have a clear bug that they are fixing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@patak-js Yes, I'm going to raise an issue. For your question, I look down the codes and It won't win over the mode in the config file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, looks like there are other issues to fix here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix it too. After looking back, I found I just solve inconstancy in some cases. Still, there is a case that could not be easily fixed. I will open another issue to describe it.


// resolve plugins
const rawUserPlugins = (config.plugins || []).flat().filter((p) => {
Expand Down