Merge branch 'tangly1024:main' into main

.env.local

@@ -1,5 +1,5 @@
 # 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
-NEXT_PUBLIC_VERSION=4.6.1
+NEXT_PUBLIC_VERSION=4.6.2
 
 
 # 可在此添加环境变量，去掉最左边的（# ）注释即可

.github/workflows/docker-ghcr.yaml

@@ -28,16 +28,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -47,14 +47,14 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/pushUrl.yml

@@ -24,11 +24,11 @@ jobs:
     runs-on: ubuntu-latest # 运行环境为最新版的Ubuntu
     steps:
       - name: 'Checkout codes' # 步骤一，获取仓库代码
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       # - name: 'Run baiduPush' # 步骤二，执行sh命令文件
       #   run: npm install && npm run baiduPush # 运行目录是仓库根目录
       - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

.github/workflows/sync.yaml

@@ -17,7 +17,7 @@ jobs:
     steps:
       # Step 1: run a standard checkout action
       - name: Checkout target repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Step 2: run the sync action
       - name: Sync upstream changes

blog.config.js

@@ -547,7 +547,7 @@ const BLOG = {
     process.env.ENABLE_CACHE ||
     process.env.npm_lifecycle_event === 'build' ||
     process.env.npm_lifecycle_event === 'export', // 在打包过程中默认开启缓存，开发或运行时开启此功能意义不大。
-  isProd: process.env.VERCEL_ENV === 'production' || process.env.EXPORT, // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)  isProd: process.env.VERCEL_ENV === 'production' // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)
+  isProd: process.env.VERCEL_ENV === 'production' || process.env.EXPORT, // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)
   BUNDLE_ANALYZER: process.env.ANALYZE === 'true' || false, // 是否展示编译依赖内容与大小
   VERSION: process.env.NEXT_PUBLIC_VERSION // 版本号
 }

components/Ackee.js

@@ -24,19 +24,19 @@ const Ackee = () => {
       },
       {
         /*
-                 * Enable or disable tracking of personal data.
-                 * We recommend to ask the user for permission before turning this option on.
-                 */
+         * Enable or disable tracking of personal data.
+         * We recommend to ask the user for permission before turning this option on.
+         */
         detailed: true,
         /*
-                * Enable or disable tracking when on localhost.
-                */
+         * Enable or disable tracking when on localhost.
+         */
         ignoreLocalhost: false,
         /*
-                * Enable or disable the tracking of your own visits.
-                * This is enabled by default, but should be turned off when using a wildcard Access-Control-Allow-Origin header.
-                * Some browsers strictly block third-party cookies. The option won't have an impact when this is the case.
-                */
+         * Enable or disable the tracking of your own visits.
+         * This is enabled by default, but should be turned off when using a wildcard Access-Control-Allow-Origin header.
+         * Some browsers strictly block third-party cookies. The option won't have an impact when this is the case.
+         */
         ignoreOwnVisits: false
       }
     )

components/CustomContextMenu.js

