From 8a85c7342cbeac3a7eb3c9fcb32821db528b1fa3 Mon Sep 17 00:00:00 2001
From: Han <1655466387@qq.com>
Date: Mon, 3 Mar 2025 15:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84=E3=80=81?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=20=F0=9F=A5=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 17 ++++++++---------
src/components/Head.astro | 3 ++-
src/components/Search.astro | 6 +++---
src/layouts/Layout.astro | 2 --
src/scripts/Comment.ts | 3 +++
src/scripts/Init.ts | 4 ++--
src/scripts/Music.ts | 12 +++++-------
src/scripts/Search.ts | 2 +-
src/scripts/Video.ts | 8 ++++----
src/type/twikoo.d.ts | 4 ----
10 files changed, 28 insertions(+), 33 deletions(-)
delete mode 100644 src/type/twikoo.d.ts
diff --git a/package.json b/package.json
index 7929ce1..6247735 100644
--- a/package.json
+++ b/package.json
@@ -14,16 +14,9 @@
"@astrojs/rss": "^4.0.11",
"@astrojs/sitemap": "^3.2.1",
"@swup/astro": "^1.5.0",
+ "aplayer": "^1.10.1",
"astro": "^5.4.1",
- "dayjs": "^1.11.13",
- "dplayer": "^1.27.1",
- "hls.js": "^1.5.20",
- "mdast-util-to-string": "^4.0.0",
"overlayscrollbars": "^2.11.1",
- "reading-time": "^1.5.0",
- "remark-directive": "^4.0.0",
- "twikoo": "1.6.41",
- "unist-util-visit": "^5.0.0",
"vanilla-lazyload": "^19.1.3",
"vh-plugin": "^1.2.2"
},
@@ -31,7 +24,13 @@
"@types/dplayer": "^1.25.5",
"@types/nprogress": "^0.2.3",
"cheerio": "^1.0.0",
- "less": "^4.2.2"
+ "dayjs": "^1.11.13",
+ "less": "^4.2.2",
+ "mdast-util-to-string": "^4.0.0",
+ "reading-time": "^1.5.0",
+ "remark-directive": "^4.0.0",
+ "typescript": "^5.8.2",
+ "unist-util-visit": "^5.0.0"
},
"pnpm": {
"onlyBuiltDependencies": [
diff --git a/src/components/Head.astro b/src/components/Head.astro
index b97402a..274adbb 100644
--- a/src/components/Head.astro
+++ b/src/components/Head.astro
@@ -30,7 +30,8 @@ import "../styles/Base.less";
-
+
+
diff --git a/src/components/Search.astro b/src/components/Search.astro
index 2228865..3a31670 100644
--- a/src/components/Search.astro
+++ b/src/components/Search.astro
@@ -7,8 +7,8 @@ import "../styles/components/Search.less";
-
+
-
\ No newline at end of file
+
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 5a182f6..0aa4fa5 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -20,8 +20,6 @@ import "../styles/Layout.less";
-
- {Twikoo.envId && }
{ad_Client && (asideAD_Slot || articleAD_Slot) && }
diff --git a/src/scripts/Comment.ts b/src/scripts/Comment.ts
index 31e334d..d7d5c93 100644
--- a/src/scripts/Comment.ts
+++ b/src/scripts/Comment.ts
@@ -1,8 +1,11 @@
+import { LoadScript } from "../utils/index";
import SITE_INFO from "../config";
declare const twikoo: any;
// 初始化评论插件
export default async () => {
const commentDOM = '.vh-comment>section'
if (!document.querySelector(commentDOM) || !SITE_INFO.Twikoo.envId) return;
+ document.querySelector(commentDOM)!.innerHTML = ''
+ await LoadScript("https://registry.npmmirror.com/twikoo/1.6.41/files/dist/twikoo.all.min.js");
twikoo.init({ envId: SITE_INFO.Twikoo.envId, el: commentDOM })
}
\ No newline at end of file
diff --git a/src/scripts/Init.ts b/src/scripts/Init.ts
index 21d35cb..659f0b0 100644
--- a/src/scripts/Init.ts
+++ b/src/scripts/Init.ts
@@ -48,6 +48,8 @@ const indexInit = async (only: boolean = true) => {
only && initMobileSidebar();
// 顶部导航 Current 状态
initLinkCurrent()
+ // 文章评论初始化
+ initComment();
// 初始化文章功能脚本
ArticleInit();
// 图片懒加载初始化
@@ -56,8 +58,6 @@ const indexInit = async (only: boolean = true) => {
initLinks();
// 动态说说初始化
initTalking();
- // 文章评论初始化
- initComment();
// Google 广告
GoogleAdInit();
// 文章视频播放器初始化
diff --git a/src/scripts/Music.ts b/src/scripts/Music.ts
index 5acefe4..cf0468f 100644
--- a/src/scripts/Music.ts
+++ b/src/scripts/Music.ts
@@ -1,20 +1,18 @@
import SITE_CONFIG from "../config";
const { vhMusicApi } = SITE_CONFIG;
import { $GET } from '../utils/index'
-import { LoadScript, LoadStyle } from "../utils/index";
+import 'aplayer/dist/APlayer.min.css';
+import APlayer from 'aplayer';
declare const APlayer: any;
// 初始化音乐播放器
-export default async (musicList: any[]) => {
+export default async (MusicList: any[]) => {
const musicDOM: any = document.querySelectorAll(".vh-node.vh-vhMusic");
- if (musicDOM.length === 0) return;
- // 载入依赖
- await LoadStyle("https://lf9-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.css");
- await LoadScript("https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.js");
+ if (!musicDOM.length) return;
musicDOM.forEach(async (container: any) => {
const { type = 'song', server = 'netease', id } = container.dataset;
const audio = await $GET(`${vhMusicApi}?server=${server}&type=${type}&id=${id}&r=${Math.random()}`);
const ap = new APlayer({ container, audio, lrcType: 3 });
- musicList.push(ap);
+ MusicList.push(ap);
});
};
diff --git a/src/scripts/Search.ts b/src/scripts/Search.ts
index 1ec5fec..021c226 100644
--- a/src/scripts/Search.ts
+++ b/src/scripts/Search.ts
@@ -31,7 +31,7 @@ const findAndModifyElements = (arr: any[], keyword: string) => {
// 渲染页面
let searchHTML = '';
const renderSearch = (arr: any[]) => {
- searchHTML = !arr.length ? '' : arr.map(i => `${i.title}${i.content}
`).join('');
+ searchHTML = !arr.length ? '' : arr.map(i => `${i.title}${i.content}
`).join('');
document.querySelector('.vh-header>.main>.vh-search>main>.vh-search-list')!.innerHTML = searchHTML;
}
diff --git a/src/scripts/Video.ts b/src/scripts/Video.ts
index 6396c95..8d007d5 100644
--- a/src/scripts/Video.ts
+++ b/src/scripts/Video.ts
@@ -7,8 +7,8 @@ export default async (videoList: any[]) => {
const videoDOM: any = document.querySelectorAll(".vh-node.vh-vhVideo");
if (videoDOM.length === 0) return;
// 载入依赖
+ if (typeof Hls === "undefined") await LoadScript("https://registry.npmmirror.com/hls.js/1.5.20/files/dist/hls.min.js");
await LoadScript("https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/dplayer/1.26.0/DPlayer.min.js");
- await LoadScript("https://registry.npmmirror.com/hls.js/1.5.20/files/dist/hls.min.js");
videoDOM.forEach((i: any) => {
const dp = new DPlayer({
container: i,
@@ -21,9 +21,9 @@ export default async (videoList: any[]) => {
customType: {
hls: (video: any) => {
if (Hls.isSupported()) {
- const hls = new Hls({ enableWorker: true, autoStartLoad: true, capLevelToPlayerSize: true });
- hls.loadSource(video.src);
- hls.attachMedia(video);
+ dp.hls = new Hls({ enableWorker: true, autoStartLoad: true, capLevelToPlayerSize: true });
+ dp.hls.loadSource(video.src);
+ dp.hls.attachMedia(video);
} else if (video.canPlayType("application/vnd.apple.mpegurl")) {
video.src = i.getAttribute("data-url");
}
diff --git a/src/type/twikoo.d.ts b/src/type/twikoo.d.ts
deleted file mode 100644
index 4b19e53..0000000
--- a/src/type/twikoo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-
-declare module 'twikoo' {
- function init(options: { envId: string, el: string }): void;
-}