Merge branch 'main' of https://github.com/tangly1024/NotionNext

Author: actions-user

.vitepress/config.mts

@@ -70,6 +70,7 @@ export default defineConfig({
             { text: 'Vercel 静态导出', link: '/user-guide/deploy/vercel-static' },
             { text: 'Cloudflare 文档站', link: '/user-guide/deploy/cloudflare-pages-docs' },
             { text: 'Cloudflare 博客静态', link: '/user-guide/deploy/cloudflare-pages' },
+            { text: 'EdgeOne Pages', link: '/user-guide/deploy/edgeone-pages' },
             { text: '构建性能调优', link: '/user-guide/deploy/build-tuning' },
             { text: 'Netlify', link: '/user-guide/deploy/netlify' },
             { text: 'VPS', link: '/user-guide/deploy/vps' }

docs/user-guide/deploy/edgeone-pages.md

@@ -0,0 +1,45 @@
+# 腾讯云 EdgeOne Pages 部署
+
+> 完整排错见仓库 [DEPLOYMENT.md · EdgeOne Pages](https://github.com/notionnext-org/NotionNext/blob/main/DEPLOYMENT.md#腾讯云-edgeone-pages)
+
+## 环境要求
+
+| 项 | 说明 |
+| --- | --- |
+| Node | 与仓库根目录 **`.nvmrc` 完全一致**（当前为 `20.18.0`） |
+| 包管理 | `yarn install` → `yarn build` 或 `yarn export` |
+| 必配变量 | `NOTION_PAGE_ID` 等（见 [配置站点](../config-site.md)） |
+
+EdgeOne 会按 `.nvmrc` 切换 Node。若日志出现 **`Failed to switch to Node.js 20.20.0`** 等，说明仓库过旧或控制台所选版本与 `.nvmrc` 不一致——请拉取最新 `main`，并在 **项目设置 → Node.js 版本** 中选择与 `.nvmrc` 相同的补丁号（如 `20.18.0`）。
+
+## 推荐：框架预设「Next SSG」
+
+部分用户在默认 Pages 构建流程下，Node 切换成功后会在 `yarn install` 阶段遇到 **`ENOSPC: no space left on device`**（构建机 `/dev/shm` 或磁盘不足）。
+
+若出现该情况，可在 EdgeOne 控制台尝试将**框架预设**改为 **Next SSG**（或平台提供的 Next 静态导出类预设）后重新部署。该方式通常由平台优化安装与构建路径，占用更小，社区反馈可成功完成部署。
+
+仍失败时请结合下方 ENOSPC 小节与 [构建性能调优](./build-tuning.md)。
+
+## `yarn install` 报 ENOSPC
+
+日志中若已有 **`Now, we're on node version v20.18.0`**，则 Node 版本已正常，失败原因是**构建机空间不足**，与 NotionNext 代码无关。
+
+可尝试（按顺序）：
+
+1. 改用上文 **Next SSG** 预设，或关闭「依赖/构建缓存」后无缓存重构建一次  
+2. 向 EdgeOne / 腾讯云工单说明 `yarn install` 阶段 ENOSPC，询问构建盘配额  
+3. 若平台支持，设置 `YARN_CACHE_FOLDER` 到空间更大的路径（以官方文档为准）  
+4. 在 GitHub Actions 等环境完成 `yarn build` / `yarn export`，仅将静态产物同步到 EdgeOne 托管
+
+## 构建超时
+
+Notion 拉取慢导致单页超时，请参阅 **[构建性能调优](./build-tuning.md)**，例如：
+
+```env
+BUILD_PREFETCH_ENABLED=false
+STATIC_PAGE_GENERATION_TIMEOUT=600
+```
+
+## 相关 Issue
+
+- [#4014](https://github.com/notionnext-org/NotionNext/issues/4014) — EdgeOne Node 版本与 ENOSPC 排错（已在 `main` 将 `.nvmrc` 对齐 `20.18.0`）

docs/user-guide/deploy/index.md

@@ -19,6 +19,7 @@
 | [vercel-redeploy.md](./vercel-redeploy.md) | 重新部署 |
 | [netlify.md](./netlify.md) | Netlify（4.0.9+） |
 | [cloudflare-pages.md](./cloudflare-pages.md) | Cloudflare 静态 |
+| [edgeone-pages.md](./edgeone-pages.md) | **腾讯云 EdgeOne**（Node 版本、ENOSPC、Next SSG 预设） |
 | [build-tuning.md](./build-tuning.md) | **构建超时 / Notion 预热与限流**（环境变量） |
 | [vps.md](./vps.md) | VPS / Docker（Node 20+） |
 
@@ -32,6 +33,6 @@
 - **Yarn**：`yarn` → `yarn build` / `yarn export`
 - 必配：`NOTION_PAGE_ID`
 
-## EdgeOne / 构建缓存
+## EdgeOne
 
-构建时若 `.next/cache` 不可写，项目会回退系统临时目录（Netlify 等）。见上游 PR #4046 与 `lib/cache/build_session.js`。
+Node 版本、磁盘 `ENOSPC`、框架预设 **Next SSG** 等见 **[edgeone-pages.md](./edgeone-pages.md)**。构建时若 `.next/cache` 不可写，项目会回退系统临时目录，见 `lib/cache/build_session.js`。

lib/global.js

@@ -7,7 +7,7 @@ import {
 } from '@/themes/theme'
 import { useUser } from '@clerk/nextjs'
 import { useRouter } from 'next/router'
-import { createContext, useContext, useEffect, useMemo, useState } from 'react'
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { generateLocaleDict, initLocale, redirectUserLang } from './utils/lang'
 
 /**
@@ -52,7 +52,7 @@ export function GlobalContextProvider(props) {
   const fullWidth = post?.fullWidth ?? false
 
   // 切换主题
-  function switchTheme() {
+  const switchTheme = useCallback(() => {
     const query = router.query
     const currentTheme = query.theme || theme
     const currentIndex = THEMES.indexOf(currentTheme)
@@ -61,30 +61,30 @@ export function GlobalContextProvider(props) {
     query.theme = newTheme
     router.push({ pathname: router.pathname, query })
     return newTheme
-  }
+  }, [router, theme, THEMES])
 
   // 抓取主题配置
-  const updateThemeConfig = async theme => {
+  const updateThemeConfig = useCallback(async theme => {
     const config = await getThemeConfig(theme)
     SET_THEME_CONFIG(config)
-  }
+  }, [])
 
   // 切换深色模式
-  const toggleDarkMode = () => {
+  const toggleDarkMode = useCallback(() => {
     const newStatus = !isDarkMode
     saveDarkModeToLocalStorage(newStatus)
     updateDarkMode(newStatus)
     const htmlElement = document.getElementsByTagName('html')[0]
     htmlElement.classList?.remove(newStatus ? 'light' : 'dark')
     htmlElement.classList?.add(newStatus ? 'dark' : 'light')
-  }
+  }, [isDarkMode])
 
-  function changeLang(lang) {
+  const changeLang = useCallback(lang => {
     if (lang) {
       updateLang(lang)
       updateLocale(generateLocaleDict(lang))
     }
-  }
+  }, [])
 
   // 添加路由变化时的语言处理
   useEffect(() => {
@@ -133,7 +133,7 @@ export function GlobalContextProvider(props) {
     }
   }, [router.events])
 
-  const contextValue = {
+  const contextValue = useMemo(() => ({
     isLiteMode,
     isLoaded,
     isSignedIn,
@@ -156,7 +156,7 @@ export function GlobalContextProvider(props) {
     siteInfo,
     categoryOptions,
     tagOptions
-  }
+  }), [isLiteMode, isLoaded, isSignedIn, user, fullWidth, NOTION_CONFIG, THEME_CONFIG, toggleDarkMode, onLoading, setOnLoading, lang, changeLang, locale, updateLocale, isDarkMode, updateDarkMode, theme, setTheme, switchTheme, siteInfo, categoryOptions, tagOptions])
   globalSnapshot = contextValue
 
   return (

lib/utils/errorHandler.js

@@ -1,3 +1,4 @@
+import React from 'react'
 /**
  * 统一错误处理工具类
  */

package.json

@@ -70,15 +70,15 @@
     "@clerk/nextjs": "^5.7.6",
     "@headlessui/react": "^1.7.19",
     "@next/bundle-analyzer": "^12.3.7",
-    "@supabase/supabase-js": "^2.57.4",
+    "@supabase/supabase-js": "^2.106.0",
     "@tabler/icons-react": "^3.36.1",
     "@vercel/analytics": "^1.6.1",
-    "@vercel/functions": "^3.4.3",
+    "@vercel/functions": "^3.6.0",
     "algoliasearch": "^4.25.2",
     "axios": "^1.16.1",
     "critters": "^0.0.23",
     "feed": "^4.2.2",
-    "ioredis": "^5.6.1",
+    "ioredis": "^5.10.1",
     "js-md5": "^0.8.3",
     "js-sha256": "^0.11.1",
     "memory-cache": "^0.2.0",

pages/_app.js

@@ -12,6 +12,7 @@ import { getBaseLayoutByTheme } from '@/themes/theme'
 import { useRouter } from 'next/router'
 import { useCallback, useEffect, useMemo } from 'react'
 import { getQueryParam } from '../lib/utils'
+import ErrorHandler from '@/lib/utils/errorHandler'
 
 // 各种扩展插件 这个要阻塞引入
 import BLOG from '@/blog.config'
@@ -23,6 +24,13 @@ import dynamic from 'next/dynamic'
 const ClerkProvider = dynamic(() =>
   import('@clerk/nextjs').then(m => m.ClerkProvider)
 )
+const AppErrorBoundary = ErrorHandler.createErrorBoundary(
+  <div style={{ padding: '2rem', textAlign: 'center', minHeight: '100vh', display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center' }}>
+    <h1 style={{ fontSize: '1.5rem', marginBottom: '1rem' }}>Something went wrong</h1>
+    <p style={{ color: '#666', marginBottom: '1.5rem' }}>An unexpected error occurred. Please refresh the page.</p>
+    <button onClick={() => window.location.reload()} style={{ padding: '0.5rem 1.5rem', cursor: 'pointer', border: '1px solid #ccc', borderRadius: '4px', background: 'transparent' }}>Refresh</button>
+  </div>
+)
 
 /**
  * App挂载DOM 入口文件
@@ -75,13 +83,15 @@ const MyApp = ({ Component, pageProps }) => {
 
   const enableClerk = process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY
   const content = (
-    <GlobalContextProvider {...pageProps}>
-      <GLayout {...pageProps}>
-        <SEO {...pageProps} />
-        <Component {...pageProps} />
-      </GLayout>
-      <ExternalPlugins {...pageProps} />
-    </GlobalContextProvider>
+    <AppErrorBoundary>
+      <GlobalContextProvider {...pageProps}>
+        <GLayout {...pageProps}>
+          <SEO {...pageProps} />
+          <Component {...pageProps} />
+        </GLayout>
+        <ExternalPlugins {...pageProps} />
+      </GlobalContextProvider>
+    </AppErrorBoundary>
   )
   return (
     <>

pages/api/cache.js

@@ -6,10 +6,20 @@ import { cleanCache } from '@/lib/cache/local_file_cache'
  * @param {*} res
  */
 export default async function handler(req, res) {
+  if (req.method !== 'POST') {
+    return res.status(405).json({ status: 'error', message: 'Method not allowed' })
+  }
+
+  const token = process.env.CACHE_REVALIDATION_TOKEN
+  if (token && req.headers.authorization !== `Bearer ${token}`) {
+    return res.status(401).json({ status: 'error', message: 'Unauthorized' })
+  }
+
   try {
     await cleanCache()
     res.status(200).json({ status: 'success', message: 'Clean cache successful!' })
   } catch (error) {
-    res.status(400).json({ status: 'error', message: 'Clean cache failed!', error })
+    console.error('Cache clean error:', error)
+    res.status(400).json({ status: 'error', message: 'Clean cache failed!' })
   }
 }

pages/api/subscribe.js

@@ -10,11 +10,11 @@ export default async function handler(req, res) {
     const { email, firstName, lastName } = req.body
     try {
       const response = await subscribeToMailchimpApi({ email, first_name: firstName, last_name: lastName })
-      const data = await response.json()
-      console.log('data', data)
+      await response.json()
       res.status(200).json({ status: 'success', message: 'Subscription successful!' })
     } catch (error) {
-      res.status(400).json({ status: 'error', message: 'Subscription failed!', error })
+      console.error('Subscription error:', error)
+      res.status(400).json({ status: 'error', message: 'Subscription failed!' })
     }
   } else {
     res.status(405).json({ status: 'error', message: 'Method not allowed' })