diff options
author | 2022-06-23 10:10:54 -0500 | |
---|---|---|
committer | 2022-06-23 10:10:54 -0500 | |
commit | 7373d61cdcaedd64bf5fd60521b157cfa4343558 (patch) | |
tree | db7ba617722a58e4b1b6437f1fcabd7f894fd8b1 /packages/integrations/vue | |
parent | 19cd962d0b3433ee305d1d277ca4fc3b93593558 (diff) | |
download | astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.tar.gz astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.tar.zst astro-7373d61cdcaedd64bf5fd60521b157cfa4343558.zip |
Enable named slots in renderers (#3652)
* feat: pass all slots to renderers
* refactor: pass `slots` as top-level props
* test: add named slot test for frameworks
* fix: nested hydration, slots that are not initially rendered
* test: add nested-recursive e2e test
* fix: render unmatched custom element children
* chore: update lockfile
* fix: unrendered slots for client:only
* fix(lit): ensure lit integration uses new slots API
* chore: add changeset
* chore: add changesets
* fix: lit slots
* feat: convert dash-case or snake_case slots to camelCase for JSX
* feat: remove tmpl special logic
* test: add slot components-in-markdown test
* refactor: prefer Object.entries.map() to for/of loop
Co-authored-by: Nate Moore <nate@astro.build>
Diffstat (limited to 'packages/integrations/vue')
-rw-r--r-- | packages/integrations/vue/client.js | 6 | ||||
-rw-r--r-- | packages/integrations/vue/server.js | 6 | ||||
-rw-r--r-- | packages/integrations/vue/static-html.js | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/packages/integrations/vue/client.js b/packages/integrations/vue/client.js index c6206fe51..648a69658 100644 --- a/packages/integrations/vue/client.js +++ b/packages/integrations/vue/client.js @@ -2,15 +2,15 @@ import { h, createSSRApp, createApp } from 'vue'; import StaticHtml from './static-html.js'; export default (element) => - (Component, props, children, { client }) => { + (Component, props, slotted, { client }) => { delete props['class']; if (!element.hasAttribute('ssr')) return; // Expose name on host component for Vue devtools const name = Component.name ? `${Component.name} Host` : undefined; const slots = {}; - if (children != null) { - slots.default = () => h(StaticHtml, { value: children }); + for (const [key, value] of Object.entries(slotted)) { + slots[key] = () => h(StaticHtml, { value, name: key === 'default' ? undefined : key }); } if (client === 'only') { const app = createApp({ name, render: () => h(Component, props, slots) }); diff --git a/packages/integrations/vue/server.js b/packages/integrations/vue/server.js index 1ae2b757b..883aa4de0 100644 --- a/packages/integrations/vue/server.js +++ b/packages/integrations/vue/server.js @@ -6,10 +6,10 @@ function check(Component) { return !!Component['ssrRender']; } -async function renderToStaticMarkup(Component, props, children) { +async function renderToStaticMarkup(Component, props, slotted) { const slots = {}; - if (children != null) { - slots.default = () => h(StaticHtml, { value: children }); + for (const [key, value] of Object.entries(slotted)) { + slots[key] = () => h(StaticHtml, { value, name: key === 'default' ? undefined : key }); } const app = createSSRApp({ render: () => h(Component, props, slots) }); const html = await renderToString(app); diff --git a/packages/integrations/vue/static-html.js b/packages/integrations/vue/static-html.js index ff1459b6f..a7f09eace 100644 --- a/packages/integrations/vue/static-html.js +++ b/packages/integrations/vue/static-html.js @@ -9,10 +9,11 @@ import { h, defineComponent } from 'vue'; const StaticHtml = defineComponent({ props: { value: String, + name: String, }, - setup({ value }) { + setup({ name, value }) { if (!value) return () => null; - return () => h('astro-fragment', { innerHTML: value }); + return () => h('astro-slot', { name, innerHTML: value }); }, }); |