From 7ab269a5f800cee41e8dda49404406be8928c3a4 Mon Sep 17 00:00:00 2001 From: jmlee2k Date: Mon, 11 Dec 2023 15:05:44 -0500 Subject: [PATCH 1/2] fix: public files map will be updated on add/unlink in windows --- packages/vite/src/node/server/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index b2632c841ca0ef..1d55f6bec9f694 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -645,10 +645,11 @@ export async function _createServer( file = normalizePath(file) await container.watchChange(file, { event: isUnlink ? 'delete' : 'create' }) - if (publicFiles && config.publicDir && file.startsWith(config.publicDir)) { - publicFiles[isUnlink ? 'delete' : 'add']( - file.slice(config.publicDir.length), - ) + if (config.publicDir && publicFiles) { + const publicDir = normalizePath(config.publicDir) + if (file.startsWith(publicDir)) { + publicFiles[isUnlink ? 'delete' : 'add'](file.slice(publicDir.length)) + } } await handleFileAddUnlink(file, server, isUnlink) await onHMRUpdate(file, true) From 776c386bd38ce9970f05f97edecacc73e7d6353a Mon Sep 17 00:00:00 2001 From: jmlee2k Date: Mon, 11 Dec 2023 16:54:24 -0500 Subject: [PATCH 2/2] precomputed normalized public dir --- packages/vite/src/node/server/index.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 1d55f6bec9f694..35a4fb02a9149a 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -641,14 +641,17 @@ export async function _createServer( } } + const normalizedPublicDir = normalizePath(config.publicDir) + const onFileAddUnlink = async (file: string, isUnlink: boolean) => { file = normalizePath(file) await container.watchChange(file, { event: isUnlink ? 'delete' : 'create' }) if (config.publicDir && publicFiles) { - const publicDir = normalizePath(config.publicDir) - if (file.startsWith(publicDir)) { - publicFiles[isUnlink ? 'delete' : 'add'](file.slice(publicDir.length)) + if (file.startsWith(normalizedPublicDir)) { + publicFiles[isUnlink ? 'delete' : 'add']( + file.slice(normalizedPublicDir.length), + ) } } await handleFileAddUnlink(file, server, isUnlink)