From 14148543e1416c072364b43a00229301316d8cd1 Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Thu, 2 Nov 2023 15:46:46 +0100 Subject: [PATCH 1/2] fix: apply post hooks after serving .html files --- packages/vite/src/node/preview.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/preview.ts b/packages/vite/src/node/preview.ts index 77b8b0687eea59..b2daa58ab5fa09 100644 --- a/packages/vite/src/node/preview.ts +++ b/packages/vite/src/node/preview.ts @@ -192,8 +192,8 @@ export async function preview( app.use(previewBase, viteAssetMiddleware) - // html fallback if (config.appType === 'spa' || config.appType === 'mpa') { + // html fallback app.use( previewBase, htmlFallbackMiddleware( @@ -202,15 +202,14 @@ export async function preview( previewBase !== '/', ), ) + // transform index.html + app.use(previewBase, indexHtmlMiddleware(distDir, server)) } // apply post server hooks from plugins postHooks.forEach((fn) => fn && fn()) if (config.appType === 'spa' || config.appType === 'mpa') { - // transform index.html - app.use(previewBase, indexHtmlMiddleware(distDir, server)) - // handle 404s app.use(previewBase, notFoundMiddleware()) } From 47d7da66539b15e29b7433521f50f0ed29d7b1f2 Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Thu, 2 Nov 2023 16:20:36 +0100 Subject: [PATCH 2/2] chore: algin dev --- packages/vite/src/node/server/index.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 9fb7c201a93633..7dd5c89b13bfee 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -712,9 +712,11 @@ export async function _createServer( middlewares.use(serveRawFsMiddleware(server)) middlewares.use(serveStaticMiddleware(root, server)) - // html fallback if (config.appType === 'spa' || config.appType === 'mpa') { + // html fallback middlewares.use(htmlFallbackMiddleware(root, config.appType === 'spa')) + // transform index.html + middlewares.use(indexHtmlMiddleware(root, server)) } // run post config hooks @@ -723,9 +725,6 @@ export async function _createServer( postHooks.forEach((fn) => fn && fn()) if (config.appType === 'spa' || config.appType === 'mpa') { - // transform index.html - middlewares.use(indexHtmlMiddleware(root, server)) - // handle 404s middlewares.use(notFoundMiddleware()) }