mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-22 13:45:18 +00:00
fix(nuxt): remove unused prop in NuxtTeleportIslandComponent
(#27093)
This commit is contained in:
parent
4bf6060db6
commit
a4d0958727
@ -27,14 +27,6 @@ export default defineComponent({
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
/**
|
|
||||||
* ONLY used in dev mode since we use build:manifest result in production
|
|
||||||
* do not pass any value in production
|
|
||||||
*/
|
|
||||||
rootDir: {
|
|
||||||
type: String,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
setup (props, { slots }) {
|
setup (props, { slots }) {
|
||||||
const nuxtApp = useNuxtApp()
|
const nuxtApp = useNuxtApp()
|
||||||
|
@ -13,12 +13,6 @@ import { isVue } from '../core/utils'
|
|||||||
|
|
||||||
interface ServerOnlyComponentTransformPluginOptions {
|
interface ServerOnlyComponentTransformPluginOptions {
|
||||||
getComponents: () => Component[]
|
getComponents: () => Component[]
|
||||||
/**
|
|
||||||
* passed down to `NuxtTeleportIslandComponent`
|
|
||||||
* should be done only in dev mode as we use build:manifest result in production
|
|
||||||
*/
|
|
||||||
rootDir?: string
|
|
||||||
isDev?: boolean
|
|
||||||
/**
|
/**
|
||||||
* allow using `nuxt-client` attribute on components
|
* allow using `nuxt-client` attribute on components
|
||||||
*/
|
*/
|
||||||
@ -43,7 +37,6 @@ function wrapWithVForDiv (code: string, vfor: string): string {
|
|||||||
|
|
||||||
export const islandsTransform = createUnplugin((options: ServerOnlyComponentTransformPluginOptions, meta) => {
|
export const islandsTransform = createUnplugin((options: ServerOnlyComponentTransformPluginOptions, meta) => {
|
||||||
const isVite = meta.framework === 'vite'
|
const isVite = meta.framework === 'vite'
|
||||||
const { isDev, rootDir } = options
|
|
||||||
return {
|
return {
|
||||||
name: 'server-only-component-transform',
|
name: 'server-only-component-transform',
|
||||||
enforce: 'pre',
|
enforce: 'pre',
|
||||||
@ -115,7 +108,7 @@ export const islandsTransform = createUnplugin((options: ServerOnlyComponentTran
|
|||||||
startTag = startTag.replaceAll(EXTRACTED_ATTRS_RE, '')
|
startTag = startTag.replaceAll(EXTRACTED_ATTRS_RE, '')
|
||||||
}
|
}
|
||||||
|
|
||||||
s.appendLeft(startingIndex + loc[0].start, `<NuxtTeleportIslandComponent${attributeToString(wrapperAttributes)} to="${node.name}-${uid}" ${rootDir && isDev ? `root-dir="${rootDir}"` : ''} :nuxt-client="${attributeValue}">`)
|
s.appendLeft(startingIndex + loc[0].start, `<NuxtTeleportIslandComponent${attributeToString(wrapperAttributes)} to="${node.name}-${uid}" :nuxt-client="${attributeValue}">`)
|
||||||
s.overwrite(startingIndex + loc[0].start, startingIndex + loc[0].end, startTag)
|
s.overwrite(startingIndex + loc[0].start, startingIndex + loc[0].end, startTag)
|
||||||
s.appendRight(startingIndex + loc[1].end, '</NuxtTeleportIslandComponent>')
|
s.appendRight(startingIndex + loc[1].end, '</NuxtTeleportIslandComponent>')
|
||||||
}
|
}
|
||||||
|
@ -260,8 +260,6 @@ export default defineNuxtModule<ComponentsOptions>({
|
|||||||
if (isServer) {
|
if (isServer) {
|
||||||
config.plugins.push(islandsTransform.vite({
|
config.plugins.push(islandsTransform.vite({
|
||||||
getComponents,
|
getComponents,
|
||||||
rootDir: nuxt.options.rootDir,
|
|
||||||
isDev: nuxt.options.dev,
|
|
||||||
selectiveClient,
|
selectiveClient,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
@ -23,11 +23,9 @@ const pluginWebpack = islandsTransform.raw({
|
|||||||
selectiveClient: true,
|
selectiveClient: true,
|
||||||
}, { framework: 'webpack', webpack: { compiler: {} as any } })
|
}, { framework: 'webpack', webpack: { compiler: {} as any } })
|
||||||
|
|
||||||
const viteTransform = async (source: string, id: string, isDev = false, selectiveClient = false) => {
|
const viteTransform = async (source: string, id: string, selectiveClient = false) => {
|
||||||
const vitePlugin = islandsTransform.raw({
|
const vitePlugin = islandsTransform.raw({
|
||||||
getComponents,
|
getComponents,
|
||||||
rootDir: '/root',
|
|
||||||
isDev,
|
|
||||||
selectiveClient,
|
selectiveClient,
|
||||||
}, { framework: 'vite' }) as Plugin
|
}, { framework: 'vite' }) as Plugin
|
||||||
|
|
||||||
@ -193,7 +191,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
<slot v-else-if="test" />
|
<slot v-else-if="test" />
|
||||||
<slot v-else />
|
<slot v-else />
|
||||||
</template>
|
</template>
|
||||||
`, 'WithVif.vue', false, true)
|
`, 'WithVif.vue', true)
|
||||||
|
|
||||||
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
||||||
"<script setup lang="ts">
|
"<script setup lang="ts">
|
||||||
@ -214,44 +212,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
|
|
||||||
describe('nuxt-client', () => {
|
describe('nuxt-client', () => {
|
||||||
describe('vite', () => {
|
describe('vite', () => {
|
||||||
it('test transform with vite in dev', async () => {
|
it('test transform with vite', async () => {
|
||||||
const result = await viteTransform(`<template>
|
|
||||||
<div>
|
|
||||||
<!-- should not be wrapped by NuxtTeleportIslandComponent -->
|
|
||||||
<HelloWorld />
|
|
||||||
<!-- should be wrapped by NuxtTeleportIslandComponent with a rootDir attr -->
|
|
||||||
<HelloWorld nuxt-client />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import HelloWorld from './HelloWorld.vue'
|
|
||||||
</script>
|
|
||||||
`, 'hello.server.vue', true, true)
|
|
||||||
|
|
||||||
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
|
||||||
"<template>
|
|
||||||
<div>
|
|
||||||
<!-- should not be wrapped by NuxtTeleportIslandComponent -->
|
|
||||||
<HelloWorld />
|
|
||||||
<!-- should be wrapped by NuxtTeleportIslandComponent with a rootDir attr -->
|
|
||||||
<NuxtTeleportIslandComponent to="HelloWorld-ZsRS8qEyqK" root-dir="/root" :nuxt-client="true"><HelloWorld /></NuxtTeleportIslandComponent>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { vforToArray as __vforToArray } from '#app/components/utils'
|
|
||||||
import NuxtTeleportIslandComponent from '#app/components/nuxt-teleport-island-component'
|
|
||||||
import NuxtTeleportSsrSlot from '#app/components/nuxt-teleport-island-slot'
|
|
||||||
import HelloWorld from './HelloWorld.vue'
|
|
||||||
</script>
|
|
||||||
"
|
|
||||||
`)
|
|
||||||
// root-dir prop should never be used in production
|
|
||||||
expect(result).toContain('root-dir="/root"')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('test transform with vite in prod', async () => {
|
|
||||||
const result = await viteTransform(`<template>
|
const result = await viteTransform(`<template>
|
||||||
<div>
|
<div>
|
||||||
<HelloWorld />
|
<HelloWorld />
|
||||||
@ -262,7 +223,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import HelloWorld from './HelloWorld.vue'
|
import HelloWorld from './HelloWorld.vue'
|
||||||
</script>
|
</script>
|
||||||
`, 'hello.server.vue', false, true)
|
`, 'hello.server.vue', true)
|
||||||
|
|
||||||
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
||||||
"<template>
|
"<template>
|
||||||
@ -280,9 +241,6 @@ describe('islandTransform - server and island components', () => {
|
|||||||
</script>
|
</script>
|
||||||
"
|
"
|
||||||
`)
|
`)
|
||||||
|
|
||||||
// root-dir prop should never be used in production
|
|
||||||
expect(result).not.toContain('root-dir="')
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('test dynamic nuxt-client', async () => {
|
it('test dynamic nuxt-client', async () => {
|
||||||
@ -298,7 +256,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
|
|
||||||
const nuxtClient = false
|
const nuxtClient = false
|
||||||
</script>
|
</script>
|
||||||
`, 'hello.server.vue', false, true)
|
`, 'hello.server.vue', true)
|
||||||
|
|
||||||
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
||||||
"<template>
|
"<template>
|
||||||
@ -333,7 +291,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
|
|
||||||
const nuxtClient = false
|
const nuxtClient = false
|
||||||
</script>
|
</script>
|
||||||
`, 'hello.server.vue', false, false)
|
`, 'hello.server.vue', false)
|
||||||
|
|
||||||
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
expect(normalizeLineEndings(result)).toMatchInlineSnapshot(`
|
||||||
"<template>
|
"<template>
|
||||||
@ -363,7 +321,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
`, 'hello.server.vue', false, true)
|
`, 'hello.server.vue', true)
|
||||||
|
|
||||||
expect(result).toMatchInlineSnapshot(`
|
expect(result).toMatchInlineSnapshot(`
|
||||||
"<script setup>
|
"<script setup>
|
||||||
@ -389,7 +347,7 @@ describe('islandTransform - server and island components', () => {
|
|||||||
<HelloWorld v-else nuxt-client />
|
<HelloWorld v-else nuxt-client />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
`, 'hello.server.vue', false, true)
|
`, 'hello.server.vue', true)
|
||||||
|
|
||||||
expect(result).toMatchInlineSnapshot(`
|
expect(result).toMatchInlineSnapshot(`
|
||||||
"<script setup>
|
"<script setup>
|
||||||
|
Loading…
Reference in New Issue
Block a user