diff options
| -rw-r--r-- | packages/astro/src/jsx/babel.ts | 37 | ||||
| -rw-r--r-- | packages/astro/src/runtime/server/jsx.ts | 10 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-jsx/index.ts | 2 |
3 files changed, 32 insertions, 17 deletions
diff --git a/packages/astro/src/jsx/babel.ts b/packages/astro/src/jsx/babel.ts index 6ce1dcf5c..8850dadc1 100644 --- a/packages/astro/src/jsx/babel.ts +++ b/packages/astro/src/jsx/babel.ts @@ -1,8 +1,8 @@ -import type { PluginMetadata } from '../vite-plugin-astro/types'; -import type { PluginObj, NodePath } from '@babel/core'; +import type { PluginObj } from '@babel/core'; import * as t from '@babel/types'; -import { pathToFileURL } from 'node:url' +import { pathToFileURL } from 'node:url'; import { ClientOnlyPlaceholder } from '../runtime/server/index.js'; +import type { PluginMetadata } from '../vite-plugin-astro/types'; function isComponent(tagName: string) { return ( @@ -24,7 +24,7 @@ function hasClientDirective(node: t.JSXElement) { function isClientOnlyComponent(node: t.JSXElement) { for (const attr of node.openingElement.attributes) { if (attr.type === 'JSXAttribute' && attr.name.type === 'JSXNamespacedName') { - return jsxAttributeToString(attr) === 'client:only'; + return jsxAttributeToString(attr) === 'client:only'; } } return false; @@ -52,7 +52,10 @@ function jsxAttributeToString(attr: t.JSXAttribute): string { return `${attr.name.name}`; } -function addClientMetadata(node: t.JSXElement, meta: { resolvedPath: string; path: string; name: string }) { +function addClientMetadata( + node: t.JSXElement, + meta: { resolvedPath: string; path: string; name: string } +) { const existingAttributes = node.openingElement.attributes.map((attr) => t.isJSXAttribute(attr) ? jsxAttributeToString(attr) : null ); @@ -81,11 +84,17 @@ function addClientMetadata(node: t.JSXElement, meta: { resolvedPath: string; pat } } -function addClientOnlyMetadata(node: t.JSXElement, meta: { resolvedPath: string; path: string; name: string }) { +function addClientOnlyMetadata( + node: t.JSXElement, + meta: { resolvedPath: string; path: string; name: string } +) { const tagName = getTagName(node); - node.openingElement = t.jsxOpeningElement(t.jsxIdentifier(ClientOnlyPlaceholder), node.openingElement.attributes) + node.openingElement = t.jsxOpeningElement( + t.jsxIdentifier(ClientOnlyPlaceholder), + node.openingElement.attributes + ); if (node.closingElement) { - node.closingElement = t.jsxClosingElement(t.jsxIdentifier(ClientOnlyPlaceholder)) + node.closingElement = t.jsxClosingElement(t.jsxIdentifier(ClientOnlyPlaceholder)); } const existingAttributes = node.openingElement.attributes.map((attr) => t.isJSXAttribute(attr) ? jsxAttributeToString(attr) : null @@ -132,7 +141,7 @@ export default function astroJSX(): PluginObj { clientOnlyComponents: [], hydratedComponents: [], scripts: [], - } + }; } path.node.body.splice( 0, @@ -142,7 +151,7 @@ export default function astroJSX(): PluginObj { t.stringLiteral('astro/jsx-runtime') ) ); - } + }, }, ImportDeclaration(path, state) { const source = path.node.source.value; @@ -210,8 +219,8 @@ export default function astroJSX(): PluginObj { (state.file.metadata as PluginMetadata).astro.clientOnlyComponents.push({ exportName: meta.name, specifier: meta.name, - resolvedPath - }) + resolvedPath, + }); meta.resolvedPath = resolvedPath; addClientOnlyMetadata(parentNode, meta); @@ -219,8 +228,8 @@ export default function astroJSX(): PluginObj { (state.file.metadata as PluginMetadata).astro.hydratedComponents.push({ exportName: meta.name, specifier: meta.name, - resolvedPath - }) + resolvedPath, + }); meta.resolvedPath = resolvedPath; addClientMetadata(parentNode, meta); diff --git a/packages/astro/src/runtime/server/jsx.ts b/packages/astro/src/runtime/server/jsx.ts index c1cad92a6..179fb172f 100644 --- a/packages/astro/src/runtime/server/jsx.ts +++ b/packages/astro/src/runtime/server/jsx.ts @@ -2,8 +2,8 @@ import { SSRResult } from '../../@types/astro.js'; import { AstroJSX, isVNode } from '../../jsx-runtime/index.js'; import { - escapeHTML, ClientOnlyPlaceholder, + escapeHTML, HTMLString, markHTMLString, renderComponent, @@ -108,7 +108,13 @@ export async function renderJSX(result: SSRResult, vnode: any): Promise<any> { slots ); } else { - output = await renderComponent(result, typeof vnode.type === 'function' ? vnode.type.name : vnode.type, vnode.type, props, slots); + output = await renderComponent( + result, + typeof vnode.type === 'function' ? vnode.type.name : vnode.type, + vnode.type, + props, + slots + ); } return markHTMLString(output); } diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts index dadd32313..a08460204 100644 --- a/packages/astro/src/vite-plugin-jsx/index.ts +++ b/packages/astro/src/vite-plugin-jsx/index.ts @@ -87,7 +87,7 @@ async function transformJSX({ }, }; } - + return { code: result.code || '', map: result.map, |