diff --git a/astro.config.mjs b/astro.config.mjs index 4fd67c6..ca82598 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,10 +1,9 @@ import { defineConfig } from "astro/config"; import solidJs from "@astrojs/solid-js"; -import { remarkAlert } from "remark-github-blockquote-alert"; -import sectionize from "@hbsnow/rehype-sectionize"; import mdx from "@astrojs/mdx"; import pagefind from "./pagefind"; +import { markdownConfig } from "./src/config/io/markdown.ts"; // https://astro.build/config export default defineConfig({ @@ -15,27 +14,5 @@ export default defineConfig({ mdx(), pagefind(), ], - markdown: { - syntaxHighlight: "shiki", - shikiConfig: { - theme: "material-theme-ocean", - wrap: true, - }, - remarkPlugins: [ - [ - remarkAlert, - { - legacyTitle: true, - }, - ], - ], - rehypePlugins: [ - [ - sectionize, - { - idPropertyName: "id", - }, - ], - ], - }, + markdown: markdownConfig, }); diff --git a/package.json b/package.json index 46a0d94..045ccee 100644 --- a/package.json +++ b/package.json @@ -12,28 +12,27 @@ "dependencies": { "@ark-ui/solid": "^3.5.0", "@astrojs/check": "^0.9.3", + "@astrojs/markdown-remark": "^5.1.0", "@astrojs/mdx": "^3.1.7", "@astrojs/solid-js": "^4.4.2", + "@hbsnow/rehype-sectionize": "^1.0.7", "@pagefind/default-ui": "^1.1.1", "@types/node": "^20.14.11", "astro": "^4.15.9", "astro-breadcrumbs": "^2.3.1", + "hast-util-from-html": "^2.0.3", "node": "npm:22.7.0", - "rehype-stringify": "^10.0.1", "remark-github-blockquote-alert": "^1.2.1", - "remark-parse": "^11.0.0", - "remark-rehype": "^11.1.1", "solid-devtools": "^0.30.1", "solid-js": "^1.8.18", "typescript": "^5.5.3", - "unified": "^11.0.5" + "unified": "^11.0.5", + "unist-util-visit": "^5.0.0" }, "devDependencies": { "@astrojs/ts-plugin": "^1.10.2", "@biomejs/biome": "^1.8.3", - "@hbsnow/rehype-sectionize": "^1.0.7", - "pagefind": "^1.1.1", - "shiki": "^1.11.0" + "pagefind": "^1.1.1" }, "packageManager": "yarn@4.5.0" } diff --git a/src/components/hooks/CreateQMLCodeButtons.astro b/src/components/hooks/CreateQMLCodeButtons.astro deleted file mode 100644 index 346181a..0000000 --- a/src/components/hooks/CreateQMLCodeButtons.astro +++ /dev/null @@ -1,107 +0,0 @@ ---- - ---- - diff --git a/src/components/hooks/TransformLinks.astro b/src/components/hooks/TransformLinks.astro deleted file mode 100644 index 7d7cca7..0000000 --- a/src/components/hooks/TransformLinks.astro +++ /dev/null @@ -1,66 +0,0 @@ ---- ---- - diff --git a/src/components/hooks/TransformMDCodeblocks.astro b/src/components/hooks/TransformMDCodeblocks.astro deleted file mode 100644 index 478cf3d..0000000 --- a/src/components/hooks/TransformMDCodeblocks.astro +++ /dev/null @@ -1,21 +0,0 @@ ---- ---- - diff --git a/src/components/type/Functions.astro b/src/components/type/Functions.astro index 11ee9dd..0371e67 100644 --- a/src/components/type/Functions.astro +++ b/src/components/type/Functions.astro @@ -3,18 +3,15 @@ import type { QMLTypeLinkObject, QuickshellFunction, } from "@config/io/types"; -import { - parseMarkdown, - getQMLTypeLink, -} from "@config/io/helpers"; +import { getQMLTypeLink } from "@config/io/helpers"; import { Tag } from "@icons"; +import TypeDetails from "./TypeDetails.astro" export interface Props { funcData: QuickshellFunction[]; - title: string; } -const { funcData, title } = Astro.props; +const { funcData } = Astro.props; ---