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: handle errors during hasWorkspacePackageJSON function #14394

Merged
merged 1 commit into from Sep 18, 2023
Merged

fix: handle errors during hasWorkspacePackageJSON function #14394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions packages/vite/src/node/server/searchRoot.ts
View file
Open in desktop
Expand Up @@ -27,8 +27,12 @@ function hasWorkspacePackageJSON(root: string): boolean {
if (!isFileReadable(path)) {
return false
}
const content = JSON.parse(fs.readFileSync(path, 'utf-8')) || {}
return !!content.workspaces
try {
const content = JSON.parse(fs.readFileSync(path, 'utf-8')) || {}
return !!content.workspaces
} catch {
return false
}
Comment on lines +30 to +35
Copy link
Member Author

Choose a reason for hiding this comment

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

fs.readFileSync might throw an error if path is not a file (isFileReadable doesn't check whether path is a file or not).
JSON.parse might throw an error if the content is not a valid JSON.

Copy link
Member

Choose a reason for hiding this comment

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

Could we remove the if (!isFileReadable(path)) { check directly in this case since we can rely on the try catch instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it's better to keep it. isFileReadable will filter the popular case (file doesn't exist) and we can avoid the slow try-catch.
It only affects if the project root is deep, but I think it's worth as this is only three lines of code.

}

function hasRootFile(root: string): boolean {
Expand Down