minearm-website 0.0.3-beta.3 → 0.1.3

package/Dockerfile

@@ -0,0 +1,12 @@
+# Base stage for building the static files
+FROM node:lts AS base
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+# Runtime stage for serving the application
+FROM nginx:mainline-alpine-slim AS runtime
+COPY --from=base ./app/dist /usr/share/nginx/html
+EXPOSE 80

package/{LICENSE → LICENSE.md}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 KraHsu
+Copyright (c) 2024 onWidget
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/README.md

@@ -1,11 +1,17 @@
 # Minearm & Website
 # 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
+最新的正式版是0.1.3
+最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到4.16.13
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.1.2
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)
 
+# node(环境)
+
+要让 Astro 在你的系统上运行，你还需要安装 Node.js，版本 v18.17.1 或 v20.3.0 或更高版本。(不支持 v19)
+
 # 文件结构
 
 ```bash
@@ -47,29 +53,38 @@ root
 ~~~bash
 # 安装主题
 npm i minearm-website
+git clone https://github.com/Minearm-RPM/Minearm.git node_modules/
 ~~~
 
+# 进入astro目录
+~~~bash
+cd node_modules/minearm-website
+# 或者(对应上面两种方法)
+cd node_modules/
 ~~~
+
+~~~bash
 # 安装依赖
 npm install
 # 更新
 npm update
 ~~~
 
-~~~
+~~~bash
 # 启动开发预览
 npm run dev
 ~~~
 
-~~~
+~~~bash
 # 构建和预览
 npm run build
 npm run preview
 ~~~
 
 # 许可证
+
 本项目在MIT许可证下授权，版权所有©2024
 
 由Minearm-RPM构建的
 
-# 转载时需标明出处！。
+# 转载时需标明出处

package/astro.config.ts

@@ -1,33 +1,38 @@
-import { defineConfig } from "astro/config";
-import sitemap from "@astrojs/sitemap";
-import { markdownDirectives, remarkFrontmatter, rehypeFrontmatter, remarkRestyling, rehypeRestyling } from "./src/utils/md";
-import remarkGfm from "remark-gfm";
-import remarkMath from "remark-math";
-import rehypeKatex from "rehype-katex";
-import rehypeMathjax from "rehype-mathjax";
-import remarkDirective from "remark-directive";
-import vue from "@astrojs/vue";
-import { SiteConfig } from "./src/site_config";
-import { generateSearchData } from "./src/utils/generateSearchData.ts";
-const remarkPlugins: any = [remarkFrontmatter, remarkGfm, SiteConfig.markdownMath !== false && remarkMath, remarkRestyling, remarkDirective, markdownDirectives, SiteConfig.localSearch && generateSearchData].filter(Boolean);
-const rehypePlugins: any = [rehypeFrontmatter, rehypeRestyling, SiteConfig.markdownMath === "Katex" && rehypeKatex, SiteConfig.markdownMath === "Mathjax" && rehypeMathjax].filter(Boolean);
-// https://astro.build/config
-export default defineConfig({
-  site: SiteConfig.site,
-  integrations: [sitemap(), vue()],
-  output: "static",
-  build: {
-    format: "directory"
-  },
-  markdown: {
-    syntaxHighlight: "shiki",
-    shikiConfig: {
-      theme: "css-variables",
-      langs: [],
-      wrap: false
-    },
-    remarkPlugins: remarkPlugins,
-    rehypePlugins: rehypePlugins
-  },
-  trailingSlash: "ignore"
+import { defineConfig } from "astro/config";
+import sitemap from "@astrojs/sitemap";
+import { markdownDirectives, remarkFrontmatter, rehypeFrontmatter, remarkRestyling, rehypeRestyling } from "./src/utils/md";
+import remarkGfm from "remark-gfm";
+import remarkMath from "remark-math";
+import rehypeKatex from "rehype-katex";
+import rehypeMathjax from "rehype-mathjax";
+import remarkDirective from "remark-directive";
+import vue from "@astrojs/vue";
+import { SiteConfig } from "./src/site_config";
+import { generateSearchData } from "./src/utils/generateSearchData.ts";
+//import netlify from "@astrojs/netlify";
+const remarkPlugins: any = [remarkFrontmatter, remarkGfm, SiteConfig.markdownMath !== false && remarkMath, remarkRestyling, remarkDirective, markdownDirectives, SiteConfig.localSearch && generateSearchData].filter(Boolean);
+const rehypePlugins: any = [rehypeFrontmatter, rehypeRestyling, SiteConfig.markdownMath === "Katex" && rehypeKatex, SiteConfig.markdownMath === "Mathjax" && rehypeMathjax].filter(Boolean);
+// https://astro.build/config
+export default defineConfig({
+  site: SiteConfig.site,
+  integrations: [sitemap(), vue()],
+  output: "static",
+
+  build: {
+    format: "directory"
+  },
+
+  markdown: {
+    syntaxHighlight: "shiki",
+    shikiConfig: {
+      theme: "css-variables",
+      langs: [],
+      wrap: false
+    },
+    remarkPlugins: remarkPlugins,
+    rehypePlugins: rehypePlugins
+  },
+
+  trailingSlash: "ignore",
+ // adapter: netlify()
 });

package/cz.yaml

@@ -0,0 +1,7 @@
+---
+commitizen:
+  name: cz_conventional_commits
+  tag_format: v$version
+  update_changelog_on_bump: true
+  version_provider: npm
+  version_scheme: semver

package/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  app:
+    image: node:20
+    ports:
+      - 4321:4321
+    working_dir: /app
+    command: npm run dev -- --host 0.0.0.0
+    volumes:
+      - ./:/app

package/netlify.toml

@@ -0,0 +1,4 @@
+[build]
+  command = "npm ci"
+  command2 = "npm run build"
+  publish = "dist"

package/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "minearm-website",
-  "description": "Welcome to Minearm & Website.",
-  "version": "0.0.3-beta.3",
-  "homepage": "https://github.com/Minearm-RPM/minearm",
-  "type": "module",
-  "license": "MIT",
-  "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev",
-    "build": "astro build",
-    "preview": "astro preview",
-    "astro": "astro",
-    "new": "ts-node ./minearm.ts new",
-    "abbr": "ts-node ./minearm.ts abbr",
-    "newpage": "ts-node ./minearm.ts newPage",
-    "help": "ts-node ./minearm.ts help",
-    "pu": "ts-node ./pu.ts"
-  },
-  "dependencies": {
-    "@astrojs/markdown-remark": "^5.3.0",
-    "@astrojs/mdx": "^3.1.9",
-    "@astrojs/rss": "^4.0.9",
-    "@duannx/vue-client-only": "^1.0.3",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
-    "@iconify-json/tabler": "^1.2.8",
-    "astro": "^4.16.13",
-    "astro-i18next": "^1.0.0-beta.21",
-    "astro-icon": "^1.1.2",
-    "fuse.js": "^6.6.2",
-    "glob": "^10.3.3",
-    "hastscript": "^7.2.0",
-    "html-loader": "^0.5.5",
-    "markdown-loader": "^8.0.0",
-    "marked": "^15.0.0",
-    "mdast-util-to-string": "^4.0.0",
-    "pnpm": "^9.14.2",
-    "reading-time": "^1.5.0",
-    "rehype-katex": "7.0.1",
-    "rehype-mathjax": "6.0.0",
-    "remark-directive": "3.0.0",
-    "remark-gfm": "4.0.0",
-    "remark-math": "6.0.0",
-    "showdown": "^2.1.0",
-    "yargs": "^17.7.2"
-  },
-  "devDependencies": {
-    "@astrojs/sitemap": "^3.2.1",
-    "@astrojs/vue": "^4.5.2",
-    "@types/yargs": "^17.0.24",
-    "sass": "1.70.0",
-    "scss": "^0.2.4",
-    "ts-node": "10.9.2",
-    "vue": "3.5.0"
-  },
-  "keywords": [
-    "astro-component",
-    "withastro"
-  ],
-  "main": "index.js",
-  "author": ""
-}
+{
+  "name": "minearm-website",
+  "description": "Welcome to Minearm & Website.",
+  "version": "0.1.3",
+  "homepage": "https://github.com/Minearm-RPM/minearm",
+  "type": "module",
+  "license": "MIT",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro",
+    "new": "ts-node ./minearm.ts new",
+    "abbr": "ts-node ./minearm.ts abbr",
+    "newpage": "ts-node ./minearm.ts newPage",
+    "help": "ts-node ./minearm.ts help",
+    "pu": "ts-node ./pu.ts"
+  },
+  "dependencies": {
+    "@astrojs/markdown-remark": "^6.0.1",
+    "@astrojs/mdx": "^4.0.3",
+    "@astrojs/rss": "^4.0.11",
+    "@duannx/vue-client-only": "^1.0.3",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@iconify-json/tabler": "^1.2.8",
+    "astro": "^5.1.2",
+    "astro-i18next": "^1.0.0-beta.21",
+    "astro-icon": "^1.1.2",
+    "fuse.js": "^6.6.2",
+    "glob": "^10.3.3",
+    "hastscript": "^7.2.0",
+    "html-loader": "^5.1.0",
+    "markdown-loader": "^8.0.0",
+    "marked": "^15.0.0",
+    "mdast-util-to-string": "^4.0.0",
+    "pnpm": "^9.14.2",
+    "reading-time": "^1.5.0",
+    "rehype-katex": "7.0.1",
+    "rehype-mathjax": "6.0.0",
+    "remark-directive": "3.0.0",
+    "remark-gfm": "4.0.0",
+    "remark-math": "6.0.0",
+    "showdown": "^2.1.0",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@astrojs/sitemap": "^3.2.1",
+    "@astrojs/vue": "^5.0.4",
+    "@types/yargs": "^17.0.24",
+    "sass": "1.70.0",
+    "scss": "^0.2.4",
+    "ts-node": "10.9.2",
+    "vue": "^3.5.13"
+  },
+  "keywords": [
+    "astro-component",
+    "withastro"
+  ],
+  "main": "index.js",
+  "author": ""
+}

package/public/scripts/mdata.json

@@ -1,4 +1,4 @@
-{
-  "totalWordCounts": 900,
-  "totalPostCounts": 2
+{
+  "totalWordCounts": 896,
+  "totalPostCounts": 2
 }