@windrun-huaiin/diaomao 11.2.0 → 12.0.0

package/.gitignore

@@ -9,6 +9,7 @@ lerna-debug.log*
 .pnpm-debug.log*
 .claude*
 .codex*
+.gemini*
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

package/dev-scripts.config.json

@@ -6,7 +6,7 @@
   },
   "scan": {
     "include": ["src/**/*.{tsx,ts,jsx,js}"],
-    "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx", "src/**/*.d.ts", "node_modules/**"]
+    "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx", "src/**/*.d.ts", "node_modules/**", ".claude/**", ".gemini/**", ".codex/**", ".vscode/**", ".clerk/**"]
   },
   "blog": {
     "mdxDir": "src/mdx/blog",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windrun-huaiin/diaomao",
-  "version": "11.2.0",
+  "version": "12.0.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -27,10 +27,10 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@tailwindcss/typography": "^0.5.19",
     "@types/mdx": "^2.0.13",
-    "@windrun-huaiin/backend-core": "^11.0.3",
-    "@windrun-huaiin/base-ui": "^11.0.1",
-    "@windrun-huaiin/lib": "^11.0.1",
-    "@windrun-huaiin/third-ui": "^11.1.0",
+    "@windrun-huaiin/backend-core": "^12.0.0",
+    "@windrun-huaiin/base-ui": "^12.0.0",
+    "@windrun-huaiin/lib": "^12.0.0",
+    "@windrun-huaiin/third-ui": "^12.0.0",
     "autoprefixer": "^10.4.22",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -77,7 +77,7 @@
     "@types/react-medium-image-zoom": "^3.0.3",
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/parser": "^8.46.4",
-    "@windrun-huaiin/dev-scripts": "^11.0.3",
+    "@windrun-huaiin/dev-scripts": "^12.0.0",
     "eslint": "^9.39.1",
     "eslint-config-next": "^16.0.0",
     "eslint-plugin-unused-imports": "^4.3.0",

package/src/app/[locale]/layout.config.tsx

@@ -7,26 +7,29 @@ import { BaseLayoutProps } from 'fumadocs-ui/layouts/shared';
 import { getTranslations } from 'next-intl/server';
 import { CreditPopover } from '@/components/credit-popover';
 import { ExtendedLinkItem, HomeTitle } from '@windrun-huaiin/third-ui/fuma/base';
+import { getOptionalAuth } from '@windrun-huaiin/third-ui/clerk/patch/optional-auth';
+import { getAsNeededLocalizedUrl } from '@windrun-huaiin/lib';
 
 // home page normal menu
 export async function homeNavLinks(locale: string): Promise<ExtendedLinkItem[]> {
   const t1 = await getTranslations({ locale: locale, namespace: 'linkPreview' });
+  const { userId } = await getOptionalAuth();
   return [
     {
       icon: <icons.BugOff />,
       text: t1('blog'),
-      url: `/${locale}/blog`,
+      url: getAsNeededLocalizedUrl(locale, '/blog'),
     },
     {
       icon: <icons.BTC />,
       text: t1('pricing'),
-      url: `/${locale}/pricing`,
+      url: getAsNeededLocalizedUrl(locale, '/pricing'),
     },
     {
       type: 'custom',
       secondary: true,
       mobilePinned: true,
-      children: <CreditPopover locale={locale} />,
+      children: userId ? <CreditPopover locale={locale} /> : null,
     },
     {
       type: 'custom',
@@ -49,7 +52,7 @@ export async function baseOptions(locale: string): Promise<BaseLayoutProps> {
   const t = await getTranslations({ locale: locale, namespace: 'home' });
   return {
     nav: {
-      url: `/${locale}`,
+      url: getAsNeededLocalizedUrl(locale, '/'),
       title: (
         <>
           <SiteIcon />

package/src/app/[locale]/layout.tsx

@@ -8,6 +8,7 @@ import { RootProvider } from "fumadocs-ui/provider/next";
 import { ClerkProviderClient } from '@windrun-huaiin/third-ui/clerk';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages, getTranslations, setRequestLocale } from 'next-intl/server';
+import { getAsNeededLocalizedUrl } from '@windrun-huaiin/lib';
 import React from 'react';
 import './globals.css';
 
@@ -27,9 +28,10 @@ export async function generateMetadata({
     keywords: t('keywords'),
     metadataBase: new URL(appConfig.baseUrl),
     alternates: {
-      canonical: `${appConfig.baseUrl}/${locale}`,
+      canonical: `${appConfig.baseUrl}${getAsNeededLocalizedUrl(locale, '/')}`,
       languages: {
-        "en": `${appConfig.baseUrl}/en`,
+        "en": `${appConfig.baseUrl}${getAsNeededLocalizedUrl('en', '/')}`,
+        "zh": `${appConfig.baseUrl}${getAsNeededLocalizedUrl('zh', '/')}`,
       }
     },
     icons: [

package/src/components/credit-popover.tsx

@@ -7,6 +7,7 @@ import { CreditOverview, buildMoneyPriceData } from '@windrun-huaiin/third-ui/ma
 import { moneyPriceConfig } from '@windrun-huaiin/backend-core/lib';
 import { buildInitUserContextFromEntities } from '@windrun-huaiin/backend-core/context';
 import { getTranslations } from 'next-intl/server';
+import { getAsNeededLocalizedUrl } from '@windrun-huaiin/lib';
 
 interface CreditPopoverProps {
   locale: string;
@@ -88,7 +89,7 @@ export async function CreditPopover({ locale }: CreditPopoverProps) {
       : [])
   ];
 
-  const pricingPageBaseUrl = `/${locale}/pricing`;
+  const pricingPageBaseUrl = getAsNeededLocalizedUrl(locale, "/pricing");
 
   const data: CreditOverviewData = {
     totalBalance,

package/src/i18n.ts

@@ -5,6 +5,7 @@ import type { I18nConfig } from 'fumadocs-core/i18n';
 export const i18n: I18nConfig = {
   defaultLanguage: appConfig.i18n.defaultLocale,
   languages: appConfig.i18n.locales as unknown as string[],
+  hideLocale: appConfig.i18n.localPrefixAsNeeded ? "default-locale" : "never",
 }
 
 // Can be imported from a shared config

package/src/lib/appConfig.ts

@@ -14,6 +14,8 @@ export const appConfig = {
 // export i18n helpers
 export const { isSupportedLocale, getValidLocale, generatedLocales } = createI18nHelpers(appConfig.i18n);
 
+export const { localPrefixAsNeeded, defaultLocale } = appConfig.i18n;
+
 // export shortcuts
 export const { iconColor, watermark, showBanner, clerkPageBanner, clerkAuthInModal, placeHolderImage } = appConfig.shortcuts;
 

package/src/mdx/blog/index.mdx

@@ -2,13 +2,13 @@
 title: Blog
 description: Articles and thoughts about various topics.
 icon: Rss
-date: 2025-12-21
+date: 2025-12-22
 ---
 
 ## Past List
 
 <Cards>
-  <ZiaCard icon={<Gift />}  href="blog/nextjs-architecture" title="About Project Structure">
+  <ZiaCard icon={<Gift />}  href="blog/readme" title="About Project Structure">
     2025-12-21
   </ZiaCard>
   <ZiaCard  href="blog/async-architecture" title="异步处理架构升级方案">

package/src/mdx/blog/ioc.mdx

@@ -1,14 +1,14 @@
 ---
 title: Monthly Summary
 description: Index and Summary
-date: 2025-12-21
+date: 2025-12-22
 ---
 
 
 ## Overview
 <Files>
   <ZiaFolder name="2025-12(1)" defaultOpen>
-    <ZiaFile name="2025-12-21(About Project Structure)" href="./nextjs-architecture" />
+    <ZiaFile name="2025-12-21(About Project Structure)" href="./readme" />
   </ZiaFolder>
   <ZiaFolder name="2025-08(1)">
     <ZiaFile name="2025-08-02(异步处理架构升级方案)" href="./async-architecture" />

package/src/mdx/legal/index.mdx

@@ -8,11 +8,11 @@ date: 2025-06-23
 # Legal is very important
 
 <Cards>
-  <Card icon={<ReceiptText />} title="Term Service">
+  <ZiaCard  icon={<ReceiptText />} href="legal/terms"  title="Term Service">
     Know your rights and obligations, and what services we provide
-  </Card>
-  <Card icon={<ShieldUser />} title="Privacy">
+  </ZiaCard>
+  <ZiaCard icon={<ShieldUser />} href="legal/privacy"  title="Privacy">
     Know your personal information and how we use it
-  </Card>
+  </ZiaCard>
 </Cards>
 

package/src/proxy.ts

@@ -11,12 +11,10 @@ import createMiddleware from "next-intl/middleware";
 import { NextRequest, NextResponse } from "next/server";
 
 const intlMiddleware = createMiddleware({
-  // 多语言配置
   locales: appConfig.i18n.locales,
-  // 默认语言配置
   defaultLocale: appConfig.i18n.defaultLocale,
-  localePrefix: "always", // 改为 always，确保始终使用语言前缀
-  localeDetection: false  // 添加此配置以禁用自动语言检测
+  localePrefix: appConfig.i18n.localPrefixAsNeeded ? "as-needed" : "always", 
+  localeDetection: false
 });
 
 // 需要身份认证的路由（页面路由）
@@ -54,6 +52,29 @@ const publicApiRoutes = createRouteMatcher([
 // 完全不需要再包一层函数，也不需要手动 (req)
 export default clerkMiddleware(
   async (auth, req: NextRequest) => {
+    const { defaultLocale, locales } = appConfig.i18n;
+    const pathname = req.nextUrl.pathname;
+    const hasLocalePrefix = locales.some(
+      (loc) => pathname === `/${loc}` || pathname.startsWith(`/${loc}/`)
+    );
+
+    // 对于无语言前缀的页面请求，根据配置进行处理
+    // 避免落不到 [locale] 路由。
+    if (!hasLocalePrefix && !pathname.startsWith('/api/')) {
+      const url = req.nextUrl.clone();
+      url.pathname = `/${defaultLocale}${pathname}`;
+
+      if (appConfig.i18n.localPrefixAsNeeded) {
+        // as-needed: 内部rewrite，用户URL保持无前缀
+        console.log('[middleware rewrite]', { from: pathname, to: url.pathname });
+        return NextResponse.rewrite(url);
+      } else {
+        // always: 重定向给用户，让他们看到前缀URL
+        console.log('[middleware redirect]', { from: pathname, to: url.pathname });
+        return NextResponse.redirect(url);
+      }
+    }
+
     // 1. 处理需要认证的页面路由
     if (protectedPageRoutes(req)) {
       const { userId: clerkUserId } = await auth();
@@ -93,13 +114,6 @@ export default clerkMiddleware(
     }
 
     // 5. 其他路由使用默认的国际化中间件处理
-    // handle root path to default locale permanent redirect
-    if (req.nextUrl.pathname === "/") {
-      return NextResponse.redirect(
-        new URL(`/${appConfig.i18n.defaultLocale}`, req.url),
-        301
-      );
-    }
 
     // handle trailing slash redirect
     if (req.nextUrl.pathname.length > 1 && req.nextUrl.pathname.endsWith("/")) {
@@ -117,7 +131,7 @@ export default clerkMiddleware(
 export const config = {
   matcher: [
     // Skip Next.js internals and all static files, but include API routes
-    "/((?!_next|sitemap.xml?|robots.txt?|[^?]*.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|webmanifest)).*)",
+    "/((?!_next|sitemap.xml?|robots.txt?|[^?]*.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|txt|webmanifest)).*)",
     // Include API routes explicitly
     "/api/(.*)",
   ],