Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-25 07:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): add baseURL to island fetch requests (#22009)

Browse Source
This commit is contained in:
Julien Huang 2023-07-18 17:07:35 +02:00 committed by GitHub
parent 4b6f3e1ba1
commit f4ec04f520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/nuxt/src/app/components/nuxt-island.ts
View File

@ -4,13 +4,13 @@ import { hash } from 'ohash'
import { appendResponseHeader } from 'h3' import { appendResponseHeader } from 'h3'
import { useHead } from '@unhead/vue' import { useHead } from '@unhead/vue'
import { randomUUID } from 'uncrypto' import { randomUUID } from 'uncrypto'
import { withQuery } from 'ufo' import { joinURL, withQuery } from 'ufo'
import type { FetchResponse } from 'ofetch' import type { FetchResponse } from 'ofetch'
// eslint-disable-next-line import/no-restricted-paths // eslint-disable-next-line import/no-restricted-paths
import type { NuxtIslandResponse } from '../../core/runtime/nitro/renderer' import type { NuxtIslandResponse } from '../../core/runtime/nitro/renderer'
import { getFragmentHTML, getSlotProps } from './utils' import { getFragmentHTML, getSlotProps } from './utils'
import { useNuxtApp } from '#app/nuxt' import { useNuxtApp, useRuntimeConfig } from '#app/nuxt'
import { useRequestEvent } from '#app/composables/ssr' import { useRequestEvent } from '#app/composables/ssr'
const pKey = '_islandPromises' const pKey = '_islandPromises'
@ -39,6 +39,7 @@ export default defineComponent({
} }
}, },
async setup (props, { slots }) { async setup (props, { slots }) {
const config = useRuntimeConfig()
const nuxtApp = useNuxtApp() const nuxtApp = useNuxtApp()
const hashId = computed(() => hash([props.name, props.props, props.context])) const hashId = computed(() => hash([props.name, props.props, props.context]))
const instance = getCurrentInstance()! const instance = getCurrentInstance()!
@ -105,7 +106,8 @@ export default defineComponent({
appendResponseHeader(event, 'x-nitro-prerender', url) appendResponseHeader(event, 'x-nitro-prerender', url)
} }
// TODO: Validate response // TODO: Validate response
const r = await eventFetch(withQuery(url, { // $fetch handles the app.baseURL in dev
const r = await eventFetch(withQuery(process.dev && process.client ? url : joinURL(config.app.baseURL ?? '', url), {
...props.context, ...props.context,
props: props.props ? JSON.stringify(props.props) : undefined props: props.props ? JSON.stringify(props.props) : undefined
})) }))

11
test/basic.test.ts
View File

@ -1751,6 +1751,17 @@ describe('component islands', () => {
await page.close() await page.close()
}) })
it.skipIf(isDev())('should not render an error when having a baseURL', async () => {
process.env.NUXT_APP_BASE_URL = '/foo/'
await startServer()
const result = await fetch('/foo/islands')
expect(result.status).toBe(200)
process.env.NUXT_APP_BASE_URL = undefined
await startServer()
})
}) })
describe.runIf(isDev() && !isWebpack)('vite plugins', () => { describe.runIf(isDev() && !isWebpack)('vite plugins', () => {