@windrun-huaiin/third-ui 11.1.0 → 12.0.0

package/dist/clerk/clerk-optional-auth.d.ts

@@ -0,0 +1,12 @@
+import { auth } from '@clerk/nextjs/server';
+export type OptionalAuthResult = {
+    userId: string | null;
+    sessionId: string | null;
+    raw: Awaited<ReturnType<typeof auth>> | null;
+    hasClerkHeader: boolean;
+};
+/**
+ * 安全的可选鉴权：调用 auth()，若缺少 Clerk 标记或其他原因抛错则兜底返回 null。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致页面崩溃。
+ */
+export declare function getOptionalAuth(): Promise<OptionalAuthResult>;

package/dist/clerk/clerk-optional-auth.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var tslib_es6 = require('../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
+var server = require('@clerk/nextjs/server');
+
+/**
+ * 安全的可选鉴权：调用 auth()，若缺少 Clerk 标记或其他原因抛错则兜底返回 null。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致页面崩溃。
+ */
+function getOptionalAuth() {
+    return tslib_es6.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const res = yield server.auth();
+            return {
+                userId: (_a = res.userId) !== null && _a !== void 0 ? _a : null,
+                sessionId: (_b = res.sessionId) !== null && _b !== void 0 ? _b : null,
+                raw: res,
+                hasClerkHeader: true,
+            };
+        }
+        catch (_c) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: false,
+            };
+        }
+    });
+}
+
+exports.getOptionalAuth = getOptionalAuth;

package/dist/clerk/clerk-optional-auth.mjs

@@ -0,0 +1,31 @@
+import { __awaiter } from '../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
+import { auth } from '@clerk/nextjs/server';
+
+/**
+ * 安全的可选鉴权：调用 auth()，若缺少 Clerk 标记或其他原因抛错则兜底返回 null。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致页面崩溃。
+ */
+function getOptionalAuth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const res = yield auth();
+            return {
+                userId: (_a = res.userId) !== null && _a !== void 0 ? _a : null,
+                sessionId: (_b = res.sessionId) !== null && _b !== void 0 ? _b : null,
+                raw: res,
+                hasClerkHeader: true,
+            };
+        }
+        catch (_c) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: false,
+            };
+        }
+    });
+}
+
+export { getOptionalAuth };

package/dist/clerk/clerk-provider-client.d.ts

@@ -2,11 +2,13 @@ import React from 'react';
 interface ClerkProviderClientProps {
     children: React.ReactNode;
     locale: string;
+    localPrefixAsNeeded?: boolean;
+    defaultLocale?: string;
     signInUrl?: string;
     signUpUrl?: string;
     fallbackSignInUrl?: string;
     fallbackSignUpUrl?: string;
     waitlistUrl?: string;
 }
