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(nuxt): pass event to useRuntimeConfig in Nuxt renderer #26058

Merged
merged 1 commit into from
Mar 4, 2024
Merged

fix(nuxt): pass event to useRuntimeConfig in Nuxt renderer #26058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nuxt/src/core/runtime/nitro/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default <NitroErrorHandler> async function errorhandler (error: H3Error,

// HTML response (via SSR)
const res = isRenderingError ? null : await useNitroApp().localFetch(
withQuery(joinURL(useRuntimeConfig().app.baseURL, '/__nuxt_error'), errorObject),
withQuery(joinURL(useRuntimeConfig(event).app.baseURL, '/__nuxt_error'), errorObject),
{
headers: { ...reqHeaders, 'x-nuxt-error': 'true' },
redirect: 'manual'
Expand Down
3 changes: 3 additions & 0 deletions packages/nuxt/src/core/runtime/nitro/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import { joinURL } from 'ufo'
import { useRuntimeConfig } from '#internal/nitro'

export function baseURL (): string {
// TODO: support passing event to `useRuntimeConfig`
return useRuntimeConfig().app.baseURL
}

export function buildAssetsDir (): string {
// TODO: support passing event to `useRuntimeConfig`
return useRuntimeConfig().app.buildAssetsDir as string
}

Expand All @@ -14,6 +16,7 @@ export function buildAssetsURL (...path: string[]): string {
}

export function publicAssetsURL (...path: string[]): string {
// TODO: support passing event to `useRuntimeConfig`
const app = useRuntimeConfig().app
const publicBase = app.cdnURL as string || app.baseURL
return path.length ? joinURL(publicBase, ...path) : publicBase
Expand Down
6 changes: 3 additions & 3 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 @@ -158,7 +158,7 @@ const getSPARenderer = lazyCachedFunction(async () => {
const result = await renderer.renderToString({})

const renderToString = (ssrContext: NuxtSSRContext) => {
const config = useRuntimeConfig()
const config = useRuntimeConfig(ssrContext.event)
ssrContext.modules = ssrContext.modules || new Set<string>()
ssrContext!.payload = {
_errors: {},
Expand Down Expand Up @@ -288,7 +288,7 @@ export default defineRenderHandler(async (event): Promise<Partial<RenderResponse
const ssrContext: NuxtSSRContext = {
url,
event,
runtimeConfig: useRuntimeConfig() as NuxtSSRContext['runtimeConfig'],
runtimeConfig: useRuntimeConfig(event) as NuxtSSRContext['runtimeConfig'],
noSSR:
!!(process.env.NUXT_NO_SSR) ||
event.context.nuxt?.noSSR ||
Expand All @@ -311,7 +311,7 @@ export default defineRenderHandler(async (event): Promise<Partial<RenderResponse

// Whether we are prerendering route
const _PAYLOAD_EXTRACTION = import.meta.prerender && process.env.NUXT_PAYLOAD_EXTRACTION && !ssrContext.noSSR && !isRenderingIsland
const payloadURL = _PAYLOAD_EXTRACTION ? joinURL(useRuntimeConfig().app.baseURL, url, process.env.NUXT_JSON_PAYLOADS ? '_payload.json' : '_payload.js') : undefined
const payloadURL = _PAYLOAD_EXTRACTION ? joinURL(ssrContext.runtimeConfig.app.baseURL, url, process.env.NUXT_JSON_PAYLOADS ? '_payload.json' : '_payload.js') : undefined
if (import.meta.prerender) {
ssrContext.payload.prerenderedAt = Date.now()
}
Expand Down