[pull] next from 142vip:next

.github/workflows/CD.yaml

@@ -12,8 +12,44 @@ on:
   push:
     branches:
       - next
-      - ci-test
+      - fix/cd
   workflow_dispatch:
+    inputs:
+      package:
+        description: 要发布的 npm 包（手动触发时必选）
+        required: true
+        type: choice
+        options:
+          - '@142vip/axios'
+          - '@142vip/changelog'
+          - '@142vip/commit-linter'
+          - '@142vip/copyright'
+          - '@142vip/data-source'
+          - '@142vip/egg'
+          - '@142vip/egg-axios'
+          - '@142vip/egg-grpc-client'
+          - '@142vip/egg-grpc-server'
+          - '@142vip/egg-mysql'
+          - '@142vip/egg-redis'
+          - '@142vip/egg-sequelize'
+          - '@142vip/egg-swagger'
+          - '@142vip/egg-validate'
+          - '@142vip/eslint-config'
+          - '@142vip/fairy-cli'
+          - '@142vip/grpc'
+          - '@142vip/nest'
+          - '@142vip/nest-logger'
+          - '@142vip/nest-redis'
+          - '@142vip/nest-starter'
+          - '@142vip/nest-typeorm'
+          - '@142vip/oauth2.0'
+          - '@142vip/open-source'
+          - '@142vip/redis'
+          - '@142vip/release-version'
+          - '@142vip/typeorm'
+          - '@142vip/utils'
+          - '@142vip/vitepress'
+          - '@142vip/vuepress'
 
 # 设置 GITHUB_TOKEN 的权限，以允许部署到 GitHub Pages
 permissions:
@@ -27,7 +63,7 @@ jobs:
     name: 创建Github发布
     runs-on: ubuntu-latest
     # 主库next且执行release更新时执行
-    if: github.repository == '142vip/core-x' && startsWith(github.event.head_commit.message, 'chore(release):')
+    if: github.event_name == 'push' && github.repository == '142vip/core-x' && startsWith(github.event.head_commit.message, 'chore(release):')
 
     steps:
       - name: Checkout Code
@@ -46,7 +82,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.12.2
+          node-version: 22.10.0
           # 缓存
           cache: pnpm
 
@@ -69,8 +105,10 @@ jobs:
   npm-release:
     name: 创建npm发布
     runs-on: ubuntu-latest
-    # 主库next且执行release更新时执行
-    if: github.repository == '142vip/core-x' && startsWith(github.event.head_commit.message, 'release(@142vip/')
+    # push: release(@scope/pkg) 提交；workflow_dispatch: 手动选择包发版
+    if: |
+      (github.event_name == 'workflow_dispatch' && github.event.inputs.package != '') ||
+      (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'release(@'))
 
     steps:
       - name: Checkout Code
@@ -90,7 +128,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.12.2
+          node-version: 22.10.0
           # npm包上传地址，用于注册，参考：https://github.com/actions/setup-node
           registry-url: 'https://registry.npmjs.org'
           # 缓存
@@ -105,23 +143,26 @@ jobs:
       #        run: |
       #          pnpm build:packages
 
-      - name: Get Package Name By Commit Scope
+      - name: Resolve Package Name
         id: getPkgName
-        # 这里使用正则截取scope，获取包名
         run: |
-          SCOPE=$(echo "${{ github.event.head_commit.message }}" | grep -o '@[^):]*')
-          echo "name=$SCOPE" >> $GITHUB_OUTPUT
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "name=${{ github.event.inputs.package }}" >> "$GITHUB_OUTPUT"
+          else
+            SCOPE=$(echo "${{ github.event.head_commit.message }}" | grep -o '@[^):]*' | head -1)
+            echo "name=${SCOPE}" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Use Package Name
         run: |
           echo "The pkgName is: ${{ steps.getPkgName.outputs.name }}"
 
-      # Npm 版本发布 注意：只发布packages中的模块
+      - name: Upgrade npm for OIDC trusted publishing
+        run: npm i -g npm@^11.10
+
+      # OIDC 发布：须在 npm 各包上配置 Trusted Publisher（见 scripts/npm-trust）
       - name: Publish New Npm Version
-        run: |
-          pnpm publish --filter "${{ steps.getPkgName.outputs.name }}"
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        run: pnpm publish --filter "${{ steps.getPkgName.outputs.name }}"
 
   # 构建并部署Dist
   deploy-dist:
