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

# Conflicts:
#	docs/src/pages/docs/environments/error-files.mdx
#	docs/src/pages/docs/getting-started/app-router/with-i18n-routing.mdx
#	docs/src/pages/docs/routing.mdx
#	examples/example-app-router-migration/src/app/[locale]/layout.tsx
#	examples/example-app-router-mixed-routing/src/app/(public)/[locale]/PublicNavigationLocaleSwitcher.tsx
#	examples/example-app-router-mixed-routing/src/app/(public)/[locale]/about/page.tsx
#	examples/example-app-router-mixed-routing/src/app/(public)/[locale]/layout.tsx
#	examples/example-app-router-mixed-routing/src/app/(public)/[locale]/page.tsx
#	examples/example-app-router-mixed-routing/src/db.ts
#	examples/example-app-router-next-auth/src/app/[locale]/layout.tsx
#	examples/example-app-router-playground/eslint.config.mjs
#	examples/example-app-router-playground/next.config.mjs
#	examples/example-app-router-playground/package.json
#	examples/example-app-router-playground/src/app/[locale]/about/page.tsx
#	examples/example-app-router-playground/src/app/[locale]/api/route.ts
#	examples/example-app-router-playground/src/app/[locale]/client/ClientContent.tsx
#	examples/example-app-router-playground/src/app/[locale]/layout.tsx
#	examples/example-app-router-playground/src/app/[locale]/news/[articleId]/page.tsx
#	examples/example-app-router-playground/src/i18n/routing.ts
#	examples/example-app-router/src/app/[locale]/layout.tsx
#	examples/example-app-router/src/app/[locale]/page.tsx
#	examples/example-app-router/src/app/[locale]/pathnames/page.tsx
#	examples/example-app-router/src/app/sitemap.ts
#	examples/example-app-router/src/components/BaseLayout.tsx
#	examples/example-app-router/src/components/LocaleSwitcherSelect.tsx
#	examples/example-app-router/src/i18n/routing.ts
#	packages/next-intl/.size-limit.ts
#	pnpm-lock.yaml

Author: amannn

docs/src/components/CodeSnippets.tsx

