合并到个人base分支

.github/workflows/bump-version-on-main.yml

@@ -32,17 +32,27 @@ jobs:
           fetch-depth: 0
 
       - name: Bump package.json patch (last segment)
-        run: node scripts/bump-package-patch-version.js
+        id: bump
+        run: |
+          node scripts/bump-package-patch-version.js
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
 
-      - name: Commit and push if changed
+      - name: Push version bump branch
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           if git diff --quiet package.json; then
             echo "No version change (unexpected)."
             exit 0
           fi
-          NEW_VER=$(node -p "require('./package.json').version")
+          BRANCH="chore/bump-package-version"
+          git checkout -B "${BRANCH}"
           git add package.json
-          git commit -m "chore(release): bump package.json to ${NEW_VER} [skip-version]"
-          git push
+          git commit -m "chore(release): bump package.json to ${{ steps.bump.outputs.version }} [skip-version]"
+          git push --force-with-lease origin "${BRANCH}"
+          {
+            echo "Version bump branch pushed: \`${BRANCH}\`"
+            echo ""
+            echo "Create a pull request from \`${BRANCH}\` to \`main\` to publish version ${{ steps.bump.outputs.version }}."
+          } >> "$GITHUB_STEP_SUMMARY"

__tests__/lib/db/notion/memberDataSource.test.js

@@ -0,0 +1,89 @@
+import {
+  fetchMembersFromOfficialAPI,
+  mapOfficialMemberPage
+} from '@/lib/db/notion/memberDataSource'
+
+const originalEnv = process.env
+const originalFetch = global.fetch
+
+function memberPage({ id, title, slug, status = 'Published' }) {
+  return {
+    id,
+    created_time: '2026-01-01T00:00:00.000Z',
+    last_edited_time: '2026-01-02T00:00:00.000Z',
+    properties: {
+      title: { type: 'title', title: [{ plain_text: title }] },
+      slug: { type: 'rich_text', rich_text: [{ plain_text: slug }] },
+      status: { type: 'select', select: { name: status } },
+      featured: { type: 'checkbox', checkbox: true }
+    }
+  }
+}
+
+describe('memberDataSource', () => {
+  beforeEach(() => {
+    process.env = { ...originalEnv }
+    global.fetch = jest.fn()
+  })
+
+  afterEach(() => {
+    process.env = originalEnv
+    global.fetch = originalFetch
+  })
+
+  it('maps an official Notion member page to site data', () => {
+    const mapped = mapOfficialMemberPage(
+      memberPage({ id: 'member-1', title: 'Ada', slug: 'ada' })
+    )
+
+    expect(mapped).toMatchObject({
+      id: 'member-1',
+      title: 'Ada',
+      slug: 'members/ada',
+      href: '/members/ada',
+      type: 'Member',
+      status: 'Published',
+      featured: true
+    })
+  })
+
+  it('paginates official API results and filters unpublished members', async () => {
+    process.env.NOTION_API_TOKEN = 'secret'
+    process.env.NOTION_MEMBERS_DATA_SOURCE_ID = 'source-id'
+
+    global.fetch
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          has_more: true,
+          next_cursor: 'cursor-2',
+          results: [
+            memberPage({ id: 'member-1', title: 'Ada', slug: 'ada' })
+          ]
+        })
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          has_more: false,
+          next_cursor: null,
+          results: [
+            memberPage({
+              id: 'member-2',
+              title: 'Draft',
+              slug: 'draft',
+              status: 'Invisible'
+            })
+          ]
+        })
+      })
+
+    const members = await fetchMembersFromOfficialAPI()
+
+    expect(global.fetch).toHaveBeenCalledTimes(2)
+    expect(JSON.parse(global.fetch.mock.calls[1][1].body)).toMatchObject({
+      start_cursor: 'cursor-2'
+    })
+    expect(members.map(member => member.id)).toEqual(['member-1'])
+  })
+})

conf/notion.config.js