-export declare function ClerkProviderClient({ children, locale, signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }: ClerkProviderClientProps): import("react/jsx-runtime").JSX.Element;
+export declare function ClerkProviderClient({ children, locale, localPrefixAsNeeded, defaultLocale, signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }: ClerkProviderClientProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/clerk/clerk-provider-client.js

@@ -5,27 +5,37 @@ var jsxRuntime = require('react/jsx-runtime');
 var clerkIntl = require('../lib/clerk-intl.js');
 var nextjs = require('@clerk/nextjs');
 
-function ClerkProviderClient({ children, locale, signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }) {
-    const currentLocalization = clerkIntl.clerkIntl[locale];
+function ClerkProviderClient({ children, locale, localPrefixAsNeeded = true, defaultLocale = 'en', signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }) {
+    var _a, _b;
+    const currentLocalization = (_b = (_a = clerkIntl.clerkIntl[locale]) !== null && _a !== void 0 ? _a : clerkIntl.clerkIntl[defaultLocale]) !== null && _b !== void 0 ? _b : clerkIntl.clerkIntl.en;
+    // In as-needed mode, skip prefixing for the default locale so /sign-in stays unprefixed.
+    const shouldPrefixLocale = localPrefixAsNeeded ? locale !== defaultLocale : true;
+    const localeSegment = shouldPrefixLocale && locale ? `/${locale}` : '';
+    const buildUrl = (path) => path ? `${localeSegment}${path}` : undefined;
     // build the ClerkProvider props, only add when the parameter is not empty
     const clerkProviderProps = {
         localization: currentLocalization,
     };
     // Only add URL when the parameter is not empty
-    if (signInUrl) {
-        clerkProviderProps.signInUrl = `/${locale}${signInUrl}`;
+    const signInWithLocale = buildUrl(signInUrl);
+    if (signInWithLocale) {
+        clerkProviderProps.signInUrl = signInWithLocale;
     }
-    if (signUpUrl) {
-        clerkProviderProps.signUpUrl = `/${locale}${signUpUrl}`;
+    const signUpWithLocale = buildUrl(signUpUrl);
+    if (signUpWithLocale) {
+        clerkProviderProps.signUpUrl = signUpWithLocale;
     }
-    if (fallbackSignInUrl) {
-        clerkProviderProps.signInFallbackRedirectUrl = `/${locale}${fallbackSignInUrl}`;
+    const signInFallbackWithLocale = buildUrl(fallbackSignInUrl);
+    if (signInFallbackWithLocale) {
+        clerkProviderProps.signInFallbackRedirectUrl = signInFallbackWithLocale;
     }
-    if (fallbackSignUpUrl) {
-        clerkProviderProps.signUpFallbackRedirectUrl = `/${locale}${fallbackSignUpUrl}`;
+    const signUpFallbackWithLocale = buildUrl(fallbackSignUpUrl);
+    if (signUpFallbackWithLocale) {
+        clerkProviderProps.signUpFallbackRedirectUrl = signUpFallbackWithLocale;
     }
-    if (waitlistUrl) {
-        clerkProviderProps.waitlistUrl = `/${locale}${waitlistUrl}`;
+    const waitlistWithLocale = buildUrl(waitlistUrl);
+    if (waitlistWithLocale) {
+        clerkProviderProps.waitlistUrl = waitlistWithLocale;
     }
     // console.log('ClerkProviderClient props:', clerkProviderProps);
     return (jsxRuntime.jsx(nextjs.ClerkProvider, Object.assign({}, clerkProviderProps, { children: children })));

package/dist/clerk/clerk-provider-client.mjs

@@ -3,27 +3,37 @@ import { jsx } from 'react/jsx-runtime';
 import { clerkIntl } from '../lib/clerk-intl.mjs';
 import { ClerkProvider } from '@clerk/nextjs';
 
-function ClerkProviderClient({ children, locale, signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }) {
-    const currentLocalization = clerkIntl[locale];
+function ClerkProviderClient({ children, locale, localPrefixAsNeeded = true, defaultLocale = 'en', signInUrl, signUpUrl, fallbackSignInUrl, fallbackSignUpUrl, waitlistUrl, }) {
+    var _a, _b;
+    const currentLocalization = (_b = (_a = clerkIntl[locale]) !== null && _a !== void 0 ? _a : clerkIntl[defaultLocale]) !== null && _b !== void 0 ? _b : clerkIntl.en;
+    // In as-needed mode, skip prefixing for the default locale so /sign-in stays unprefixed.
+    const shouldPrefixLocale = localPrefixAsNeeded ? locale !== defaultLocale : true;
+    const localeSegment = shouldPrefixLocale && locale ? `/${locale}` : '';
+    const buildUrl = (path) => path ? `${localeSegment}${path}` : undefined;
     // build the ClerkProvider props, only add when the parameter is not empty
     const clerkProviderProps = {
         localization: currentLocalization,
     };
     // Only add URL when the parameter is not empty
-    if (signInUrl) {
-        clerkProviderProps.signInUrl = `/${locale}${signInUrl}`;
+    const signInWithLocale = buildUrl(signInUrl);
+    if (signInWithLocale) {
+        clerkProviderProps.signInUrl = signInWithLocale;
     }
-    if (signUpUrl) {
-        clerkProviderProps.signUpUrl = `/${locale}${signUpUrl}`;
+    const signUpWithLocale = buildUrl(signUpUrl);
+    if (signUpWithLocale) {
+        clerkProviderProps.signUpUrl = signUpWithLocale;
     }
-    if (fallbackSignInUrl) {
-        clerkProviderProps.signInFallbackRedirectUrl = `/${locale}${fallbackSignInUrl}`;
+    const signInFallbackWithLocale = buildUrl(fallbackSignInUrl);
+    if (signInFallbackWithLocale) {
+        clerkProviderProps.signInFallbackRedirectUrl = signInFallbackWithLocale;
     }
-    if (fallbackSignUpUrl) {
-        clerkProviderProps.signUpFallbackRedirectUrl = `/${locale}${fallbackSignUpUrl}`;
+    const signUpFallbackWithLocale = buildUrl(fallbackSignUpUrl);
+    if (signUpFallbackWithLocale) {
+        clerkProviderProps.signUpFallbackRedirectUrl = signUpFallbackWithLocale;
     }
-    if (waitlistUrl) {
-        clerkProviderProps.waitlistUrl = `/${locale}${waitlistUrl}`;
+    const waitlistWithLocale = buildUrl(waitlistUrl);
+    if (waitlistWithLocale) {
+        clerkProviderProps.waitlistUrl = waitlistWithLocale;
     }
     // console.log('ClerkProviderClient props:', clerkProviderProps);
     return (jsx(ClerkProvider, Object.assign({}, clerkProviderProps, { children: children })));

package/dist/clerk/optional-auth.d.ts

@@ -0,0 +1,12 @@
+import { auth } from '@clerk/nextjs/server';
+export type OptionalAuthResult = {
+    userId: string | null;
+    sessionId: string | null;
+    raw: Awaited<ReturnType<typeof auth>> | null;
+    hasClerkHeader: boolean;
+};
+/**
+ * 安全的可选鉴权：只有在请求头已包含 Clerk 标记时才调用 auth()。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致 auth() 抛错。
+ */
+export declare function getOptionalAuth(): Promise<OptionalAuthResult>;

package/dist/clerk/optional-auth.js

@@ -0,0 +1,47 @@
+'use strict';
+
+var tslib_es6 = require('../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
+var server = require('@clerk/nextjs/server');
+var headers = require('next/headers');
+
+/**
+ * 安全的可选鉴权：只有在请求头已包含 Clerk 标记时才调用 auth()。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致 auth() 抛错。
+ */
+function getOptionalAuth() {
+    return tslib_es6.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        const h = yield headers.headers();
+        const hasClerkHeader = Boolean(h.get('x-clerk-auth-status')) ||
+            Boolean(h.get('x-clerk-user-id')) ||
+            Boolean(h.get('authorization')) ||
+            Boolean((_a = h.get('cookie')) === null || _a === void 0 ? void 0 : _a.includes('__session'));
+        if (!hasClerkHeader) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: false,
+            };
+        }
+        try {
+            const res = yield server.auth();
+            return {
+                userId: (_b = res.userId) !== null && _b !== void 0 ? _b : null,
+                sessionId: (_c = res.sessionId) !== null && _c !== void 0 ? _c : null,
+                raw: res,
+                hasClerkHeader: true,
+            };
+        }
+        catch (_d) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: true,
+            };
+        }
+    });
+}
+
+exports.getOptionalAuth = getOptionalAuth;

package/dist/clerk/optional-auth.mjs

@@ -0,0 +1,45 @@
+import { __awaiter } from '../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
+import { auth } from '@clerk/nextjs/server';
+import { headers } from 'next/headers';
+
+/**
+ * 安全的可选鉴权：只有在请求头已包含 Clerk 标记时才调用 auth()。
+ * 用于公开页/可选登录场景，避免因缺少中间件标记导致 auth() 抛错。
+ */
+function getOptionalAuth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        const h = yield headers();
+        const hasClerkHeader = Boolean(h.get('x-clerk-auth-status')) ||
+            Boolean(h.get('x-clerk-user-id')) ||
+            Boolean(h.get('authorization')) ||
+            Boolean((_a = h.get('cookie')) === null || _a === void 0 ? void 0 : _a.includes('__session'));
+        if (!hasClerkHeader) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: false,
+            };
+        }
+        try {
+            const res = yield auth();
+            return {
+                userId: (_b = res.userId) !== null && _b !== void 0 ? _b : null,
+                sessionId: (_c = res.sessionId) !== null && _c !== void 0 ? _c : null,
+                raw: res,
+                hasClerkHeader: true,
+            };
+        }
+        catch (_d) {
+            return {
+                userId: null,
+                sessionId: null,
+                raw: null,
+                hasClerkHeader: true,
+            };
+        }
+    });
+}
+
+export { getOptionalAuth };

package/dist/clerk/patch/optional-auth.d.ts

@@ -0,0 +1,11 @@
+import { auth } from '@clerk/nextjs/server';
+export type OptionalAuthResult = {
+    userId: string | null;
+    sessionId: string | null;
+    raw: Awaited<ReturnType<typeof auth>> | null;
+};
+/**
+ * 可选鉴权：在缺少 Clerk 标记或未登录时返回 null，避免 auth() 抛错。
+ * 仅供服务端使用，请从 @third-ui/clerk/patch/optional-auth 导入。
+ */
+export declare function getOptionalAuth(): Promise<OptionalAuthResult>;

package/dist/clerk/patch/optional-auth.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
+var server = require('@clerk/nextjs/server');
+
+/**
+ * 可选鉴权：在缺少 Clerk 标记或未登录时返回 null，避免 auth() 抛错。
+ * 仅供服务端使用，请从 @third-ui/clerk/patch/optional-auth 导入。
+ */
+function getOptionalAuth() {
+    return tslib_es6.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const res = yield server.auth();
+            return {
+                userId: (_a = res.userId) !== null && _a !== void 0 ? _a : null,
+                sessionId: (_b = res.sessionId) !== null && _b !== void 0 ? _b : null,
+                raw: res,
+            };
+        }
+        catch (_c) {
+            return { userId: null, sessionId: null, raw: null };
+        }
+    });
+}
+
+exports.getOptionalAuth = getOptionalAuth;

package/dist/clerk/patch/optional-auth.mjs

@@ -0,0 +1,25 @@
+import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
+import { auth } from '@clerk/nextjs/server';
+
+/**
+ * 可选鉴权：在缺少 Clerk 标记或未登录时返回 null，避免 auth() 抛错。
+ * 仅供服务端使用，请从 @third-ui/clerk/patch/optional-auth 导入。
+ */
+function getOptionalAuth() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const res = yield auth();
+            return {
+                userId: (_a = res.userId) !== null && _a !== void 0 ? _a : null,
+                sessionId: (_b = res.sessionId) !== null && _b !== void 0 ? _b : null,
+                raw: res,
+            };
+        }
+        catch (_c) {
+            return { userId: null, sessionId: null, raw: null };
+        }
+    });
+}
+
+export { getOptionalAuth };

