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: apply post hooks after serving .html files #14859

Closed
wants to merge 2 commits into from
Closed

fix: apply post hooks after serving .html files #14859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1414854
fix: apply post hooks after serving .html files
brillout Nov 2, 2023
47d7da6
chore: algin dev
brillout Nov 2, 2023
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
7 changes: 3 additions & 4 deletions packages/vite/src/node/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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())
}
Expand Down
7 changes: 3 additions & 4 deletions packages/vite/src/node/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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())
}
Expand Down