From 62b7917d2ca21794a54e69b9667b1ac8547b2ed3 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 30 Oct 2023 21:56:34 +0100 Subject: [PATCH] fix(nuxt): use payload url for isPrerendered, not current route (#24031) --- packages/nuxt/src/app/composables/payload.ts | 8 +- packages/nuxt/src/core/nitro.ts | 98 +++++++++++--------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/packages/nuxt/src/app/composables/payload.ts b/packages/nuxt/src/app/composables/payload.ts index 7220a36e53..886ba3958b 100644 --- a/packages/nuxt/src/app/composables/payload.ts +++ b/packages/nuxt/src/app/composables/payload.ts @@ -23,7 +23,7 @@ export function loadPayload (url: string, opts: LoadPayloadOptions = {}): Record if (payloadURL in cache) { return cache[payloadURL] } - cache[payloadURL] = isPrerendered().then((prerendered) => { + cache[payloadURL] = isPrerendered(url).then((prerendered) => { if (!prerendered) { cache[payloadURL] = null return null @@ -78,11 +78,7 @@ async function _importPayload (payloadURL: string) { export async function isPrerendered (url = useRoute().path) { // Note: Alternative for server is checking x-nitro-prerender header - const nuxtApp = useNuxtApp() - if (nuxtApp.payload.prerenderedAt) { - return true - } - if (!appManifest) { return false } + if (!appManifest) { return !!useNuxtApp().payload.prerenderedAt } const manifest = await getAppManifest() if (manifest.prerendered.includes(url)) { return true diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts index c51c829c48..46613fee20 100644 --- a/packages/nuxt/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -244,53 +244,55 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { } ) - nuxt.hook('nitro:build:before', async (nitro) => { - const routeRules = {} as Record - const _routeRules = nitro.options.routeRules - for (const key in _routeRules) { - if (key === '/__nuxt_error') { continue } - const filteredRules = Object.entries(_routeRules[key]) - .filter(([key, value]) => ['prerender', 'redirect'].includes(key) && value) - .map(([key, value]: any) => { - if (key === 'redirect') { - return [key, typeof value === 'string' ? value : value.to] - } - return [key, value] - }) - if (filteredRules.length > 0) { - routeRules[key] = Object.fromEntries(filteredRules) - } - } - - // Add pages prerendered but not covered by route rules - const prerenderedRoutes = new Set() - const routeRulesMatcher = toRouteMatcher( - createRadixRouter({ routes: routeRules }) - ) - const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? '/_payload.json' : '/_payload.js' - for (const route of nitro._prerenderedRoutes || []) { - if (!route.error && route.route.endsWith(payloadSuffix)) { - const url = route.route.slice(0, -payloadSuffix.length) || '/' - const rules = defu({}, ...routeRulesMatcher.matchAll(url).reverse()) as Record - if (!rules.prerender) { - prerenderedRoutes.add(url) + nuxt.hook('nitro:init', (nitro) => { + nitro.hooks.hook('rollup:before', async (nitro) => { + const routeRules = {} as Record + const _routeRules = nitro.options.routeRules + for (const key in _routeRules) { + if (key === '/__nuxt_error') { continue } + const filteredRules = Object.entries(_routeRules[key]) + .filter(([key, value]) => ['prerender', 'redirect'].includes(key) && value) + .map(([key, value]: any) => { + if (key === 'redirect') { + return [key, typeof value === 'string' ? value : value.to] + } + return [key, value] + }) + if (filteredRules.length > 0) { + routeRules[key] = Object.fromEntries(filteredRules) } } - } - const manifest = { - id: buildId, - timestamp: buildTimestamp, - matcher: exportMatcher(routeRulesMatcher), - prerendered: nuxt.options.dev ? [] : [...prerenderedRoutes] - } + // Add pages prerendered but not covered by route rules + const prerenderedRoutes = new Set() + const routeRulesMatcher = toRouteMatcher( + createRadixRouter({ routes: routeRules }) + ) + const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? '/_payload.json' : '/_payload.js' + for (const route of nitro._prerenderedRoutes || []) { + if (!route.error && route.route.endsWith(payloadSuffix)) { + const url = route.route.slice(0, -payloadSuffix.length) || '/' + const rules = defu({}, ...routeRulesMatcher.matchAll(url).reverse()) as Record + if (!rules.prerender) { + prerenderedRoutes.add(url) + } + } + } - await fsp.mkdir(join(tempDir, 'meta'), { recursive: true }) - await fsp.writeFile(join(tempDir, 'latest.json'), JSON.stringify({ - id: buildId, - timestamp: buildTimestamp - })) - await fsp.writeFile(join(tempDir, `meta/${buildId}.json`), JSON.stringify(manifest)) + const manifest = { + id: buildId, + timestamp: buildTimestamp, + matcher: exportMatcher(routeRulesMatcher), + prerendered: nuxt.options.dev ? [] : [...prerenderedRoutes] + } + + await fsp.mkdir(join(tempDir, 'meta'), { recursive: true }) + await fsp.writeFile(join(tempDir, 'latest.json'), JSON.stringify({ + id: buildId, + timestamp: buildTimestamp + })) + await fsp.writeFile(join(tempDir, `meta/${buildId}.json`), JSON.stringify(manifest)) + }) }) } @@ -457,6 +459,14 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { }) } + // Copy public assets after prerender so app manifest can be present + if (!nuxt.options.dev) { + nitro.hooks.hook('rollup:before', async (nitro) => { + await copyPublicAssets(nitro) + await nuxt.callHook('nitro:build:public-assets', nitro) + }) + } + // nuxt build/dev nuxt.hook('build:done', async () => { await nuxt.callHook('nitro:build:before', nitro) @@ -464,8 +474,6 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { await build(nitro) } else { await prepare(nitro) - await copyPublicAssets(nitro) - await nuxt.callHook('nitro:build:public-assets', nitro) await prerender(nitro) logger.restoreAll()