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

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.26.5 (2025-02-21)
+
+### Bug Fixes
+
+* Handle `query` in `<Link />` correctly when using `localePrefix: 'as-needed'` with `domains` ([#1732](https://github.com/amannn/next-intl/issues/1732)) ([ec8776e](https://github.com/amannn/next-intl/commit/ec8776e8f0344f78fea4f71284c48312484a7059)), closes [#1731](https://github.com/amannn/next-intl/issues/1731) – by @amannn
+
 ## 3.26.4 (2025-02-18)
 
 ### Bug Fixes

lerna.json

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

packages/next-intl/.size-limit.ts

@@ -21,13 +21,13 @@ const config: SizeLimitConfig = [
     name: "import {createNavigation} from 'next-intl/navigation' (react-client)",
     path: 'dist/esm/production/navigation.react-client.js',
     import: '{createNavigation}',
-    limit: '2.475 KB'
+    limit: '2.485 KB'
   },
   {
     name: "import {createNavigation} from 'next-intl/navigation' (react-server)",
     path: 'dist/esm/production/navigation.react-server.js',
     import: '{createNavigation}',
-    limit: '3.255 KB'
+    limit: '3.275 KB'
   },
   {
     name: "import * from 'next-intl/server' (react-client)",

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.26.5 (2025-02-21)
+
+### Bug Fixes
+
+* Handle `query` in `<Link />` correctly when using `localePrefix: 'as-needed'` with `domains` ([#1732](https://github.com/amannn/next-intl/issues/1732)) ([ec8776e](https://github.com/amannn/next-intl/commit/ec8776e8f0344f78fea4f71284c48312484a7059)), closes [#1731](https://github.com/amannn/next-intl/issues/1731) – by @amannn
+
 ## 3.26.4 (2025-02-18)
 
 ### Bug Fixes

packages/next-intl/package.json

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

packages/next-intl/src/navigation/createNavigation.test.tsx

@@ -961,6 +961,15 @@ describe.each([
         );
         expect(markup).toContain('href="/de/about"');
       });
+
+      it('accepts search params', () => {
+        render(
+          <Link href={{pathname: '/about', query: {foo: 'bar'}}}>Test</Link>
+        );
+        expect(
+          screen.getByRole('link', {name: 'Test'}).getAttribute('href')
+        ).toBe('/about?foo=bar');
+      });
     });
 
     describe('getPathname', () => {
@@ -1015,6 +1024,39 @@ describe.each([
     });
   });
 
+  describe("localePrefix: 'as-needed', with `domains` and `pathnames`", () => {
+    const {Link, permanentRedirect, redirect} = createNavigation({
+      locales,
+      defaultLocale,
+      domains,
+      localePrefix: 'as-needed',
+      pathnames
+    });
+
+    describe('Link', () => {
+      it('accepts search params', () => {
+        render(
+          <Link href={{pathname: '/about', query: {foo: 'bar'}}}>Test</Link>
+        );
+        expect(
+          screen.getByRole('link', {name: 'Test'}).getAttribute('href')
+        ).toBe('/about?foo=bar');
+      });
+    });
+
+    describe.each([
+      ['redirect', redirect, nextRedirect],
+      ['permanentRedirect', permanentRedirect, nextPermanentRedirect]
+    ])('%s', (_, redirectFn, nextRedirectFn) => {
+      it('accepts search params', () => {
+        runInRender(() =>
+          redirectFn({href: {pathname: '/', query: {foo: 'bar'}}, locale: 'en'})
+        );
+        expect(nextRedirectFn).toHaveBeenLastCalledWith('/en?foo=bar');
+      });
+    });
+  });
+
   describe("localePrefix: 'never'", () => {
     const {Link, getPathname, permanentRedirect, redirect} = createNavigation({
       locales,

packages/next-intl/src/navigation/shared/createSharedNavigationFns.tsx

@@ -94,9 +94,10 @@ export default function createSharedNavigationFns<
     {href, locale, ...rest}: LinkProps<Pathname>,
     ref: ComponentProps<typeof BaseLink>['ref']
   ) {
-    let pathname, params;
+    let pathname, params, query;
     if (typeof href === 'object') {
       pathname = href.pathname;
+      query = href.query;
       // @ts-expect-error -- This is ok
       params = href.params;
     } else {
@@ -154,7 +155,10 @@ export default function createSharedNavigationFns<
                   // @ts-expect-error -- This is ok
                   {
                     locale: curLocale,
-                    href: pathnames == null ? pathname : {pathname, params}
+                    href:
+                      pathnames == null
+                        ? {pathname, query}
+                        : {pathname, query, params}
                   },
                   false
                 )

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.26.5 (2025-02-21)
+
+### Bug Fixes
+
+* Handle `query` in `<Link />` correctly when using `localePrefix: 'as-needed'` with `domains` ([#1732](https://github.com/amannn/next-intl/issues/1732)) ([ec8776e](https://github.com/amannn/next-intl/commit/ec8776e8f0344f78fea4f71284c48312484a7059)), closes [#1731](https://github.com/amannn/next-intl/issues/1731) – by @amannn
+
 ## 3.26.4 (2025-02-18)
 
 ### Bug Fixes

packages/use-intl/package.json

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