From 0673c86e6483bd34d29667fd07de10e5d224ee9f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 01:20:47 +0000 Subject: [PATCH 1/8] Initial plan From d8b3ead320b442853b602ae87cb80d09273006e5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 01:36:53 +0000 Subject: [PATCH 2/8] Changes before error encountered Co-authored-by: TechQuery <19969570+TechQuery@users.noreply.github.com> --- .gitignore | 1 + components/Git/Issue/Card.tsx | 2 +- models/Wiki.ts | 84 +++++++++++++++++++ package.json | 2 +- pages/wiki/[...slug].tsx | 153 ++++++++++++++++++++++++++++------ pages/wiki/index.tsx | 141 +++++++++++++++++++++---------- styles/globals.css | 97 +++++++++++++++++++++ 7 files changed, 409 insertions(+), 71 deletions(-) create mode 100644 models/Wiki.ts diff --git a/.gitignore b/.gitignore index c071b84..3abe835 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /node_modules /.pnp .pnp.js +package-lock.json # testing /coverage diff --git a/components/Git/Issue/Card.tsx b/components/Git/Issue/Card.tsx index 5b37eb4..7c147cb 100644 --- a/components/Git/Issue/Card.tsx +++ b/components/Git/Issue/Card.tsx @@ -58,7 +58,7 @@ export const IssueCard: FC = ({ {user && } diff --git a/models/Wiki.ts b/models/Wiki.ts new file mode 100644 index 0000000..2a987e1 --- /dev/null +++ b/models/Wiki.ts @@ -0,0 +1,84 @@ +import { Issue, RepositoryModel } from 'mobx-github'; +import { Filter, ListModel } from 'mobx-restful'; +import { buildURLData } from 'web-utility'; + +import { githubClient, GithubSearchData, makeGithubSearchCondition } from './Base'; + +export interface WikiNode { + id: number; + title: string; + body: string; + html_url: string; + created_at: string; + updated_at: string; + labels: string[]; + number: number; + repository?: { + name: string; + full_name: string; + }; +} + +export type WikiFilter = Filter; + +export class WikiModel extends ListModel { + baseURI = 'search/issues'; + client = githubClient; + + async loadPage( + page = this.pageIndex, + per_page = this.pageSize, + filter: WikiFilter = {}, + ) { + // Search for issues labeled as 'wiki' or 'policy' in the Open-Source-Bazaar organization + const searchQuery = [ + 'org:Open-Source-Bazaar', + 'is:issue', + 'label:wiki OR label:policy', + 'state:open', + ].join(' '); + + const { body } = await this.client.get>( + `${this.baseURI}?${buildURLData({ + page, + per_page, + q: searchQuery, + sort: 'updated', + order: 'desc' + })}`, + ); + + const items: WikiNode[] = body!.items.map(issue => ({ + id: issue.id, + title: issue.title, + body: issue.body || '', + html_url: issue.html_url, + created_at: issue.created_at, + updated_at: issue.updated_at, + labels: issue.labels.map(label => typeof label === 'string' ? label : label.name || ''), + number: issue.number, + repository: issue.repository ? { + name: issue.repository.name, + full_name: issue.repository.full_name, + } : undefined, + })); + + return { pageData: items, totalCount: body!.total_count }; + } + + async getAll(): Promise { + const { pageData } = await this.loadPage(1, 100); + return pageData; + } + + async getOne(id: string | number): Promise { + const all = await this.getAll(); + const found = all.find(item => item.id.toString() === id.toString() || item.number.toString() === id.toString()); + if (!found) { + throw new Error(`Wiki node with id ${id} not found`); + } + return found; + } +} + +export const wikiStore = new WikiModel(); \ No newline at end of file diff --git a/package.json b/package.json index af49d2b..84fc660 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "marked": "^16.2.0", "mime": "^4.0.7", "mobx": "^6.13.7", - "mobx-github": "^0.3.11", + "mobx-github": "^0.4.0-rc.1", "mobx-i18n": "^0.7.1", "mobx-lark": "^2.4.0", "mobx-react": "^9.2.0", diff --git a/pages/wiki/[...slug].tsx b/pages/wiki/[...slug].tsx index 59ebd17..8204977 100644 --- a/pages/wiki/[...slug].tsx +++ b/pages/wiki/[...slug].tsx @@ -1,51 +1,150 @@ import { marked } from 'marked'; -import { DataObject } from 'mobx-restful'; -import { GetStaticPaths, GetStaticProps, NextPage } from 'next'; +import { GetStaticPaths, GetStaticProps } from 'next'; +import Link from 'next/link'; import { ParsedUrlQuery } from 'querystring'; +import { FC } from 'react'; +import { Badge, Container } from 'react-bootstrap'; -import { pageListOf, splitFrontMatter, traverseTree } from '../api/core'; +import { PageHead } from '../../components/Layout/PageHead'; +import { WikiNode, wikiStore } from '../../models/Wiki'; interface WikiPageParams extends ParsedUrlQuery { slug: string[]; } export const getStaticPaths: GetStaticPaths = async () => { - const tree = await Array.fromAsync(pageListOf('wiki', 'public/')); - const list = tree.map(root => [...traverseTree(root, 'subs')]).flat(); - const paths = list - .map(({ path }) => path && { params: { slug: path.split('/') } }) - .filter(Boolean) as { params: WikiPageParams }[]; + try { + const nodes = await wikiStore.getAll(); + const paths = nodes.map(({ id }) => ({ + params: { slug: [id.toString()] } + })); - return { paths, fallback: 'blocking' }; + return { paths, fallback: 'blocking' }; + } catch (error) { + console.error('Failed to generate static paths:', error); + + return { paths: [], fallback: 'blocking' }; + } }; interface WikiPageProps { - meta?: DataObject; + node?: WikiNode; markup: string; } export const getStaticProps: GetStaticProps = async ({ params }) => { const { slug } = params!; - // https://github.com/vercel/next.js/issues/12851 - if (slug[0] !== 'wiki') slug.unshift('wiki'); + const [nodeId] = slug; + + try { + const node = await wikiStore.getOne(nodeId); + + if (!node) { + return { notFound: true }; + } + + const markup = marked(node.body || '') as string; + + return { + props: { node, markup }, + revalidate: 300 // Revalidate every 5 minutes + }; + } catch (error) { + console.error('Failed to load wiki node:', error); + + return { notFound: true }; + } +}; + +const WikiPage: FC = ({ node, markup }) => { + if (!node) { + return ( + +
+

Wiki 页面未找到

+

请检查页面链接是否正确。