package/dist/fuma/base/custom-home-layout.d.ts

@@ -72,6 +72,14 @@ export interface CustomHomeLayoutProps {
      * Customize the order of header action items.
      */
     actionOrders?: HeaderActionOrders;
+    /**
+     * Whether localePrefix is set to 'as-needed' (default: true)
+     */
+    localPrefixAsNeeded?: boolean;
+    /**
+     * The default locale for the application (default: 'en')
+     */
+    defaultLocale?: string;
     children?: ReactNode;
 }
 export interface HeaderActionOrders {
@@ -79,7 +87,7 @@ export interface HeaderActionOrders {
     mobileBar?: MobileBarAction[];
     mobileMenu?: MobileMenuAction[];
 }
-export declare function CustomHomeLayout({ locale, options, children, showBanner, bannerHeight, headerHeight, headerPaddingTop, navbarClassName, banner, footer, goToTop, showFooter, showGoToTop, style, floatingNav, actionOrders, }: CustomHomeLayoutProps): import("react/jsx-runtime").JSX.Element;
+export declare function CustomHomeLayout({ locale, options, children, showBanner, bannerHeight, headerHeight, headerPaddingTop, navbarClassName, banner, footer, goToTop, showFooter, showGoToTop, style, floatingNav, actionOrders, localPrefixAsNeeded, defaultLocale, }: CustomHomeLayoutProps): import("react/jsx-runtime").JSX.Element;
 export declare function HomeTitle({ children, className, }: {
     children: ReactNode;
     className?: string;

package/dist/fuma/base/custom-home-layout.js

@@ -8,7 +8,7 @@ var footer = require('../../main/footer.js');
 var goToTop = require('../../main/go-to-top.js');
 var customHeader = require('./custom-header.js');
 
-function CustomHomeLayout({ locale, options, children, showBanner = false, bannerHeight, headerHeight = 2.5, headerPaddingTop, navbarClassName, banner, footer: footer$1, goToTop: goToTop$1, showFooter = true, showGoToTop = true, style, floatingNav = false, actionOrders, }) {
+function CustomHomeLayout({ locale, options, children, showBanner = false, bannerHeight, headerHeight = 2.5, headerPaddingTop, navbarClassName, banner, footer: footer$1, goToTop: goToTop$1, showFooter = true, showGoToTop = true, style, floatingNav = false, actionOrders, localPrefixAsNeeded = true, defaultLocale = 'en', }) {
     const resolvedBannerHeight = bannerHeight !== null && bannerHeight !== void 0 ? bannerHeight : (showBanner ? 3 : 0.5);
     const resolvedPaddingTop = headerPaddingTop !== null && headerPaddingTop !== void 0 ? headerPaddingTop : (showBanner ? 0 : 0.5);
     const layoutStyle = Object.assign({ '--fd-banner-height': `${resolvedBannerHeight}rem`, '--fd-nav-height': `${headerHeight}rem`, paddingTop: floatingNav
@@ -17,7 +17,7 @@ function CustomHomeLayout({ locale, options, children, showBanner = false, banne
     const { nav } = options, homeLayoutProps = tslib_es6.__rest(options, ["nav"]);
     const navOptions = nav !== null && nav !== void 0 ? nav : {};
     const header = (jsxRuntime.jsx(customHeader.CustomHomeHeader, Object.assign({}, homeLayoutProps, { nav: navOptions, bannerHeight: resolvedBannerHeight, headerHeight: headerHeight, navbarClassName: navbarClassName, floating: floatingNav, desktopActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.desktop, mobileBarActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.mobileBar, mobileMenuActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.mobileMenu })));
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [banner !== null && banner !== void 0 ? banner : (jsxRuntime.jsx(fumaBannerSuit.FumaBannerSuit, { locale: locale, showBanner: showBanner, floating: floatingNav })), jsxRuntime.jsxs(home.HomeLayout, Object.assign({}, homeLayoutProps, { nav: Object.assign(Object.assign({}, navOptions), { component: header }), className: 'bg-neutral-100 dark:bg-neutral-900', style: layoutStyle, children: [children, showFooter ? footer$1 !== null && footer$1 !== void 0 ? footer$1 : jsxRuntime.jsx(footer.Footer, { locale: locale }) : null, showGoToTop ? goToTop$1 !== null && goToTop$1 !== void 0 ? goToTop$1 : jsxRuntime.jsx(goToTop.GoToTop, {}) : null] }))] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [banner !== null && banner !== void 0 ? banner : (jsxRuntime.jsx(fumaBannerSuit.FumaBannerSuit, { locale: locale, showBanner: showBanner, floating: floatingNav })), jsxRuntime.jsxs(home.HomeLayout, Object.assign({}, homeLayoutProps, { nav: Object.assign(Object.assign({}, navOptions), { component: header }), className: 'bg-neutral-100 dark:bg-neutral-900', style: layoutStyle, children: [children, showFooter ? footer$1 !== null && footer$1 !== void 0 ? footer$1 : jsxRuntime.jsx(footer.Footer, { locale: locale, localPrefixAsNeeded: localPrefixAsNeeded, defaultLocale: defaultLocale }) : null, showGoToTop ? goToTop$1 !== null && goToTop$1 !== void 0 ? goToTop$1 : jsxRuntime.jsx(goToTop.GoToTop, {}) : null] }))] }));
 }
 function HomeTitle({ children, className, }) {
     return (jsxRuntime.jsx("span", { className: `font-medium in-[.uwu]:hidden in-[header]:text-[clamp(12px,3vw,15px)]! ${className !== null && className !== void 0 ? className : ''}`, children: children }));

package/dist/fuma/base/custom-home-layout.mjs

@@ -6,7 +6,7 @@ import { Footer } from '../../main/footer.mjs';
 import { GoToTop } from '../../main/go-to-top.mjs';
 import { CustomHomeHeader } from './custom-header.mjs';
 
-function CustomHomeLayout({ locale, options, children, showBanner = false, bannerHeight, headerHeight = 2.5, headerPaddingTop, navbarClassName, banner, footer, goToTop, showFooter = true, showGoToTop = true, style, floatingNav = false, actionOrders, }) {
+function CustomHomeLayout({ locale, options, children, showBanner = false, bannerHeight, headerHeight = 2.5, headerPaddingTop, navbarClassName, banner, footer, goToTop, showFooter = true, showGoToTop = true, style, floatingNav = false, actionOrders, localPrefixAsNeeded = true, defaultLocale = 'en', }) {
     const resolvedBannerHeight = bannerHeight !== null && bannerHeight !== void 0 ? bannerHeight : (showBanner ? 3 : 0.5);
     const resolvedPaddingTop = headerPaddingTop !== null && headerPaddingTop !== void 0 ? headerPaddingTop : (showBanner ? 0 : 0.5);
     const layoutStyle = Object.assign({ '--fd-banner-height': `${resolvedBannerHeight}rem`, '--fd-nav-height': `${headerHeight}rem`, paddingTop: floatingNav
@@ -15,7 +15,7 @@ function CustomHomeLayout({ locale, options, children, showBanner = false, banne
     const { nav } = options, homeLayoutProps = __rest(options, ["nav"]);
     const navOptions = nav !== null && nav !== void 0 ? nav : {};
     const header = (jsx(CustomHomeHeader, Object.assign({}, homeLayoutProps, { nav: navOptions, bannerHeight: resolvedBannerHeight, headerHeight: headerHeight, navbarClassName: navbarClassName, floating: floatingNav, desktopActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.desktop, mobileBarActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.mobileBar, mobileMenuActionsOrder: actionOrders === null || actionOrders === void 0 ? void 0 : actionOrders.mobileMenu })));
-    return (jsxs(Fragment, { children: [banner !== null && banner !== void 0 ? banner : (jsx(FumaBannerSuit, { locale: locale, showBanner: showBanner, floating: floatingNav })), jsxs(HomeLayout, Object.assign({}, homeLayoutProps, { nav: Object.assign(Object.assign({}, navOptions), { component: header }), className: 'bg-neutral-100 dark:bg-neutral-900', style: layoutStyle, children: [children, showFooter ? footer !== null && footer !== void 0 ? footer : jsx(Footer, { locale: locale }) : null, showGoToTop ? goToTop !== null && goToTop !== void 0 ? goToTop : jsx(GoToTop, {}) : null] }))] }));
+    return (jsxs(Fragment, { children: [banner !== null && banner !== void 0 ? banner : (jsx(FumaBannerSuit, { locale: locale, showBanner: showBanner, floating: floatingNav })), jsxs(HomeLayout, Object.assign({}, homeLayoutProps, { nav: Object.assign(Object.assign({}, navOptions), { component: header }), className: 'bg-neutral-100 dark:bg-neutral-900', style: layoutStyle, children: [children, showFooter ? footer !== null && footer !== void 0 ? footer : jsx(Footer, { locale: locale, localPrefixAsNeeded: localPrefixAsNeeded, defaultLocale: defaultLocale }) : null, showGoToTop ? goToTop !== null && goToTop !== void 0 ? goToTop : jsx(GoToTop, {}) : null] }))] }));
 }
 function HomeTitle({ children, className, }) {
     return (jsx("span", { className: `font-medium in-[.uwu]:hidden in-[header]:text-[clamp(12px,3vw,15px)]! ${className !== null && className !== void 0 ? className : ''}`, children: children }));

package/dist/fuma/fuma-page-genarator.d.ts

@@ -15,8 +15,10 @@ interface FumaPageParams {
     showBreadcrumb?: boolean;
     showTableOfContent?: boolean;
     showTableOfContentPopover?: boolean;
+    localPrefixAsNeeded?: boolean;
+    defaultLocale?: string;
 }
-export declare function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales, showBreadcrumb, showTableOfContent, showTableOfContentPopover, }: FumaPageParams): {
+export declare function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales, showBreadcrumb, showTableOfContent, showTableOfContentPopover, localPrefixAsNeeded, defaultLocale, }: FumaPageParams): {
     Page: ({ params }: {
         params: Promise<{
             locale: string;

package/dist/fuma/fuma-page-genarator.js

@@ -5,13 +5,16 @@ var jsxRuntime = require('react/jsx-runtime');
 var page = require('fumadocs-ui/page');
 var React = require('react');
 var tocFooterWrapper = require('./mdx/toc-footer-wrapper.js');
+var lib = require('@windrun-huaiin/lib');
 
-function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, showTableOfContentPopover = false, }) {
+function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, showTableOfContentPopover = false, localPrefixAsNeeded = true, defaultLocale = 'en', }) {
     const Page = function Page(_a) {
         return tslib_es6.__awaiter(this, arguments, void 0, function* ({ params }) {
+            var _b, _c, _d;
             const { slug, locale } = yield params;
             const page$1 = mdxContentSource.getPage(slug, locale);
             if (!page$1) {
+                console.log('[FumaPage] missing page', { slug, locale, available: (_d = (_c = (_b = mdxContentSource.pageTree) === null || _b === void 0 ? void 0 : _b[locale]) === null || _c === void 0 ? void 0 : _c.children) === null || _d === void 0 ? void 0 : _d.map((c) => c.url) });
                 return jsxRuntime.jsx(FallbackPage, { siteIcon: siteIcon });
             }
             const path = githubBaseUrl ? `${mdxSourceDir}/${page$1.path}` : undefined;
@@ -47,11 +50,13 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
             const baseRoute = mdxSourceDir.replace('src/mdx/', '');
             // build the current page path
             const currentPath = slug ? slug.join('/') : '';
-            const currentUrl = `${baseUrl}/${locale}/${baseRoute}${currentPath ? `/${currentPath}` : ''}`;
+            const localizedPath = lib.getAsNeededLocalizedUrl(locale || defaultLocale, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localPrefixAsNeeded, defaultLocale);
+            const currentUrl = `${baseUrl}${localizedPath}`;
             // generate the seo language map
             const seoLanguageMap = {};
             supportedLocales.forEach(loc => {
-                seoLanguageMap[loc] = `${baseUrl}/${loc}/${baseRoute}${currentPath ? `/${currentPath}` : ''}`;
+                const seoPath = lib.getAsNeededLocalizedUrl(loc, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localPrefixAsNeeded, defaultLocale);
+                seoLanguageMap[loc] = `${baseUrl}${seoPath}`;
             });
             return {
                 metadataBase: new URL(baseUrl),

package/dist/fuma/fuma-page-genarator.mjs

@@ -3,13 +3,16 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { DocsPage, DocsTitle, DocsDescription, DocsBody } from 'fumadocs-ui/page';
 import { cloneElement } from 'react';
 import { TocFooterWrapper } from './mdx/toc-footer-wrapper.mjs';
+import { getAsNeededLocalizedUrl } from '@windrun-huaiin/lib';
 
-function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, showTableOfContentPopover = false, }) {
+function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, siteIcon, FallbackPage, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, showTableOfContentPopover = false, localPrefixAsNeeded = true, defaultLocale = 'en', }) {
     const Page = function Page(_a) {
         return __awaiter(this, arguments, void 0, function* ({ params }) {
+            var _b, _c, _d;
             const { slug, locale } = yield params;
             const page = mdxContentSource.getPage(slug, locale);
             if (!page) {
+                console.log('[FumaPage] missing page', { slug, locale, available: (_d = (_c = (_b = mdxContentSource.pageTree) === null || _b === void 0 ? void 0 : _b[locale]) === null || _c === void 0 ? void 0 : _c.children) === null || _d === void 0 ? void 0 : _d.map((c) => c.url) });
                 return jsx(FallbackPage, { siteIcon: siteIcon });
             }
             const path = githubBaseUrl ? `${mdxSourceDir}/${page.path}` : undefined;
@@ -45,11 +48,13 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
             const baseRoute = mdxSourceDir.replace('src/mdx/', '');
             // build the current page path
             const currentPath = slug ? slug.join('/') : '';
-            const currentUrl = `${baseUrl}/${locale}/${baseRoute}${currentPath ? `/${currentPath}` : ''}`;
+            const localizedPath = getAsNeededLocalizedUrl(locale || defaultLocale, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localPrefixAsNeeded, defaultLocale);
+            const currentUrl = `${baseUrl}${localizedPath}`;
             // generate the seo language map
             const seoLanguageMap = {};
             supportedLocales.forEach(loc => {
-                seoLanguageMap[loc] = `${baseUrl}/${loc}/${baseRoute}${currentPath ? `/${currentPath}` : ''}`;
+                const seoPath = getAsNeededLocalizedUrl(loc, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localPrefixAsNeeded, defaultLocale);
+                seoLanguageMap[loc] = `${baseUrl}${seoPath}`;
             });
             return {
                 metadataBase: new URL(baseUrl),

package/dist/lib/seo-util.d.ts

@@ -11,9 +11,11 @@ export declare function generateRobots(baseUrl: string): MetadataRoute.Robots;
  * @param locales - Supported locales array
  * @param mdxSourceDir - MDX source directory path
  * @param openMdxSEOSiteMap - Whether to include MDX content in sitemap, default is true
+ * @param localPrefixAsNeeded - Whether localePrefix is set to 'as-needed' (default: true)
+ * @param defaultLocale - The default locale for the application (default: 'en')
  * @returns Sitemap entries
  */
-export declare function generateSitemap(baseUrl: string, locales: string[], mdxSourceDir: string, openMdxSEOSiteMap?: boolean): MetadataRoute.Sitemap;
+export declare function generateSitemap(baseUrl: string, locales: string[], mdxSourceDir: string, openMdxSEOSiteMap?: boolean, localPrefixAsNeeded?: boolean, defaultLocale?: string): MetadataRoute.Sitemap;
 /**
  * Create robots.txt handler function
  * @param baseUrl - The base URL of the website
@@ -26,6 +28,8 @@ export declare function createRobotsHandler(baseUrl: string): () => MetadataRout
  * @param locales - Supported locales array
  * @param mdxSourceDir - MDX source directory path, default is empty
  * @param openMdxSEOSiteMap - Whether to include MDX content in sitemap, default is true
+ * @param localPrefixAsNeeded - Whether localePrefix is set to 'as-needed' (default: true)
+ * @param defaultLocale - The default locale for the application (default: 'en')
  * @returns Sitemap handler function
  */
-export declare function createSitemapHandler(baseUrl: string, locales: string[], mdxSourceDir?: string, openMdxSEOSiteMap?: boolean): () => MetadataRoute.Sitemap;
+export declare function createSitemapHandler(baseUrl: string, locales: string[], mdxSourceDir?: string, openMdxSEOSiteMap?: boolean, localPrefixAsNeeded?: boolean, defaultLocale?: string): () => MetadataRoute.Sitemap;

package/dist/lib/seo-util.js

@@ -2,6 +2,7 @@
 
 var fs = require('fs');
 var path = require('path');
+var lib = require('@windrun-huaiin/lib');
 
 /**
  * Generate robots.txt content
@@ -23,9 +24,11 @@ function generateRobots(baseUrl) {
  * @param locales - Supported locales array
  * @param mdxSourceDir - MDX source directory path
  * @param openMdxSEOSiteMap - Whether to include MDX content in sitemap, default is true
+ * @param localPrefixAsNeeded - Whether localePrefix is set to 'as-needed' (default: true)
+ * @param defaultLocale - The default locale for the application (default: 'en')
  * @returns Sitemap entries
  */
-function generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap = true) {
+function generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap = true, localPrefixAsNeeded = true, defaultLocale = 'en') {
     // 2. handle index.mdx (blog start page) and other slugs
     const blogRoutes = [];
     // 1. read all blog mdx file names with error handling
@@ -38,8 +41,9 @@ function generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap = tru
                 for (const locale of locales) {
                     for (const f of blogFiles) {
                         if (f === 'index.mdx') {
+                            const localizedPath = lib.getAsNeededLocalizedUrl(locale, '/blog', localPrefixAsNeeded, defaultLocale);
                             blogRoutes.push({
-                                url: `${baseUrl}/${locale}/blog`,
+                                url: `${baseUrl}${localizedPath}`,
                                 lastModified: new Date(),
                                 changeFrequency: 'daily',
                                 priority: 1.0
@@ -47,8 +51,9 @@ function generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap = tru
                         }
                         else {
                             const slug = f.replace(/\.mdx$/, '');
+                            const localizedPath = lib.getAsNeededLocalizedUrl(locale, `/blog/${slug}`, localPrefixAsNeeded, defaultLocale);
                             blogRoutes.push({
-                                url: `${baseUrl}/${locale}/blog/${slug}`,
+                                url: `${baseUrl}${localizedPath}`,
                                 lastModified: new Date(),
                                 changeFrequency: f === 'ioc.mdx' ? 'daily' : 'monthly',
                                 priority: 0.8
@@ -64,12 +69,15 @@ function generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap = tru
         }
     }
     // 3. main page (all language versions)
-    const mainRoutes = locales.map(locale => ({
-        url: `${baseUrl}/${locale}`,
-        lastModified: new Date(),
-        changeFrequency: 'weekly',
-        priority: 1.0
-    }));
+    const mainRoutes = locales.map(locale => {
+        const localizedPath = lib.getAsNeededLocalizedUrl(locale, '/', localPrefixAsNeeded, defaultLocale);
+        return {
+            url: `${baseUrl}${localizedPath}`,
+            lastModified: new Date(),
+            changeFrequency: 'weekly',
+            priority: 1.0
+        };
+    });
     return openMdxSEOSiteMap ? [...mainRoutes, ...blogRoutes] : [...mainRoutes];
 }
 /**
@@ -88,12 +96,14 @@ function createRobotsHandler(baseUrl) {
  * @param locales - Supported locales array
  * @param mdxSourceDir - MDX source directory path, default is empty
  * @param openMdxSEOSiteMap - Whether to include MDX content in sitemap, default is true
+ * @param localPrefixAsNeeded - Whether localePrefix is set to 'as-needed' (default: true)
+ * @param defaultLocale - The default locale for the application (default: 'en')
  * @returns Sitemap handler function
  */
-function createSitemapHandler(baseUrl, locales, mdxSourceDir = '', openMdxSEOSiteMap = true) {
+function createSitemapHandler(baseUrl, locales, mdxSourceDir = '', openMdxSEOSiteMap = true, localPrefixAsNeeded = true, defaultLocale = 'en') {
     // force static generation
     const sitemapHandler = function sitemap() {
-        return generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap);
+        return generateSitemap(baseUrl, locales, mdxSourceDir, openMdxSEOSiteMap, localPrefixAsNeeded, defaultLocale);
     };
     // Add static generation directive
     sitemapHandler.dynamic = 'force-static';