diff options
| -rw-r--r-- | .changeset/flat-ads-lay.md | 5 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-jsx/tag.ts | 45 |
2 files changed, 36 insertions, 14 deletions
diff --git a/.changeset/flat-ads-lay.md b/.changeset/flat-ads-lay.md new file mode 100644 index 000000000..a5d2a7e69 --- /dev/null +++ b/.changeset/flat-ads-lay.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix warning when using hooks inside the react components not exported as a function declaration diff --git a/packages/astro/src/vite-plugin-jsx/tag.ts b/packages/astro/src/vite-plugin-jsx/tag.ts index 12bb3bcdd..9b3491361 100644 --- a/packages/astro/src/vite-plugin-jsx/tag.ts +++ b/packages/astro/src/vite-plugin-jsx/tag.ts @@ -55,21 +55,38 @@ export default function tagExportsWithRenderer({ if (node.exportKind === 'type') return; if (node.type === 'ExportAllDeclaration') return; - if (node.type === 'ExportNamedDeclaration') { - if (t.isFunctionDeclaration(node.declaration)) { - if (node.declaration.id?.name) { - const id = node.declaration.id.name; - const tags = state.get('astro:tags') ?? []; - state.set('astro:tags', [...tags, id]); - } + const addTag = (id: string) => { + const tags = state.get('astro:tags') ?? []; + state.set('astro:tags', [...tags, id]); + } + + if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') { + if (t.isIdentifier(node.declaration)) { + addTag(node.declaration.name); } - } else if (node.type === 'ExportDefaultDeclaration') { - if (t.isFunctionDeclaration(node.declaration)) { - if (node.declaration.id?.name) { - const id = node.declaration.id.name; - const tags = state.get('astro:tags') ?? []; - state.set('astro:tags', [...tags, id]); - } + else if (t.isFunctionDeclaration(node.declaration) && node.declaration.id?.name) { + addTag(node.declaration.id.name); + } + else if (t.isVariableDeclaration(node.declaration)) { + node.declaration.declarations?.forEach(declaration => { + if (t.isArrowFunctionExpression(declaration.init) && t.isIdentifier(declaration.id)) { + addTag(declaration.id.name); + } + }); + } + else if (t.isObjectExpression(node.declaration)) { + node.declaration.properties?.forEach(property => { + if (t.isProperty(property) && t.isIdentifier(property.key)) { + addTag(property.key.name); + } + }); + } + else if (t.isExportNamedDeclaration(node)) { + node.specifiers.forEach(specifier => { + if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) { + addTag(specifier.local.name); + } + }); } } }, |