Skip to content

Commit 26b63cf

Browse files
committed
Upgrade to Astro 5.X
1 parent e05706c commit 26b63cf

34 files changed

+3585
-4104
lines changed

.eslintrc.cjs

-32
This file was deleted.

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,5 @@ All commands are run from the root of the project, from a terminal:
239239
- schema tags
240240
- automatically generated sidebar links
241241
- improved RSS and search metadata
242+
- 5.0.0: Major changes:
243+
- Upgrade to Astro 5.X

astro.config.mjs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineConfig } from 'astro/config';
2-
import tailwind from '@astrojs/tailwind';
32
import sitemap from '@astrojs/sitemap';
43
import mdx from '@astrojs/mdx';
4+
import tailwindcss from '@tailwindcss/vite'
55
import alpinejs from '@astrojs/alpinejs';
66
import robotsTxt from 'astro-robots-txt';
77
import remarkMath from 'remark-math';
@@ -17,14 +17,15 @@ import markdoc from "@astrojs/markdoc";
1717
// https://astro.build/config
1818
export default defineConfig({
1919
vite: {
20+
plugins: [tailwindcss()],
2021
ssr: {
2122
external: ['svgo'],
2223
noExternal: ['swiper', 'leaflet']
2324
}
2425
},
2526
site: 'https://hellotham.github.io',
2627
base: '/hello-astro/',
27-
integrations: [icon(), tailwind(), sitemap(), mdx(), alpinejs(), robotsTxt(), markdoc()],
28+
integrations: [icon(), sitemap(), mdx(), alpinejs(), robotsTxt(), markdoc()],
2829
markdown: {
2930
extendDefaultPlugins: true,
3031
remarkPlugins: [remarkReadingTime, remarkMath, remarkPlantUML, remarkDiagram, remarkEmoji],

eslint.config.mjs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import eslintPluginAstro from 'eslint-plugin-astro'
2+
import markdown from '@eslint/markdown'
3+
import unocss from '@unocss/eslint-config/flat'
4+
5+
export default [
6+
...eslintPluginAstro.configs['flat/recommended'],
7+
// ...eslintPluginAstro.configs['flat/jsx-a11y-recommended'],
8+
{
9+
files: ['**/*.md'],
10+
plugins: {
11+
markdown
12+
},
13+
language: 'markdown/commonmark',
14+
rules: {
15+
'markdown/no-html': 'error'
16+
}
17+
},
18+
unocss
19+
]

package.json

+35-37
Original file line numberDiff line numberDiff line change
@@ -16,58 +16,56 @@
1616
},
1717
"devDependencies": {
1818
"@akebifiky/remark-simple-plantuml": "^1.0.2",
19-
"@astrojs/alpinejs": "^0.4.0",
20-
"@astrojs/mdx": "^2.2.2",
21-
"@astrojs/sitemap": "^3.1.2",
22-
"@astrojs/tailwind": "^5.1.0",
19+
"@astrojs/alpinejs": "^0.4.3",
20+
"@astrojs/mdx": "^4.0.8",
21+
"@astrojs/sitemap": "^3.2.1",
2322
"@tailwindcss/aspect-ratio": "^0.4.2",
24-
"@tailwindcss/forms": "^0.5.7",
23+
"@tailwindcss/forms": "^0.5.10",
2524
"@tailwindcss/line-clamp": "^0.4.4",
26-
"@tailwindcss/typography": "^0.5.12",
27-
"@types/alpinejs": "^3.13.10",
28-
"@types/leaflet": "^1.9.8",
29-
"@typescript-eslint/parser": "^7.4.0",
30-
"alpinejs": "^3.13.7",
31-
"astro": "^4.5.12",
25+
"@tailwindcss/typography": "^0.5.16",
26+
"@types/alpinejs": "^3.13.11",
27+
"@types/leaflet": "^1.9.16",
28+
"@typescript-eslint/parser": "^8.24.1",
29+
"alpinejs": "^3.14.8",
30+
"astro": "^5.3.0",
3231
"astro-robots-txt": "^1.0.0",
33-
"eslint": "^8.57.0",
34-
"eslint-plugin-astro": "^0.33.1",
35-
"eslint-plugin-css": "^0.9.2",
36-
"eslint-plugin-jsx-a11y": "^6.8.0",
37-
"eslint-plugin-markdown": "^4.0.1",
38-
"eslint-plugin-mdx": "^3.1.5",
32+
"eslint": "^9.20.1",
33+
"eslint-plugin-astro": "^1.3.1",
34+
"eslint-plugin-css": "^0.11.0",
35+
"eslint-plugin-jsx-a11y": "^6.10.2",
36+
"eslint-plugin-markdown": "^5.1.0",
3937
"exifr": "^7.1.3",
4038
"mdast-util-to-string": "^4.0.0",
41-
"prettier": "^3.2.5",
39+
"prettier": "^3.5.1",
4240
"prettier-config-standard": "^7.0.0",
43-
"prettier-plugin-astro": "^0.13.0",
44-
"prettier-plugin-tailwindcss": "^0.5.13",
41+
"prettier-plugin-astro": "^0.14.1",
42+
"prettier-plugin-tailwindcss": "^0.6.11",
4543
"reading-time": "^1.5.0",
46-
"rehype-katex": "^7.0.0",
47-
"remark-emoji": "^4.0.1",
44+
"rehype-katex": "^7.0.1",
45+
"remark-emoji": "^5.0.1",
4846
"remark-math": "^6.0.0",
4947
"schema-dts": "^1.1.2",
50-
"tailwindcss": "^3.4.3",
51-
"typescript": "~5.4.3",
52-
"unist-util-visit": "^5.0.0",
53-
"vite": "^5.2.7"
48+
"typescript": "~5.7.3",
49+
"unist-util-visit": "^5.0.0"
5450
},
5551
"dependencies": {
56-
"@astrojs/check": "^0.5.10",
57-
"@astrojs/markdoc": "^0.9.3",
58-
"@astrojs/rss": "^4.0.5",
59-
"@iconify-json/bi": "^1.1.23",
60-
"@iconify-json/heroicons": "^1.1.20",
61-
"astro-icon": "^1.1.0",
62-
"astro-seo": "^0.8.3",
52+
"@astrojs/check": "^0.9.4",
53+
"@astrojs/markdoc": "^0.12.9",
54+
"@astrojs/rss": "^4.0.11",
55+
"@iconify-json/bi": "^1.2.2",
56+
"@iconify-json/heroicons": "^1.2.2",
57+
"@tailwindcss/vite": "^4.0.6",
58+
"astro-icon": "^1.1.5",
59+
"astro-seo": "^0.8.4",
6360
"hero-patterns": "^2.1.0",
64-
"katex": "^0.16.10",
61+
"katex": "^0.16.21",
6562
"leaflet": "^1.9.4",
6663
"lunr": "^2.3.9",
67-
"mermaid": "^10.9.0",
68-
"photoswipe": "^5.4.3",
64+
"mermaid": "^11.4.1",
65+
"photoswipe": "^5.4.4",
6966
"photoswipe-dynamic-caption-plugin": "^1.2.7",
70-
"swiper": "^11.1.0"
67+
"swiper": "^11.2.4",
68+
"tailwindcss": "^4.0.6"
7169
},
7270
"packageManager": "[email protected]+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589"
7371
}

0 commit comments

Comments
 (0)