Skip to content

Commit ea2f6a4

Browse files
fix(vite-dev-server): windows supportFile + preserve optimize entries (#18286)
Co-authored-by: Jessica Sachs <jess@jessicasachs.io>
1 parent e1a3fa2 commit ea2f6a4

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

npm/vite-dev-server/src/startServer.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,21 @@ const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOption
5252
// Ask vite to pre-optimize all dependencies of the specs
5353
finalConfig.optimizeDeps = finalConfig.optimizeDeps || {}
5454

55-
// pre-optimizea all the specs
55+
// pre-optimize all the specs
5656
if ((options.specs && options.specs.length)) {
57-
finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)]
57+
// fix: we must preserve entries configured on target project
58+
const existingOptimizeDepsEntries = finalConfig.optimizeDeps.entries
59+
60+
if (existingOptimizeDepsEntries) {
61+
finalConfig.optimizeDeps.entries = [...existingOptimizeDepsEntries, ...options.specs.map((spec) => spec.relative)]
62+
} else {
63+
finalConfig.optimizeDeps.entries = [...options.specs.map((spec) => spec.relative)]
64+
}
65+
5866
// only optimize a supportFile is it is not false or undefined
5967
if (supportFile) {
60-
finalConfig.optimizeDeps.entries.push(supportFile)
68+
// fix: on windows we need to replace backslashes with slashes
69+
finalConfig.optimizeDeps.entries.push(supportFile.replace(/\\/g, '/'))
6170
}
6271
}
6372

0 commit comments

Comments
 (0)