Merge branch 'main' into docs/refactor-playground

Author: Adebesin-Cell

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.11.2 (2026-05-11)
+
+### Bug Fixes
+
+* Revert x-forwarded-host redirect domain change ([#2322](https://github.com/amannn/next-intl/issues/2322)) ([eb3a6a4](https://github.com/amannn/next-intl/commit/eb3a6a4eb26a6e0c02a297efbe1b139983faae4e)) – by @amannn
+
 ## 4.11.1 (2026-05-08)
 
 ### Bug Fixes

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "packages": [
     "packages/*"
   ],

packages/icu-minify/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.11.2 (2026-05-11)
+
+### Bug Fixes
+
+* Revert x-forwarded-host redirect domain change ([#2322](https://github.com/amannn/next-intl/issues/2322)) ([eb3a6a4](https://github.com/amannn/next-intl/commit/eb3a6a4eb26a6e0c02a297efbe1b139983faae4e)) – by @amannn
+
 ## 4.11.1 (2026-05-08)
 
 ### Bug Fixes

packages/icu-minify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icu-minify",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [

packages/next-intl/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.11.2 (2026-05-11)
+
+### Bug Fixes
+
+* Revert x-forwarded-host redirect domain change ([#2322](https://github.com/amannn/next-intl/issues/2322)) ([eb3a6a4](https://github.com/amannn/next-intl/commit/eb3a6a4eb26a6e0c02a297efbe1b139983faae4e)) – by @amannn
+
 ## 4.11.1 (2026-05-08)
 
 ### Bug Fixes

packages/next-intl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [

packages/next-intl/src/middleware/middleware.test.tsx

@@ -1172,33 +1172,6 @@ describe('prefix-based routing', () => {
       );
     });
 
-    it('uses the forwarded host when behind a proxy', () => {
-      middleware(
-        createMockRequest('/', 'en', 'http://project.vercel.app', undefined, {
-          'x-forwarded-host': 'myproject.com',
-          'x-forwarded-proto': 'https'
-        })
-      );
-      expect(MockedNextResponse.next).not.toHaveBeenCalled();
-      expect(MockedNextResponse.rewrite).not.toHaveBeenCalled();
-      expect(MockedNextResponse.redirect.mock.calls[0][0].toString()).toBe(
-        'https://myproject.com/en'
-      );
-
-      middleware(
-        createMockRequest('/', 'en', 'http://project.vercel.app', undefined, {
-          'x-forwarded-host': 'myproject.com',
-          'x-forwarded-port': '8443',
-          'x-forwarded-proto': 'https'
-        })
-      );
-      expect(MockedNextResponse.next).not.toHaveBeenCalled();
-      expect(MockedNextResponse.rewrite).not.toHaveBeenCalled();
-      expect(MockedNextResponse.redirect.mock.calls[1][0].toString()).toBe(
-        'https://myproject.com:8443/en'
-      );
-    });
-
     it('redirects when a pathname starts with the locale characters', () => {
       middleware(createMockRequest('/engage'));
       expect(MockedNextResponse.rewrite).not.toHaveBeenCalled();

packages/next-intl/src/middleware/middleware.tsx

@@ -101,7 +101,6 @@ export default function createMiddleware<
 
     function redirect(url: string, redirectDomain?: string) {
       const urlObj = new URL(url, request.url);
-      const forwardedHost = request.headers.get('x-forwarded-host');
 
       urlObj.pathname = normalizeTrailingSlash(urlObj.pathname);
 
@@ -129,24 +128,20 @@ export default function createMiddleware<
         }
       }
 
-      // Priority for redirect origins:
-      // 1) Explicit domain from `redirectDomain`
-      // 2) Reverse proxy host from `x-forwarded-host`
-      // 3) Fallback to `request.url`
-      const redirectHost = redirectDomain ?? forwardedHost;
-      if (redirectHost) {
-        urlObj.host = redirectHost;
-      }
+      if (redirectDomain) {
+        urlObj.host = redirectDomain;
 
-      if (forwardedHost) {
-        urlObj.protocol =
-          request.headers.get('x-forwarded-proto') ?? request.nextUrl.protocol;
+        if (request.headers.get('x-forwarded-host')) {
+          urlObj.protocol =
+            request.headers.get('x-forwarded-proto') ??
+            request.nextUrl.protocol;
 
-        const redirectHostPort = redirectHost?.split(':')[1] as
-          | string
-          | undefined;
-        urlObj.port =
-          redirectHostPort ?? request.headers.get('x-forwarded-port') ?? '';
+          const redirectDomainPort = redirectDomain.split(':')[1] as
+            | string
+            | undefined;
+          urlObj.port =
+            redirectDomainPort ?? request.headers.get('x-forwarded-port') ?? '';
+        }
       }
 
       if (request.nextUrl.basePath) {

packages/swc-plugin-extractor/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 4.11.2 (2026-05-11)
+
+### Bug Fixes
+
+* Revert x-forwarded-host redirect domain change ([#2322](https://github.com/amannn/next-intl/issues/2322)) ([eb3a6a4](https://github.com/amannn/next-intl/commit/eb3a6a4eb26a6e0c02a297efbe1b139983faae4e)) – by @amannn
+
 ## 4.11.1 (2026-05-08)
 
 ### Bug Fixes

packages/swc-plugin-extractor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl-swc-plugin-extractor",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "sideEffects": false,
   "author": "강동윤 <kdy1997.dev@gmail.com>",
   "contributors": [