@rspress/runtime 2.0.0-beta.28 → 2.0.0-beta.29

package/dist/hooks/usePage.d.ts

@@ -1,10 +1,10 @@
+import type { PageDataLegacy } from '@rspress/shared';
+interface IPageContext {
+    data: PageDataLegacy['page'];
+    setData?: (data: PageDataLegacy['page']) => void;
+}
+export declare const PageContext: import("react").Context<IPageContext>;
 export declare function usePage(): {
-    page: import("@rspress/shared").BaseRuntimePageInfo & {
-        [key: string]: unknown;
-        headingTitle?: string;
-        pagePath: string;
-        lastUpdatedTime?: string;
-        description?: string;
-        pageType: import("@rspress/shared").PageType;
-    };
+    page: PageDataLegacy['page'];
 };
+export {};

package/dist/hooks/usePage.js

@@ -1,8 +1,9 @@
-import { usePageData } from "./usePageData.js";
+import { createContext, useContext } from "react";
+const PageContext = createContext({});
 function usePage() {
-    const { page } = usePageData();
+    const ctx = useContext(PageContext);
     return {
-        page
+        page: ctx.data
     };
 }
-export { usePage };
+export { PageContext, usePage };

package/dist/hooks/usePageData.d.ts

@@ -1,11 +1,5 @@
-import type { PageData } from '@rspress/shared';
-interface IDataContext {
-    data: PageData;
-    setData?: (data: PageData) => void;
-}
-export declare const DataContext: import("react").Context<IDataContext>;
+import type { PageDataLegacy } from '@rspress/shared';
 /**
  * should use `usePage` and `useSite` instead
  */
-export declare function usePageData(): PageData;
-export {};
+export declare function usePageData(): PageDataLegacy;

package/dist/hooks/usePageData.js

@@ -1,7 +1,16 @@
-import { createContext, useContext } from "react";
-const DataContext = createContext({});
+import { usePage } from "./usePage.js";
+import { usePages } from "./usePages.js";
+import { useSite } from "./useSite.js";
 function usePageData() {
-    const ctx = useContext(DataContext);
-    return ctx.data;
+    const { page } = usePage();
+    const { pages } = usePages();
+    const { site } = useSite();
+    return {
+        page,
+        siteData: {
+            ...site,
+            pages
+        }
+    };
 }
-export { DataContext, usePageData };
+export { usePageData };

package/dist/hooks/usePages.d.ts

@@ -0,0 +1,4 @@
+import type { PageData } from '@rspress/shared';
+export declare function usePages(): {
+    pages: PageData['pages'];
+};

package/dist/hooks/usePages.js

@@ -0,0 +1,7 @@
+import { pageData } from "virtual-page-data";
+function usePages() {
+    return {
+        pages: pageData.pages
+    };
+}
+export { usePages };

package/dist/hooks/useSite.d.ts

@@ -1,3 +1,4 @@
+import type { SiteData } from '@rspress/shared';
 export declare function useSite(): {
-    site: import("@rspress/shared").SiteData<import("@rspress/shared").DefaultThemeConfig>;
+    site: SiteData;
 };

package/dist/hooks/useSite.js

@@ -1,8 +1,7 @@
-import { usePageData } from "./usePageData.js";
+import virtual_site_data from "virtual-site-data";
 function useSite() {
-    const { siteData } = usePageData();
     return {
-        site: siteData
+        site: virtual_site_data
     };
 }
 export { useSite };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { Head } from '@unhead/react';
-export { createPortal, flushSync, } from 'react-dom';
+export { createPortal, flushSync } from 'react-dom';
 export { BrowserRouter, matchPath, matchRoutes, useLocation, useNavigate, useSearchParams, } from 'react-router-dom';
 export { Content } from './Content.js';
 export { ThemeContext, useDark } from './hooks/useDark.js';
@@ -8,12 +8,13 @@ export { useI18n } from './hooks/useI18n.js';
 export { useLang } from './hooks/useLang.js';
 export { useLocaleSiteData } from './hooks/useLocaleSiteData.js';
 export { useNav } from './hooks/useNav.js';
-export { usePage } from './hooks/usePage.js';
-export { DataContext, usePageData } from './hooks/usePageData.js';
+export { PageContext, usePage } from './hooks/usePage.js';
+export { usePageData } from './hooks/usePageData.js';
+export { usePages } from './hooks/usePages.js';
 export { getSidebarDataGroup, useSidebar } from './hooks/useSidebar.js';
 export { useSite } from './hooks/useSite.js';
 export { useVersion } from './hooks/useVersion.js';
 export { useWindowSize } from './hooks/useWindowSize.js';
 export { NoSSR } from './NoSSR.js';
-export { isActive, pathnameToRouteService, } from './route.js';
-export { addLeadingSlash, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, removeBase, removeTrailingSlash, withBase, } from './utils.js';
+export { isActive, pathnameToRouteService } from './route.js';
+export { addLeadingSlash, cleanUrlByConfig, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, removeBase, removeTrailingSlash, withBase, } from './utils.js';

package/dist/index.js

@@ -8,13 +8,14 @@ import { useI18n } from "./hooks/useI18n.js";
 import { useLang } from "./hooks/useLang.js";
 import { useLocaleSiteData } from "./hooks/useLocaleSiteData.js";
 import { useNav } from "./hooks/useNav.js";