@@ -130,8 +171,8 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    # todo 确定这里的触发条件
-    if: github.repository == '142vip/core-x'
+    # 仅 push 到 next/fix/cd 时部署文档，手动发版 npm 不触发
+    if: github.event_name == 'push' && github.repository == '142vip/core-x'
     steps:
       # 拉取代码
       - name: Checkout
@@ -149,7 +190,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.12.2
+          node-version: 22.10.0
           cache: pnpm
 
       - name: Setup Pages
@@ -190,7 +231,7 @@ jobs:
     name: 部署到Github Wiki
     runs-on: ubuntu-latest
     # 主库next且执行release更新时执行
-    if: github.repository == '142vip/core-x' && startsWith(github.event.head_commit.message, 'chore(release):')
+    if: github.event_name == 'push' && github.repository == '142vip/core-x' && startsWith(github.event.head_commit.message, 'chore(release):')
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

.github/workflows/CI.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.12.2
+          node-version: 22.10.0
           # 缓存
           cache: pnpm
 

.vitepress/sidebar.ts

@@ -1,14 +1,13 @@
-import type { SidebarConfig, VipPackageJSON, VipProject } from '@142vip/vitepress'
-import { defineVipSidebarConfig } from '@142vip/vitepress'
+import { defineVipSidebarConfig, SidebarConfig } from '@142vip/vitepress'
 
