feat: Support Astro v6

.changeset/dry-carpets-drive.md

@@ -0,0 +1,5 @@
+---
+"@studiocms/ui": patch
+---
+
+Adds a new `noInjectResetCSS` option to disable the reset styles

.changeset/lemon-countries-repeat.md

@@ -0,0 +1,5 @@
+---
+"@studiocms/ui": minor
+---
+
+Adds support for Astro v6.

docs/astro.config.mts

@@ -36,10 +36,17 @@ export default defineConfig({
 	},
 	env: {
 		schema: {
-			THUM_SECRET_KEY: envField.string({ access: 'secret', context: 'server', optional: true }),
+			THUM_SECRET_KEY: envField.string({
+				access: 'secret',
+				context: 'server',
+				optional: true,
+			}),
 		},
 	},
 	integrations: [
+		ui({
+			noInjectResetCSS: true,
+		}),
 		starlight({
 			title: 'StudioCMS UI',
 			description: 'The UI library for StudioCMS, available for Astro for all to use.',
@@ -59,14 +66,38 @@ export default defineConfig({
 			},
 			defaultLocale: 'root',
 			locales,
-			social: {
-				github: 'https://github.com/withstudiocms/ui',
-				discord: 'https://chat.studiocms.dev',
-				youtube: 'https://www.youtube.com/@StudioCMS',
-				'x.com': 'https://x.com/withstudiocms',
-				blueSky: 'https://bsky.app/profile/studiocms.dev',
-				patreon: 'https://patreon.com/StudioCMS',
-			},
+			social: [
+				{
+					href: 'https://github.com/withstudiocms/ui',
+					icon: 'github',
+					label: 'GitHub',
+				},
+				{
+					href: 'https://chat.studiocms.dev',
+					icon: 'discord',
+					label: 'Discord',
+				},
+				{
+					href: 'https://www.youtube.com/@StudioCMS',
+					icon: 'youtube',
+					label: 'YouTube',
+				},
+				{
+					href: 'https://x.com/withstudiocms',
+					icon: 'x.com',
+					label: 'X/Twitter',
+				},
+				{
+					href: 'https://bsky.app/profile/studiocms.dev',
+					icon: 'blueSky',
+					label: 'BlueSky',
+				},
+				{
+					href: 'https://opencollective.com/StudioCMS',
+					icon: 'openCollective',
+					label: 'Open Collective',
+				},
+			],
 			customCss: [
 				'@studiocms/ui/css/global.css',
 				'./src/styles/sponsorcolors.css',
@@ -197,6 +228,5 @@ export default defineConfig({
 				},
 			],
 		}),
-		ui(),
 	],
 });

docs/package.json

@@ -1,51 +1,46 @@
 {
-  "name": "docs",
-  "type": "module",
-  "version": "0.0.1",
-  "scripts": {
-    "dev": "astro dev",
-    "start": "pnpm dev",
-    "check": "astro check",
-    "build": "pnpm make-changelog && astro build",
-    "preview": "astro preview",
-    "astro": "astro",
-    "lunaria:build": "tsm ./scripts/lunaria.mts",
-    "make-changelog": "tsm --require=../scripts/filter-warnings.cjs ./scripts/changelog.ts"
-  },
-  "dependencies": {
-    "@11ty/eleventy-fetch": "^5.0.1",
-    "@astrojs/check": "catalog:",
-    "@astrojs/starlight": "0.30.0",
-    "@expressive-code/plugin-line-numbers": "^0.38.3",
-    "@fontsource-variable/fira-code": "^5.1.0",
-    "@fontsource-variable/onest": "catalog:",
-    "@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@4c8b9b0",
-    "@shikijs/colorized-brackets": "^1.24.0",
-    "@studiocms/ui": "workspace:*",
-    "@types/hast": "^3.0.4",
-    "@types/html-escaper": "^3.0.2",
-    "@types/md5": "^2.3.5",
-    "@types/mdast": "^4.0.4",
-    "@types/node": "catalog:",
-    "astro": "catalog:",
-    "astro-embed": "^0.9.0",
-    "expressive-code-twoslash": "^0.3.1",
-    "hast-util-to-string": "^3.0.1",
-    "hastscript": "^9.0.0",
-    "html-escaper": "^3.0.3",
-    "md5": "2.3.0",
-    "mdast-util-from-markdown": "^2.0.2",
-    "mdast-util-to-markdown": "^2.1.2",
-    "mdast-util-to-string": "^4.0.0",
-    "p-retry": "^6.2.1",
-    "rehype-autolink-headings": "^7.1.0",
-    "rehype-external-links": "^3.0.0",
-    "rehype-slug": "^6.0.0",
-    "sharp": "^0.33.5",
-    "starlight-package-managers": "^0.8.1",
-    "tsm": "^2.3.0",
-    "typescript": "catalog:",
-    "unist-util-visit": "^5.0.0",
-    "unified": "^11.0.5"
-  }
+	"name": "docs",
+	"type": "module",
+	"version": "0.0.1",
+	"scripts": {
+		"dev": "astro dev",
+		"start": "pnpm dev",
+		"check": "astro check",
+		"build": "pnpm make-changelog && astro build",
+		"preview": "astro preview",
+		"astro": "astro",
+		"lunaria:build": "tsm ./scripts/lunaria.mts",
+		"make-changelog": "tsm --require=../scripts/filter-warnings.cjs ./scripts/changelog.ts"
+	},
+	"dependencies": {
+		"@11ty/eleventy-fetch": "^5.0.1",
+		"@astrojs/check": "catalog:",
+		"@astrojs/starlight": "^0.38.1",
+		"@expressive-code/plugin-line-numbers": "^0.41.7",
+		"@fontsource-variable/fira-code": "^5.1.0",
+		"@fontsource-variable/onest": "catalog:",
+		"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@4c8b9b0",
+		"@shikijs/colorized-brackets": "^1.24.0",
+		"@studiocms/ui": "workspace:*",
+		"@types/hast": "^3.0.4",
+		"@types/md5": "^2.3.5",
+		"@types/mdast": "^4.0.4",
+		"@types/node": "catalog:",
+		"astro": "catalog:",
+		"astro-embed": "^0.12.0",
+		"expressive-code-twoslash": "^0.6.1",
+		"md5": "2.3.0",
+		"mdast-util-from-markdown": "^2.0.2",
+		"mdast-util-to-markdown": "^2.1.2",
+		"mdast-util-to-string": "^4.0.0",
+		"p-retry": "^6.2.1",
+		"rehype-external-links": "^3.0.0",
+		"rehype-slug": "^6.0.0",
+		"sharp": "^0.33.5",
+		"starlight-package-managers": "^0.8.1",
+		"tsm": "^2.3.0",
+		"typescript": "catalog:",
+		"unist-util-visit": "^5.0.0",
+		"unified": "^11.0.5"
+	}
 }

docs/src/content/docs/docs/components/progress.mdx

@@ -1,16 +1,12 @@
 ---
 title: Progress
-sidebar:
-  badge:
-    text: Updated!
-    variant: tip
 ---
 
-import { Tabs, TabItem } from '@astrojs/starlight/components';
-import PreviewCard from '~/components/PreviewCard.astro';
-import ProgressScript from '~/components/ProgressScript.astro';
-import { Progress } from 'studiocms:ui/components/progress';
-import { ProgressHelper } from 'studiocms:ui/components/progress/client';
+import { Tabs, TabItem } from "@astrojs/starlight/components";
+import PreviewCard from "~/components/PreviewCard.astro";
+import ProgressScript from "~/components/ProgressScript.astro";
+import { Progress } from "studiocms:ui/components/progress";
+import { ProgressHelper } from "studiocms:ui/components/progress/client";
 
 :::caution[Helper required]
 This component requires a **helper**. Make sure to read the documentation carefully so you know how to use it.
@@ -34,6 +30,7 @@ A progress bar, used to show the progress of a task.
 
     <Progress label="Example Progress Bar" id="progress" max={100} value={50} />
     ```
+
   </TabItem>
 </Tabs>
 
@@ -69,6 +66,7 @@ The value and max can be adjusted after the component has been initialized by us
       progress.getPercentage(); // 50
     </script>
     ```
+
   </TabItem>
 </Tabs>
 
@@ -107,6 +105,7 @@ The progress component can be colored with all the colors available in the theme
     <Progress label="Example Progress Bar - Info" id="progress-5" max={100} value={50} color="info" />
     <Progress label="Example Progress Bar - Monochrome" id="progress-6" max={100} value={50} color="monochrome" />
     ```
+
   </TabItem>
 </Tabs>