From 4e87e14308e0bad47bf56818a81ed693dae82081 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Fri, 29 Apr 2022 15:42:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Vercel=20=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=AF=BB=E5=8F=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/_app.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pages/_app.js b/pages/_app.js
index 779a81eb..ef7b1408 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -27,23 +27,24 @@ const Messenger = dynamic(() => import('@/components/FacebookMessenger'), {
 })
 
 const MyApp = ({ Component, pageProps }) => {
+  // 外部插件
+  const externalPlugins = <>
+        {JSON.parse(BLOG.THEME_SWITCH) && <ThemeSwitch />}
+        {JSON.parse(BLOG.DEBUG) && <DebugPanel />}
+        {BLOG.ANALYTICS_ACKEE_TRACKER && <Ackee />}
+        {BLOG.ANALYTICS_GOOGLE_ID && <Gtag />}
+        {JSON.parse(BLOG.ANALYTICS_BUSUANZI_ENABLE) && <Busuanzi />}
+        {BLOG.ADSENSE_GOOGLE_ID && <GoogleAdsense />}
+        {BLOG.FACEBOOK_APP_ID && BLOG.FACEBOOK_PAGE_ID && <Messenger />}
+    </>
+
   return (
-    <GlobalContextProvider>
-      {BLOG.THEME_SWITCH && <ThemeSwitch />}
-      {BLOG.DEBUG && <DebugPanel />}
-      {BLOG.ANALYTICS_ACKEE_TRACKER && <Ackee />}
-      {BLOG.ANALYTICS_GOOGLE_ID && <Gtag />}
-      {JSON.parse(BLOG.ANALYTICS_BUSUANZI_ENABLE) && <Busuanzi />}
-      {BLOG.ADSENSE_GOOGLE_ID && <GoogleAdsense />}
-      {BLOG.FACEBOOK_APP_ID && BLOG.FACEBOOK_PAGE_ID && <Messenger />}
-      {/* FontawesomeCDN */}
-      <link
-        href={BLOG.FONT_AWESOME_PATH}
-        rel="stylesheet"
-        referrerPolicy="no-referrer"
-      />
-      <Component {...pageProps} />
-    </GlobalContextProvider>
+        <GlobalContextProvider>
+            {externalPlugins}
+            {/* FontawesomeCDN */}
+            <link rel="stylesheet" href={BLOG.FONT_AWESOME_PATH} referrerPolicy="no-referrer" />
+            <Component {...pageProps} />
+        </GlobalContextProvider>
   )
 }
 

From 2496908003cc984c8579623bd1e902d235bec833 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Fri, 29 Apr 2022 16:02:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/notion/getNotionData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/notion/getNotionData.js b/lib/notion/getNotionData.js
index 118ed16b..0b2d5ba1 100644
--- a/lib/notion/getNotionData.js
+++ b/lib/notion/getNotionData.js
@@ -167,7 +167,7 @@ function getAllCategories({ allPosts, categoryOptions, sliceCount = 0 }) {
  * @param from
  * @returns {Promise<{title,description,pageCover}>}
  */
-function getBlogInfo(collection, block) {
+function getBlogInfo({ collection, block }) {
   const title = collection?.name?.[0][0] || BLOG.TITLE
   const description = collection?.description?.[0][0] || BLOG.DESCRIPTION
   const pageCover = mapCoverUrl(collection?.cover, block)