From 199d44624a6107631fe8fc23f4a975c2be1693f7 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 12 Apr 2022 16:06:04 +0100 Subject: [PATCH 1/7] fix(nitro): add back `nitro:generate` hook --- packages/bridge/src/nitro.ts | 1 + packages/nuxt3/src/core/nitro.ts | 1 + packages/schema/src/types/hooks.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/bridge/src/nitro.ts b/packages/bridge/src/nitro.ts index 4a37520fabf..a808cafb701 100644 --- a/packages/bridge/src/nitro.ts +++ b/packages/bridge/src/nitro.ts @@ -269,6 +269,7 @@ export async function setupNitroBridge () { nuxt.hook('build:done', async () => { if (nuxt.options._prepare) { return } await writeDocumentTemplate(nuxt) + await nuxt.callHook('nitro:generate', nitro) if (nuxt.options.dev) { await build(nitro) await waitUntilCompile diff --git a/packages/nuxt3/src/core/nitro.ts b/packages/nuxt3/src/core/nitro.ts index 2c43c169fcd..596e01d40fe 100644 --- a/packages/nuxt3/src/core/nitro.ts +++ b/packages/nuxt3/src/core/nitro.ts @@ -141,6 +141,7 @@ export async function initNitro (nuxt: Nuxt) { // nuxt build/dev nuxt.hook('build:done', async () => { await writeDocumentTemplate(nuxt) + await nuxt.callHook('nitro:generate', nitro) if (nuxt.options.dev) { await build(nitro) } else { diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts index 00d141ac456..714fdfd94d4 100644 --- a/packages/schema/src/types/hooks.ts +++ b/packages/schema/src/types/hooks.ts @@ -101,6 +101,7 @@ export interface NuxtHooks { // nitropack 'nitro:config': (nitroConfig: NitroConfig) => HookResult 'nitro:init': (nitro: Nitro) => HookResult + 'nitro:generate': (nitro: Nitro) => HookResult // @nuxt/cli 'generate:cache:ignore': (ignore: string[]) => HookResult From 6a99ca37eb6db212f94190e0f2e801fe533fbc67 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 1 May 2022 10:00:47 +0200 Subject: [PATCH 2/7] fix: use `nitro:generate` hook for vite workarounds --- packages/vite/src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index cb2f14b8476..2872ff95959 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -89,7 +89,7 @@ export async function buildServer (ctx: ViteBuildContext) { await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) // TODO: Do we still need this? - ctx.nuxt.hook('build:done', async () => { + ctx.nuxt.hook('nitro:generate', async () => { const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client') // Remove public files that have been duplicated into buildAssetsDir From 0f20a9c167c331adea08b82666e1b630fb5d7657 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 1 May 2022 10:01:49 +0200 Subject: [PATCH 3/7] fix: remove comment --- packages/vite/src/server.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 2872ff95959..43462da91c2 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -88,7 +88,6 @@ export async function buildServer (ctx: ViteBuildContext) { await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) - // TODO: Do we still need this? ctx.nuxt.hook('nitro:generate', async () => { const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client') From 6c795093d6de2eb3c756cb7b9eb6267762775593 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 2 May 2022 21:05:26 +0100 Subject: [PATCH 4/7] fix: only call `nitro:generate` in build mode --- packages/nuxt/src/core/nitro.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 0b3302b651f..3ff803ba1d2 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -139,10 +139,10 @@ export async function initNitro (nuxt: Nuxt) { // nuxt build/dev nuxt.hook('build:done', async () => { - await nuxt.callHook('nitro:generate', nitro) if (nuxt.options.dev) { await build(nitro) } else { + await nuxt.callHook('nitro:generate', nitro) await prepare(nitro) await copyPublicAssets(nitro) await prerender(nitro) From 792993c4750227332c577703a6f43bde11482e7d Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 2 May 2022 22:07:18 +0200 Subject: [PATCH 5/7] rename hook to `nitro:_build` --- packages/nuxt/src/core/nitro.ts | 2 +- packages/schema/src/types/hooks.ts | 2 +- packages/vite/src/server.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 3ff803ba1d2..113acb00d8a 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -142,7 +142,7 @@ export async function initNitro (nuxt: Nuxt) { if (nuxt.options.dev) { await build(nitro) } else { - await nuxt.callHook('nitro:generate', nitro) + await nuxt.callHook('nitro:_build', nitro) await prepare(nitro) await copyPublicAssets(nitro) await prerender(nitro) diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts index 528849fb03c..14dd1bc08ae 100644 --- a/packages/schema/src/types/hooks.ts +++ b/packages/schema/src/types/hooks.ts @@ -101,7 +101,7 @@ export interface NuxtHooks { // nitropack 'nitro:config': (nitroConfig: NitroConfig) => HookResult 'nitro:init': (nitro: Nitro) => HookResult - 'nitro:generate': (nitro: Nitro) => HookResult + 'nitro:_build': (nitro: Nitro) => HookResult // @nuxt/cli 'generate:cache:ignore': (ignore: string[]) => HookResult diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 43462da91c2..0a96ee959c4 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -88,7 +88,7 @@ export async function buildServer (ctx: ViteBuildContext) { await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) - ctx.nuxt.hook('nitro:generate', async () => { + ctx.nuxt.hook('nitro:_build', async () => { const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client') // Remove public files that have been duplicated into buildAssetsDir From 76f82350a2db0f78ae4ed7fab4b141d95874ad1d Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 2 May 2022 21:11:57 +0100 Subject: [PATCH 6/7] fix: use `nitro:build:before` --- packages/nuxt/src/core/nitro.ts | 2 +- packages/schema/src/types/hooks.ts | 2 +- packages/vite/src/server.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 113acb00d8a..7acb8f99865 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -142,7 +142,7 @@ export async function initNitro (nuxt: Nuxt) { if (nuxt.options.dev) { await build(nitro) } else { - await nuxt.callHook('nitro:_build', nitro) + await nuxt.callHook('nitro:build:before', nitro) await prepare(nitro) await copyPublicAssets(nitro) await prerender(nitro) diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts index 14dd1bc08ae..9eeccfbc12b 100644 --- a/packages/schema/src/types/hooks.ts +++ b/packages/schema/src/types/hooks.ts @@ -101,7 +101,7 @@ export interface NuxtHooks { // nitropack 'nitro:config': (nitroConfig: NitroConfig) => HookResult 'nitro:init': (nitro: Nitro) => HookResult - 'nitro:_build': (nitro: Nitro) => HookResult + 'nitro:build:before': (nitro: Nitro) => HookResult // @nuxt/cli 'generate:cache:ignore': (ignore: string[]) => HookResult diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 0a96ee959c4..09d9ed63b79 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -88,7 +88,7 @@ export async function buildServer (ctx: ViteBuildContext) { await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) - ctx.nuxt.hook('nitro:_build', async () => { + ctx.nuxt.hook('nitro:build:before', async () => { const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client') // Remove public files that have been duplicated into buildAssetsDir From 23898bf89bf572d2bef2a99fc927945c92ebb99b Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 2 May 2022 22:13:42 +0200 Subject: [PATCH 7/7] move dev guard --- packages/nuxt/src/core/nitro.ts | 2 +- packages/vite/src/server.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index 7acb8f99865..77bfcbbb0c3 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -139,10 +139,10 @@ export async function initNitro (nuxt: Nuxt) { // nuxt build/dev nuxt.hook('build:done', async () => { + await nuxt.callHook('nitro:build:before', nitro) if (nuxt.options.dev) { await build(nitro) } else { - await nuxt.callHook('nitro:build:before', nitro) await prepare(nitro) await copyPublicAssets(nitro) await prerender(nitro) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 09d9ed63b79..cf0204d2cd1 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -89,6 +89,9 @@ export async function buildServer (ctx: ViteBuildContext) { await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) ctx.nuxt.hook('nitro:build:before', async () => { + if (ctx.nuxt.options.dev) { + return + } const clientDist = resolve(ctx.nuxt.options.buildDir, 'dist/client') // Remove public files that have been duplicated into buildAssetsDir