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): respect baseUrl for client components within server components #25727

Merged
merged 11 commits into from
Mar 15, 2024
Merged

fix(nuxt): respect baseUrl for client components within server components #25727

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6cbfdac
add appBaseURL to dynamic client import
marccremer Feb 9, 2024
dee4281
use virutal files for url
marccremer Feb 9, 2024
4014c54
[autofix.ci] apply automated fixes
autofix-ci[bot] Feb 9, 2024
d9fcf4f
chore: add space
danielroe Feb 11, 2024
98f17dd
dont overwrite remote source
marccremer Feb 12, 2024
e89ee8b
Merge remote-tracking branch 'origin/nuxt_islands_baseUrl' into nuxt_…
marccremer Feb 12, 2024
60d615e
redo the changes:dont overwrite source
marccremer Feb 12, 2024
b198963
Merge remote-tracking branch 'origin/main' into nuxt_islands_baseUrl
danielroe Mar 15, 2024
f3530be
fix: set source to `appBaseURL` by default
danielroe Mar 15, 2024
fb3fdb6
chore: add back space
danielroe Mar 15, 2024
e41371b
[autofix.ci] apply automated fixes
autofix-ci[bot] Mar 15, 2024
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
4 changes: 2 additions & 2 deletions packages/nuxt/src/app/components/nuxt-island.ts
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ import { prerenderRoutes, useRequestEvent } from '../composables/ssr'
import { getFragmentHTML } from './utils'

// @ts-expect-error virtual file
import { remoteComponentIslands, selectiveClient } from '#build/nuxt.config.mjs'
import { appBaseURL, remoteComponentIslands, selectiveClient } from '#build/nuxt.config.mjs'

const pKey = '_islandPromises'
const SSR_UID_RE = /data-island-uid="([^"]*)"/
Expand All @@ -28,7 +28,7 @@ const getId = import.meta.client ? () => (id++).toString() : randomUUID

const components = import.meta.client ? new Map<string, Component>() : undefined

async function loadComponents (source = '/', paths: NuxtIslandResponse['components']) {
async function loadComponents (source = appBaseURL, paths: NuxtIslandResponse['components']) {
const promises = []
danielroe marked this conversation as resolved.
Show resolved Hide resolved

for (const component in paths) {
Expand Down