@@ -117,12 +117,14 @@ export default function CustomContextMenu(props) {
   function handleCopy() {
     const selectedText = document.getSelection().toString()
     if (selectedText) {
-      const tempInput = document.createElement('input')
-      tempInput.value = selectedText
-      document.body.appendChild(tempInput)
-      tempInput.select()
-      document.execCommand('copy')
-      document.body.removeChild(tempInput)
+      const tempInput = document.createElement('input');
+      tempInput.value = selectedText;
+      document.body.appendChild(tempInput);
+      tempInput.select();
+      document.execCommand('copy');
+      if (tempInput && tempInput.parentNode && tempInput.parentNode.contains(tempInput)) {
+        tempInput.parentNode.removeChild(tempInput);
+      }
       // alert("Text copied: " + selectedText);
     } else {
       // alert("Please select some text first.");

components/DifyChatbot.js

@@ -24,7 +24,9 @@ export default function DifyChatbot() {
     return () => {
       // 在组件卸载时清理 script 标签
       const existingScript = document.getElementById(siteConfig('DIFY_CHATBOT_TOKEN')); // 注意调用 siteConfig()
-      if (existingScript) document.body.removeChild(existingScript);
+      if (existingScript && existingScript.parentNode && existingScript.parentNode.contains(existingScript)) {
+        existingScript.parentNode.removeChild(existingScript);
+      }
     };
   }, []); // 注意依赖数组为空，意味着脚本将仅在加载页面时执行一次
 

components/ExternalPlugins.js

@@ -63,6 +63,7 @@ const ExternalPlugin = props => {
   const MOUSE_FOLLOW = siteConfig('MOUSE_FOLLOW')
   const CUSTOM_EXTERNAL_CSS = siteConfig('CUSTOM_EXTERNAL_CSS')
   const CUSTOM_EXTERNAL_JS = siteConfig('CUSTOM_EXTERNAL_JS')
+  const ENABLE_NPROGRSS = siteConfig('ENABLE_NPROGRSS', true)
 
   // 自定义样式css和js引入
   if (isBrowser) {
@@ -145,7 +146,7 @@ const ExternalPlugin = props => {
       {AD_WWADS_BLOCK_DETECT && <AdBlockDetect />}
       {TIANLI_KEY && <TianLiGPT />}
       <VConsole />
-      <LoadingProgress />
+      {ENABLE_NPROGRSS && <LoadingProgress />}
       <AosAnimation />
       {ANALYTICS_51LA_ID && ANALYTICS_51LA_CK && <LA51 />}
 
@@ -186,10 +187,19 @@ const ExternalPlugin = props => {
             async
             dangerouslySetInnerHTML={{
               __html: `
-                (function(c,l,a,r,i,t,y){
-                    c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
-                    t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
-                    y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+                (function(c, l, a, r, i, t, y) {
+                  c[a] = c[a] || function() {
+                    (c[a].q = c[a].q || []).push(arguments);
+                  };
+                  t = l.createElement(r);
+                  t.async = 1;
+                  t.src = "https://www.clarity.ms/tag/" + i;
+                  y = l.getElementsByTagName(r)[0];
+                  if (y && y.parentNode) {
+                    y.parentNode.insertBefore(t, y);
+                  } else {
+                    l.head.appendChild(t);
+                  }
                 })(window, document, "clarity", "script", "${CLARITY_ID}");
                 `
             }}
@@ -204,8 +214,24 @@ const ExternalPlugin = props => {
             async
             dangerouslySetInnerHTML={{
               __html: `
-              (function(i,s,o,g,r,a,m){i["DaoVoiceObject"]=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;a.charset="utf-8";m.parentNode.insertBefore(a,m)})(window,document,"script",('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/daf1a94b.js","daovoice")
-              `
+                (function(i, s, o, g, r, a, m) {
+                  i["DaoVoiceObject"] = r;
+                  i[r] = i[r] || function() {
+                    (i[r].q = i[r].q || []).push(arguments);
+                  };
+                  i[r].l = 1 * new Date();
+                  a = s.createElement(o);
+                  m = s.getElementsByTagName(o)[0];
+                  a.async = 1;
+                  a.src = g;
+                  a.charset = "utf-8";
+                  if (m && m.parentNode) {
+                    m.parentNode.insertBefore(a, m);
+                  } else {
+                    s.head.appendChild(a);
+                  }
+                })(window, document, "script", ('https:' == document.location.protocol ? 'https:' : 'http:') + "//widget.daovoice.io/widget/daf1a94b.js", "daovoice")
+                `
             }}
           />
           <script

components/FacebookMessenger.js

@@ -116,7 +116,11 @@ class MessengerCustomerChat extends Component {
             js = d.createElement(s);
             js.id = id;
             js.src = `https://connect.facebook.net/${language}/sdk/xfbml.customerchat.js`;
-            fjs.parentNode.insertBefore(js, fjs);
+            if (fjs && fjs.parentNode && fjs.parentNode.contains(fjs)) {
+              fjs.parentNode.insertBefore(js, fjs);
+            } else {
+              document.body.appendChild(js);
+            }
         })(document, 'script', 'facebook-jssdk');
         /* eslint-enable */
   }

components/Fireworks.js

@@ -18,7 +18,7 @@ const Fireworks = () => {
     // 异步加载
     async function loadFireworks() {
       loadExternalResource(
-        'https://cdn.bootcdn.net/ajax/libs/animejs/3.2.1/anime.min.js',
+        'https://cdnjs.snrat.com/ajax/libs/animejs/3.2.1/anime.min.js',
         'js'
       ).then(() => {
         loadExternalResource('/js/fireworks.js', 'js').then(() => {

components/LoadingCover.js

@@ -0,0 +1,71 @@
+import { useGlobal } from '@/lib/global'
+import { useEffect, useState } from 'react'
+/**
+ * @see https://css-loaders.com/
+ * @returns 加载动画
+ */
+export default function LoadingCover() {
+  const { onLoading, setOnLoading } = useGlobal()
+  const [isVisible, setIsVisible] = useState(false) // 初始状态设置为false，避免服务端渲染与客户端渲染不一致
+
+  useEffect(() => {
+    // 确保在客户端渲染时才设置可见性
+    if (onLoading) {
+      setIsVisible(true)
+    } else {
+      const timeout = setTimeout(() => setIsVisible(false), 1500) // 等待淡出动画结束
+      return () => clearTimeout(timeout)
+    }
+  }, [onLoading])
+
+  const handleClick = () => {
+    setOnLoading(false) // 强行关闭 LoadingCover
+  }
+
+  if (typeof window === 'undefined') {
+    return null // 避免在服务端渲染时渲染出这个组件
+  }
+
+  return isVisible ? (
+    <div
+      id='loading-cover'
+      onClick={handleClick}
+      className={`dark:text-white text-black bg-white dark:bg-black animate__animated animate__faster ${
+        onLoading ? 'animate__fadeIn' : 'animate__fadeOut'
+      } flex flex-col justify-center z-50 w-full h-screen fixed top-0 left-0`}>
+      <div className='mx-auto'>
+        <style global>
+          {`
+      .loader {
+        width: 20px;
+        aspect-ratio: 1;
+        border-radius: 50%;
+        background: #000;
+        box-shadow: 0 0 0 0 #0004;
+        animation: l2 1.5s infinite linear;
+        position: relative;
+      }
+      .loader:before,
+      .loader:after {
+        content: '';
+        position: absolute;
+        inset: 0;
+        border-radius: inherit;
+        box-shadow: 0 0 0 0 #0004;
+        animation: inherit;
+        animation-delay: -0.5s;
+      }
+      .loader:after {
+        animation-delay: -1s;
+      }
+      @keyframes l2 {
+        100% {
+          box-shadow: 0 0 0 40px #0000;
+        }
+      }`}
+        </style>
+        <div className='loader'></div>
+      </div>
+    </div>
+  ) : null
+}

components/LoadingProgress.js

@@ -3,23 +3,24 @@ import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
 
 /**
- * 出现页面加载进度条
+ * 加载进度条
+ * NProgress实现
  */
 export default function LoadingProgress() {
   const router = useRouter()
   const [NProgress, setNProgress] = useState(null)
   // 加载进度条
   useEffect(() => {
     loadExternalResource(
-      'https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.js',
+      'https://cdnjs.snrat.com/ajax/libs/nprogress/0.2.0/nprogress.min.js',
       'js'
     ).then(() => {
       if (window.NProgress) {
         setNProgress(window.NProgress)
         // 调速
         window.NProgress.settings.minimun = 0.1
         loadExternalResource(
-          'https://cdn.bootcdn.net/ajax/libs/nprogress/0.2.0/nprogress.min.css',
+          'https://cdnjs.snrat.com/ajax/libs/nprogress/0.2.0/nprogress.min.css',
           'css'
         )
       }

components/PWA.js

@@ -34,7 +34,7 @@ export function PWA(post, siteInfo) {
 
   // 删除已有的 manifest link 元素（如果存在）
   const existingManifest = document.querySelector('link[rel="manifest"]')
-  if (existingManifest) {
+  if (existingManifest && existingManifest.parentNode && existingManifest.parentNode.contains(existingManifest)) {
     existingManifest.parentNode.removeChild(existingManifest)
   }
 

components/PrismMac.js

@@ -74,7 +74,7 @@ const loadPrismThemeCSS = (isDarkMode, prismThemeSwitch, prismThemeDarkPath, pri
       PRISM_PREVIOUS = prismThemeDarkPath
     }
     const previousTheme = document.querySelector(`link[href="${PRISM_PREVIOUS}"]`)
-    if (previousTheme) {
+    if (previousTheme && previousTheme.parentNode && previousTheme.parentNode.contains(previousTheme)) {
       previousTheme.parentNode.removeChild(previousTheme)
     }
     loadExternalResource(PRISM_THEME, 'css')

hooks/useAdjustStyle.js

@@ -6,8 +6,8 @@ import { useEffect } from 'react';
  */
 const useAdjustStyle = () => {
   /**
-     * 避免 callout 含有图片时溢出撑开父容器
-     */
+   * 避免 callout 含有图片时溢出撑开父容器
+   */
   const adjustCalloutImg = () => {
     const callOuts = document.querySelectorAll('.notion-callout-text');
     callOuts.forEach((callout) => {