-enum ProjectId {
-  BUSINESS = '商业代码',
+export enum ProjectId {
+  BUSINESS = '商业模块',
   TOOLS = '通用工具',
   EGG = 'Egg.js框架',
   NEST = 'Nest.js框架',
   BLOG = '博客工具',
   INFRA = '工程化',
-  DEMO = '演示Demo',
+  DEMO = '最佳实践',
 }
 
 /**
@@ -21,6 +20,15 @@ export const sidebarConfig = defineVipSidebarConfig([
       { text: '@142vip/data-source', link: '/packages/data-source/index.md' },
     ],
   },
+  {
+    text: `🎮 ${ProjectId.DEMO}`,
+    items: [
+      { text: 'egg-demo', link: '/apps/egg-demo/index.md' },
+      { text: 'nest-demo', link: '/apps/nest-demo/index.md' },
+      { text: 'vitepress-demo', link: '/apps/vitepress-demo/index.md' },
+      { text: 'vuepress-demo', link: '/apps/vuepress-demo/index.md' },
+    ],
+  },
   {
     text: `🏆 ${ProjectId.INFRA}`,
     items: [
@@ -75,84 +83,8 @@ export const sidebarConfig = defineVipSidebarConfig([
       { text: '@142vip/vuepress', link: '/packages/vuepress/index.md' },
     ],
   },
-  {
-    text: `🎮 ${ProjectId.DEMO}`,
-    items: [
-      { text: 'egg-demo', link: '/apps/egg-demo/index.md' },
-      { text: 'nest-demo', link: '/apps/nest-demo/index.md' },
-      { text: 'vitepress-demo', link: '/apps/vitepress-demo/index.md' },
-      { text: 'vuepress-demo', link: '/apps/vuepress-demo/index.md' },
-    ],
-  },
 ])
 
-/**
- * 获取基本包信息
- * - 注意目录格式，例如：@packages/utils
- * @vite-ignore
- */
-async function getBasePkgJSON(pkgDirName: string): Promise<VipPackageJSON> {
-  // 参考格式：@packages/xxx @apps/xxx
-  return await import(`@packages/${pkgDirName}/package.json`)
-}
-
-/**
- * 获取apps目录下的模块
- * - @apps/vitepress-demo
- */
-async function getAppsPkgJSON(pkgDirName: string): Promise<VipPackageJSON> {
-  // 参考格式：@packages/xxx @apps/xxx
-  return await import(`@apps/${pkgDirName}/package.json`)
-}
-
-/**
- * 动态获取模块信息
- * - 注意：遍历侧边栏
- */
-export async function getCoreProjectData(): Promise<VipProject[]> {
-  const coreProjects: VipProject[] = []
-  for (const { items = [], text = '' } of sidebarConfig) {
-    // 过滤掉apps下的模块
-    if (text?.includes(ProjectId.DEMO)) {
-      continue
-    }
-    for (const { text: pkgName = '' } of items) {
-      const pkgDirName = pkgName.split('@142vip/')[1]
-      const basePkg = await getBasePkgJSON(`${pkgDirName}`)
-      coreProjects.push({
-        ...basePkg,
-        // 约定：图标+文字
-        id: text.split(' ')[0],
-        changelog: `../changelogs/${pkgDirName}/changelog.html`,
-        readme: `../packages/${pkgDirName}/index.html`,
-        sourceCode: `https://github.com/142vip/core-x/tree/main/packages/${pkgDirName}/`,
-      })
-    }
-  }
-  return coreProjects
-}
-
-/**
- * demo项目，用于项目展示
- */
-export async function getExampleDemoTableData(): Promise<VipProject[]> {
-  const pkgNames = ['egg-demo', 'nest-demo', 'vuepress-demo', 'vitepress-demo']
-
-  const exampleDemos: VipProject[] = []
-  for (const pkgDirName of pkgNames) {
-    const pkg = await getAppsPkgJSON(`${pkgDirName}`)
-    exampleDemos.push({
-      ...pkg,
-      private: true,
-      id: '🤡',
-      changelog: `../changelogs/${pkgDirName}/changelog.html`,
-      readme: `../apps/${pkgDirName}/index.html`,
-      sourceCode: `https://github.com/142vip/core-x/tree/main/apps/${pkgDirName}/`,
-    })
-  }
-  return exampleDemos
-}
-
 /**
  * 根据侧边栏获取变更日志侧边栏
  */

.vitepress/theme/components/HomePage.vue

@@ -6,24 +6,15 @@ import {
   VipProjectTable,
   VipTeam,
 } from '@142vip/vitepress/components'
-import { onMounted, ref } from 'vue'
-import { getCoreProjectData, getExampleDemoTableData } from '../../sidebar'
+import { getCoreProjectData, getExampleDemoTableData } from './project-data'
 
-const coreProjectTableData = ref<any[]>([])
-const exampleDemoTableData = ref()
-
-/**
- * 异步加载表格数据
- */
-onMounted(async () => {
-  coreProjectTableData.value = await getCoreProjectData()
-  exampleDemoTableData.value = await getExampleDemoTableData()
-})
+const exampleDemoTableData = getExampleDemoTableData()
+const coreProjectTableData = getCoreProjectData()
 </script>
 
 <!-- 首页 -->
 <template>
-  <section id="version-table">
+  <section id="project-table">
     <VipProjectTable :data="exampleDemoTableData" title="最佳实践" />
     <VipProjectTable :data="coreProjectTableData" title="开源模块" />
   </section>
@@ -38,3 +29,9 @@ onMounted(async () => {
   </section>
   <VipBackTop />
 </template>
+
+<style lang="scss" scoped>
+#project-table {
+  margin: 30px auto;
+}
+</style>

.vitepress/theme/components/project-data.ts

@@ -0,0 +1,50 @@
+import type { VipProject } from '@142vip/vitepress'
+import { resolveWorkspacePackageMaps } from '@142vip/vitepress/workspace'
+import { ProjectId, sidebarConfig } from '../../sidebar'
+
+const { packagesByDir, appsByDir } = resolveWorkspacePackageMaps(
+  import.meta.glob('../../../packages/*/package.json', { eager: true }),
+  import.meta.glob('../../../apps/*/package.json', { eager: true }),
+)
+
+const DEMO_APP_DIRS = ['egg-demo', 'nest-demo', 'vuepress-demo', 'vitepress-demo'] as const
+
+export function getCoreProjectData(): VipProject[] {
+  const rows: VipProject[] = []
+  for (const { items = [], text = '' } of sidebarConfig) {
+    if (text.includes(ProjectId.DEMO))
+      continue
+    for (const { text: pkgName = '' } of items) {
+      const dir = pkgName.split('@142vip/')[1]
+      const base = dir ? packagesByDir[dir] : undefined
+      if (!base)
+        continue
+      rows.push({
+        ...base,
+        id: text.split(' ')[0],
+        changelog: `../changelogs/${dir}/changelog.html`,
+        readme: `../packages/${dir}/index.html`,
+        sourceCode: `https://github.com/142vip/core-x/tree/main/packages/${dir}/`,
+      })
+    }
+  }
+  return rows
+}
+
+export function getExampleDemoTableData(): VipProject[] {
+  const rows: VipProject[] = []
+  for (const dir of DEMO_APP_DIRS) {
+    const pkg = appsByDir[dir]
+    if (!pkg)
+      continue
+    rows.push({
+      ...pkg,
+      private: true,
+      id: '🤡',
+      changelog: `../changelogs/${dir}/changelog.html`,
+      readme: `../apps/${dir}/index.html`,
+      sourceCode: `https://github.com/142vip/core-x/tree/main/apps/${dir}/`,
+    })
+  }
+  return rows
+}