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

fix(vite-dev-server): windows supportFile + preserve optimize entries #18286

Merged
merged 4 commits into from
Oct 1, 2021
Merged

fix(vite-dev-server): windows supportFile + preserve optimize entries #18286

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01df929
fix(master - vite-dev-server):
userquin Sep 28, 2021
25aa1b7
chore: simplify `supportFile` on windows, just replace backslashes wi…
userquin Sep 28, 2021
dc19915
chore: simplify `supportFile` on windows, just replace backslashes wi…
userquin Sep 28, 2021
ba54da1
Merge branch 'master' into fix/vite-dev-server-win-optimize-devs
JessicaSachs Oct 1, 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
15 changes: 12 additions & 3 deletions npm/vite-dev-server/src/startServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,21 @@ const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOption
// Ask vite to pre-optimize all dependencies of the specs
finalConfig.optimizeDeps = finalConfig.optimizeDeps || {}

// pre-optimizea all the specs
// pre-optimize all the specs
if ((options.specs && options.specs.length)) {
finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)]
// fix: we must preserve entries configured on target project
const existingOptimizeDepsEntries = finalConfig.optimizeDeps.entries

if (existingOptimizeDepsEntries) {
finalConfig.optimizeDeps.entries = [...existingOptimizeDepsEntries, ...options.specs.map((spec) => spec.relative)]
} else {
finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)]
}

// only optimize a supportFile is it is not false or undefined
if (supportFile) {
finalConfig.optimizeDeps.entries.push(supportFile)
// fix: on windows we need to replace backslashes with slashes
finalConfig.optimizeDeps.entries.push(supportFile.replace(/\\/g, '/'))
}
}

Expand Down