@rspress/shared 2.0.0-rc.3 → 2.0.0-rc.4

package/dist/649.js

@@ -1,2 +1 @@
-import { logger } from "@rsbuild/core";
-export { logger };
+export { logger } from "@rsbuild/core";

package/dist/index.d.ts

@@ -245,7 +245,7 @@ export declare type NavItem = NavItemWithLink | NavItemWithChildren | NavItemWit
 export declare interface NavItemWithChildren {
     text?: string;
     tag?: string;
-    items: NavItemWithLink[];
+    items: NavItem[];
     position?: 'left' | 'right';
 }
 
@@ -260,7 +260,7 @@ export declare type NavItemWithLink = {
 export declare interface NavItemWithLinkAndChildren {
     text: string;
     link: string;
-    items: NavItemWithLink[];
+    items: NavItem[];
     tag?: string;
     activeMatch?: string;
     position?: 'left' | 'right';

package/dist/index.js

@@ -1,18 +1,3 @@
-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?$/;
@@ -160,4 +145,19 @@ function removeBase(url, base) {
     if ('' === removedBaseUrl) return '/';
     return removedBaseUrl;
 }
+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 || normalizeHref(item.link, true)).test(currentPathname);
 export { HASH_REGEXP, MDX_OR_MD_REGEXP, QUERY_REGEXP, RSPRESS_TEMP_DIR, SEARCH_INDEX_NAME, addLeadingSlash, addTrailingSlash, getSidebarDataGroup, inBrowser, isDataUrl, isDebugMode, isDevDebugMode, isExternalUrl, isProduction, matchNavbar, matchSidebar, normalizeHref, normalizePosixPath, parseUrl, removeBase, removeHash, removeLeadingSlash, removeTrailingSlash, replaceLang, replaceVersion, slash, utils_cleanUrl as cleanUrl, withBase, withoutLang };

package/dist/logger.js

@@ -1,2 +1 @@
-import "./649.js";
-export { logger } from "@rsbuild/core";
+export { logger } from "./649.js";

package/dist/node-utils.d.ts

@@ -235,7 +235,7 @@ declare type NavItem = NavItemWithLink | NavItemWithChildren | NavItemWithLinkAn
 declare interface NavItemWithChildren {
     text?: string;
     tag?: string;
-    items: NavItemWithLink[];
+    items: NavItem[];
     position?: 'left' | 'right';
 }
 
@@ -250,7 +250,7 @@ declare type NavItemWithLink = {
 declare interface NavItemWithLinkAndChildren {
     text: string;
     link: string;
-    items: NavItemWithLink[];
+    items: NavItem[];
     tag?: string;
     activeMatch?: string;
     position?: 'left' | 'right';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/shared",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/web-infra-dev/rspress.git",
@@ -39,7 +39,7 @@
     "unified": "^11.0.5"
   },
   "devDependencies": {
-    "@rslib/core": "0.18.5",
+    "@rslib/core": "0.18.6",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.8.1",
     "@types/react": "^19.2.7",