Merge pull request #2399 from tangly1024/feat/notion-config

sitemap,robots支持NOTION_CONFIG

lib/robots.txt.js

@@ -1,18 +1,18 @@
-
 import fs from 'fs'
-import BLOG from '@/blog.config'
+import { siteConfig } from './config'
 
-export async function generateRobotsTxt() {
+export async function generateRobotsTxt(NOTION_CONFIG) {
+  const LINK = siteConfig('LINK', '', NOTION_CONFIG)
   const content = `
     # *
     User-agent: *
     Allow: /
   
     # Host
-    Host: ${BLOG.LINK}
+    Host: ${LINK}
   
     # Sitemaps
-    Sitemap: ${BLOG.LINK}/sitemap.xml
+    Sitemap: ${LINK}/sitemap.xml
   
     `
   try {

lib/rss.js

@@ -1,4 +1,3 @@
-import BLOG from '@/blog.config'
 import NotionPage from '@/components/NotionPage'
 import { getPostBlocks } from '@/lib/db/getSiteData'
 import { Feed } from 'feed'
@@ -27,22 +26,22 @@ const createFeedContent = async post => {
 }
 
 export async function generateRss(NOTION_CONFIG, posts) {
-  const link = siteConfig('LINK', BLOG.LINK, NOTION_CONFIG)
-  const author = siteConfig('AUTHOR', BLOG.AUTHOR, NOTION_CONFIG)
-  const lang = siteConfig('LANG', BLOG.LANG, NOTION_CONFIG)
-  const subPath = siteConfig('SUB_PATH', BLOG.SUB_PATH, NOTION_CONFIG)
+  const link = siteConfig('LINK', '', NOTION_CONFIG)
+  const author = siteConfig('AUTHOR', '', NOTION_CONFIG)
+  const lang = siteConfig('LANG', '', NOTION_CONFIG)
+  const subPath = siteConfig('SUB_PATH', '', NOTION_CONFIG)
 
   const year = new Date().getFullYear()
   const feed = new Feed({
-    title: BLOG.TITLE,
-    description: BLOG.DESCRIPTION,
+    title: siteConfig('TITLE', '', NOTION_CONFIG),
+    description: siteConfig('DESCRIPTION', '', NOTION_CONFIG),
     link: `${link}/${subPath}`,
     language: lang,
     favicon: `${link}/favicon.png`,
     copyright: `All rights reserved ${year}, ${author}`,
     author: {
       name: author,
-      email: BLOG.CONTACT_EMAIL,
+      email: siteConfig('CONTACT_EMAIL', '', NOTION_CONFIG),
       link: link
     }
   })

pages/index.js

@@ -56,7 +56,7 @@ export async function getStaticProps(req) {
   }
 
   // 生成robotTxt
-  generateRobotsTxt()
+  generateRobotsTxt(props?.NOTION_CONFIG)
   // 生成Feed订阅
   if (JSON.parse(BLOG.ENABLE_RSS)) {
     generateRss(props?.NOTION_CONFIG, props?.latestPosts || [])

pages/sitemap.xml.js

@@ -17,7 +17,7 @@ export const getServerSideProps = async ctx => {
       pageId: id,
       from: 'sitemap.xml'
     })
-    const link = siteConfig('LINK', BLOG.LINK, siteData.NOTION_CONFIG)
+    const link = siteConfig('LINK', '', siteData.NOTION_CONFIG)
     const localeFields = generateLocalesSitemap(link, siteData.allPages, locale)
     fields = fields.concat(localeFields)
   }