Merge remote-tracking branch 'origin/main' into v4

# Conflicts:
#	docs/src/pages/docs/workflows/typescript.mdx

Author: amannn

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.
 
+## 3.25.1 (2024-11-13)
+
+### Bug Fixes
+
+* Correctly handle search params in redirects when using `trailingSlash: true` ([#1537](https://github.com/amannn/next-intl/issues/1537)) ([03a4620](https://github.com/amannn/next-intl/commit/03a4620432ff063b2b84f4dba5c49ae36b92fd73)) – by @deini
+
 ## 3.25.0 (2024-11-08)
 
 ### Features

lerna.json

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

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.
 
+## 3.25.1 (2024-11-13)
+
+### Bug Fixes
+
+* Correctly handle search params in redirects when using `trailingSlash: true` ([#1537](https://github.com/amannn/next-intl/issues/1537)) ([03a4620](https://github.com/amannn/next-intl/commit/03a4620432ff063b2b84f4dba5c49ae36b92fd73)) – by @deini
+
 ## 3.25.0 (2024-11-08)
 
 ### Features

packages/next-intl/package.json

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

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

@@ -1143,6 +1143,20 @@ describe('prefix-based routing', () => {
           'http://localhost:3000/en/'
         );
       });
+
+      it('keeps search params when redirecting to a locale at the root', () => {
+        middleware(createMockRequest('/?sort=asc'));
+        expect(MockedNextResponse.redirect.mock.calls[0][0].toString()).toBe(
+          'http://localhost:3000/en/?sort=asc'
+        );
+      });
+
+      it('keeps search params when redirecting to a locale', () => {
+        middleware(createMockRequest('/users?sort=asc'));
+        expect(MockedNextResponse.redirect.mock.calls[0][0].toString()).toBe(
+          'http://localhost:3000/en/users/?sort=asc'
+        );
+      });
     });
 
     describe('localized pathnames', () => {

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

@@ -91,7 +91,9 @@ export default function createMiddleware<
     }
 
     function redirect(url: string, redirectDomain?: string) {
-      const urlObj = new URL(normalizeTrailingSlash(url), request.url);
+      const urlObj = new URL(url, request.url);
+
+      urlObj.pathname = normalizeTrailingSlash(urlObj.pathname);
 
       if (domainsConfig.length > 0 && !redirectDomain && domain) {
         const bestMatchingDomain = getBestMatchingDomain(

packages/use-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.
 
+## 3.25.1 (2024-11-13)
+
+### Bug Fixes
+
+* Correctly handle search params in redirects when using `trailingSlash: true` ([#1537](https://github.com/amannn/next-intl/issues/1537)) ([03a4620](https://github.com/amannn/next-intl/commit/03a4620432ff063b2b84f4dba5c49ae36b92fd73)) – by @deini
+
 ## 3.25.0 (2024-11-08)
 
 ### Features

packages/use-intl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "use-intl",
-  "version": "3.25.0",
+  "version": "3.25.1",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "description": "Internationalization (i18n) for React",