Skip to content

Commit ea2f93b

Browse files
Merge branch 'main' into build/update_latest
# Conflicts: # .github/workflows/ci.yml # AstroPaper-lighthouse-score.svg # CHANGELOG.md # README.md # package.json # pnpm-lock.yaml # src/config.ts # src/constants.ts # src/data/blog/_releases/astro-paper-5.md # src/data/blog/adding-new-post.md # src/data/blog/customizing-astropaper-theme-color-schemes.md # src/data/blog/dynamic-og-images.md # src/data/blog/examples/portfolio-website-development.md # src/data/blog/examples/tailwind-typography.md # src/data/blog/examples/terminal-development.md # src/data/blog/how-to-add-latex-equations-in-blog-posts.md # src/data/blog/how-to-configure-astropaper-theme.md # src/data/blog/how-to-integrate-giscus-comments.md # src/data/blog/how-to-update-dependencies.md # src/data/blog/setting-dates-via-git-hooks.md # src/pages/about.md # src/styles/global.css
2 parents e0f873d + e8bcc0d commit ea2f93b

30 files changed

Lines changed: 1650 additions & 824 deletions

astro.config.ts

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
import { defineConfig } from "astro/config";
1+
import { defineConfig, envField } from "astro/config";
22
import tailwindcss from "@tailwindcss/vite";
33
import sitemap from "@astrojs/sitemap";
44
import remarkToc from "remark-toc";
55
import remarkCollapse from "remark-collapse";
6+
import {
7+
transformerNotationDiff,
8+
transformerNotationHighlight,
9+
transformerNotationWordHighlight,
10+
} from "@shikijs/transformers";
11+
import { transformerFileName } from "./src/utils/transformers/fileName";
612
import { SITE } from "./src/config";
713

814
import react from "@astrojs/react";
@@ -18,23 +24,40 @@ export default defineConfig({
1824
shikiConfig: {
1925
// For more themes, visit https://shiki.style/themes
2026
themes: { light: "min-light", dark: "night-owl" },
21-
wrap: true,
27+
defaultColor: false,
28+
wrap: false,
29+
transformers: [
30+
transformerFileName({ style: "v2", hideDot: false }),
31+
transformerNotationHighlight(),
32+
transformerNotationWordHighlight(),
33+
transformerNotationDiff({ matchAlgorithm: "v3" }),
34+
],
2235
},
2336
},
2437
vite: {
38+
// eslint-disable-next-line
39+
// @ts-ignore
40+
// This will be fixed in Astro 6 with Vite 7 support
41+
// See: https://github.com/withastro/astro/issues/14030
2542
plugins: [tailwindcss()],
2643
optimizeDeps: {
2744
exclude: ["@resvg/resvg-js"],
2845
},
2946
},
3047
image: {
31-
// Used for all Markdown images; not configurable per-image
32-
// Used for all `<Image />` and `<Picture />` components unless overridden with a prop
33-
experimentalLayout: "responsive",
48+
responsiveStyles: true,
49+
layout: "constrained",
50+
},
51+
env: {
52+
schema: {
53+
PUBLIC_GOOGLE_SITE_VERIFICATION: envField.string({
54+
access: "public",
55+
context: "client",
56+
optional: true,
57+
}),
58+
},
3459
},
3560
experimental: {
36-
svg: true,
37-
responsiveImages: true,
3861
preserveScriptOrder: true,
3962
},
4063
});

package.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "astro-paper",
33
"type": "module",
4-
"version": "5.1.0",
4+
"version": "5.5.0",
55
"scripts": {
66
"dev": "astro dev",
77
"build": "astro check && astro build && pagefind --site dist && cp -r dist/pagefind public/",
@@ -14,37 +14,39 @@
1414
},
1515
"dependencies": {
1616
"@astrojs/react": "^4.2.1",
17-
"@astrojs/rss": "^4.0.11",
18-
"@astrojs/sitemap": "^3.2.1",
17+
"@astrojs/rss": "^4.0.12",
18+
"@astrojs/sitemap": "^3.4.1",
1919
"@giscus/react": "^3.1.0",
2020
"@resvg/resvg-js": "^2.6.2",
21-
"@tailwindcss/vite": "^4.0.14",
21+
"@tailwindcss/vite": "^4.1.11",
2222
"@types/react": "^19.0.10",
2323
"@types/react-dom": "^19.0.4",
24-
"astro": "^5.5.2",
24+
"astro": "^5.12.0",
25+
"dayjs": "^1.11.13",
2526
"lodash.kebabcase": "^4.1.1",
2627
"react": "^19.0.0",
2728
"react-dom": "^19.0.0",
2829
"remark-collapse": "^0.1.2",
2930
"remark-toc": "^9.0.0",
30-
"satori": "^0.12.1",
31-
"sharp": "^0.33.5",
32-
"tailwindcss": "^4.0.14"
31+
"satori": "^0.15.2",
32+
"sharp": "^0.34.2",
33+
"tailwindcss": "^4.1.11"
3334
},
3435
"devDependencies": {
3536
"@astrojs/check": "^0.9.4",
3637
"@pagefind/default-ui": "^1.3.0",
38+
"@shikijs/transformers": "^3.7.0",
3739
"@tailwindcss/typography": "^0.5.16",
3840
"@types/lodash.kebabcase": "^4.1.9",
39-
"@typescript-eslint/parser": "^8.26.1",
40-
"eslint": "^9.22.0",
41+
"@typescript-eslint/parser": "^8.36.0",
42+
"eslint": "^9.30.1",
4143
"eslint-plugin-astro": "^1.3.1",
42-
"globals": "^16.0.0",
44+
"globals": "^16.3.0",
4345
"pagefind": "^1.3.0",
44-
"prettier": "^3.5.3",
46+
"prettier": "^3.6.2",
4547
"prettier-plugin-astro": "^0.14.1",
46-
"prettier-plugin-tailwindcss": "^0.6.11",
47-
"typescript": "^5.8.2",
48-
"typescript-eslint": "^8.26.1"
48+
"prettier-plugin-tailwindcss": "^0.6.13",
49+
"typescript": "^5.8.3",
50+
"typescript-eslint": "^8.36.0"
4951
}
5052
}

0 commit comments

Comments
 (0)