From 4341dab7418df32a11e92441c6cf23467decff40 Mon Sep 17 00:00:00 2001 From: radishzzz Date: Mon, 13 Jan 2025 22:03:57 +0000 Subject: [PATCH] fix: incorrect configuration --- astro.config.ts | 115 +++++++++++++++++++------------- package.json | 5 +- pnpm-lock.yaml | 159 +++++++++++++++++++++++++++----------------- src/config/index.ts | 2 +- tsconfig.json | 7 +- uno.config.ts | 9 ++- 6 files changed, 183 insertions(+), 114 deletions(-) diff --git a/astro.config.ts b/astro.config.ts index 35d3b5d..a863443 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -1,65 +1,38 @@ +import type { ThemeConfig } from './src/types' import mdx from '@astrojs/mdx' import sitemap from '@astrojs/sitemap' import swup from '@swup/astro' import compress from 'astro-compress' import robotsTxt from 'astro-robots-txt' import { defineConfig } from 'astro/config' +// Rehype import rehypeAutolinkHeadings from 'rehype-autolink-headings' +import rehypeExternalLinks from 'rehype-external-links' import rehypeKatex from 'rehype-katex' +import rehypePrettyCode from 'rehype-pretty-code' import rehypeSlug from 'rehype-slug' +// Remark +import remarkDirective from 'remark-directive' +import remarkDirectiveRehype from 'remark-directive-rehype' +import remarkGithubAdmonitions from 'remark-github-admonitions-to-directives' import remarkMath from 'remark-math' +import remarkSectionize from 'remark-sectionize' +// import UnoCSS from 'unocss/astro' import { themeConfig } from './src/config' +const { url }: { url: ThemeConfig['site']['url'] } = themeConfig.site + export default defineConfig({ - site: themeConfig.site.url, + site: url, base: '/', - trailingSlash: 'always', // whether the URL ends with a slash - markdown: { - remarkPlugins: [remarkMath], - rehypePlugins: [ - rehypeKatex, - rehypeSlug, - [rehypeAutolinkHeadings, { - behavior: 'append', - properties: { - className: ['anchor'], - }, - content: { - type: 'element', - tagName: 'span', - properties: { - 'className': ['anchor-icon'], - 'data-pagefind-ignore': true, - }, - children: [ - { - type: 'text', - value: '#', - }, - ], - }, - }], - ], - shikiConfig: { - theme: 'github-dark', - wrap: true, - }, - }, + trailingSlash: 'always', integrations: [ - UnoCSS({ - injectReset: true, - }), + UnoCSS({ injectReset: true }), mdx(), sitemap(), robotsTxt(), - compress({ - CSS: true, - HTML: true, - Image: true, - JavaScript: true, - SVG: true, - }), + compress(), swup({ theme: false, animationClass: 'transition-swup-', @@ -71,7 +44,59 @@ export default defineConfig({ updateBodyClass: true, }), ], - devToolbar: { - enabled: false, + markdown: { + remarkPlugins: [ + remarkMath, + remarkReadingTime, + remarkExcerpt, + remarkGithubAdmonitions, + remarkDirective, + remarkDirectiveRehype, + remarkSectionize, + parseDirectiveNode, + ], + rehypePlugins: [ + rehypeKatex, + rehypeSlug, + rehypePrettyCode, + [ + rehypeComponents, + { + components: { + github: GithubCardComponent, + note: (x: any, y: any) => AdmonitionComponent(x, y, 'note'), + tip: (x: any, y: any) => AdmonitionComponent(x, y, 'tip'), + important: (x: any, y: any) => AdmonitionComponent(x, y, 'important'), + caution: (x: any, y: any) => AdmonitionComponent(x, y, 'caution'), + warning: (x: any, y: any) => AdmonitionComponent(x, y, 'warning'), + }, + }, + ], + [ + rehypeAutolinkHeadings, + { + behavior: 'append', + properties: { + className: ['anchor'], + }, + content: { + type: 'element', + tagName: 'span', + properties: { + 'className': ['anchor-icon'], + 'data-pagefind-ignore': true, + }, + children: [{ type: 'text', value: '#' }], + }, + }, + ], + [ + rehypeExternalLinks, + { + target: '_blank', + rel: ['nofollow', 'noopener', 'noreferrer'], + }, + ], + ], }, }) diff --git a/package.json b/package.json index 242e9e3..e8035a1 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,11 @@ "@astrojs/rss": "^4.0.11", "@astrojs/sitemap": "^3.2.1", "@swup/astro": "^1.5.0", - "astro": "^5.1.5", + "astro": "^5.1.6", "astro-compress": "^2.3.6", "astro-robots-txt": "^1.0.0", "astro-seo": "^0.8.4", + "markdown-it": "^14.1.0", "overlayscrollbars": "^2.10.1", "photoswipe": "^5.4.4", "reading-time": "^1.5.0", @@ -39,7 +40,7 @@ "remark-sectionize": "^2.1.0", "sanitize-html": "^2.14.0", "sharp": "^0.33.5", - "shiki": "^1.26.1", + "shiki": "^1.26.2", "typescript": "~5.7.3", "unist-util-visit": "^5.0.0", "vite": "^6.0.7" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5147a0..084e039 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 0.9.4(typescript@5.7.3) '@astrojs/mdx': specifier: ^4.0.5 - version: 4.0.5(astro@5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0)) + version: 4.0.5(astro@5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0)) '@astrojs/rss': specifier: ^4.0.11 version: 4.0.11 @@ -24,8 +24,8 @@ importers: specifier: ^1.5.0 version: 1.5.0 astro: - specifier: ^5.1.5 - version: 5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + specifier: ^5.1.6 + version: 5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) astro-compress: specifier: ^2.3.6 version: 2.3.6(@types/node@22.10.5)(jiti@2.4.2)(rollup@2.79.2)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) @@ -35,6 +35,9 @@ importers: astro-seo: specifier: ^0.8.4 version: 0.8.4(typescript@5.7.3) + markdown-it: + specifier: ^14.1.0 + version: 14.1.0 overlayscrollbars: specifier: ^2.10.1 version: 2.10.1 @@ -58,7 +61,7 @@ importers: version: 7.0.1 rehype-pretty-code: specifier: ^0.14.0 - version: 0.14.0(shiki@1.26.1) + version: 0.14.0(shiki@1.26.2) rehype-slug: specifier: ^6.0.0 version: 6.0.0 @@ -84,8 +87,8 @@ importers: specifier: ^0.33.5 version: 0.33.5 shiki: - specifier: ^1.26.1 - version: 1.26.1 + specifier: ^1.26.2 + version: 1.26.2 typescript: specifier: ~5.7.3 version: 5.7.3 @@ -1663,23 +1666,23 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.26.1': - resolution: {integrity: sha512-yeo7sG+WZQblKPclUOKRPwkv1PyoHYkJ4gP9DzhFJbTdueKR7wYTI1vfF/bFi1NTgc545yG/DzvVhZgueVOXMA==} + '@shikijs/core@1.26.2': + resolution: {integrity: sha512-ORyu3MrY7dCC7FDLDsFSkBM9b/AT9/Y8rH+UQ07Rtek48pp0ZhQOMPTKolqszP4bBCas6FqTZQYt18BBamVl/g==} - '@shikijs/engine-javascript@1.26.1': - resolution: {integrity: sha512-CRhA0b8CaSLxS0E9A4Bzcb3LKBNpykfo9F85ozlNyArxjo2NkijtiwrJZ6eHa+NT5I9Kox2IXVdjUsP4dilsmw==} + '@shikijs/engine-javascript@1.26.2': + resolution: {integrity: sha512-ngkIu9swLVo9Zt5QBtz5Sk08vmPcwuj01r7pPK/Zjmo2U2WyKMK4WMUMmkdQiUacdcLth0zt8u1onp4zhkFXKQ==} - '@shikijs/engine-oniguruma@1.26.1': - resolution: {integrity: sha512-F5XuxN1HljLuvfXv7d+mlTkV7XukC1cawdtOo+7pKgPD83CAB1Sf8uHqP3PK0u7njFH0ZhoXE1r+0JzEgAQ+kg==} + '@shikijs/engine-oniguruma@1.26.2': + resolution: {integrity: sha512-mlN7Qrs+w60nKrd7at7XkXSwz6728Pe34taDmHrG6LRHjzCqQ+ysg+/AT6/D2LMk0s2lsr71DjpI73430QP4/w==} - '@shikijs/langs@1.26.1': - resolution: {integrity: sha512-oz/TQiIqZejEIZbGtn68hbJijAOTtYH4TMMSWkWYozwqdpKR3EXgILneQy26WItmJjp3xVspHdiUxUCws4gtuw==} + '@shikijs/langs@1.26.2': + resolution: {integrity: sha512-o5cdPycB2Kw3IgncHxWopWPiTkjAj7dG01fLkkUyj3glb5ftxL/Opecq9F54opMlrgXy7ZIqDERvFLlUzsCOuA==} - '@shikijs/themes@1.26.1': - resolution: {integrity: sha512-JDxVn+z+wgLCiUhBGx2OQrLCkKZQGzNH3nAxFir4PjUcYiyD8Jdms9izyxIogYmSwmoPTatFTdzyrRKbKlSfPA==} + '@shikijs/themes@1.26.2': + resolution: {integrity: sha512-y4Pn6PM5mODz/e3yF6jAUG7WLKJzqL2tJ5qMJCUkMUB1VRgtQVvoa1cHh7NScryGXyrYGJ8nPnRDhdv2rw0xpA==} - '@shikijs/types@1.26.1': - resolution: {integrity: sha512-d4B00TKKAMaHuFYgRf3L0gwtvqpW4hVdVwKcZYbBfAAQXspgkbWqnFfuFl3MDH6gLbsubOcr+prcnsqah3ny7Q==} + '@shikijs/types@1.26.2': + resolution: {integrity: sha512-PO2jucx2FIdlLBPYbIUlMtWSLs5ulcRcuV93cR3T65lkK5SJP4MGBRt9kmWGXiQc0f7+FHj/0BEawditZcI/fQ==} '@shikijs/vscode-textmate@10.0.1': resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==} @@ -2190,8 +2193,8 @@ packages: astro-seo@0.8.4: resolution: {integrity: sha512-Ou1vzQSXAxa0K8rtNtXNvSpYqOGEgMhh0immMxJeXmbVZac3UKCNWAoXWyOQDFYsZvBugCRSg0N1phBqPMVgCw==} - astro@5.1.5: - resolution: {integrity: sha512-Q9TE4aNlczxVoPDoXR3UcjLezL+70z0KbTRXovE4ybpx0mgNL1jsmSWtF3UFXB5+GTf9JK7om5fbIaaMReKcUg==} + astro@5.1.6: + resolution: {integrity: sha512-LpTazCIW6syxFePi65gg2ptqqC2kR+PDRym3V23hEQj5yCf+T0t5v9qtp3fW0/+6G+JvP0EprCfCRTt7h/hexg==} engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0'} hasBin: true @@ -3794,6 +3797,9 @@ packages: lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + linkify-it@5.0.0: + resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + lint-staged@15.3.0: resolution: {integrity: sha512-vHFahytLoF2enJklgtOtCtIjZrKD/LoxlaUusd5nh7dWv/dkKQJY74ndFSzxCdv7g0ueGg1ORgTSt4Y9LPZn9A==} engines: {node: '>=18.12.0'} @@ -3882,6 +3888,10 @@ packages: resolution: {integrity: sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==} engines: {node: '>=16'} + markdown-it@14.1.0: + resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} + hasBin: true + markdown-table@3.0.4: resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==} @@ -3929,8 +3939,8 @@ packages: mdast-util-mdx-expression@2.0.1: resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==} - mdast-util-mdx-jsx@3.1.3: - resolution: {integrity: sha512-bfOjvNt+1AcbPLTFMFWY149nJz0OjmewJs3LQQ5pIyVGxP4CdOqNVJL6kTaM5c68p8q82Xv3nCyFfUnuEcH3UQ==} + mdast-util-mdx-jsx@3.2.0: + resolution: {integrity: sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==} mdast-util-mdx@3.0.0: resolution: {integrity: sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==} @@ -3962,6 +3972,9 @@ packages: mdn-data@2.12.2: resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==} + mdurl@2.0.0: + resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} + merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -4226,8 +4239,8 @@ packages: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} engines: {node: '>=18'} - oniguruma-to-es@0.10.0: - resolution: {integrity: sha512-zapyOUOCJxt+xhiNRPPMtfJkHGsZ98HHB9qJEkdT8BGytO/+kpe4m1Ngf0MzbzTmhacn11w9yGeDP6tzDhnCdg==} + oniguruma-to-es@1.0.0: + resolution: {integrity: sha512-kihvp0O4lFwf5tZMkfanwQLIZ9ORe9OeOFgZonH0BQeThgwfJiaZFeOfvvJVnJIM9TiVmx0RDD35hUJDR0++rQ==} open@8.4.2: resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} @@ -4671,6 +4684,10 @@ packages: property-information@6.5.0: resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==} + punycode.js@2.3.1: + resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} + engines: {node: '>=6'} + punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -5040,8 +5057,8 @@ packages: engines: {node: '>=4'} hasBin: true - shiki@1.26.1: - resolution: {integrity: sha512-Gqg6DSTk3wYqaZ5OaYtzjcdxcBvX5kCy24yvRJEgjT5U+WHlmqCThLuBUx0juyxQBi+6ug53IGeuQS07DWwpcw==} + shiki@1.26.2: + resolution: {integrity: sha512-iP7u2NA9A6JwRRCkIUREEX2cMhlYV5EBmbbSlfSRvPThwca8HBRbVkWuNWW+kw9+i6BSUZqqG6YeUs5dC2SjZw==} side-channel-list@1.0.0: resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==} @@ -5374,6 +5391,9 @@ packages: engines: {node: '>=14.17'} hasBin: true + uc.micro@2.1.0: + resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} + ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} @@ -6007,7 +6027,7 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.1 remark-smartypants: 3.0.2 - shiki: 1.26.1 + shiki: 1.26.2 unified: 11.0.5 unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 @@ -6016,12 +6036,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@astrojs/mdx@4.0.5(astro@5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0))': + '@astrojs/mdx@4.0.5(astro@5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0))': dependencies: '@astrojs/markdown-remark': 6.0.1 '@mdx-js/mdx': 3.1.0(acorn@8.14.0) acorn: 8.14.0 - astro: 5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + astro: 5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) es-module-lexer: 1.6.0 estree-util-visit: 2.0.0 hast-util-to-html: 9.0.4 @@ -7409,35 +7429,35 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.30.1': optional: true - '@shikijs/core@1.26.1': + '@shikijs/core@1.26.2': dependencies: - '@shikijs/engine-javascript': 1.26.1 - '@shikijs/engine-oniguruma': 1.26.1 - '@shikijs/types': 1.26.1 + '@shikijs/engine-javascript': 1.26.2 + '@shikijs/engine-oniguruma': 1.26.2 + '@shikijs/types': 1.26.2 '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4 hast-util-to-html: 9.0.4 - '@shikijs/engine-javascript@1.26.1': + '@shikijs/engine-javascript@1.26.2': dependencies: - '@shikijs/types': 1.26.1 + '@shikijs/types': 1.26.2 '@shikijs/vscode-textmate': 10.0.1 - oniguruma-to-es: 0.10.0 + oniguruma-to-es: 1.0.0 - '@shikijs/engine-oniguruma@1.26.1': + '@shikijs/engine-oniguruma@1.26.2': dependencies: - '@shikijs/types': 1.26.1 + '@shikijs/types': 1.26.2 '@shikijs/vscode-textmate': 10.0.1 - '@shikijs/langs@1.26.1': + '@shikijs/langs@1.26.2': dependencies: - '@shikijs/types': 1.26.1 + '@shikijs/types': 1.26.2 - '@shikijs/themes@1.26.1': + '@shikijs/themes@1.26.2': dependencies: - '@shikijs/types': 1.26.1 + '@shikijs/types': 1.26.2 - '@shikijs/types@1.26.1': + '@shikijs/types@1.26.2': dependencies: '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4 @@ -8139,7 +8159,7 @@ snapshots: '@playform/pipe': 0.1.2 '@types/csso': 5.0.4 '@types/html-minifier-terser': 7.0.2 - astro: 5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + astro: 5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) commander: 13.0.0 csso: 5.0.5 deepmerge-ts: 7.1.3 @@ -8214,7 +8234,7 @@ snapshots: - prettier-plugin-astro - typescript - astro@5.1.5(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0): + astro@5.1.6(@types/node@22.10.5)(jiti@2.4.2)(lightningcss@1.28.2)(rollup@2.79.2)(terser@5.37.0)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0): dependencies: '@astrojs/compiler': 2.10.3 '@astrojs/internal-helpers': 0.4.2 @@ -8259,7 +8279,7 @@ snapshots: prompts: 2.4.2 rehype: 13.0.2 semver: 7.6.3 - shiki: 1.26.1 + shiki: 1.26.2 tinyexec: 0.3.2 tsconfck: 3.1.4(typescript@5.7.3) ultrahtml: 1.5.3 @@ -9756,7 +9776,7 @@ snapshots: estree-util-is-identifier-name: 3.0.0 hast-util-whitespace: 3.0.0 mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.1.3 + mdast-util-mdx-jsx: 3.2.0 mdast-util-mdxjs-esm: 2.0.1 property-information: 6.5.0 space-separated-tokens: 2.0.2 @@ -9790,7 +9810,7 @@ snapshots: estree-util-is-identifier-name: 3.0.0 hast-util-whitespace: 3.0.0 mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.1.3 + mdast-util-mdx-jsx: 3.2.0 mdast-util-mdxjs-esm: 2.0.1 property-information: 6.5.0 space-separated-tokens: 2.0.2 @@ -10227,6 +10247,10 @@ snapshots: lines-and-columns@1.2.4: {} + linkify-it@5.0.0: + dependencies: + uc.micro: 2.1.0 + lint-staged@15.3.0: dependencies: chalk: 5.4.1 @@ -10332,6 +10356,15 @@ snapshots: markdown-extensions@2.0.0: {} + markdown-it@14.1.0: + dependencies: + argparse: 2.0.1 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.1.0 + markdown-table@3.0.4: {} math-intrinsics@1.1.0: {} @@ -10466,7 +10499,7 @@ snapshots: transitivePeerDependencies: - supports-color - mdast-util-mdx-jsx@3.1.3: + mdast-util-mdx-jsx@3.2.0: dependencies: '@types/estree-jsx': 1.0.5 '@types/hast': 3.0.4 @@ -10487,7 +10520,7 @@ snapshots: dependencies: mdast-util-from-markdown: 2.0.2 mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.1.3 + mdast-util-mdx-jsx: 3.2.0 mdast-util-mdxjs-esm: 2.0.1 mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: @@ -10545,6 +10578,8 @@ snapshots: mdn-data@2.12.2: {} + mdurl@2.0.0: {} + merge-stream@2.0.0: {} merge2@1.4.1: {} @@ -11008,7 +11043,7 @@ snapshots: dependencies: mimic-function: 5.0.1 - oniguruma-to-es@0.10.0: + oniguruma-to-es@1.0.0: dependencies: emoji-regex-xs: 1.0.0 regex: 5.1.1 @@ -11422,6 +11457,8 @@ snapshots: property-information@6.5.0: {} + punycode.js@2.3.1: {} + punycode@2.3.1: {} queue-microtask@1.2.3: {} @@ -11599,13 +11636,13 @@ snapshots: hast-util-from-html: 2.0.3 unified: 11.0.5 - rehype-pretty-code@0.14.0(shiki@1.26.1): + rehype-pretty-code@0.14.0(shiki@1.26.2): dependencies: '@types/hast': 3.0.4 hast-util-to-string: 3.0.1 parse-numeric-range: 1.3.0 rehype-parse: 9.0.1 - shiki: 1.26.1 + shiki: 1.26.2 unified: 11.0.5 unist-util-visit: 5.0.0 @@ -11994,14 +12031,14 @@ snapshots: interpret: 1.4.0 rechoir: 0.6.2 - shiki@1.26.1: + shiki@1.26.2: dependencies: - '@shikijs/core': 1.26.1 - '@shikijs/engine-javascript': 1.26.1 - '@shikijs/engine-oniguruma': 1.26.1 - '@shikijs/langs': 1.26.1 - '@shikijs/themes': 1.26.1 - '@shikijs/types': 1.26.1 + '@shikijs/core': 1.26.2 + '@shikijs/engine-javascript': 1.26.2 + '@shikijs/engine-oniguruma': 1.26.2 + '@shikijs/langs': 1.26.2 + '@shikijs/themes': 1.26.2 + '@shikijs/types': 1.26.2 '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4 @@ -12364,6 +12401,8 @@ snapshots: typescript@5.7.3: {} + uc.micro@2.1.0: {} + ufo@1.5.4: {} ultrahtml@1.5.3: {} diff --git a/src/config/index.ts b/src/config/index.ts index e032464..b4d0f50 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -7,7 +7,7 @@ export const themeConfig: ThemeConfig = { subtitle: '再现版式之美', description: '一个优美的博客主题', author: 'radishzz', - url: 'http://localhost:4321/', + url: 'https://retypeset.netlify.app', favicon: '#', }, // SITE INFORMATION >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> END diff --git a/tsconfig.json b/tsconfig.json index 52157b6..f660573 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,16 +1,15 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "lib": ["esnext", "dom"], + "lib": ["ESNext", "DOM"], "baseUrl": ".", "paths": { "@/*": ["src/*"] } }, "include": [ - "src/**/*.astro", - "src/**/*.ts", - ".astro/types.d.ts" + ".astro/types.d.ts", + "src/**/*" ], "exclude": ["dist"] } diff --git a/uno.config.ts b/uno.config.ts index 7a5c5a4..d50fbed 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -1,3 +1,4 @@ +import type { Theme } from 'unocss/preset-uno' import type { ThemeConfig } from './src/types' import { defineConfig, @@ -41,8 +42,12 @@ export default defineConfig({ presetUno(), presetAttributify(), presetTypography({ cssExtend }), - presetTheme({ - theme: { dark }, + presetTheme({ + theme: { + dark: { + colors: dark, + }, + }, }), ], transformers: [