Skip to content

Commit 5318632

Browse files
Merge branch 'main' of https://github.com/satnaing/astro-paper into build/update_latest
# Conflicts: # .github/workflows/ci.yml # .gitignore # CHANGELOG.md # README.md # package-lock.json # package.json # public/dev.svg # public/favicon.svg # src/assets/socialIcons.ts # src/config.ts # src/data/blog/202205ReadingList.md # src/data/blog/202206ReadingList.md # src/data/blog/202207ReadingList.md # src/data/blog/2025Goal.md # src/data/blog/Action_Experiment.md # src/data/blog/Book1017143.md # src/data/blog/Book25774775.md # src/data/blog/Book26866084.md # src/data/blog/Book34429983.md # src/data/blog/Book35174681.md # src/data/blog/Book35275470.md # src/data/blog/Book35579269.md # src/data/blog/Book35626972.md # src/data/blog/Book35732136.md # src/data/blog/Book35819419.md # src/data/blog/Book35863001.md # src/data/blog/Book36331624.md # src/data/blog/Book36530548.md # src/data/blog/Design+Code_Vue.js_Learning.md # src/data/blog/Design_Thoughts.md # src/data/blog/Digital_Life.md # src/data/blog/EffectiveObjcTips.md # src/data/blog/GoodCode-BadCode.md # src/data/blog/Haze-Free.md # src/data/blog/Hibernate_Basic.md # src/data/blog/HongKongGapYear.md # src/data/blog/Mediator_Pattern.md # src/data/blog/MusicGenLofi.md # src/data/blog/Muzik_GettingStarted.md # src/data/blog/Muzik_Progress.md # src/data/blog/NSURL.md # src/data/blog/OSXMavericks.md # src/data/blog/Objc_Learning_1.md # src/data/blog/Objc_Learning_2.md # src/data/blog/Objc_Learning_3.md # src/data/blog/Objc_Learning_4.md # src/data/blog/Objc_Learning_5.md # src/data/blog/Objc_Learning_6.md # src/data/blog/Objc_Learning_7.md # src/data/blog/Objc_Learning_8.md # src/data/blog/OpenCV_Filter.md # src/data/blog/OpenCV_Grayscale.md # src/data/blog/OpenCV_Xcode.md # src/data/blog/Photo_Library.md # src/data/blog/Singleton_Pattern.md # src/data/blog/Struts_Experiment.md # src/data/blog/Struts_Workflow.md # src/data/blog/SwiftUIExploration.md # src/data/blog/TheAlmanackofNaval.md # src/data/blog/WEKA_Association.md # src/data/blog/WWDC22-UIKit.md # src/data/blog/WWDC23-UIKit.md # src/data/blog/WWDC24-Siri.md # src/data/blog/Warp_Review.md # src/data/blog/Yunnan_Travelling.md # src/data/blog/adding-new-post.md # src/data/blog/astro-paper-2.md # src/data/blog/astro-paper-3.md # src/data/blog/astro-paper-4.md # src/data/blog/customizing-astropaper-theme-color-schemes.md # src/data/blog/dynamic-og-images.md # src/data/blog/example-draft-post.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/portfolio-website-development.md # src/data/blog/predefined-color-schemes.md # src/data/blog/setting-dates-via-git-hooks.md # src/data/blog/tailwind-typography.md # src/data/blog/terminal-development.md # src/layouts/PostDetails.astro # src/pages/about.md # src/pages/index.astro # src/styles/base.css
2 parents 6f9ec72 + 4b730b1 commit 5318632

148 files changed

Lines changed: 7036 additions & 11751 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# build output
22
dist/
3-
.output/
3+
4+
# generated types
5+
.astro/
46

57
# dependencies
68
node_modules/
@@ -11,25 +13,16 @@ yarn-debug.log*
1113
yarn-error.log*
1214
pnpm-debug.log*
1315

14-
1516
# environment variables
1617
.env
1718
.env.production
1819

1920
# macOS-specific files
2021
.DS_Store
2122

22-
# ignore .astro directory
23-
.astro
23+
# jetbrains setting folder
24+
.idea/
2425