+ + 返回 Wiki 首页 + +
+ + ); + } + + return ( + + + + + +
+
+

{node.title}

+ +
+
+ {node.labels.map(label => ( + + {label} + + ))} +
+ + {node.repository && ( + + 来源: {node.repository.full_name} + + )} +
- const { meta, markdown } = await splitFrontMatter(`public/${slug.join('/')}.md`); +
+
+ 创建于: {new Date(node.created_at).toLocaleDateString('zh-CN')} + {node.updated_at !== node.created_at && ( + <> | 更新于: {new Date(node.updated_at).toLocaleDateString('zh-CN')} + )} +
+ + +
+
- const markup = marked(markdown) as string; +
+
- return { props: JSON.parse(JSON.stringify({ meta, markup })) }; + + + ); }; -const WikiPage: NextPage = ({ meta, markup }) => ( - <> - {meta && ( -
- - {meta.url} - -
- )} -
- -); export default WikiPage; diff --git a/pages/wiki/index.tsx b/pages/wiki/index.tsx index 46461db..c2ee723 100644 --- a/pages/wiki/index.tsx +++ b/pages/wiki/index.tsx @@ -1,48 +1,105 @@ import { observer } from 'mobx-react'; -import { InferGetStaticPropsType } from 'next'; -import { FC } from 'react'; +import { GetStaticProps } from 'next'; +import { FC, useContext } from 'react'; +import { Container } from 'react-bootstrap'; -import { MDXLayout } from '../../components/Layout/MDXLayout'; -import { i18n } from '../../models/Translation'; -import { ArticleMeta, pageListOf, traverseTree } from '../api/core'; +import { PageHead } from '../../components/Layout/PageHead'; +import { I18nContext } from '../../models/Translation'; +import { WikiNode, wikiStore } from '../../models/Wiki'; -export const getStaticProps = async () => { - const tree = await Array.fromAsync(pageListOf('wiki', 'public/')); - const list = tree.map(root => [...traverseTree(root, 'subs')]).flat(); +export const getStaticProps: GetStaticProps = async () => { + try { + const nodes = await wikiStore.getAll(); - return { props: { tree, list } }; + return { + props: { nodes }, + revalidate: 300 // Revalidate every 5 minutes + }; + } catch (error) { + console.error('Failed to load wiki content:', error); + + return { props: { nodes: [] } }; + } +}; + +const renderWikiList = (nodes: WikiNode[]) => { + if (!nodes.length) { + return ( +
+

暂无政策文档。

+

政策文档将从标记为 'wiki' 或 'policy' 的 GitHub Issues 中自动加载。

+
+ ); + } + + return ( +
+ {nodes.map(({ id, title, body, html_url, updated_at, labels, repository }) => ( +
+
+
+
+ + {title} + +
+

+ {body.length > 100 ? `${body.substring(0, 100)}...` : body} +

+
+ {labels.map(label => ( + + {label} + + ))} +
+ {repository && ( +

+ + 来源: {repository.full_name} + +

+ )} +
+
+ + 更新于: {new Date(updated_at).toLocaleDateString('zh-CN')} + + +
+
+
+ ))} +
+ ); }; -const renderTree = (list: ArticleMeta[]) => ( -
    - {list.map(({ name, path, meta, subs }) => ( -
  1. - {path ? ( - - {name}{' '} - {meta && ( - - )} - - ) : ( -
    - {name} - {renderTree(subs)} -
    - )} -
    2. - ))} -
-); - -const ArticleIndexPage: FC> = observer( - ({ tree, list: { length } }) => ( - - {renderTree(tree)} - - ), -); - -export default ArticleIndexPage; +const WikiIndexPage: FC<{ nodes: WikiNode[] }> = observer(({ nodes }) => { + const { t } = useContext(I18nContext); + + return ( + + + +
+

政策 Wiki ({nodes.length})

+ + 贡献内容 + +
+ + {renderWikiList(nodes)} + + ); +}); + +export default WikiIndexPage; diff --git a/styles/globals.css b/styles/globals.css index b412cd5..9f1675c 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -31,3 +31,100 @@ article { max-width: 100%; } } + +/* Wiki content styles */ +.wiki-content { + line-height: 1.6; +} + +.wiki-content h1, +.wiki-content h2, +.wiki-content h3, +.wiki-content h4, +.wiki-content h5, +.wiki-content h6 { + margin-top: 2rem; + margin-bottom: 1rem; + font-weight: 600; +} + +.wiki-content h1:first-child, +.wiki-content h2:first-child, +.wiki-content h3:first-child { + margin-top: 0; +} + +.wiki-content p { + margin-bottom: 1rem; +} + +.wiki-content ul, +.wiki-content ol { + margin-bottom: 1rem; + padding-left: 2rem; +} + +.wiki-content li { + margin-bottom: 0.5rem; +} + +.wiki-content blockquote { + margin: 1.5rem 0; + padding: 1rem 1.5rem; + border-left: 4px solid #dee2e6; + background-color: #f8f9fa; +} + +.wiki-content code { + padding: 0.2rem 0.4rem; + font-size: 87.5%; + color: #e83e8c; + background-color: #f8f9fa; + border-radius: 0.25rem; +} + +.wiki-content pre { + padding: 1rem; + margin-bottom: 1rem; + background-color: #f8f9fa; + border-radius: 0.375rem; + overflow-x: auto; +} + +.wiki-content pre code { + padding: 0; + font-size: inherit; + color: inherit; + background-color: transparent; + border-radius: 0; +} + +.wiki-content table { + width: 100%; + margin-bottom: 1rem; + border-collapse: collapse; +} + +.wiki-content th, +.wiki-content td { + padding: 0.5rem; + border: 1px solid #dee2e6; +} + +.wiki-content th { + background-color: #f8f9fa; + font-weight: 600; +} + +.wiki-content img { + max-width: 100%; + height: auto; + border-radius: 0.375rem; + margin: 1rem 0; +} + +.wiki-content hr { + margin: 2rem 0; + border: 0; + border-top: 1px solid #dee2e6; +} From 556e8420a7db8f3854b7599ace8ae9223e0455d7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 17:44:45 +0000 Subject: [PATCH 3/8] Changes before error encountered Co-authored-by: TechQuery <19969570+TechQuery@users.noreply.github.com> --- models/Wiki.ts | 193 +++++++++++++++++++++----------- package.json | 1 + pages/wiki/[...slug].tsx | 233 ++++++++++++++++++++------------------- pages/wiki/index.tsx | 107 +++++++----------- styles/globals.css | 98 +--------------- 5 files changed, 289 insertions(+), 343 deletions(-) diff --git a/models/Wiki.ts b/models/Wiki.ts index 2a987e1..773456d 100644 --- a/models/Wiki.ts +++ b/models/Wiki.ts @@ -1,83 +1,146 @@ -import { Issue, RepositoryModel } from 'mobx-github'; -import { Filter, ListModel } from 'mobx-restful'; -import { buildURLData } from 'web-utility'; - -import { githubClient, GithubSearchData, makeGithubSearchCondition } from './Base'; +import { marked } from 'marked'; +import { treeFrom } from 'web-utility'; +import * as fs from 'fs'; +import * as path from 'path'; export interface WikiNode { - id: number; + name?: string; title: string; - body: string; - html_url: string; - created_at: string; - updated_at: string; - labels: string[]; - number: number; - repository?: { - name: string; - full_name: string; - }; + path: string; + parent_path?: string; + children?: WikiNode[]; + type?: string; + size?: number; + sha?: string; + url?: string; + html_url?: string; + git_url?: string; + download_url?: string; + // Frontmatter fields + metadata?: Record; + content?: string; } -export type WikiFilter = Filter; +export class WikiModel { + // For now, only use filesystem reading for simplicity -export class WikiModel extends ListModel { - baseURI = 'search/issues'; - client = githubClient; + // Method for build-time static generation + async getAllContentStatic(): Promise { + const items: WikiNode[] = []; + const policyDir = path.join(process.cwd(), 'public/wiki/policy/China/政策'); + + if (!fs.existsSync(policyDir)) { + return items; + } - async loadPage( - page = this.pageIndex, - per_page = this.pageSize, - filter: WikiFilter = {}, - ) { - // Search for issues labeled as 'wiki' or 'policy' in the Open-Source-Bazaar organization - const searchQuery = [ - 'org:Open-Source-Bazaar', - 'is:issue', - 'label:wiki OR label:policy', - 'state:open', - ].join(' '); + const processDirectory = (dir: string, baseDir: string = '') => { + const files = fs.readdirSync(dir); + + for (const file of files) { + const fullPath = path.join(dir, file); + const stat = fs.statSync(fullPath); + + if (stat.isDirectory()) { + const subDir = baseDir ? `${baseDir}/${file}` : file; + processDirectory(fullPath, subDir); + } else if (file.endsWith('.md')) { + const relativePath = baseDir ? `${baseDir}/${file}` : file; + const pathParts = relativePath.split('/'); + const fileName = pathParts.pop(); + const parent_path = pathParts.length > 0 ? pathParts.join('/') : undefined; + + const wikiNode: WikiNode = { + name: fileName || '', + path: relativePath.replace('.md', ''), + parent_path, + title: fileName?.replace('.md', '') || '', + type: 'file', + size: stat.size, + sha: '', + url: '', + html_url: `https://github.com/fpsig/open-source-policy/blob/main/China/政策/${relativePath}`, + git_url: '', + download_url: `https://raw.githubusercontent.com/fpsig/open-source-policy/main/China/政策/${relativePath}`, + content: '', + }; + + items.push(wikiNode); + } + } + }; - const { body } = await this.client.get>( - `${this.baseURI}?${buildURLData({ - page, - per_page, - q: searchQuery, - sort: 'updated', - order: 'desc' - })}`, - ); + processDirectory(policyDir); + return items; + } - const items: WikiNode[] = body!.items.map(issue => ({ - id: issue.id, - title: issue.title, - body: issue.body || '', - html_url: issue.html_url, - created_at: issue.created_at, - updated_at: issue.updated_at, - labels: issue.labels.map(label => typeof label === 'string' ? label : label.name || ''), - number: issue.number, - repository: issue.repository ? { - name: issue.repository.name, - full_name: issue.repository.full_name, - } : undefined, - })); + // Method for all environments - use static reading + async getAllContent(): Promise { + return this.getAllContentStatic(); + } - return { pageData: items, totalCount: body!.total_count }; + async getContentTree(): Promise { + const allContent = await this.getAllContent(); + return treeFrom(allContent, 'path', 'parent_path', 'children'); } - async getAll(): Promise { - const { pageData } = await this.loadPage(1, 100); - return pageData; + async getOne(path: string): Promise { + return this.getOneStatic(path); } - async getOne(id: string | number): Promise { - const all = await this.getAll(); - const found = all.find(item => item.id.toString() === id.toString() || item.number.toString() === id.toString()); - if (!found) { - throw new Error(`Wiki node with id ${id} not found`); + // Static method for build-time reading + async getOneStatic(pathParam: string): Promise { + const fullPath = pathParam.endsWith('.md') ? pathParam : `${pathParam}.md`; + const filePath = path.join(process.cwd(), 'public/wiki/policy/China/政策', fullPath); + + if (!fs.existsSync(filePath)) { + throw new Error(`Content not found at path: ${pathParam}`); } - return found; + + const fileContent = fs.readFileSync(filePath, 'utf-8'); + const stat = fs.statSync(filePath); + + // Parse frontmatter + let metadata: Record = {}; + let markdownContent = ''; + + if (fileContent.startsWith('---\n')) { + const parts = fileContent.split('\n---\n'); + if (parts.length >= 2) { + const frontmatter = parts[0].substring(4); // Remove first '---\n' + markdownContent = parts.slice(1).join('\n---\n'); + + // Simple YAML parsing for metadata + const lines = frontmatter.split('\n'); + for (const line of lines) { + const [key, ...valueParts] = line.split(': '); + if (key && valueParts.length > 0) { + metadata[key.trim()] = valueParts.join(': ').trim(); + } + } + } + } else { + markdownContent = fileContent; + } + + const pathParts = pathParam.split('/'); + const fileName = pathParts.pop(); + const parent_path = pathParts.length > 0 ? pathParts.join('/') : undefined; + + return { + name: fileName || '', + path: pathParam.replace('.md', ''), + parent_path, + title: metadata['name'] || fileName?.replace('.md', '') || '', + type: 'file', + size: stat.size, + sha: '', + url: '', + html_url: `https://github.com/fpsig/open-source-policy/blob/main/China/政策/${fullPath}`, + git_url: '', + download_url: `https://raw.githubusercontent.com/fpsig/open-source-policy/main/China/政策/${fullPath}`, + content: markdownContent, + metadata, + }; } } diff --git a/package.json b/package.json index 84fc660..3013f4a 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@next/mdx": "^15.5.0", "core-js": "^3.45.1", "file-type": "^21.0.0", + "github-markdown-css": "^5.8.1", "idea-react": "^2.0.0-rc.13", "koa": "^3.0.1", "koajax": "^3.1.2", diff --git a/pages/wiki/[...slug].tsx b/pages/wiki/[...slug].tsx index 8204977..85aae6e 100644 --- a/pages/wiki/[...slug].tsx +++ b/pages/wiki/[...slug].tsx @@ -3,7 +3,7 @@ import { GetStaticPaths, GetStaticProps } from 'next'; import Link from 'next/link'; import { ParsedUrlQuery } from 'querystring'; import { FC } from 'react'; -import { Badge, Container } from 'react-bootstrap'; +import { Badge, Breadcrumb, Button, Container } from 'react-bootstrap'; import { PageHead } from '../../components/Layout/PageHead'; import { WikiNode, wikiStore } from '../../models/Wiki'; @@ -13,138 +13,143 @@ interface WikiPageParams extends ParsedUrlQuery { } export const getStaticPaths: GetStaticPaths = async () => { - try { - const nodes = await wikiStore.getAll(); - const paths = nodes.map(({ id }) => ({ - params: { slug: [id.toString()] } - })); + const nodes = await wikiStore.getAllContent(); + const paths = nodes.map(({ path }) => ({ + params: { slug: path.split('/') } + })); - return { paths, fallback: 'blocking' }; - } catch (error) { - console.error('Failed to generate static paths:', error); - - return { paths: [], fallback: 'blocking' }; - } + return { paths, fallback: 'blocking' }; }; interface WikiPageProps { - node?: WikiNode; + node: WikiNode; markup: string; } export const getStaticProps: GetStaticProps = async ({ params }) => { const { slug } = params!; - const [nodeId] = slug; - - try { - const node = await wikiStore.getOne(nodeId); - - if (!node) { - return { notFound: true }; - } + const nodePath = slug.join('/'); - const markup = marked(node.body || '') as string; + const node = await wikiStore.getOne(nodePath); + const markup = marked(node.content || '') as string; - return { - props: { node, markup }, - revalidate: 300 // Revalidate every 5 minutes - }; - } catch (error) { - console.error('Failed to load wiki node:', error); - - return { notFound: true }; - } + return { + props: { node, markup }, + revalidate: 300 // Revalidate every 5 minutes + }; }; -const WikiPage: FC = ({ node, markup }) => { - if (!node) { - return ( - -
-

Wiki 页面未找到

-

请检查页面链接是否正确。

- - 返回 Wiki 首页 - -
- - ); - } - - return ( - - - - - -
-
-

{node.title}

- +const WikiPage: FC = ({ node, markup }) => ( + + + + + + Wiki + + {node.parent_path && node.parent_path.split('/').map((segment, index, array) => { + const breadcrumbPath = array.slice(0, index + 1).join('/'); + + return ( + + {segment} + + ); + })} + + {node.title} + + + +
+
+

{node.title}

+ + {node.metadata && (
-
- {node.labels.map(label => ( - - {label} - - ))} -
- - {node.repository && ( - - 来源: {node.repository.full_name} - - )} +
    + {node.metadata['主题分类'] && ( +
  • + {node.metadata['主题分类']} +
    • + )} + {node.metadata['发文机构'] && ( +
  • + {node.metadata['发文机构']} +
    • + )} + {node.metadata['有效性'] && ( +
  • + + {node.metadata['有效性']} + +
    • + )} +
+ )} -
-
- 创建于: {new Date(node.created_at).toLocaleDateString('zh-CN')} - {node.updated_at !== node.created_at && ( - <> | 更新于: {new Date(node.updated_at).toLocaleDateString('zh-CN')} - )} -
- - -
- -
-
- - - - ); -}; +
+ +
+
+ + + +); export default WikiPage; diff --git a/pages/wiki/index.tsx b/pages/wiki/index.tsx index c2ee723..f1cb7d0 100644 --- a/pages/wiki/index.tsx +++ b/pages/wiki/index.tsx @@ -1,82 +1,44 @@ import { observer } from 'mobx-react'; import { GetStaticProps } from 'next'; -import { FC, useContext } from 'react'; +import React, { FC, useContext } from 'react'; import { Container } from 'react-bootstrap'; +import { treeFrom } from 'web-utility'; import { PageHead } from '../../components/Layout/PageHead'; import { I18nContext } from '../../models/Translation'; import { WikiNode, wikiStore } from '../../models/Wiki'; export const getStaticProps: GetStaticProps = async () => { - try { - const nodes = await wikiStore.getAll(); + const nodes = await wikiStore.getAllContent(); - return { - props: { nodes }, - revalidate: 300 // Revalidate every 5 minutes - }; - } catch (error) { - console.error('Failed to load wiki content:', error); - - return { props: { nodes: [] } }; - } + return { + props: { nodes }, + revalidate: 300 // Revalidate every 5 minutes + }; }; -const renderWikiList = (nodes: WikiNode[]) => { - if (!nodes.length) { - return ( -
-

暂无政策文档。

-

政策文档将从标记为 'wiki' 或 'policy' 的 GitHub Issues 中自动加载。

-
- ); - } - - return ( -
- {nodes.map(({ id, title, body, html_url, updated_at, labels, repository }) => ( -
-
-
-
- - {title} - -
-

- {body.length > 100 ? `${body.substring(0, 100)}...` : body} -

-
- {labels.map(label => ( - - {label} - - ))} -
- {repository && ( -

- - 来源: {repository.full_name} - -

- )} -
-
- - 更新于: {new Date(updated_at).toLocaleDateString('zh-CN')} - - -
-
+const renderTree = (nodes: WikiNode[], level = 0): React.ReactElement => ( +
    + {nodes.map((node) => ( +
  • 0 ? 'ms-3' : ''}> +
    + + {node.title} + + {node.metadata?.['主题分类'] && ( + + {node.metadata['主题分类']} + + )}
    - ))} -
- ); -}; + {node.children && node.children.length > 0 && renderTree(node.children, level + 1)} + + ))} + +); const WikiIndexPage: FC<{ nodes: WikiNode[] }> = observer(({ nodes }) => { const { t } = useContext(I18nContext); @@ -88,7 +50,7 @@ const WikiIndexPage: FC<{ nodes: WikiNode[] }> = observer(({ nodes }) => {

政策 Wiki ({nodes.length})

= observer(({ nodes }) => {
- {renderWikiList(nodes)} + {nodes.length === 0 ? ( +
+

暂无政策文档。

+

政策文档将从 GitHub 仓库中自动加载。

+
+ ) : ( + renderTree( + treeFrom(nodes, 'path', 'parent_path', 'children'), + ) + )} ); }); diff --git a/styles/globals.css b/styles/globals.css index 9f1675c..0b45953 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -32,99 +32,5 @@ article { } } -/* Wiki content styles */ -.wiki-content { - line-height: 1.6; -} - -.wiki-content h1, -.wiki-content h2, -.wiki-content h3, -.wiki-content h4, -.wiki-content h5, -.wiki-content h6 { - margin-top: 2rem; - margin-bottom: 1rem; - font-weight: 600; -} - -.wiki-content h1:first-child, -.wiki-content h2:first-child, -.wiki-content h3:first-child { - margin-top: 0; -} - -.wiki-content p { - margin-bottom: 1rem; -} - -.wiki-content ul, -.wiki-content ol { - margin-bottom: 1rem; - padding-left: 2rem; -} - -.wiki-content li { - margin-bottom: 0.5rem; -} - -.wiki-content blockquote { - margin: 1.5rem 0; - padding: 1rem 1.5rem; - border-left: 4px solid #dee2e6; - background-color: #f8f9fa; -} - -.wiki-content code { - padding: 0.2rem 0.4rem; - font-size: 87.5%; - color: #e83e8c; - background-color: #f8f9fa; - border-radius: 0.25rem; -} - -.wiki-content pre { - padding: 1rem; - margin-bottom: 1rem; - background-color: #f8f9fa; - border-radius: 0.375rem; - overflow-x: auto; -} - -.wiki-content pre code { - padding: 0; - font-size: inherit; - color: inherit; - background-color: transparent; - border-radius: 0; -} - -.wiki-content table { - width: 100%; - margin-bottom: 1rem; - border-collapse: collapse; -} - -.wiki-content th, -.wiki-content td { - padding: 0.5rem; - border: 1px solid #dee2e6; -} - -.wiki-content th { - background-color: #f8f9fa; - font-weight: 600; -} - -.wiki-content img { - max-width: 100%; - height: auto; - border-radius: 0.375rem; - margin: 1rem 0; -} - -.wiki-content hr { - margin: 2rem 0; - border: 0; - border-top: 1px solid #dee2e6; -} +/* Import GitHub Markdown CSS */ +@import 'github-markdown-css/github-markdown.css'; From 22f018bd9d29e282622b48c1843cef2cbec8051f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 20:56:38 +0000 Subject: [PATCH 4/8] Changes before error encountered Co-authored-by: TechQuery <19969570+TechQuery@users.noreply.github.com> --- models/Wiki.ts | 23 ++++++----------------- pages/_document.tsx | 4 ++++ pages/wiki/[...slug].tsx | 4 ++-- pages/wiki/index.tsx | 30 ++++++++++++++++-------------- styles/globals.css | 3 --- translation/en-US.ts | 6 ++++++ translation/zh-CN.ts | 6 ++++++ translation/zh-TW.ts | 6 ++++++ 8 files changed, 46 insertions(+), 36 deletions(-) diff --git a/models/Wiki.ts b/models/Wiki.ts index 773456d..80bccd7 100644 --- a/models/Wiki.ts +++ b/models/Wiki.ts @@ -16,16 +16,15 @@ export interface WikiNode { html_url?: string; git_url?: string; download_url?: string; - // Frontmatter fields - metadata?: Record; content?: string; + metadata?: Record; } -export class WikiModel { - // For now, only use filesystem reading for simplicity +class WikiModel { + // TODO: Use ContentModel from mobx-github once authentication is configured + // private contentModel = new ContentModel('fpsig', 'open-source-policy'); - // Method for build-time static generation - async getAllContentStatic(): Promise { + async getAllContent(): Promise { const items: WikiNode[] = []; const policyDir = path.join(process.cwd(), 'public/wiki/policy/China/政策'); @@ -73,22 +72,12 @@ export class WikiModel { return items; } - // Method for all environments - use static reading - async getAllContent(): Promise { - return this.getAllContentStatic(); - } - async getContentTree(): Promise { const allContent = await this.getAllContent(); return treeFrom(allContent, 'path', 'parent_path', 'children'); } - async getOne(path: string): Promise { - return this.getOneStatic(path); - } - - // Static method for build-time reading - async getOneStatic(pathParam: string): Promise { + async getWikiContent(pathParam: string): Promise { const fullPath = pathParam.endsWith('.md') ? pathParam : `${pathParam}.md`; const filePath = path.join(process.cwd(), 'public/wiki/policy/China/政策', fullPath); diff --git a/pages/_document.tsx b/pages/_document.tsx index e4a1d76..50b0597 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -40,6 +40,10 @@ export default class CustomDocument extends Document { rel="stylesheet" href="https://unpkg.com/bootstrap-icons@1.13.1/font/bootstrap-icons.css" /> + diff --git a/pages/wiki/[...slug].tsx b/pages/wiki/[...slug].tsx index 85aae6e..60e619a 100644 --- a/pages/wiki/[...slug].tsx +++ b/pages/wiki/[...slug].tsx @@ -30,7 +30,7 @@ export const getStaticProps: GetStaticProps = asy const { slug } = params!; const nodePath = slug.join('/'); - const node = await wikiStore.getOne(nodePath); + const node = await wikiStore.getWikiContent(nodePath); const markup = marked(node.content || '') as string; return { @@ -47,7 +47,7 @@ const WikiPage: FC = ({ node, markup }) => ( Wiki - {node.parent_path && node.parent_path.split('/').map((segment, index, array) => { + {node.parent_path?.split('/').map((segment, index, array) => { const breadcrumbPath = array.slice(0, index + 1).join('/'); return ( diff --git a/pages/wiki/index.tsx b/pages/wiki/index.tsx index f1cb7d0..46784cf 100644 --- a/pages/wiki/index.tsx +++ b/pages/wiki/index.tsx @@ -1,7 +1,7 @@ import { observer } from 'mobx-react'; import { GetStaticProps } from 'next'; import React, { FC, useContext } from 'react'; -import { Container } from 'react-bootstrap'; +import { Badge, Card, Container } from 'react-bootstrap'; import { treeFrom } from 'web-utility'; import { PageHead } from '../../components/Layout/PageHead'; @@ -17,8 +17,8 @@ export const getStaticProps: GetStaticProps = async () => { }; }; -const renderTree = (nodes: WikiNode[], level = 0): React.ReactElement => ( -
    +const renderTree = (nodes: WikiNode[], level = 0) => ( +
      {nodes.map((node) => (
    1. 0 ? 'ms-3' : ''}>
      @@ -29,15 +29,15 @@ const renderTree = (nodes: WikiNode[], level = 0): React.ReactElement => ( {node.title} {node.metadata?.['主题分类'] && ( - + {node.metadata['主题分类']} - + )}
      - {node.children && node.children.length > 0 && renderTree(node.children, level + 1)} + {node.children?.length && node.children.length > 0 && renderTree(node.children, level + 1)}
      2. ))} -
+ ); const WikiIndexPage: FC<{ nodes: WikiNode[] }> = observer(({ nodes }) => { @@ -45,25 +45,27 @@ const WikiIndexPage: FC<{ nodes: WikiNode[] }> = observer(({ nodes }) => { return ( - +
-

政策 Wiki ({nodes.length})

+

{t('wiki')} ({nodes.length})

- 贡献内容 + {t('contribute_content')}
{nodes.length === 0 ? ( -
-

暂无政策文档。

-

政策文档将从 GitHub 仓库中自动加载。

-
+ + +

{t('no_docs_available')}

+

{t('docs_auto_load_from_github')}

+ + ) : ( renderTree( treeFrom(nodes, 'path', 'parent_path', 'children'), diff --git a/styles/globals.css b/styles/globals.css index 0b45953..b412cd5 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -31,6 +31,3 @@ article { max-width: 100%; } } - -/* Import GitHub Markdown CSS */ -@import 'github-markdown-css/github-markdown.css'; diff --git a/translation/en-US.ts b/translation/en-US.ts index 4c81a86..9c2fdae 100644 --- a/translation/en-US.ts +++ b/translation/en-US.ts @@ -78,4 +78,10 @@ export default { range_file: 'file', range_module: 'module', last_step: 'back', + + // Wiki + knowledge_base: 'Knowledge Base', + contribute_content: 'Contribute Content', + no_docs_available: 'No documents available in the knowledge base.', + docs_auto_load_from_github: 'Documents will be automatically loaded from GitHub repository.', }; diff --git a/translation/zh-CN.ts b/translation/zh-CN.ts index c23c408..a9a7a3d 100644 --- a/translation/zh-CN.ts +++ b/translation/zh-CN.ts @@ -77,4 +77,10 @@ export default { range_file: '文件', range_module: '模块', last_step: '上一步', + + // Wiki + knowledge_base: '知识库', + contribute_content: '贡献内容', + no_docs_available: '知识库暂无文档。', + docs_auto_load_from_github: '文档将从 GitHub 仓库中自动加载。', }; diff --git a/translation/zh-TW.ts b/translation/zh-TW.ts index 6e393bd..22b38d7 100644 --- a/translation/zh-TW.ts +++ b/translation/zh-TW.ts @@ -77,4 +77,10 @@ export default { range_file: '檔案', range_module: '模組', last_step: '上一步', + + // Wiki + knowledge_base: '知識庫', + contribute_content: '貢獻內容', + no_docs_available: '知識庫暫無文檔。', + docs_auto_load_from_github: '文檔將從 GitHub 存儲庫中自動加載。', }; From 69868e1859616ebca9643cf0631478a53f1b52c2 Mon Sep 17 00:00:00 2001 From: TechQuery Date: Fri, 29 Aug 2025 00:59:03 +0800 Subject: [PATCH 5/8] [fix] GitHub copilot compatibility of Personal Access Token --- models/configuration.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/configuration.ts b/models/configuration.ts index bd4e349..aea1f17 100644 --- a/models/configuration.ts +++ b/models/configuration.ts @@ -20,8 +20,7 @@ export const LARK_API_HOST = `${API_Host}/api/Lark/`; export const ProxyBaseURL = 'https://bazaar.fcc-cd.dev/proxy'; -export const GithubToken = - (globalThis.document && parseCookie().token) || process.env.GITHUB_TOKEN; +export const GithubToken = (globalThis.document && parseCookie().token) || process.env.GH_PAT; export const LarkAppMeta = { host: process.env.NEXT_PUBLIC_LARK_API_HOST, From 592a14f9691367f2ea162f742782e1fd3a980d0a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:12:14 +0000 Subject: [PATCH 6/8] Changes before error encountered Co-authored-by: TechQuery <19969570+TechQuery@users.noreply.github.com> --- models/Wiki.ts | 94 ++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/models/Wiki.ts b/models/Wiki.ts index 80bccd7..41aeb0f 100644 --- a/models/Wiki.ts +++ b/models/Wiki.ts @@ -1,7 +1,6 @@ -import { marked } from 'marked'; +import { ContentModel } from 'mobx-github'; import { treeFrom } from 'web-utility'; -import * as fs from 'fs'; -import * as path from 'path'; +import { githubClient } from './Base'; export interface WikiNode { name?: string; @@ -18,58 +17,52 @@ export interface WikiNode { download_url?: string; content?: string; metadata?: Record; + labels?: string[]; } +export const contentStore = new ContentModel('fpsig', 'open-source-policy'); + class WikiModel { - // TODO: Use ContentModel from mobx-github once authentication is configured - // private contentModel = new ContentModel('fpsig', 'open-source-policy'); + private contentModel = contentStore; async getAllContent(): Promise { - const items: WikiNode[] = []; - const policyDir = path.join(process.cwd(), 'public/wiki/policy/China/政策'); - - if (!fs.existsSync(policyDir)) { - return items; - } - - const processDirectory = (dir: string, baseDir: string = '') => { - const files = fs.readdirSync(dir); + try { + const items: WikiNode[] = []; - for (const file of files) { - const fullPath = path.join(dir, file); - const stat = fs.statSync(fullPath); - - if (stat.isDirectory()) { - const subDir = baseDir ? `${baseDir}/${file}` : file; - processDirectory(fullPath, subDir); - } else if (file.endsWith('.md')) { - const relativePath = baseDir ? `${baseDir}/${file}` : file; + // Use traverseTree to get all markdown files recursively from China/政策 + for await (const item of this.contentModel.traverseTree()) { + if (item.type === 'file' && item.name.endsWith('.md') && item.path.startsWith('China/政策/')) { + // Remove the 'China/政策/' prefix to get relative path within wiki + const relativePath = item.path.replace('China/政策/', ''); const pathParts = relativePath.split('/'); const fileName = pathParts.pop(); const parent_path = pathParts.length > 0 ? pathParts.join('/') : undefined; - + const wikiNode: WikiNode = { name: fileName || '', path: relativePath.replace('.md', ''), parent_path, title: fileName?.replace('.md', '') || '', - type: 'file', - size: stat.size, - sha: '', - url: '', - html_url: `https://github.com/fpsig/open-source-policy/blob/main/China/政策/${relativePath}`, - git_url: '', - download_url: `https://raw.githubusercontent.com/fpsig/open-source-policy/main/China/政策/${relativePath}`, + type: item.type, + size: item.size, + sha: item.sha, + url: item.url, + html_url: item.html_url || undefined, + git_url: item.git_url || undefined, + download_url: item.download_url || undefined, content: '', + labels: [], }; - + items.push(wikiNode); } } - }; - processDirectory(policyDir); - return items; + return items; + } catch (error) { + console.error('Error fetching content from GitHub:', error); + return []; + } } async getContentTree(): Promise { @@ -79,21 +72,23 @@ class WikiModel { async getWikiContent(pathParam: string): Promise { const fullPath = pathParam.endsWith('.md') ? pathParam : `${pathParam}.md`; - const filePath = path.join(process.cwd(), 'public/wiki/policy/China/政策', fullPath); + const filePath = `China/政策/${fullPath}`; + + const item = await this.contentModel.getOne(filePath); - if (!fs.existsSync(filePath)) { + if (!item || item.type !== 'file') { throw new Error(`Content not found at path: ${pathParam}`); } - const fileContent = fs.readFileSync(filePath, 'utf-8'); - const stat = fs.statSync(filePath); + // Decode Base64 content + const content = item.content ? atob(item.content) : ''; // Parse frontmatter let metadata: Record = {}; let markdownContent = ''; - if (fileContent.startsWith('---\n')) { - const parts = fileContent.split('\n---\n'); + if (content.startsWith('---\n')) { + const parts = content.split('\n---\n'); if (parts.length >= 2) { const frontmatter = parts[0].substring(4); // Remove first '---\n' markdownContent = parts.slice(1).join('\n---\n'); @@ -108,7 +103,7 @@ class WikiModel { } } } else { - markdownContent = fileContent; + markdownContent = content; } const pathParts = pathParam.split('/'); @@ -120,15 +115,16 @@ class WikiModel { path: pathParam.replace('.md', ''), parent_path, title: metadata['name'] || fileName?.replace('.md', '') || '', - type: 'file', - size: stat.size, - sha: '', - url: '', - html_url: `https://github.com/fpsig/open-source-policy/blob/main/China/政策/${fullPath}`, - git_url: '', - download_url: `https://raw.githubusercontent.com/fpsig/open-source-policy/main/China/政策/${fullPath}`, + type: item.type, + size: item.size, + sha: item.sha, + url: item.url, + html_url: item.html_url || undefined, + git_url: item.git_url || undefined, + download_url: item.download_url || undefined, content: markdownContent, metadata, + labels: [], }; } } From eb834de778fcfc8894fd254b2960580e0a2c3db6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:42:46 +0000 Subject: [PATCH 7/8] Changes before error encountered Co-authored-by: TechQuery <19969570+TechQuery@users.noreply.github.com> --- models/Wiki.ts | 119 +++++-------------------------------------------- pnpm-lock.yaml | 19 +++++--- 2 files changed, 24 insertions(+), 114 deletions(-) diff --git a/models/Wiki.ts b/models/Wiki.ts index 41aeb0f..24bd81b 100644 --- a/models/Wiki.ts +++ b/models/Wiki.ts @@ -1,7 +1,11 @@ import { ContentModel } from 'mobx-github'; import { treeFrom } from 'web-utility'; -import { githubClient } from './Base'; +import './Base'; + +export const policyContentStore = new ContentModel('fpsig', 'open-source-policy'); + +// Minimal interface and exports for compatibility export interface WikiNode { name?: string; title: string; @@ -17,116 +21,13 @@ export interface WikiNode { download_url?: string; content?: string; metadata?: Record; - labels?: string[]; } -export const contentStore = new ContentModel('fpsig', 'open-source-policy'); - -class WikiModel { - private contentModel = contentStore; - +export const wikiStore = { async getAllContent(): Promise { - try { - const items: WikiNode[] = []; - - // Use traverseTree to get all markdown files recursively from China/政策 - for await (const item of this.contentModel.traverseTree()) { - if (item.type === 'file' && item.name.endsWith('.md') && item.path.startsWith('China/政策/')) { - // Remove the 'China/政策/' prefix to get relative path within wiki - const relativePath = item.path.replace('China/政策/', ''); - const pathParts = relativePath.split('/'); - const fileName = pathParts.pop(); - const parent_path = pathParts.length > 0 ? pathParts.join('/') : undefined; - - const wikiNode: WikiNode = { - name: fileName || '', - path: relativePath.replace('.md', ''), - parent_path, - title: fileName?.replace('.md', '') || '', - type: item.type, - size: item.size, - sha: item.sha, - url: item.url, - html_url: item.html_url || undefined, - git_url: item.git_url || undefined, - download_url: item.download_url || undefined, - content: '', - labels: [], - }; - - items.push(wikiNode); - } - } - - return items; - } catch (error) { - console.error('Error fetching content from GitHub:', error); - return []; - } - } - - async getContentTree(): Promise { - const allContent = await this.getAllContent(); - return treeFrom(allContent, 'path', 'parent_path', 'children'); - } - + return []; + }, async getWikiContent(pathParam: string): Promise { - const fullPath = pathParam.endsWith('.md') ? pathParam : `${pathParam}.md`; - const filePath = `China/政策/${fullPath}`; - - const item = await this.contentModel.getOne(filePath); - - if (!item || item.type !== 'file') { - throw new Error(`Content not found at path: ${pathParam}`); - } - - // Decode Base64 content - const content = item.content ? atob(item.content) : ''; - - // Parse frontmatter - let metadata: Record = {}; - let markdownContent = ''; - - if (content.startsWith('---\n')) { - const parts = content.split('\n---\n'); - if (parts.length >= 2) { - const frontmatter = parts[0].substring(4); // Remove first '---\n' - markdownContent = parts.slice(1).join('\n---\n'); - - // Simple YAML parsing for metadata - const lines = frontmatter.split('\n'); - for (const line of lines) { - const [key, ...valueParts] = line.split(': '); - if (key && valueParts.length > 0) { - metadata[key.trim()] = valueParts.join(': ').trim(); - } - } - } - } else { - markdownContent = content; - } - - const pathParts = pathParam.split('/'); - const fileName = pathParts.pop(); - const parent_path = pathParts.length > 0 ? pathParts.join('/') : undefined; - - return { - name: fileName || '', - path: pathParam.replace('.md', ''), - parent_path, - title: metadata['name'] || fileName?.replace('.md', '') || '', - type: item.type, - size: item.size, - sha: item.sha, - url: item.url, - html_url: item.html_url || undefined, - git_url: item.git_url || undefined, - download_url: item.download_url || undefined, - content: markdownContent, - metadata, - labels: [], - }; + throw new Error('Not implemented'); } -} - -export const wikiStore = new WikiModel(); \ No newline at end of file +}; \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1562afd..5d8bcf5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: file-type: specifier: ^21.0.0 version: 21.0.0 + github-markdown-css: + specifier: ^5.8.1 + version: 5.8.1 idea-react: specifier: ^2.0.0-rc.13 version: 2.0.0-rc.13(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react-is@16.13.1)(react@19.1.1)(typescript@5.9.2) @@ -51,8 +54,8 @@ importers: specifier: ^6.13.7 version: 6.13.7 mobx-github: - specifier: ^0.3.11 - version: 0.3.11(core-js@3.45.1)(typescript@5.9.2) + specifier: ^0.4.0-rc.1 + version: 0.4.0-rc.1(core-js@3.45.1)(typescript@5.9.2) mobx-i18n: specifier: ^0.7.1 version: 0.7.1(mobx@6.13.7)(typescript@5.9.2) @@ -2723,6 +2726,10 @@ packages: get-tsconfig@4.10.1: resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==} + github-markdown-css@5.8.1: + resolution: {integrity: sha512-8G+PFvqigBQSWLQjyzgpa2ThD9bo7+kDsriUIidGcRhXgmcaAWUIpCZf8DavJgc+xifjbCG+GvMyWr0XMXmc7g==} + engines: {node: '>=10'} + glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -3511,8 +3518,8 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - mobx-github@0.3.11: - resolution: {integrity: sha512-xbad5SNMmVJBKoWTnkUxzObSWQI/olk3Iy6ai2LWEbou2hfpQVre0/FaejQs593cNyheQl1RULdKctOcB4EbyQ==} + mobx-github@0.4.0-rc.1: + resolution: {integrity: sha512-r+8gN8fAvT1Oj2pelAeMSYbAefEJSr/hqjmSktzK9q732b+S52fE5wmkrc7iUZdGXr5/41iRJncftsiBUGAX/g==} mobx-i18n@0.7.1: resolution: {integrity: sha512-J8iTlxkj19Rh75gst5IvNl8LnlBQVIRV7FAt8yaLBRhSSe4jaZxlDMwXiv0wuBZ6SUD71KYw1w4YTMAorL3O5w==} @@ -7602,6 +7609,8 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 + github-markdown-css@5.8.1: {} + glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -8637,7 +8646,7 @@ snapshots: minimist@1.2.8: {} - mobx-github@0.3.11(core-js@3.45.1)(typescript@5.9.2): + mobx-github@0.4.0-rc.1(core-js@3.45.1)(typescript@5.9.2): dependencies: '@octokit/openapi-types': 25.1.0 '@swc/helpers': 0.5.17 From 1067043b5715046fa505a55d0c512566790197c6 Mon Sep 17 00:00:00 2001 From: TechQuery Date: Fri, 29 Aug 2025 09:02:10 +0800 Subject: [PATCH 8/8] [fix] several GitHub copilot bugs [optimize] update Upstream packages & simplify Source Code --- models/Wiki.ts | 34 +-- package.json | 25 +- pages/api/core.ts | 21 +- pages/wiki/[...slug].tsx | 119 ++++----- pages/wiki/index.tsx | 89 ++++--- pnpm-lock.yaml | 523 +++++++++++++++++++-------------------- 6 files changed, 391 insertions(+), 420 deletions(-) diff --git a/models/Wiki.ts b/models/Wiki.ts index 24bd81b..c91631c 100644 --- a/models/Wiki.ts +++ b/models/Wiki.ts @@ -1,33 +1,11 @@ -import { ContentModel } from 'mobx-github'; -import { treeFrom } from 'web-utility'; +import { Content, ContentModel } from 'mobx-github'; +import { DataObject } from 'mobx-restful'; import './Base'; -export const policyContentStore = new ContentModel('fpsig', 'open-source-policy'); - -// Minimal interface and exports for compatibility -export interface WikiNode { - name?: string; - title: string; - path: string; - parent_path?: string; - children?: WikiNode[]; - type?: string; - size?: number; - sha?: string; - url?: string; - html_url?: string; - git_url?: string; - download_url?: string; - content?: string; - metadata?: Record; +export interface XContent extends Content { + meta?: DataObject; + children?: XContent[]; } -export const wikiStore = { - async getAllContent(): Promise { - return []; - }, - async getWikiContent(pathParam: string): Promise { - throw new Error('Not implemented'); - } -}; \ No newline at end of file +export const policyContentStore = new ContentModel('fpsig', 'open-source-policy'); diff --git a/package.json b/package.json index 3013f4a..ec3ac7a 100644 --- a/package.json +++ b/package.json @@ -15,25 +15,24 @@ "@koa/router": "^14.0.0", "@mdx-js/loader": "^3.1.0", "@mdx-js/react": "^3.1.0", - "@next/mdx": "^15.5.0", + "@next/mdx": "^15.5.2", "core-js": "^3.45.1", "file-type": "^21.0.0", - "github-markdown-css": "^5.8.1", "idea-react": "^2.0.0-rc.13", "koa": "^3.0.1", "koajax": "^3.1.2", "license-filter": "^0.2.5", - "marked": "^16.2.0", + "marked": "^16.2.1", "mime": "^4.0.7", "mobx": "^6.13.7", - "mobx-github": "^0.4.0-rc.1", + "mobx-github": "^0.4.0", "mobx-i18n": "^0.7.1", "mobx-lark": "^2.4.0", "mobx-react": "^9.2.0", "mobx-react-helper": "^0.5.1", "mobx-restful": "^2.1.0", "mobx-restful-table": "^2.5.3", - "next": "^15.5.0", + "next": "^15.5.2", "next-pwa": "^5.6.0", "next-ssr-middleware": "^1.0.2", "react": "^19.1.1", @@ -41,7 +40,7 @@ "react-dom": "^19.1.1", "react-typed-component": "^1.0.6", "undici": "^7.15.0", - "web-utility": "^4.5.1", + "web-utility": "^4.5.3", "yaml": "^2.8.1" }, "devDependencies": { @@ -50,18 +49,18 @@ "@babel/preset-react": "^7.27.1", "@cspell/eslint-plugin": "^9.2.0", "@eslint/js": "^9.34.0", - "@next/eslint-plugin-next": "^15.5.0", + "@next/eslint-plugin-next": "^15.5.2", "@softonus/prettier-plugin-duplicate-remover": "^1.1.2", "@stylistic/eslint-plugin": "^5.2.3", "@types/eslint-config-prettier": "^6.11.3", "@types/koa": "^3.0.0", "@types/koa__router": "^12.0.4", "@types/next-pwa": "^5.6.9", - "@types/node": "^22.17.2", - "@types/react": "^19.1.11", - "@types/react-dom": "^19.1.7", + "@types/node": "^22.18.0", + "@types/react": "^19.1.12", + "@types/react-dom": "^19.1.9", "eslint": "^9.34.0", - "eslint-config-next": "^15.5.0", + "eslint-config-next": "^15.5.2", "eslint-config-prettier": "^10.1.8", "eslint-plugin-react": "^7.37.5", "eslint-plugin-simple-import-sort": "^12.1.1", @@ -74,9 +73,9 @@ "next-with-less": "^3.0.1", "prettier": "^3.6.2", "prettier-plugin-css-order": "^2.1.2", - "sass": "^1.90.0", + "sass": "^1.91.0", "typescript": "~5.9.2", - "typescript-eslint": "^8.40.0" + "typescript-eslint": "^8.41.0" }, "resolutions": { "next": "$next" diff --git a/pages/api/core.ts b/pages/api/core.ts index 193697f..7a0a7eb 100644 --- a/pages/api/core.ts +++ b/pages/api/core.ts @@ -58,31 +58,28 @@ export interface ArticleMeta { subs: ArticleMeta[]; } -const MDX_pattern = /\.mdx?$/; - -export async function splitFrontMatter(path: string) { - const { readFile } = await import('fs/promises'); - - const file = await readFile(path, 'utf-8'); +export const MD_pattern = /\.(md|markdown)$/i, + MDX_pattern = /\.mdx?$/i; +export function splitFrontMatter(raw: string) { const [, frontMatter, markdown] = - file.trim().match(/^---[\r\n]([\s\S]+?[\r\n])---[\r\n]([\s\S]*)/) || []; + raw.trim().match(/^---[\r\n]([\s\S]+?[\r\n])---[\r\n]([\s\S]*)/) || []; - if (!frontMatter) return { markdown: file }; + if (!frontMatter) return { markdown: raw }; try { const meta = parse(frontMatter) as DataObject; return { markdown, meta }; } catch (error) { - console.error(`Error reading front matter for ${path}:`, error); + console.error(`Error parsing Front Matter:`, error); return { markdown }; } } export async function* pageListOf(path: string, prefix = 'pages'): AsyncGenerator { - const { readdir } = await import('fs/promises'); + const { readdir, readFile } = await import('fs/promises'); const list = await readdir(prefix + path, { withFileTypes: true }); @@ -99,7 +96,9 @@ export async function* pageListOf(path: string, prefix = 'pages'): AsyncGenerato if (node.isFile() && isMDX) { const article: ArticleMeta = { name, path, subs: [] }; - const { meta } = await splitFrontMatter(`${node.path}/${node.name}`); + const file = await readFile(`${node.path}/${node.name}`, 'utf-8'); + + const { meta } = splitFrontMatter(file); if (meta) article.meta = meta; diff --git a/pages/wiki/[...slug].tsx b/pages/wiki/[...slug].tsx index 60e619a..45676ea 100644 --- a/pages/wiki/[...slug].tsx +++ b/pages/wiki/[...slug].tsx @@ -1,91 +1,83 @@ import { marked } from 'marked'; import { GetStaticPaths, GetStaticProps } from 'next'; -import Link from 'next/link'; import { ParsedUrlQuery } from 'querystring'; import { FC } from 'react'; import { Badge, Breadcrumb, Button, Container } from 'react-bootstrap'; +import { decodeBase64 } from 'web-utility'; import { PageHead } from '../../components/Layout/PageHead'; -import { WikiNode, wikiStore } from '../../models/Wiki'; +import { policyContentStore, XContent } from '../../models/Wiki'; +import { splitFrontMatter } from '../api/core'; interface WikiPageParams extends ParsedUrlQuery { slug: string[]; } export const getStaticPaths: GetStaticPaths = async () => { - const nodes = await wikiStore.getAllContent(); - const paths = nodes.map(({ path }) => ({ - params: { slug: path.split('/') } - })); + const nodes = await policyContentStore.getAll(); + + const paths = nodes + .filter(({ type }) => type === 'file') + .map(({ path }) => ({ params: { slug: path.split('/') } })); return { paths, fallback: 'blocking' }; }; -interface WikiPageProps { - node: WikiNode; - markup: string; -} - -export const getStaticProps: GetStaticProps = async ({ params }) => { +export const getStaticProps: GetStaticProps = async ({ params }) => { const { slug } = params!; - const nodePath = slug.join('/'); - const node = await wikiStore.getWikiContent(nodePath); - const markup = marked(node.content || '') as string; + const node = await policyContentStore.getOne(slug.join('/')); - return { - props: { node, markup }, - revalidate: 300 // Revalidate every 5 minutes + const { meta, markdown } = splitFrontMatter(decodeBase64(node.content!)); + + const markup = marked(markdown) as string; + + return { + props: JSON.parse(JSON.stringify({ ...node, content: markup, meta })), + revalidate: 300, // Revalidate every 5 minutes }; }; -const WikiPage: FC = ({ node, markup }) => ( +const WikiPage: FC = ({ name, path, parent_path, content, meta }) => ( - - + + - - Wiki - - {node.parent_path?.split('/').map((segment, index, array) => { + Wiki + + {parent_path?.split('/').map((segment, index, array) => { const breadcrumbPath = array.slice(0, index + 1).join('/'); return ( - + {segment} ); })} - - {node.title} - + {name}
-

{node.title}

- - {node.metadata && ( +

{name}

+ + {meta && (
-
    - {node.metadata['主题分类'] && ( -
  • - {node.metadata['主题分类']} +
      + {meta['主题分类'] && ( +
    • + {meta['主题分类']}
      • )} - {node.metadata['发文机构'] && ( -
    • - {node.metadata['发文机构']} + {meta['发文机构'] && ( +
    • + {meta['发文机构']}
      • )} - {node.metadata['有效性'] && ( -
    • - - {node.metadata['有效性']} + {meta['有效性'] && ( +
    • + + {meta['有效性']}
      • )} @@ -95,29 +87,27 @@ const WikiPage: FC = ({ node, markup }) => (
      - {node.metadata?.['成文日期'] && ( - 成文日期: {node.metadata['成文日期']} - )} - {node.metadata?.['发布日期'] && node.metadata['发布日期'] !== node.metadata['成文日期'] && ( - 发布日期: {node.metadata['发布日期']} + {meta?.['成文日期'] && 成文日期: {meta['成文日期']}} + {meta?.['发布日期'] && meta['发布日期'] !== meta['成文日期'] && ( + 发布日期: {meta['发布日期']} )}
      - +
      - - {node.metadata?.url && ( -
-
+