@rspress/shared 2.0.0-beta.29 → 2.0.0-beta.30

package/dist/index.d.ts

@@ -423,8 +423,6 @@ export declare function normalizeHref(url?: string, cleanUrls?: boolean, assetEx
 
 export declare function normalizePosixPath(id: string): string;
 
-export declare function normalizeSlash(url: string): string;
-
 export declare interface PageData {
     pages: BaseRuntimePageInfo[];
 }

package/dist/index.js

@@ -64,9 +64,6 @@ function addTrailingSlash(url) {
 function removeTrailingSlash(url) {
     return '/' === url.charAt(url.length - 1) ? url.slice(0, -1) : url;
 }
-function normalizeSlash(url) {
-    return removeTrailingSlash(addLeadingSlash(normalizePosixPath(url)));
-}
 function isExternalUrl(url = '') {
     return url.startsWith('http://') || url.startsWith('https://') || url.startsWith('mailto:') || url.startsWith('tel:');
 }
@@ -137,12 +134,24 @@ function withoutLang(path, langs) {
     const langRegexp = new RegExp(`^\\/(${langs.join('|')})`);
     return addLeadingSlash(path.replace(langRegexp, ''));
 }
+function normalizeSlash(url) {
+    return removeTrailingSlash(addLeadingSlash(normalizePosixPath(url)));
+}
 function withBase(url, base) {
     const normalizedUrl = addLeadingSlash(url);
     const normalizedBase = normalizeSlash(base);
-    return normalizedUrl.startsWith(normalizedBase) ? normalizedUrl : `${normalizedBase}${normalizedUrl}`;
+    const hasBase = normalizedUrl.startsWith(normalizedBase);
+    if (hasBase) {
+        if (normalizedUrl + '/' === base) return base;
+        return normalizedUrl;
+    }
+    return `${normalizedBase}${normalizedUrl}`;
 }
 function removeBase(url, base) {
-    return addLeadingSlash(url).replace(new RegExp(`^${normalizeSlash(base)}`), '');
+    const normalizedUrl = addLeadingSlash(url);
+    const normalizedBase = normalizeSlash(base);
+    const removedBaseUrl = normalizedUrl.replace(new RegExp(`^${normalizedBase}`), '');
+    if ('' === removedBaseUrl) return '/';
+    return removedBaseUrl;
 }
-export { APPEARANCE_KEY, 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, matchNavbar, matchSidebar, normalizeHref, normalizePosixPath, normalizeSlash, parseUrl, removeBase, removeHash, removeLeadingSlash, removeTrailingSlash, replaceLang, replaceVersion, slash, withBase, withoutLang };
+export { APPEARANCE_KEY, 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, matchNavbar, matchSidebar, normalizeHref, normalizePosixPath, parseUrl, removeBase, removeHash, removeLeadingSlash, removeTrailingSlash, replaceLang, replaceVersion, slash, withBase, withoutLang };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/shared",
-  "version": "2.0.0-beta.29",
+  "version": "2.0.0-beta.30",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/web-infra-dev/rspress.git",
@@ -32,18 +32,18 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild/core": "~1.4.16",
-    "@shikijs/rehype": "^3.11.0",
+    "@rsbuild/core": "~1.5.3",
+    "@shikijs/rehype": "^3.12.0",
     "gray-matter": "4.0.3",
     "lodash-es": "^4.17.21",
     "unified": "^11.0.5"
   },
   "devDependencies": {
-    "@rslib/core": "0.12.2",
+    "@rslib/core": "0.12.4",
     "@types/jest": "~29.5.14",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.8.1",
-    "@types/react": "^19.1.11",
+    "@types/react": "^19.1.12",
     "mdast-util-mdx-jsx": "^3.2.0",
     "medium-zoom": "1.1.0",
     "rimraf": "^6.0.1",