@@ -19,6 +19,10 @@ module.exports = {
     type_menu: process.env.NEXT_PUBLIC_NOTION_PROPERTY_TYPE_MENU || 'Menu', // 当type文章类型与此值相同时，为菜单。
     type_sub_menu:
       process.env.NEXT_PUBLIC_NOTION_PROPERTY_TYPE_SUB_MENU || 'SubMenu', // 当type文章类型与此值相同时，为子菜单。
+    type_member:
+      process.env.NEXT_PUBLIC_NOTION_PROPERTY_TYPE_MEMBER || 'Member', // 社区成员资料
+    type_event:
+      process.env.NEXT_PUBLIC_NOTION_PROPERTY_TYPE_EVENT || 'Event', // 社区活动
     title: process.env.NEXT_PUBLIC_NOTION_PROPERTY_TITLE || 'title', // 文章标题
     status: process.env.NEXT_PUBLIC_NOTION_PROPERTY_STATUS || 'status',
     status_publish:

lib/db/SiteDataApi.js

@@ -27,6 +27,7 @@ import { fetchPageFromNotion } from './notion/getNotionPost'
 import { processPostData } from '../utils/post'
 import { adapterNotionBlockMap } from '../utils/notion.util'
 import { sortPinnedPostsByLatestUpdate } from '@/lib/utils/pinnedPosts'
+import { fetchMembersFromOfficialAPI } from './notion/memberDataSource'
 // import pLimit from 'p-limit'
 
 export { getAllTags } from './notion/getAllTags'
@@ -182,6 +183,8 @@ const EmptyData = pageId => ({
   rawMetadata: {},
   customNav: [],
   customMenu: [],
+  allMembers: [],
+  allEvents: [],
   postCount: 1,
   pageIds: [],
   latestPosts: []
@@ -393,6 +396,26 @@ async function convertNotionToSiteData(
     )
   }
   collectionData.forEach(element => adjustPageProperties(element, NOTION_CONFIG))
+
+  const officialMembers = await fetchMembersFromOfficialAPI({
+    typeProperty: BLOG.NOTION_PROPERTY_NAME.type,
+    statusProperty: BLOG.NOTION_PROPERTY_NAME.status,
+    typeValue: BLOG.NOTION_PROPERTY_NAME.type_member,
+    statusValue: BLOG.NOTION_PROPERTY_NAME.status_publish
+  })
+  if (officialMembers.length > 0) {
+    const existingMembers = new Set(
+      collectionData
+        .filter(item => item?.type === 'Member')
+        .flatMap(item => [item.id, item.slug].filter(Boolean))
+    )
+    officialMembers.forEach(member => {
+      if (!existingMembers.has(member.id) && !existingMembers.has(member.slug)) {
+        collectionData.push(member)
+      }
+    })
+  }
+
   const siteInfo = getSiteInfo({ collection, block, rawMetadata, NOTION_CONFIG })
   const stepEnd9 = Date.now()
   console.log(`[${traceId}] ⏱ 配置站点信息耗时: ${stepEnd9 - stepStart9}ms @ ${new Date().toISOString()}`)
@@ -432,6 +455,11 @@ async function convertNotionToSiteData(
     latestPostCount: siteConfig('LATEST_POST_COUNT', 6, NOTION_CONFIG)
   })
   const allNavPages = getNavPages({ allPages })
+
+  // ── 社区数据：Member / Event ──
+  const allMembers = getAllMembers({ allPages })
+  const allEvents = getAllEvents({ allPages })
+
   const stepEnd11 = Date.now()
   console.log(`[${traceId}] ⏱ 其他数据生成耗时: ${stepEnd11 - stepStart11}ms @ ${new Date().toISOString()}`)
   const overallEnd = Date.now()
@@ -442,6 +470,8 @@ async function convertNotionToSiteData(
     notice,
     siteInfo,
     allPages,
+    allMembers,
+    allEvents,
     allNavPages,
     collection,
     collectionQuery,
@@ -490,16 +520,20 @@ function handleDataBeforeReturn(db) {
   db.tagOptions = cleanTagOptions(db?.tagOptions)
   db.allNavPages = cleanPages(db?.allNavPages, db.tagOptions)
   db.allPages = cleanPages(db.allPages, db.tagOptions)
+  db.allMembers = cleanPages(db.allMembers, db.tagOptions)
+  db.allEvents = cleanPages(db.allEvents, db.tagOptions)
   db.latestPosts = cleanPages(db.latestPosts, db.tagOptions)
 
   // 定时发布：检查发布时间窗口，超出范围的隐藏
+  // 仅对 Post/Page 生效，Event 和 Member 不受此限制
   const POST_SCHEDULE_PUBLISH = siteConfig(
     'POST_SCHEDULE_PUBLISH',
     null,
     db.NOTION_CONFIG
   )
   if (POST_SCHEDULE_PUBLISH) {
     db.allPages?.forEach(p => {
+      if (p.type === 'Event' || p.type === 'Member') return
       if (!isInRange(p.title, p.date)) {
         console.log('[定时发布] 隐藏-->', p.title, p.date)
         p.status = 'Invisible'
@@ -799,3 +833,38 @@ export function getNavPages({ allPages }) {
     ext: item.ext || {}
   }))
 }
+
+/**
+ * 获取所有已发布的社区成员
+ * 从 allPages 中筛选 type=Member && status=Published 的条目
+ */
+export function getAllMembers({ allPages }) {
+  if (!Array.isArray(allPages)) return []
+  return allPages
+    .filter(page => page?.type === 'Member' && page?.status === 'Published')
+    .sort((a, b) => {
+      // Featured 优先
+      const aFeatured = Boolean(a.featured)
+      const bFeatured = Boolean(b.featured)
+      if (aFeatured !== bFeatured) return bFeatured ? 1 : -1
+      // Verified 优先
+      const aVerified = Boolean(a.verified)
+      const bVerified = Boolean(b.verified)
+      if (aVerified !== bVerified) return bVerified ? 1 : -1
+      // sortOrder 升序
+      if (a.sortOrder != null && b.sortOrder != null) return a.sortOrder - b.sortOrder
+      // 发布时间倒序
+      return (b?.publishDate ?? 0) - (a?.publishDate ?? 0)
+    })
+}
+
+/**
+ * 获取所有已发布的社区活动
+ * 从 allPages 中筛选 type=Event && status=Published 的条目
+ */
+export function getAllEvents({ allPages }) {
+  if (!Array.isArray(allPages)) return []
+  return allPages
+    .filter(page => page?.type === 'Event' && page?.status === 'Published')
+    .sort((a, b) => (b?.publishDate ?? 0) - (a?.publishDate ?? 0))
+}

lib/db/notion/getPageProperties.js

@@ -154,7 +154,9 @@ function mapProperties(properties) {
     [BLOG.NOTION_PROPERTY_NAME.type_page]: 'Page',
     [BLOG.NOTION_PROPERTY_NAME.type_notice]: 'Notice',
     [BLOG.NOTION_PROPERTY_NAME.type_menu]: 'Menu',
-    [BLOG.NOTION_PROPERTY_NAME.type_sub_menu]: 'SubMenu'
+    [BLOG.NOTION_PROPERTY_NAME.type_sub_menu]: 'SubMenu',
+    [BLOG.NOTION_PROPERTY_NAME.type_member]: 'Member',
+    [BLOG.NOTION_PROPERTY_NAME.type_event]: 'Event'
   }
 
   const statusMap = {