use localeDetector when using noPrefix option

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.4.2
+
+- Fixes bug where `noPrefix` did not use `localeDetector` when no cookie present
+
 ## 5.4.1
 
 - Update `next` dev dependency to 14.2.2

__tests__/i18nRouter.test.ts

@@ -349,7 +349,7 @@ basePaths.forEach(basePath => {
       const mockRewrite = jest.fn().mockReturnValue(new NextResponse());
       NextResponse.rewrite = mockRewrite;
 
-      const request = mockRequest('/faq', ['en'], 'jp');
+      const request = mockRequest('/faq', ['zh']);
 
       i18nRouter(request, {
         locales: ['en', 'de', 'jp'],
@@ -360,8 +360,44 @@ basePaths.forEach(basePath => {
 
       expect(mockRedirect).toHaveBeenCalledTimes(0);
       expect(mockRewrite).toHaveBeenCalledTimes(1);
-      expect(mockRewrite.mock.calls[0][0]).toEqual(
-        new URL(`${basePath}/jp/faq`, 'https://example.com/faq')
+      expect(mockRewrite.mock.calls[0][0].href).toEqual(
+        new URL(`${basePath}/en/faq`, 'https://example.com/faq').href
+      );
+    });
+
+    it('should use cookie when noPrefix is true', () => {
+      const mockRewrite = jest.fn().mockReturnValue(new NextResponse());
+      NextResponse.rewrite = mockRewrite;
+
+      const request = mockRequest('/faq', ['en'], 'jp');
+
+      i18nRouter(request, {
+        locales: ['en', 'de', 'jp'],
+        defaultLocale: 'en',
+        basePath,
+        noPrefix: true
+      });
+
+      expect(mockRewrite.mock.calls[0][0].href).toEqual(
+        new URL(`${basePath}/jp/faq`, 'https://example.com/faq').href
+      );
+    });
+
+    it('should use localeDetector when noPrefix is true and no cookie', () => {
+      const request = mockRequest('/faq', ['de']);
+
+      const mockRewrite = jest.fn().mockReturnValue(new NextResponse());
+      NextResponse.rewrite = mockRewrite;
+
+      i18nRouter(request, {
+        locales: ['en', 'de', 'jp'],
+        defaultLocale: 'en',
+        basePath,
+        noPrefix: true
+      });
+
+      expect(mockRewrite.mock.calls[0][0].href).toEqual(
+        new URL(`${basePath}/de/faq`, 'https://example.com/faq').href
       );
     });
   });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-i18n-router",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Next.js App Router internationalized routing and locale detection.",
   "repository": "https://github.com/i18nexus/next-i18n-router",
   "keywords": [

src/i18nRouter.ts

@@ -46,30 +46,12 @@ function i18nRouter(request: NextRequest, config: Config): NextResponse {
     }
   }
 
-  if (noPrefix) {
-    let locale = cookieLocale || defaultLocale;
-
-    let newPath = `${locale}${pathname}`;
-
-    newPath = `${basePath}${basePathTrailingSlash ? '' : '/'}${newPath}`;
-
-    if (request.nextUrl.search) {
-      newPath += request.nextUrl.search;
-    }
-
-    response = NextResponse.rewrite(
-      new URL(newPath, request.url),
-      responseOptions
-    );
-
-    response.headers.set('x-next-i18n-router-locale', locale);
-
-    return response;
-  }
-
-  const pathLocale = locales.find(
-    locale => pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`
-  );
+  const pathLocale = noPrefix
+    ? undefined
+    : locales.find(
+        locale =>
+          pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`
+      );
 
   if (!pathLocale) {
     let locale = cookieLocale;
@@ -99,13 +81,15 @@ function i18nRouter(request: NextRequest, config: Config): NextResponse {
       newPath += request.nextUrl.search;
     }
 
-    // redirect to prefixed path
-    if (prefixDefault || locale !== defaultLocale) {
+    if (noPrefix) {
+      response = NextResponse.rewrite(
+        new URL(newPath, request.url),
+        responseOptions
+      );
+    } else if (prefixDefault || locale !== defaultLocale) {
       return NextResponse.redirect(new URL(newPath, request.url));
-    }
-
-    // If we get here, we're using the defaultLocale.
-    if (!prefixDefault) {
+    } else {
+      // prefixDefault is false and using default locale
       response = NextResponse.rewrite(
         new URL(newPath, request.url),
         responseOptions