@fecommunity/reactpress-toolkit 3.1.0 → 4.0.0-beta.0

package/dist/theme/content/assets.js

@@ -10,9 +10,18 @@ const PUBLIC_PATH_ALIASES = {
     '/favicon.png': '/public/favicon.png',
     '/favicon.ico': '/public/favicon.ico',
 };
+/** Theme Next rewrites serve alias keys (e.g. `/logo.png`), not `/public/*` API paths. */
+const THEME_LOCAL_PUBLIC_PATHS = Object.fromEntries(Object.entries(PUBLIC_PATH_ALIASES).map(([themePath, apiPath]) => [apiPath, themePath]));
 function normalizePublicAssetPath(path) {
     return PUBLIC_PATH_ALIASES[path] ?? path;
 }
+function toThemeServablePath(apiPath) {
+    return THEME_LOCAL_PUBLIC_PATHS[apiPath] ?? apiPath;
+}
+/** Paths proxied by theme `next.config` rewrites — keep relative, never bake absolute API URLs. */
+function isThemeRewritePath(path) {
+    return path in THEME_LOCAL_PUBLIC_PATHS || path.startsWith('/public/') || path.startsWith('/uploads/');
+}
 /** Whether a configured asset path is likely to resolve (skip broken defaults like `/logo.png`). */
 function isLikelyValidAssetPath(url) {
     const trimmed = (url ?? '').trim();
@@ -44,6 +53,26 @@ function resolvePublicSiteOrigin() {
         'http://localhost:3002/api';
     return serverApi.replace(/\/api\/?$/, '').replace(/\/$/, '');
 }
+/** Visitor site origin — differs from API origin during SSR (theme :3001 vs API :3002). */
+function resolveThemeSiteOrigin() {
+    if (typeof window !== 'undefined') {
+        return window.location.origin;
+    }
+    const clientSite = process.env.CLIENT_SITE_URL?.trim();
+    if (clientSite) {
+        try {
+            return new URL(clientSite).origin;
+        }
+        catch {
+            return clientSite.replace(/\/$/, '');
+        }
+    }
+    const clientPort = process.env.CLIENT_PORT?.trim() || process.env.PORT?.trim();
+    if (clientPort) {
+        return `http://127.0.0.1:${clientPort}`;
+    }
+    return resolvePublicSiteOrigin();
+}
 /** Resolve media / logo URLs for theme pages. */
 function resolvePublicAssetUrl(url) {
     const trimmed = (url ?? '').trim();
@@ -57,8 +86,11 @@ function resolvePublicAssetUrl(url) {
     }
     if (trimmed.startsWith('/')) {
         const normalized = normalizePublicAssetPath(trimmed);
+        if (isThemeRewritePath(normalized)) {
+            return toThemeServablePath(normalized);
+        }
         const origin = resolvePublicSiteOrigin();
-        const themeOrigin = typeof window !== 'undefined' ? window.location.origin : origin;
+        const themeOrigin = resolveThemeSiteOrigin();
         if (origin === themeOrigin) {
             return normalized;
         }

package/dist/theme/extension/theme.d.ts

@@ -71,7 +71,7 @@ export interface SiteThemeState {
     mods: Record<string, ThemeMods>;
     previewThemeId?: string;
 }
-export declare const DEFAULT_ACTIVE_THEME = "twentytwentyfive";
+export declare const DEFAULT_ACTIVE_THEME = "hello-world";
 export declare const defaultSiteThemeState: SiteThemeState;
 export interface GlobalSettingWithTheme {
     zh?: unknown;

package/dist/theme/extension/theme.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "appearancePrimaryColorForMode", { enumerable: tr
 function appearancePrimaryColor(mods, fallback = '#f44336') {
     return (0, twentytwentyfive_vars_1.appearancePrimaryColorForMode)(mods, false, fallback);
 }
-exports.DEFAULT_ACTIVE_THEME = 'twentytwentyfive';
+exports.DEFAULT_ACTIVE_THEME = 'hello-world';
 exports.defaultSiteThemeState = {
     activeTheme: exports.DEFAULT_ACTIVE_THEME,
     installedThemes: [exports.DEFAULT_ACTIVE_THEME],

package/dist/theme/ssr/fetch.d.ts

@@ -73,7 +73,10 @@ export declare function fetchTagArchive(api: ThemeApi, tag: string): Promise<{
 export type ThemeArticlePage = {
     id: string;
     title: string;
+    slug?: string;
     summary?: string;
+    seoDescription?: string;
+    seoKeywords?: string;
     html?: string;
     cover?: string;
     publishAt?: string;

package/dist/theme/ssr/pageProps.d.ts

@@ -1,7 +1,7 @@
 import type { ThemeApi } from '../api/api';
 import { type CarouselArticle, type ListArticle } from '../content/articleSlim';
 import { type ArchiveTree } from '../content/archiveSlim';
-import type { IArticle, ICategory, IKnowledge, ITag } from '../../types';
+import type { IArticle, ICategory, IKnowledge, IPage, ITag } from '../../types';
 export type HomePageProps = {
     articles: ListArticle[];
     total: number;
@@ -52,9 +52,10 @@ export declare function fetchKnowledgeChapterPageProps(api: ThemeApi, pId: strin
 }>;
 /** Site search results for `/search?keyword=`. */
 export declare function fetchSearchPageProps(api: ThemeApi, keyword: string): Promise<SearchPageProps>;
-/** CMS static page by id. */
-export declare function fetchCmsPageProps(api: ThemeApi, id: string): Promise<{
-    page: unknown;
+export type CmsPageProps = Pick<IPage, 'id' | 'name' | 'path' | 'html' | 'toc' | 'status' | 'publishAt' | 'views'>;
+/** CMS static page by id or path slug (admin → 页面). */
+export declare function fetchCmsPageProps(api: ThemeApi, idOrPath: string | undefined): Promise<{
+    page: CmsPageProps | null;
 }>;
 /** Single article by id (full entity from API). */
 export declare function fetchArticleDetailProps(api: ThemeApi, id: string): Promise<{

package/dist/theme/ssr/pageProps.js

@@ -15,6 +15,7 @@ const api_data_1 = require("../api/api-data");
 const articleSlim_1 = require("../content/articleSlim");
 const archiveSlim_1 = require("../content/archiveSlim");
 const carouselArticles_1 = require("../content/carouselArticles");
+const assets_1 = require("../content/assets");
 const fetch_1 = require("./fetch");
 const DEFAULT_PAGE_SIZE = 12;
 function fallbackCategory(value) {
@@ -128,9 +129,25 @@ async function fetchSearchPageProps(api, keyword) {
     const articles = (0, api_data_1.unpackList)(response).filter((article) => article.status === 'publish');
     return { keyword: trimmed, articles };
 }
-/** CMS static page by id. */
-async function fetchCmsPageProps(api, id) {
-    return { page: (0, api_data_1.unpackOne)(await api.page.findById(id)) };
+/** CMS static page by id or path slug (admin → 页面). */
+async function fetchCmsPageProps(api, idOrPath) {
+    if (!idOrPath?.trim())
+        return { page: null };
+    const raw = (0, api_data_1.unpackOne)(await api.page.findById(idOrPath.trim()));
+    if (!raw || raw.status !== 'publish')
+        return { page: null };
+    return {
+        page: {
+            id: raw.id,
+            name: raw.name,
+            path: raw.path,
+            html: raw.html ? (0, assets_1.rewriteArticleHtmlAssets)(raw.html) : raw.html,
+            toc: raw.toc,
+            status: raw.status,
+            publishAt: raw.publishAt,
+            views: raw.views,
+        },
+    };
 }
 /** Single article by id (full entity from API). */
 async function fetchArticleDetailProps(api, id) {

package/dist/theme/ssr/setting.d.ts

@@ -3,6 +3,7 @@ export declare function unwrapSetting(response: unknown): Record<string, unknown
 export interface SiteMeta {
     siteName: string;
     siteDescription: string;
+    siteKeywords?: string;
     siteUrl?: string;
     siteLogo?: string;
     siteFavicon?: string;

package/dist/theme/ssr/setting.js

@@ -31,6 +31,9 @@ function parseSiteMeta(row) {
         siteName: String(row.systemTitle ?? 'ReactPress Site').trim() || exports.DEFAULT_SITE_META.siteName,
         siteDescription: String(row.systemSubTitle ?? exports.DEFAULT_SITE_META.siteDescription).trim() ||
             exports.DEFAULT_SITE_META.siteDescription,
+        siteKeywords: row.seoKeyword != null && String(row.seoKeyword).trim()
+            ? String(row.seoKeyword).trim()
+            : undefined,
         siteUrl: row.systemUrl != null ? String(row.systemUrl).trim() || undefined : undefined,
         siteLogo: row.systemLogo != null && String(row.systemLogo).trim()
             ? String(row.systemLogo).trim()

package/dist/theme/ssr/templates.js

@@ -34,7 +34,7 @@ exports.ThemeTemplate = {
 exports.DEFAULT_TEMPLATE_FILES = {
     [exports.ThemeTemplate.HOME]: 'pages/index.tsx',
     [exports.ThemeTemplate.SINGLE]: 'pages/article/[id].tsx',
-    [exports.ThemeTemplate.PAGE]: 'pages/about.tsx',
+    [exports.ThemeTemplate.PAGE]: 'pages/[path].tsx',
     [exports.ThemeTemplate.ARCHIVE_CATEGORY]: 'pages/category/[category].tsx',
     [exports.ThemeTemplate.ARCHIVE_TAG]: 'pages/tag/[tag].tsx',
     [exports.ThemeTemplate.SEARCH]: 'pages/search.tsx',

package/dist/types/index.d.ts

@@ -94,6 +94,9 @@ export interface IArticle {
     title: string;
     cover: string;
     summary: string;
+    slug?: string | null;
+    seoKeywords?: string | null;
+    seoDescription?: string | null;
     content: string;
     html: string;
     toc: string;

package/dist/ui/components/SiteAnalytics.d.ts

@@ -2,4 +2,4 @@ export interface SiteAnalyticsProps {
     children?: React.ReactNode;
 }
 /** Inject Google Analytics / Baidu Tongji scripts from site settings. */
-export declare function SiteAnalytics({ children }: SiteAnalyticsProps): string | number | boolean | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | import("react").ReactPortal | null;
+export declare function SiteAnalytics({ children }: SiteAnalyticsProps): string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | import("react").ReactPortal | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | null | undefined> | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-toolkit",
-  "version": "3.1.0",
+  "version": "4.0.0-beta.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -79,6 +79,18 @@
     "./plugin/dev": {
       "types": "./dist/plugin/dev/index.d.ts",
       "default": "./dist/plugin/dev/index.js"
+    },
+    "./plugin/extension": {
+      "types": "./dist/plugin/extension/index.d.ts",
+      "default": "./dist/plugin/extension/index.js"
+    },
+    "./plugin/server": {
+      "types": "./dist/plugin/server/index.d.ts",
+      "default": "./dist/plugin/server/index.js"
+    },
+    "./plugin/node": {
+      "types": "./dist/plugin/node.d.ts",
+      "default": "./dist/plugin/node.js"
     }
   },
   "peerDependencies": {
@@ -92,19 +104,30 @@
     "viewerjs": ">=1"
   },
   "peerDependenciesMeta": {
-    "@tanstack/react-query": { "optional": true },
-    "@ant-design/cssinjs": { "optional": true },
-    "highlight.js": { "optional": true },
-    "next": { "optional": true },
-    "nprogress": { "optional": true },
-    "react": { "optional": true },
-    "react-dom": { "optional": true },
-    "viewerjs": { "optional": true }
-  },
-  "scripts": {
-    "generate": "node scripts/generate-swagger.js",
-    "build": "tsc && rm -rf dist/config/locales && cp -r src/config/locales dist/config/locales",
-    "typecheck": "tsc --noEmit"
+    "@tanstack/react-query": {
+      "optional": true
+    },
+    "@ant-design/cssinjs": {
+      "optional": true
+    },
+    "highlight.js": {
+      "optional": true
+    },
+    "next": {
+      "optional": true
+    },
+    "nprogress": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    },
+    "viewerjs": {
+      "optional": true
+    }
   },
   "files": [
     "dist"
@@ -145,5 +168,10 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.7.3"
+  },
+  "scripts": {
+    "generate": "node scripts/generate-swagger.js",
+    "build": "tsc && rm -rf dist/config/locales && cp -r src/config/locales dist/config/locales",
+    "typecheck": "tsc --noEmit"
   }
-}
+}