Merge remote-tracking branch 'origin/main'

# Conflicts:
#	templates/modules/foot/footer.html

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 LIUZHICHAO.COM
+Copyright (c) 2019 DILLONZQ.COM
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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.

README.md

@@ -1,23 +1,22 @@
-# Clear 主题使用与限制
+# Clear 主题
 
 基于 Halo2.0 开发，将当前目录压缩为 zip 包后安装
 
 基于 [LoveIt](https://github.com/dillonzq/LoveIt) Hugo 主题模版进行开发
 
 初始化设置步骤如下：
+
 - [x] 如果需要展示博客内容，需要在 Console 端添加 **文章 / 标签 / 分类**，然后将文章在设置里划分到对应的标签和分类中
 - [x] 该主题需要配合 Halo 官方的评论组件、搜索组件的插件使用
 
-注：如果主题的部分样式丢失，可在 Console 端的主题 tag 菜单底部点击保存并再次刷新主题页面查看效果
+预览效果：
 
-预览效果
 ![clear1.jpg](clear1.jpg)
 
 ![clear2.jpg](clear2.jpg)
 
-预览地址:
-http://43.136.69.44:8090/
+预览地址：<http://43.136.69.44:8090/>
 
-如有版权问题请联系 [email protected] 进行修改
+如有版权问题请联系 <[email protected]> 进行修改
 
 主题开发参考 [Halo官方文档](https://docs.halo.run)

package.json

@@ -1,14 +1,8 @@
 {
   "name": "@halo-dev/theme-clear",
-  "private": true,
   "version": "1.0.1",
+  "private": true,
   "description": "A development starter theme with modern front-end technology stack for Halo",
-  "scripts": {
-    "dev": "vite build --watch",
-    "build": "tsc && vite build",
-    "lint": "eslint ./src --ext .js,.cjs,.mjs,.ts,.cts,.mts --ignore-path .gitignore",
-    "prettier": "prettier --write './src/**/*.{js,ts,css,json,ml,yaml,html}' './templates/**/*.html'"
-  },
   "keywords": [
     "halo",
     "halo-theme"
@@ -24,8 +18,8 @@
   "license": "GPL-3.0",
   "author": {
     "name": "Halo OSS Organization",
-    "url": "https://github.com/halo-dev",
-    "email": "[email protected]"
+    "email": "hi@halo.run",
+    "url": "https://github.com/halo-dev"
   },
   "maintainers": [
     {
@@ -34,24 +28,37 @@
       "url": "https://github.com/ruibaby"
     }
   ],
+  "scripts": {
+    "build": "tsc && vite build",
+    "dev": "vite build --watch",
+    "lint": "eslint ./src --ext .js,.cjs,.mjs,.ts,.cts,.mts --ignore-path .gitignore",
+    "prepare": "husky install",
+    "prettier": "prettier --write './src/**/*.{js,ts,css,json,ml,yaml,html}' './templates/**/*.html'"
+  },
+  "lint-staged": {
+    "*.html": [
+      "prettier --write"
+    ]
+  },
   "devDependencies": {
+    "@algolia/cli": "^4.0.8",
+    "@babel/cli": "^7.17.10",
+    "@babel/core": "^7.17.10",
+    "@babel/preset-env": "^7.17.10",
     "@types/node": "18.11.9",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
+    "babelify": "^10.0.0",
+    "browserify": "^16.5.2",
+    "core-js": "^3.22.4",
     "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^7.0.4",
+    "lint-staged": "^15.2.0",
     "prettier": "^2.8.8",
+    "segmentit": "^2.0.3",
     "typescript": "^4.9.5",
-    "vite": "^4.5.0",
-    "@algolia/cli": "^4.0.8",
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "babelify": "^10.0.0",
-    "browserify": "^16.5.2",
-    "core-js": "^3.22.4",
-    "husky": "^7.0.0",
-    "segmentit": "^2.0.3"
+    "vite": "^4.5.0"
   }
 }