Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-31 07:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vite): avoid creating server for production build (#5941)

Browse Source
This commit is contained in:
Anthony Fu 2022-07-17 22:17:07 +08:00 committed by GitHub
parent 02598fba56
commit 4abcfb6bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/vite/src/client.ts
View File

@ -60,25 +60,27 @@ export async function buildClient (ctx: ViteBuildContext) {
await ctx.nuxt.callHook('vite:extendConfig', clientConfig, { isClient: true, isServer: false }) await ctx.nuxt.callHook('vite:extendConfig', clientConfig, { isClient: true, isServer: false })
const viteServer = await vite.createServer(clientConfig) if (ctx.nuxt.options.dev) {
ctx.clientServer = viteServer // Dev
await ctx.nuxt.callHook('vite:serverCreated', viteServer, { isClient: true, isServer: false }) const viteServer = await vite.createServer(clientConfig)
ctx.clientServer = viteServer
await ctx.nuxt.callHook('vite:serverCreated', viteServer, { isClient: true, isServer: false })
const viteMiddleware: Connect.NextHandleFunction = (req, res, next) => { const viteMiddleware: Connect.NextHandleFunction = (req, res, next) => {
// Workaround: vite devmiddleware modifies req.url // Workaround: vite devmiddleware modifies req.url
const originalURL = req.url const originalURL = req.url
viteServer.middlewares.handle(req, res, (err) => { viteServer.middlewares.handle(req, res, (err) => {
req.url = originalURL req.url = originalURL
next(err) next(err)
})
}
await ctx.nuxt.callHook('server:devMiddleware', viteMiddleware)
ctx.nuxt.hook('close', async () => {
await viteServer.close()
}) })
} } else {
await ctx.nuxt.callHook('server:devMiddleware', viteMiddleware) // Build
ctx.nuxt.hook('close', async () => {
await viteServer.close()
})
if (!ctx.nuxt.options.dev) {
const start = Date.now() const start = Date.now()
await vite.build(clientConfig) await vite.build(clientConfig)
await ctx.nuxt.callHook('build:resources', wpfs) await ctx.nuxt.callHook('build:resources', wpfs)

10
packages/vite/src/vite.ts
View File

@ -101,15 +101,6 @@ export async function bundle (nuxt: Nuxt) {
if (!nuxt.options.dev) { if (!nuxt.options.dev) {
ctx.config.server.hmr = false ctx.config.server.hmr = false
ctx.config.server.watch = undefined ctx.config.server.watch = undefined
// TODO: Workaround for vite watching tsconfig changes
// https://github.com/nuxt/framework/pull/5875
ctx.config.plugins.push({
name: 'nuxt:close-vite-watcher',
configureServer (server) {
return server?.watcher?.close()
}
})
} }
await nuxt.callHook('vite:extend', ctx) await nuxt.callHook('vite:extend', ctx)
@ -129,6 +120,7 @@ export async function bundle (nuxt: Nuxt) {
.then(() => logger.info(`Vite ${env.isClient ? 'client' : 'server'} warmed up in ${Date.now() - start}ms`)) .then(() => logger.info(`Vite ${env.isClient ? 'client' : 'server'} warmed up in ${Date.now() - start}ms`))
.catch(logger.error) .catch(logger.error)
}) })
await buildClient(ctx) await buildClient(ctx)
await buildServer(ctx) await buildServer(ctx)
} }