fumadocs-core 16.0.1 → 16.0.3

package/dist/i18n/middleware.d.ts

@@ -1,4 +1,4 @@
-import { NextMiddleware } from 'next/dist/server/web/types';
+import { NextProxy } from 'next/dist/server/web/types';
 import { I18nConfig } from './index.js';
 
 interface MiddlewareOptions extends I18nConfig {
@@ -7,6 +7,6 @@ interface MiddlewareOptions extends I18nConfig {
      */
     format?: (locale: string, path: string) => string;
 }
-declare function createI18nMiddleware({ languages, defaultLanguage, format, hideLocale, }: MiddlewareOptions): NextMiddleware;
+declare function createI18nMiddleware({ languages, defaultLanguage, format, hideLocale, }: MiddlewareOptions): NextProxy;
 
 export { createI18nMiddleware };

package/dist/i18n/middleware.js

@@ -20,50 +20,44 @@ function createI18nMiddleware({
   format = defaultFormat,
   hideLocale = "never"
 }) {
-  function getUrl(request, pathname, locale) {
-    if (!locale) {
-      return new URL(
-        pathname.startsWith("/") ? pathname : `/${pathname}`,
-        request.url
-      );
-    }
-    return new URL(
-      format(locale, pathname.startsWith("/") ? pathname.slice(1) : pathname),
-      request.url
-    );
+  function getLocaleUrl(request, locale) {
+    const next = new URL(request.url);
+    next.pathname = format(locale, forceSlashPrefix(request.nextUrl.pathname));
+    return next;
   }
   return (request) => {
-    const inputPath = `${request.nextUrl.pathname}${request.nextUrl.search}`;
+    const url = request.nextUrl;
     const pathLocale = languages.find(
-      (locale) => inputPath.startsWith(`/${locale}/`) || inputPath === `/${locale}`
+      (locale) => url.pathname.startsWith(`/${locale}/`) || url.pathname === `/${locale}`
     );
     if (!pathLocale) {
       if (hideLocale === "default-locale") {
-        return NextResponse.rewrite(
-          getUrl(request, inputPath, defaultLanguage)
-        );
+        return NextResponse.rewrite(getLocaleUrl(request, defaultLanguage));
       }
       const preferred = getLocale(request, languages, defaultLanguage);
       if (hideLocale === "always") {
         const locale = request.cookies.get(COOKIE)?.value ?? preferred;
-        return NextResponse.rewrite(getUrl(request, inputPath, locale));
+        return NextResponse.rewrite(getLocaleUrl(request, locale));
       }
-      return NextResponse.redirect(getUrl(request, inputPath, preferred));
+      return NextResponse.redirect(getLocaleUrl(request, preferred));
     }
-    if (hideLocale === "always") {
-      const path = inputPath.slice(`/${pathLocale}`.length);
-      const res = NextResponse.redirect(getUrl(request, path));
+    if (hideLocale === "always" || hideLocale === "default-locale" && pathLocale === defaultLanguage) {
+      const res = NextResponse.redirect(
+        new URL(
+          forceSlashPrefix(url.pathname.slice(`/${pathLocale}`.length)),
+          request.url
+        )
+      );
       res.cookies.set(COOKIE, pathLocale);
       return res;
     }
-    if (hideLocale === "default-locale" && pathLocale === defaultLanguage) {
-      return NextResponse.redirect(
-        getUrl(request, inputPath.slice(`/${pathLocale}`.length))
-      );
-    }
     return NextResponse.next();
   };
 }
+function forceSlashPrefix(v) {
+  if (v.startsWith("/")) return v;
+  return "/" + v;
+}
 export {
   createI18nMiddleware
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "16.0.1",
+  "version": "16.0.3",
   "description": "The library for building a documentation website in any React.js framework",
   "keywords": [
     "Fumadocs",