fix: exported links typing

cssninjaStudio · Mar 20, 2023 · 07b6e11 · 07b6e11
1 parent 6c14081
commit 07b6e11
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/client.d.ts b/client.d.ts
@@ -4,5 +4,6 @@ declare module 'unfonts.css' {
 }
 
 declare module 'unplugin-fonts/head' {
-  export const links: string[]
+  import { HtmlTagDescriptor } from "vite"
+  export const links: HtmlTagDescriptor[]
 }
diff --git a/examples/astro/src/pages/index.astro b/examples/astro/src/pages/index.astro
@@ -2,12 +2,16 @@
 import Unfont from 'unplugin-fonts/astro/component.astro';
 ---
 
-<div>
-  <Unfont />
-  <h1>Hello Astro!</h1>
-  <h2>I'm using a local font !</h2>
-  <a href="https://vitejs.dev/guide/features.html" target="_blank">Documentation</a>
-</div>
+<html>
+  <head>
+    <Unfont />
+  </head>
+  <body>
+    <h1>Hello Astro!</h1>
+    <h2>I'm using a local font !</h2>
+    <a href="https://vitejs.dev/guide/features.html" target="_blank">Documentation</a>
+  </body>
+</html>
 
 <style>
   body {

diff --git a/src/astro.ts b/src/astro.ts
@@ -1,25 +1,18 @@
+import type { AstroIntegration } from 'astro'
 import type { Options } from './types'
 import unplugin from '.'
-// import { getHeadLinkTags } from './loaders'
 
 export default function (options: Options) {
-  return {
+  return <AstroIntegration>{
     name: 'unplugin-fonts',
     hooks: {
-      'astro:config:setup': async (astro: any) => {
+      'astro:config:setup': async (astro) => {
         if (options?.custom)
           options.custom.stripPrefix = 'public/'
 
         astro.config.vite.plugins ||= []
         astro.config.vite.plugins.push(unplugin.vite(options))
 
-        // const links = getHeadLinkTags(options, astro.config.root.toString())
-        // const linksString: string[] = []
-
-        // for (const link of links) {
-        //   linksString.push(`<link ${Object.entries(link.attrs || {}).map(([key, value]) => `${key}="${value}"`).join(' ')} />`)
-        // }
-
         astro.injectScript('page-ssr', 'import "unfonts.css";')
       },
     },

diff --git a/src/astro/component.astro b/src/astro/component.astro
@@ -1,15 +1,12 @@
 ---
-import type { HtmlTagDescriptor } from 'vite'
-
-// @ts-ignore
 import { links } from 'unplugin-fonts/head'
 ---
 
 <>
-  {links.map((link: HtmlTagDescriptor) => {
+  {links.map((link) => {
     const attrs = link?.attrs || {}
     return (
       <link {...attrs} />
     )
   })}
-</>
+</>