@rspress/shared 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/index.d.ts

@@ -221,7 +221,7 @@ export declare interface FrontMatterMeta {
  * @param currentPathname
  * @returns
  */
-export declare const getSidebarDataGroup: (sidebar: NormalizedSidebar, currentPathname: string, base: string) => NormalizedSidebar[string];
+export declare const getSidebarDataGroup: (sidebar: NormalizedSidebar, currentPathname: string) => NormalizedSidebar[string];
 
 export declare const HASH_REGEXP: RegExp;
 
@@ -363,14 +363,14 @@ export declare interface MarkdownOptions {
     crossCompilerCache?: boolean;
 }
 
-export declare const matchNavbar: (item: NavItemWithLink, currentPathname: string, base: string) => boolean;
+export declare const matchNavbar: (item: NavItemWithLink, currentPathname: string) => boolean;
 
 /**
  * match the sidebar key in user config
  * @param pattern /zh/guide
  * @param currentPathname /base/zh/guide/getting-started
  */
-export declare const matchSidebar: (pattern: string, currentPathname: string, base: string) => boolean;
+export declare const matchSidebar: (pattern: string, currentPathname: string) => boolean;
 
 export declare const MDX_OR_MD_REGEXP: RegExp;
 
@@ -415,12 +415,16 @@ export declare interface NormalizedLocales extends Omit<LocaleConfig, 'sidebar'>
     sidebar: NormalizedSidebar;
 }
 
+export declare interface NormalizedRuntimeConfig {
+    base: string;
+}
+
 export declare interface NormalizedSidebar {
     [path: string]: (NormalizedSidebarGroup | SidebarItem | SidebarDivider)[];
 }
 
 export declare interface NormalizedSidebarGroup extends Omit<SidebarGroup, 'items'> {
-    items: (SidebarDivider | SidebarItem | NormalizedSidebarGroup)[];
+    items: (SidebarDivider | SidebarItem | SidebarSectionHeader | NormalizedSidebarGroup)[];
     collapsible: boolean;
     collapsed: boolean;
 }