@@ -293,23 +293,23 @@ function buildOutput() {
       <span className="line">
         <span data-token="text">┌ ● /</span>
         <span data-token="text"> </span>
-        <span data-token="text">{'           '}2.1 kB</span>
+        <span data-token="text">{'           '}2.5 kB</span>
         <span data-token="text">{'     '}</span>
-        <span data-token="string">97.1 kB</span>
+        <span data-token="string">115 kB</span>
       </span>
       <span className="line">
         <span data-token="text">├ ● /about</span>
         <span data-token="text">{'       '}</span>
-        <span data-token="text">2.5 kB</span>
+        <span data-token="text">2.6 kB</span>
         <span data-token="text">{'     '}</span>
-        <span data-token="string">97.6 kB</span>
+        <span data-token="string">116 kB</span>
       </span>
       <span className="line">
         <span data-token="text">└ λ /[username]</span>
         <span data-token="text">{'  '}</span>
         <span data-token="text">3.2 kB</span>
         <span data-token="text">{'     '}</span>
-        <span data-token="string">98.3 kB</span>
+        <span data-token="string">117 kB</span>
       </span>
       <span className="line"> </span>
       <span className="line">

docs/src/components/HeroCode.tsx

@@ -164,7 +164,7 @@ const files = [
           <span data-token="text">:</span>
           <span data-token="text"> </span>
           <span data-token="string">
-            "{'{'}firstname{'}'}'s profile"
+            "{'{'}firstName{'}'}'s profile"
           </span>
           <span data-token="text">,</span>
         </span>

docs/src/pages/blog/next-intl-4-0.mdx

@@ -19,9 +19,10 @@ Here's what's new in `next-intl@4.0`:
 4. [**GDPR compliance**](#gdpr-compliance)
 5. [**Modernized build output**](#modernized-build-output)
 6. [**Improved inheritance in `NextIntlClientProvider`**](#nextintlclientprovider-inheritance)
-7. [**Preparation for upcoming Next.js features**](#nextjs-future)
+7. [**Stricter config for `domains`**](#domains-config)
+8. [**Preparation for upcoming Next.js features**](#nextjs-future)
 
-Please also have a look at the [other breaking changes](#other-breaking-changes) listed below before you upgrade.
+Please also have a look at the [other changes](#other-changes) listed below before you upgrade.
 
 ## Revamped augmented types
 
@@ -118,7 +119,7 @@ t('message', {});
 t('message', {});
 //           ^? {page: number, total: number}
 
-// "You have {count, plural, =0 {no followers yet} =1 {one follower} other {# followers}}."
+// "You have {count, plural, =0 {no followers yet} one {one follower} other {# followers}}."
 t('message', {});
 //           ^? {count: number}
 
@@ -127,8 +128,8 @@ t('message', {});
 //           ^? {country: 'US' | 'CA' | (string & {})}
 
 // "Please refer to the <link>guidelines</link>."
-t('message', {});
-//           ^? {link: (chunks: ReactNode) => ReactNode}
+t.rich('message', {});
+//                ^? {link: (chunks: ReactNode) => ReactNode}
 ```
 
 With this type inference in place, you can now use autocompletion in your IDE to get suggestions for the available arguments of a given ICU message and catch potential errors early.
@@ -153,7 +154,7 @@ Due to a current limitation in TypeScript, this feature is opt-in for now. Pleas
 
 In order to comply with the current GDPR regulations, the following changes have been made and are relevant to you if you're using the `next-intl` middleware for i18n routing:
 
-1. The locale cookie has been changed to a session cookie that expires when a browser is closed.
+1. The locale cookie now defaults to a session cookie that expires when a browser is closed.
 2. The locale cookie is now only set when a user switches to a locale that doesn't match the `accept-language` header.
 
 If you want to increase the cookie expiration, e.g. because you're informing users about the usage of cookies or if GDPR doesn't apply to your app, you can use the `maxAge` attribute to do so:
@@ -187,13 +188,13 @@ The build output of `next-intl` has been modernized and now leverages the follow
 2. **Modern JSX transform:** The peer dependency for React has been bumped to v17 in order to use the more efficient, modern JSX transform.
 3. **Modern syntax:** Syntax is now compiled down to the Browserslist `defaults` query, which is a shortcut for ">0.5%, last 2 versions, Firefox ESR, not dead"—a baseline that is considered a reasonable target for modern apps.
 
-With these changes, the bundle size of `next-intl` has been reduced by ~7% ([all details](https://github.com/amannn/next-intl/pull/1470)).
+With these changes, the bundle size of `next-intl` has been reduced by ~7% ([PR #1470](https://github.com/amannn/next-intl/pull/1470)).
 
 ## Improved inheritance of `NextIntlClientProvider` [#nextintlclientprovider-inheritance]
 
 Previously, [`NextIntlClientProvider`](/docs/usage/configuration#nextintlclientprovider) would conservatively inherit only a subset from `i18n/request.ts`.
 
-To improve the getting started experience, the provider now also inherits:
+To improve the getting started experience, the provider by default now also inherits:
 
 - `messages` ([PR #1682](https://github.com/amannn/next-intl/pull/1682))
 - `formats` ([PR #1191](https://github.com/amannn/next-intl/pull/1191))
@@ -209,10 +210,64 @@ Due to this, you can now remove these props from `NextIntlClientProvider` if you
 </NextIntlClientProvider>
 ```
 
+If you don't want to inherit these props, you can either opt-out via `messages={null}` and `formats={null}`, or by passing a specific value for these props.
+
 With this, `NextIntlClientProvider` now inherits all of your configuration, with the minor exception of [error handling functions](/docs/usage/configuration#error-handling). Since functions are not serializable, they cannot be passed across the server/client boundary. However, [an alternative](https://github.com/amannn/next-intl/issues/1285) for this is also on the horizon.
 
 To make it easier to work with error handling functions on the client side, `NextIntlClientProvider` can now also be used in a nested fashion and will inherit the configuration from a parent provider ([PR #1413](https://github.com/amannn/next-intl/pull/1413)).
 
+## Stricter config for `domains` [#domains-config]
+
+So far, when using [`domains`](/docs/routing#domains) in combination with [`localePrefix: 'as-needed'`](/docs/routing#locale-prefix-as-needed), `next-intl` had to make some [tradeoffs](https://next-intl-docs-6wwcmwb9a-next-intl.vercel.app/docs/routing#domains-localeprefix-asneeded) to avoid reading the current host of the incoming request in components.
+
+Now, by introducing two new constraints, `next-intl` can avoid these tradeoffs altogether:
+
+1. A locale can now only be used for a single domain
+2. Each domain now must specify its `locales`
+
+The result is a simplified, more intuitive model that works as expected for this popular use case.
+
+If you previously used locales across multiple domains, you now have to be more specific—typically by introducing a regional variant for a base language. You can additionally customize the prefixes if desired.
+
+**Example:**
+
+```tsx
+import {defineRouting} from 'next-intl/routing';
+
+export const routing = defineRouting({
+  locales: ['sv-SE', 'en-SE', 'no-NO', 'en-NO'],
+  defaultLocale: 'en-SE',
+  localePrefix: {
+    mode: 'as-needed',
+    prefixes: {
+      'en-SE': '/en',
+      'en-NO': '/en'
+    }
+  },
+  domains: [
+    {
+      domain: 'example.se',
+      defaultLocale: 'sv-SE',
+      locales: ['sv-SE', 'en-SE']
+    },
+    {
+      domain: 'example.no',
+      defaultLocale: 'no-NO',
+      locales: ['no-NO', 'en-NO']
+    }
+  ]
+});
+```
+
+This will create the following structure:
+
+- `example.se`: `sv-SE`
+- `example.se/en`: `en-SE`
+- `example.no`: `no-NO`
+- `example.no/en`: `en-NO`
+
+Learn more in the updated docs for [`domains`](https://v4.next-intl.dev/docs/routing#domains).
+
 ## Preparation for upcoming Next.js features [#nextjs-future]
 
 To ensure that the sails of `next-intl` are set for a steady course in the upcoming future, I've investigated the implications of upcoming Next.js features like [`ppr`](https://nextjs.org/docs/app/api-reference/next-config-js/ppr), [`dynamicIO`](https://nextjs.org/docs/canary/app/api-reference/config/next-config-js/dynamicIO) and [`rootParams`](https://github.com/vercel/next.js/pull/72837) for `next-intl`.
@@ -221,21 +276,22 @@ This led to three minor changes:
 
 1. If you don't already have a `NextIntlClientProvider` in your app that wraps all Client Components that use `next-intl`, you now have to add one (see [PR #1541](https://github.com/amannn/next-intl/pull/1541) for details).
 2. If you're using `format.relativeTime` in Client Components, you may need to provide the `now` argument explicitly now (see [PR #1536](https://github.com/amannn/next-intl/pull/1536) for details).
-3. If you're using i18n routing, make sure you've updated to [`await requestLocale`](https://next-intl.dev/blog/next-intl-3-22#await-request-locale) that was introduced in `next-intl@3.22`. The previously deprecated `locale` argument will serve an edge case in the future once `rootParams` is a thing (see [PR #1625](https://github.com/amannn/next-intl/pull/1625/) for details).
+3. If you're using i18n routing, make sure you've updated to [`await requestLocale`](/blog/next-intl-3-22#await-request-locale) that was introduced in `next-intl@3.22`. The previously deprecated `locale` argument will serve an edge case in the future once `rootParams` is a thing (see [PR #1625](https://github.com/amannn/next-intl/pull/1625/) for details).
 
 While the mentioned Next.js features are still under development and may change, these changes seem reasonable to me in any case—and ideally will be all that's necessary to adapt for `next-intl` to get the most out of these upcoming capabilities.
 
 I'm particularly excited about the announcement of `rootParams`, as it seems like this will finally fill in the [missing piece](https://github.com/vercel/next.js/discussions/58862) that enables apps with i18n routing to support static rendering without workarounds like `setRequestLocale`. I hope to have more to share on this soon!
 
-## Other breaking changes
+## Other changes
 
 1. Return type-safe messages from `useMessages` and `getMessages` (see [PR #1489](https://github.com/amannn/next-intl/pull/1489))
 2. Require locale to be returned from `getRequestConfig` (see [PR #1486](https://github.com/amannn/next-intl/pull/1486))
-3. Disallow passing `null`, `undefined` or `boolean` as an ICU argument (see [PR #1561](https://github.com/amannn/next-intl/pull/1561))
-4. Bump minimum required TypeScript version to 5 for projects using TypeScript (see [PR #1481](https://github.com/amannn/next-intl/pull/1481))
-5. Return `x-default` alternate link also for sub pages when using `localePrefix: 'always'` and update middleware matcher suggestion in docs (see [PR #1720](https://github.com/amannn/next-intl/pull/1720))
-6. Remove deprecated APIs (see [PR #1479](https://github.com/amannn/next-intl/pull/1479))
-7. Remove deprecated APIs pt. 2 (see [PR #1482](https://github.com/amannn/next-intl/pull/1482))
+3. Allow to declare `pathnames` partially for convenience (see [PR #1743](https://github.com/amannn/next-intl/pull/1743))
+4. Disallow passing `null`, `undefined` or `boolean` as an ICU argument (see [PR #1561](https://github.com/amannn/next-intl/pull/1561))
+5. Bump minimum required TypeScript version to 5 for projects using TypeScript (see [PR #1481](https://github.com/amannn/next-intl/pull/1481))
+6. Return `x-default` alternate link also for sub pages when using `localePrefix: 'always'` and update middleware matcher suggestion to `/((?!api|_next|_vercel|.*\\..*).*)` (see [PR #1720](https://github.com/amannn/next-intl/pull/1720))
+7. Remove deprecated APIs (see [PR #1479](https://github.com/amannn/next-intl/pull/1479))
+8. Remove deprecated APIs pt. 2 (see [PR #1482](https://github.com/amannn/next-intl/pull/1482))
 
 ## Upgrade now
 
@@ -255,7 +311,7 @@ I'd love to hear about your experiences with `next-intl@4.0`! Join the conversat
 
 I want to sincerely thank everyone who has helped to make `next-intl` what it is today.
 
-A special thank you goes to <PartnerContentLink href="https://crowdin.com/">Crowdin</PartnerContentLink>, the primary sponsor of `next-intl`, enabling me to regularly work on this project and provide it as a free and open-source library for everyone.
+A special thank you goes to <PartnerContentLink href="https://crowdin.com/">Crowdin</PartnerContentLink>, the sponsor partner of `next-intl`, enabling me to regularly work on this project and provide it as a free and open-source library for everyone.
 
 —Jan
 

docs/src/pages/docs/environments/actions-metadata-route-handlers.mdx

@@ -21,7 +21,8 @@ To internationalize metadata like the page title, you can use functionality from
 ```tsx filename="layout.tsx"
 import {getTranslations} from 'next-intl/server';
 
-export async function generateMetadata({params: {locale}}) {
+export async function generateMetadata({params}) {
+  const {locale} = await params;
   const t = await getTranslations({locale, namespace: 'Metadata'});
 
   return {
@@ -109,7 +110,8 @@ If you're programmatically generating [Open Graph images](https://nextjs.org/doc
 import {ImageResponse} from 'next/og';
 import {getTranslations} from 'next-intl/server';
 
-export default async function OpenGraphImage({params: {locale}}) {
+export default async function OpenGraphImage({params}) {
+  const {locale} = await params;
   const t = await getTranslations({locale, namespace: 'OpenGraphImage'});
   return new ImageResponse(<div style={{fontSize: 128}}>{t('title')}</div>);
 }
@@ -231,12 +233,13 @@ You can use `next-intl` in [Route Handlers](https://nextjs.org/docs/app/building
 import {NextResponse} from 'next/server';
 import {hasLocale} from 'next-intl';
 import {getTranslations} from 'next-intl/server';
+import {routing} from '@/i18n/routing';
 
 export async function GET(request) {
   // Example: Receive the `locale` via a search param
   const {searchParams} = new URL(request.url);
   const locale = searchParams.get('locale');
-  if (!hasLocale(locales, locale)) {
+  if (!hasLocale(routing.locales, locale)) {
     return NextResponse.json({error: 'Invalid locale'}, {status: 400});
   }
 

docs/src/pages/docs/environments/error-files.mdx

@@ -84,7 +84,8 @@ import {hasLocale} from 'next-intl';
 import {notFound} from 'next/navigation';
 import {routing} from '@/i18n/routing';
 
-export default function LocaleLayout({children, params: {locale}}) {
+export default function LocaleLayout({children, params}) {
+  const {locale} = await params;
   if (!hasLocale(routing.locales, locale)) {
     notFound();
   }

docs/src/pages/docs/environments/mdx.mdx

@@ -24,8 +24,10 @@ Now, in `page.tsx`, you can import the MDX content based on the user's locale:
 import {notFound} from 'next/navigation';
 
 export default async function HomePage({params}) {
+  const {locale} = await params;
+
   try {
-    const Content = (await import(`./${params.locale}.mdx`)).default;
+    const Content = (await import(`./${locale}.mdx`)).default;
     return <Content />;
   } catch (error) {
     notFound();