Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxt): disable payload extraction for spa generated pages #7535

Merged
merged 3 commits into from
Sep 15, 2022
Merged

fix(nuxt): disable payload extraction for spa generated pages #7535

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1efa318
fix(nuxt): disable payload extraction for spa generated pages
pi0 Sep 15, 2022
b3ebbf1
improve `noSSR` in ssrContext to handle NUXT_NO_SSR
pi0 Sep 15, 2022
c7df6cb
update var name
pi0 Sep 15, 2022
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
11 changes: 7 additions & 4 deletions packages/nuxt/src/core/runtime/nitro/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const getSPARenderer = lazyCachedFunction(async () => {
const PAYLOAD_CACHE = process.env.prerender ? new Map() : null // TODO: Use LRU cache
const PAYLOAD_URL_RE = /\/_payload(\.[a-zA-Z0-9]+)?.js(\?.*)?$/

const NO_SSR_ROUTES = new Set(['/index.html', '/200.html', '/404.html'])
const PRERENDER_NO_SSR_ROUTES = new Set(['/index.html', '/200.html', '/404.html'])

export default defineRenderHandler(async (event) => {
// Whether we're rendering an error page
Expand All @@ -132,14 +132,17 @@ export default defineRenderHandler(async (event) => {
req: event.req,
res: event.res,
runtimeConfig: useRuntimeConfig() as NuxtSSRContext['runtimeConfig'],
noSSR: !!(event.req.headers['x-nuxt-no-ssr']) || (process.env.prerender ? NO_SSR_ROUTES.has(url) : false),
noSSR:
!!(process.env.NUXT_NO_SSR) ||
!!(event.req.headers['x-nuxt-no-ssr']) ||
(process.env.prerender ? PRERENDER_NO_SSR_ROUTES.has(url) : false),
error: !!ssrError,
nuxt: undefined!, /* NuxtApp */
payload: (ssrError ? { error: ssrError } : {}) as NuxtSSRContext['payload']
}

// Whether we are prerendering route
const payloadURL = process.env.prerender ? joinURL(url, '_payload.js') : undefined
const payloadURL = (process.env.prerender && !ssrContext.noSSR) ? joinURL(url, '_payload.js') : undefined
if (process.env.prerender) {
ssrContext.payload.prerenderedAt = Date.now()
}
Expand Down Expand Up @@ -209,7 +212,7 @@ export default defineRenderHandler(async (event) => {
bodyAppend: normalizeChunks([
process.env.NUXT_NO_SCRIPTS
? undefined
: (process.env.prerender
: ((process.env.prerender && !ssrContext.noSSR)
? `<script type="module">import p from "${payloadURL}";window.__NUXT__={...p,...(${devalue(splitPayload(ssrContext).initial)})}</script>`
: `<script>window.__NUXT__=${devalue(ssrContext.payload)}</script>`
),
Expand Down