@@ -676,7 +680,7 @@ export declare interface SidebarGroup {
     text: string;
     link?: string;
     tag?: string;
-    items: (SidebarItem | SidebarDivider | SidebarGroup | string)[];
+    items: (SidebarGroup | SidebarItem | SidebarDivider | SidebarSectionHeader)[];
     collapsible?: boolean;
     collapsed?: boolean;
     /**
@@ -706,7 +710,6 @@ export declare type SidebarSectionHeader = {
 
 export declare interface SiteData<ThemeConfig = NormalizedConfig> {
     root: string;
-    base: string;
     lang: string;
     route: RouteOptions;
     locales: {
@@ -894,8 +897,6 @@ export declare interface UserConfig<ThemeConfig = DefaultThemeConfig> {
 
 export declare function withBase(url: string, base: string): string;
 
-export declare function withoutBase(path: string, base: string): string;
-
 export declare function withoutLang(path: string, langs: string[]): string;
 
 declare interface ZoomContainer {

package/dist/index.js

@@ -1,3 +1,18 @@
+const matchSidebar = (pattern, currentPathname)=>{
+    if (pattern === currentPathname) return true;
+    if (currentPathname.startsWith(pattern)) return true;
+    const prefixWithDot = `${pattern}.`;
+    return currentPathname.startsWith(prefixWithDot);
+};
+const getSidebarDataGroup = (sidebar, currentPathname)=>{
+    const navRoutes = Object.keys(sidebar).sort((a, b)=>b.length - a.length);
+    for (const name of navRoutes)if (matchSidebar(name, currentPathname)) {
+        const sidebarGroup = sidebar[name];
+        return sidebarGroup;
+    }
+    return [];
+};
+const matchNavbar = (item, currentPathname)=>new RegExp(item.activeMatch || item.link).test(currentPathname);
 const QUERY_REGEXP = /\?.*$/s;
 const HASH_REGEXP = /#.*$/s;
 const MDX_OR_MD_REGEXP = /\.mdx?$/;
@@ -100,11 +115,11 @@ function replaceLang(rawUrl, lang, version, base = '', cleanUrls = false, isPage
     } else parts.shift();
     purePathPart = parts.join('/') || '';
     if ((versionPart || langPart) && !purePathPart) purePathPart = cleanUrls ? 'index' : 'index.html';
-    return withBase(addLeadingSlash([
+    return addLeadingSlash([
         versionPart,
         langPart,
         purePathPart
-    ].filter(Boolean).join('/')), base);
+    ].filter(Boolean).join('/'));
 }
 function replaceVersion(rawUrl, version, base = '', cleanUrls = false, isPageNotFound = false) {
     let url = removeBase(rawUrl, base);
@@ -117,10 +132,10 @@ function replaceVersion(rawUrl, version, base = '', cleanUrls = false, isPageNot
     } else parts.shift();
     let restPart = parts.join('/') || '';
     if (versionPart && !restPart) restPart = cleanUrls ? 'index' : 'index.html';
-    return withBase(addLeadingSlash([
+    return addLeadingSlash([
         versionPart,
         restPart
-    ].filter(Boolean).join('/')), base);
+    ].filter(Boolean).join('/'));
 }
 const parseUrl = (url)=>{
     const [withoutHash, hash = ''] = url.split('#');
@@ -145,9 +160,6 @@ function withoutLang(path, langs) {
     const langRegexp = new RegExp(`^\\/(${langs.join('|')})`);
     return addLeadingSlash(path.replace(langRegexp, ''));
 }
-function withoutBase(path, base) {
-    return addLeadingSlash(path).replace(normalizeSlash(base), '');
-}
 function withBase(url, base) {
     const normalizedUrl = addLeadingSlash(url);
     const normalizedBase = normalizeSlash(base);
@@ -156,21 +168,4 @@ function withBase(url, base) {
 function removeBase(url, base) {
     return addLeadingSlash(url).replace(new RegExp(`^${normalizeSlash(base)}`), '');
 }
-const matchSidebar = (pattern, currentPathname, base)=>{
-    const prefix = withBase(pattern, base);
-    if (prefix === currentPathname) return true;
-    const prefixWithTrailingSlash = addTrailingSlash(prefix);
-    if (currentPathname.startsWith(prefixWithTrailingSlash)) return true;
-    const prefixWithDot = `${prefix}.`;
-    return currentPathname.startsWith(prefixWithDot);
-};
-const getSidebarDataGroup = (sidebar, currentPathname, base)=>{
-    const navRoutes = Object.keys(sidebar).sort((a, b)=>b.length - a.length);
-    for (const name of navRoutes)if (matchSidebar(name, currentPathname, base)) {
-        const sidebarGroup = sidebar[name];
-        return sidebarGroup;
-    }
-    return [];
-};
-const matchNavbar = (item, currentPathname, base)=>new RegExp(item.activeMatch || item.link).test(withoutBase(currentPathname, base));
-export { APPEARANCE_KEY, DEFAULT_HIGHLIGHT_LANGUAGES, HASH_REGEXP, MDX_OR_MD_REGEXP, QUERY_REGEXP, RSPRESS_TEMP_DIR, SEARCH_INDEX_NAME, addLeadingSlash, addTrailingSlash, utils_cleanUrl as cleanUrl, getSidebarDataGroup, inBrowser, isDataUrl, isDebugMode, isDevDebugMode, isExternalUrl, isProduction, isSCM, matchNavbar, matchSidebar, normalizeHref, normalizePosixPath, normalizeSlash, parseUrl, removeBase, removeHash, removeLeadingSlash, removeTrailingSlash, replaceLang, replaceVersion, slash, withBase, withoutBase, withoutLang };
+export { APPEARANCE_KEY, DEFAULT_HIGHLIGHT_LANGUAGES, HASH_REGEXP, MDX_OR_MD_REGEXP, QUERY_REGEXP, RSPRESS_TEMP_DIR, SEARCH_INDEX_NAME, addLeadingSlash, addTrailingSlash, utils_cleanUrl as cleanUrl, getSidebarDataGroup, inBrowser, isDataUrl, isDebugMode, isDevDebugMode, isExternalUrl, isProduction, isSCM, matchNavbar, matchSidebar, normalizeHref, normalizePosixPath, normalizeSlash, parseUrl, removeBase, removeHash, removeLeadingSlash, removeTrailingSlash, replaceLang, replaceVersion, slash, withBase, withoutLang };

package/dist/node-utils.d.ts

@@ -539,7 +539,7 @@ declare interface SidebarGroup {
     text: string;
     link?: string;
     tag?: string;
-    items: (SidebarItem | SidebarDivider | SidebarGroup | string)[];
+    items: (SidebarGroup | SidebarItem | SidebarDivider | SidebarSectionHeader)[];
     collapsible?: boolean;
     collapsed?: boolean;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/shared",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/web-infra-dev/rspress.git",
@@ -32,14 +32,14 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.3.22",
+    "@rsbuild/core": "~1.4.0",
     "@shikijs/rehype": "^3.4.2",
     "gray-matter": "4.0.3",
     "lodash-es": "^4.17.21",
     "unified": "^11.0.5"
   },
   "devDependencies": {
-    "@rslib/core": "0.10.0",
+    "@rslib/core": "0.10.3",
     "@types/jest": "~29.5.14",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.8.1",