25-
# yarn
26-
.yarn/*
27-
!.yarn/patches
28-
!.yarn/plugins
29-
!.yarn/releases
30-
!.yarn/sdks
31-
!.yarn/versions
32-
.pnp.*
26+
# pagefind
3327

34-
# editor
35-
.vscode
28+
public/pagefind

.markdownlint.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

.npmrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
!/.github
88
!tsconfig.json
99
!astro.config.ts
10+
!.prettierrc.mjs
1011
!package.json
1112
!.prettierrc
12-
!eslint.config.mjs
13+
!eslint.config.js
1314
!README.md

.prettierrc

Lines changed: 0 additions & 20 deletions
This file was deleted.

.prettierrc.mjs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/** @type {import("prettier").Config} */
2+
export default {
3+
arrowParens: "avoid",
4+
semi: true,
5+
tabWidth: 2,
6+
printWidth: 80,
7+
singleQuote: false,
8+
jsxSingleQuote: false,
9+
trailingComma: "es5",
10+
bracketSpacing: true,
11+
endOfLine: "lf",
12+
plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
13+
tailwindStylesheet: "./src/styles/global.css",
14+
overrides: [
15+
{
16+
files: "*.astro",
17+
options: {
18+
parser: "astro",
19+
},
20+
},
21+
],
22+
};

Dockerfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
# Base stage for building the static files
22
FROM node:lts AS base
33
WORKDIR /app
4-
COPY package*.json ./
5-
RUN npm install
4+
5+
# Install pnpm
6+
RUN corepack enable && corepack prepare pnpm@latest --activate
7+
8+
COPY package.json pnpm-lock.yaml ./
9+
RUN pnpm install --frozen-lockfile
10+
611
COPY . .
7-
RUN npm run build
12+
RUN pnpm run build
813

914
# Runtime stage for serving the application
1015
FROM nginx:mainline-alpine-slim AS runtime
11-
COPY --from=base ./app/dist /usr/share/nginx/html
12-
EXPOSE 80
16+
COPY --from=base /app/dist /usr/share/nginx/html
17+
EXPOSE 80

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 StephenFang
3+
Copyright (c) 2025 StephenFang
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

astro.config.ts

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,39 @@
11
import { defineConfig } from "astro/config";
2-
import tailwind from "@astrojs/tailwind";
3-
import react from "@astrojs/react";
2+
import tailwindcss from "@tailwindcss/vite";
3+
import sitemap from "@astrojs/sitemap";
44
import remarkToc from "remark-toc";
55
import remarkCollapse from "remark-collapse";
6-
import sitemap from "@astrojs/sitemap";
76
import { SITE } from "./src/config";
87

98
// https://astro.build/config
109
export default defineConfig({
1110
site: SITE.website,
1211
integrations: [
13-
tailwind({
14-
applyBaseStyles: false,
15-
}),
16-
react(),
1712
sitemap({
1813
filter: page => SITE.showArchives || !page.endsWith("/archives"),
1914
}),
2015
],
2116
markdown: {
22-
remarkPlugins: [
23-
remarkToc,
24-
[
25-
remarkCollapse,
26-
{
27-
test: "Table of contents",
28-
},
29-
],
30-
],
17+
remarkPlugins: [remarkToc, [remarkCollapse, { test: "Table of contents" }]],
3118
shikiConfig: {
3219
// For more themes, visit https://shiki.style/themes
3320
themes: { light: "min-light", dark: "night-owl" },
3421
wrap: true,
3522
},
3623
},
3724
vite: {
25+
plugins: [tailwindcss()],
3826
optimizeDeps: {
3927
exclude: ["@resvg/resvg-js"],
4028
},
4129
},
42-
scopedStyleStrategy: "where",
30+
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",
34+
},
4335
experimental: {
44-
contentLayer: true,
36+
svg: true,
37+
responsiveImages: true,
4538
},
4639
});

eslint.config.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import eslintPluginAstro from "eslint-plugin-astro";
2+
import globals from "globals";
3+
import tseslint from "typescript-eslint";
4+
5+
export default [
6+
...tseslint.configs.recommended,
7+
...eslintPluginAstro.configs.recommended,
8+
{
9+
languageOptions: {
10+
globals: {
11+
...globals.browser,
12+
...globals.node,
13+
},
14+
},
15+
},
16+
{ rules: { "no-console": "error" } },
17+
{ ignores: ["dist/**", ".astro", "public/pagefind/**"] },
18+
];

0 commit comments

Comments
 (0)