From d99386b3c3b5f9d8ad8401aec26b96f8771639f3 Mon Sep 17 00:00:00 2001
From: equt <17521736+equt@users.noreply.github.com>
Date: Tue, 15 Nov 2022 09:51:09 +0800
Subject: [PATCH 1/3] feat(astro): introduce `injects` option

This commit also marks the existing `injectReset` & `injectEntry` as
deprecated. Users with those options set should have no breaking changes
on their existing code, but only receive a warning via the linting tool.

close #1877
---
 packages/astro/src/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/astro/src/index.ts b/packages/astro/src/index.ts
index 307dc7163e..cf804105bb 100644
--- a/packages/astro/src/index.ts
+++ b/packages/astro/src/index.ts
@@ -8,14 +8,22 @@ export interface AstroIntegrationConfig<Theme extends {} = {}> extends VitePlugi
    * Include reset styles
    * When passing `true`, `@unocss/reset/tailwind.css` will be used
    * @default true
+   * @deprecated use `injects` instead
    */
   injectReset?: string | boolean
 
   /**
    * Inject UnoCSS entry import for every astro page
    * @default true
+   * @deprecated use `injects` instead
    */
   injectEntry?: boolean | string
+
+  /**
+   * Inject for every astro page, e.g., `['import "uno.css"']`
+   * @default []
+   */
+  injects?: ReadonlyArray<string>
 }
 
 export default function UnoCSSAstroIntegration<Theme extends {}>(
@@ -25,6 +33,7 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
   const {
     injectEntry = true,
     injectReset: includeReset = true,
+    injects: rawInjects = [],
   } = options
 
   return {
@@ -46,6 +55,8 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
             ? injectEntry
             : 'import "uno.css"')
         }
+        if (rawInjects.length !== 0)
+          injects.push(...rawInjects)
         if (injects?.length)
           injectScript('page-ssr', injects.join('\n'))
       },

From 4dfe1b1c04ca872791a5eac8f914b4540e703777 Mon Sep 17 00:00:00 2001
From: equt <17521736+equt@users.noreply.github.com>
Date: Fri, 18 Nov 2022 08:44:48 +0800
Subject: [PATCH 2/3] revert(astro): introduce `injects` option

This reverts commit d99386b3c3b5f9d8ad8401aec26b96f8771639f3.
---
 packages/astro/src/index.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/astro/src/index.ts b/packages/astro/src/index.ts
index cf804105bb..307dc7163e 100644
--- a/packages/astro/src/index.ts
+++ b/packages/astro/src/index.ts
@@ -8,22 +8,14 @@ export interface AstroIntegrationConfig<Theme extends {} = {}> extends VitePlugi
    * Include reset styles
    * When passing `true`, `@unocss/reset/tailwind.css` will be used
    * @default true
-   * @deprecated use `injects` instead
    */
   injectReset?: string | boolean
 
   /**
    * Inject UnoCSS entry import for every astro page
    * @default true
-   * @deprecated use `injects` instead
    */
   injectEntry?: boolean | string
-
-  /**
-   * Inject for every astro page, e.g., `['import "uno.css"']`
-   * @default []
-   */
-  injects?: ReadonlyArray<string>
 }
 
 export default function UnoCSSAstroIntegration<Theme extends {}>(
@@ -33,7 +25,6 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
   const {
     injectEntry = true,
     injectReset: includeReset = true,
-    injects: rawInjects = [],
   } = options
 
   return {
@@ -55,8 +46,6 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
             ? injectEntry
             : 'import "uno.css"')
         }
-        if (rawInjects.length !== 0)
-          injects.push(...rawInjects)
         if (injects?.length)
           injectScript('page-ssr', injects.join('\n'))
       },

From 6e59b610ea979456775413bfa4004acfa97728f3 Mon Sep 17 00:00:00 2001
From: equt <17521736+equt@users.noreply.github.com>
Date: Fri, 18 Nov 2022 08:48:19 +0800
Subject: [PATCH 3/3] feat(astro): add `injectExtra` option

---
 packages/astro/src/index.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/astro/src/index.ts b/packages/astro/src/index.ts
index 307dc7163e..80ce994693 100644
--- a/packages/astro/src/index.ts
+++ b/packages/astro/src/index.ts
@@ -16,6 +16,12 @@ export interface AstroIntegrationConfig<Theme extends {} = {}> extends VitePlugi
    * @default true
    */
   injectEntry?: boolean | string
+
+  /**
+   * Inject extra imports for every astro page
+   * @default []
+   */
+  injectExtra?: string[]
 }
 
 export default function UnoCSSAstroIntegration<Theme extends {}>(
@@ -25,6 +31,7 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
   const {
     injectEntry = true,
     injectReset: includeReset = true,
+    injectExtra = [],
   } = options
 
   return {
@@ -46,6 +53,8 @@ export default function UnoCSSAstroIntegration<Theme extends {}>(
             ? injectEntry
             : 'import "uno.css"')
         }
+        if (injectExtra.length > 0)
+          injects.push(...injectExtra)
         if (injects?.length)
           injectScript('page-ssr', injects.join('\n'))
       },