-import { usePage } from "./hooks/usePage.js";
-import { DataContext, usePageData } from "./hooks/usePageData.js";
+import { PageContext, usePage } from "./hooks/usePage.js";
+import { usePageData } from "./hooks/usePageData.js";
+import { usePages } from "./hooks/usePages.js";
 import { getSidebarDataGroup, useSidebar } from "./hooks/useSidebar.js";
 import { useSite } from "./hooks/useSite.js";
 import { useVersion } from "./hooks/useVersion.js";
 import { useWindowSize } from "./hooks/useWindowSize.js";
 import { NoSSR } from "./NoSSR.js";
 import { isActive, pathnameToRouteService } from "./route.js";
-import { addLeadingSlash, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, removeBase, removeTrailingSlash, withBase } from "./utils.js";
-export { BrowserRouter, Content, DataContext, Head, NoSSR, ThemeContext, addLeadingSlash, createPortal, flushSync, getSidebarDataGroup, isActive, isEqualPath, isProduction, matchPath, matchRoutes, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, pathnameToRouteService, removeBase, removeTrailingSlash, useDark, useFrontmatter, useI18n, useLang, useLocaleSiteData, useLocation, useNav, useNavigate, usePage, usePageData, useSearchParams, useSidebar, useSite, useVersion, useWindowSize, withBase };
+import { addLeadingSlash, cleanUrlByConfig, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, removeBase, removeTrailingSlash, withBase } from "./utils.js";
+export { BrowserRouter, Content, Head, NoSSR, PageContext, ThemeContext, addLeadingSlash, cleanUrlByConfig, createPortal, flushSync, getSidebarDataGroup, isActive, isEqualPath, isProduction, matchPath, matchRoutes, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, pathnameToRouteService, removeBase, removeTrailingSlash, useDark, useFrontmatter, useI18n, useLang, useLocaleSiteData, useLocation, useNav, useNavigate, usePage, usePageData, usePages, useSearchParams, useSidebar, useSite, useVersion, useWindowSize, withBase };

package/dist/utils.d.ts

@@ -2,6 +2,10 @@ import { addLeadingSlash, isProduction, normalizeSlash, removeTrailingSlash } fr
 export declare function withBase(url?: string): string;
 export declare function removeBase(url: string): string;
 export declare function isEqualPath(a: string, b: string): boolean;
-export declare function normalizeHrefInRuntime(a: string): string;
+export declare function normalizeHrefInRuntime(link: string): string;
+/**
+ * we do cleanUrls in runtime side
+ */
+export declare function cleanUrlByConfig(link: string): string;
 export declare function normalizeImagePath(imagePath: string): string;
 export { addLeadingSlash, removeTrailingSlash, normalizeSlash, isProduction };

package/dist/utils.js

@@ -1,18 +1,21 @@
 import { addLeadingSlash, isDataUrl, isExternalUrl, isProduction, normalizeHref, normalizeSlash, removeBase, removeHash, removeTrailingSlash, withBase } from "@rspress/shared";
-import { base } from "virtual-runtime-config";
 import virtual_site_data from "virtual-site-data";
 function utils_withBase(url = '/') {
-    return withBase(url, base);
+    return withBase(url, virtual_site_data.base);
 }
 function utils_removeBase(url) {
-    return removeBase(url, base);
+    return removeBase(url, virtual_site_data.base);
 }
 function isEqualPath(a, b) {
-    return utils_removeBase(normalizeHrefInRuntime(removeHash(a))) === utils_removeBase(normalizeHrefInRuntime(removeHash(b)));
+    return utils_removeBase(normalizeHref(removeHash(a), true)) === utils_removeBase(normalizeHref(removeHash(b), true));
 }
-function normalizeHrefInRuntime(a) {
+function normalizeHrefInRuntime(link) {
     const cleanUrls = Boolean(virtual_site_data?.route?.cleanUrls);
-    return normalizeHref(a, cleanUrls);
+    return normalizeHref(link, cleanUrls);
+}
+function cleanUrlByConfig(link) {
+    if (virtual_site_data?.route?.cleanUrls) return normalizeHref(link, true);
+    return link;
 }
 function normalizeImagePath(imagePath) {
     if (isAbsoluteUrl(imagePath)) return imagePath;
@@ -22,4 +25,4 @@ function normalizeImagePath(imagePath) {
 function isAbsoluteUrl(path) {
     return isExternalUrl(path) || isDataUrl(path) || path.startsWith('//');
 }
-export { addLeadingSlash, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, utils_removeBase as removeBase, removeTrailingSlash, utils_withBase as withBase };
+export { addLeadingSlash, cleanUrlByConfig, isEqualPath, isProduction, normalizeHrefInRuntime, normalizeImagePath, normalizeSlash, utils_removeBase as removeBase, removeTrailingSlash, utils_withBase as withBase };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/runtime",
-  "version": "2.0.0-beta.28",
+  "version": "2.0.0-beta.29",
   "description": "The Runtime of Rspress Documentation Framework",
   "bugs": "https://github.com/web-infra-dev/rspress/issues",
   "repository": {
@@ -37,13 +37,13 @@
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-router-dom": "^6.30.1",
-    "@rspress/shared": "2.0.0-beta.28"
+    "@rspress/shared": "2.0.0-beta.29"
   },
   "devDependencies": {
     "@rsbuild/plugin-react": "~1.3.5",
-    "@rslib/core": "0.12.1",
+    "@rslib/core": "0.12.2",
     "@types/jest": "~29.5.14",
-    "@types/react": "^19.1.10",
+    "@types/react": "^19.1.11",
     "@types/react-dom": "^19.1.7",
     "rsbuild-plugin-publint": "^0.3.3",
     "typescript": "^5.8.2",