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

# Conflicts: # packages/next-intl/.size-limit.ts # packages/next-intl/package.json # packages/next-intl/src/navigation/react-client/createLocalizedPathnamesNavigation.tsx # packages/next-intl/src/navigation/react-client/createSharedPathnamesNavigation.tsx # packages/next-intl/src/navigation/shared/createSharedNavigationFns.tsx # packages/next-intl/src/plugin.tsx # packages/next-intl/src/server/react-server/RequestLocaleLegacy.tsx # packages/next-intl/src/server/react-server/getConfig.tsx # packages/next-intl/src/server/react-server/getRequestConfig.tsx # packages/next-intl/src/server/react-server/getTranslations.tsx # packages/next-intl/src/shared/NextIntlClientProvider.tsx # packages/use-intl/package.json # packages/use-intl/src/core/AbstractIntlMessages.tsx # packages/use-intl/src/core/IntlConfig.tsx # packages/use-intl/src/core/createFormatter.tsx # packages/use-intl/src/react/useIntlContext.tsx # pnpm-lock.yaml
amannn · Dec 18, 2024 · 8b9a2fc · 8b9a2fc
2 parents 8f37883 + a6e070b
commit 8b9a2fc
Show file tree

Hide file tree

Showing 73 changed files with 261 additions and 349 deletions.
diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -23,11 +23,11 @@ body:
     attributes:
       label: Verifications
       options:
-        - label: I've verified that the problem I'm experiencing isn't covered in [the docs](https://next-intl-docs.vercel.app/).
+        - label: I've verified that the problem I'm experiencing isn't covered in [the docs](https://next-intl.dev).
           required: true
         - label: I've searched for similar, existing issues on [GitHub](https://github.com/amannn/next-intl/issues) and [Stack Overflow](https://stackoverflow.com/search?q=next-intl).
           required: true
-        - label: I've compared my app to [a working example](https://next-intl-docs.vercel.app/examples) to look for differences.
+        - label: I've compared my app to [a working example](https://next-intl.dev/examples) to look for differences.
           required: true
   - type: input
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: View documentation
-    url: https://next-intl-docs.vercel.app/
+    url: https://next-intl.dev
     about: Check out the official docs for answers to common questions
   - name: Get community support
     url: https://stackoverflow.com/questions/ask

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 3.26.2 (2024-12-18)
+
+### Bug Fixes
+
+* Support `t.has` when `getTranslations` is called with an object argument ([#1616](https://github.com/amannn/next-intl/issues/1616)) ([64895a2](https://github.com/amannn/next-intl/commit/64895a2bb3c445f6e3deab85152a0d04ced17e46)), closes [/github.com/amannn/next-intl/discussions/437#discussioncomment-11593318](https://github.com/amannn//github.com/amannn/next-intl/discussions/437/issues/discussioncomment-11593318) – by @amannn
+
+## 3.26.1 (2024-12-11)
+
+### Bug Fixes
+
+* Use new domain `next-intl.dev` in links ([#1601](https://github.com/amannn/next-intl/issues/1601)) ([40a9a77](https://github.com/amannn/next-intl/commit/40a9a7722edc8e7787ed799a4bf1d3c4a2e04848)) – by @amannn
+
+## 3.26.0 (2024-12-06)
+
+### Features
+
+* Support React 19 ([#1597](https://github.com/amannn/next-intl/issues/1597)) ([e0ffe29](https://github.com/amannn/next-intl/commit/e0ffe292a3cae8955fcd06bd8e8e2b02c525ef69)) – by @amannn
+
 ## 3.25.3 (2024-11-26)
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-  <a href="https://next-intl-docs.vercel.app/">
+  <a href="https://next-intl.dev">
     <picture>
       <source media="(prefers-color-scheme: dark)" srcset="media/logo-dark-mode.svg">
       <source media="(prefers-color-scheme: light)" srcset="media/logo.svg">
@@ -29,10 +29,10 @@ Internationalization (i18n) is an essential part of the user experience, therefo
 ```jsx
 // UserProfile.tsx
 import {useTranslations} from 'next-intl';
- 
+
 export default function UserProfile({user}) {
   const t = useTranslations('UserProfile');
- 
+
   return (
     <section>
       <h1>{t('title', {firstName: user.firstName})}</h1>
@@ -58,10 +58,10 @@ export default function UserProfile({user}) {
 }
 ```
 
-### [→ Read the docs](https://next-intl-docs.vercel.app/)
+### [→ Read the docs](https://next-intl.dev)
 
 <div align="center">
-  <a href="https://next-intl-docs.vercel.app/redirect?href=https://crowdin.com" target="_blank">
+  <a href="https://next-intl.dev/redirect?href=https://crowdin.com" target="_blank">
     <img width="350" src="media/partner.svg" alt="Crowdin logo">
   </a>
   <br>

diff --git a/docs/next-sitemap.config.js b/docs/next-sitemap.config.js
@@ -1,4 +1,4 @@
-const config = require('./config');
+const config = require('./src/config');
 
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {

diff --git a/docs/package.json b/docs/package.json
@@ -5,8 +5,7 @@
     "dev": "next dev",
     "lint": "eslint src && tsc && prettier src --check && node lintLinks.mjs",
     "test": "echo 'No tests yet'",
-    "build": "next build",
-    "sitemap": "next-sitemap",
+    "build": "next build && next-sitemap",
     "start": "next start"
   },
   "dependencies": {
@@ -15,7 +14,6 @@
     "@headlessui/react": "^2.0.0",
     "@heroicons/react": "^2.1.4",
     "@vercel/analytics": "1.3.1",
-    "@vercel/og": "^0.6.3",
     "@vercel/speed-insights": "^1.0.12",
     "clsx": "^2.1.1",
     "http-status-codes": "^2.3.0",

diff --git a/docs/public/favicon/android-chrome-192x192.png b/docs/public/favicon/android-chrome-192x192.png
diff --git a/docs/public/favicon/android-chrome-384x384.png b/docs/public/favicon/android-chrome-384x384.png
diff --git a/docs/public/favicon/android-chrome-512x512.png b/docs/public/favicon/android-chrome-512x512.png
diff --git a/docs/public/favicon/apple-touch-icon.png b/docs/public/favicon/apple-touch-icon.png
diff --git a/docs/public/favicon/browserconfig.xml b/docs/public/favicon/browserconfig.xml
@@ -3,7 +3,7 @@
     <msapplication>
         <tile>
             <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
+            <TileColor>#ffffff</TileColor>
         </tile>
     </msapplication>
 </browserconfig>
diff --git a/docs/public/favicon/favicon-16x16.png b/docs/public/favicon/favicon-16x16.png
diff --git a/docs/public/favicon/favicon-32x32.png b/docs/public/favicon/favicon-32x32.png
diff --git a/docs/public/favicon/favicon.ico b/docs/public/favicon/favicon.ico
diff --git a/docs/public/favicon/mstile-150x150.png b/docs/public/favicon/mstile-150x150.png
diff --git a/docs/public/favicon/site.webmanifest b/docs/public/favicon/site.webmanifest
@@ -8,8 +8,8 @@
       "type": "image/png"
     },
     {
-      "src": "/favicon/android-chrome-384x384.png",
-      "sizes": "384x384",
+      "src": "/favicon/android-chrome-512x512.png",
+      "sizes": "512x512",
       "type": "image/png"
     }
   ],

diff --git a/docs/public/logo.svg b/docs/public/logo.svg
diff --git a/docs/public/twitter-image.png b/docs/public/twitter-image.png
diff --git a/docs/src/components/GetStartedBackground.module.css b/docs/src/components/GetStartedBackground.module.css
@@ -10,6 +10,14 @@
   }
 }
 
+.dot {
+  --GetStartedBackground-dot: rgba(0, 0, 0, 0.1);
+
+  :global(.dark) & {
+    --GetStartedBackground-dot: rgba(255, 255, 255, 0.1);
+  }
+}
+
 .dot1 {
   animation: pulsate 4s infinite;
 }

diff --git a/docs/src/components/GetStartedBackground.tsx b/docs/src/components/GetStartedBackground.tsx
@@ -23,7 +23,13 @@ export default function GetStartedBackground() {
             patternUnits="userSpaceOnUse"
             width={patternSize}
           >
-            <circle cx="3" cy="3" fill="#D0D3E2" r={radius} />
+            <circle
+              className={styles.dot}
+              cx="3"
+              cy="3"
+              fill="var(--GetStartedBackground-dot)"
+              r={radius}
+            />
           </pattern>
           <radialGradient cx="50%" cy="50%" id="fade-out" r="50%">
             <stop offset="0%" stopColor="white" stopOpacity="1" />

diff --git a/docs/src/components/Logo.tsx b/docs/src/components/Logo.tsx
@@ -3,62 +3,47 @@ export default function Logo() {
     <svg
       aria-label="next-intl logo"
       className="h-8"
-      viewBox="0 0 1663.8 399"
+      viewBox="0 0 499 120"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <g>
+      <g fill="none" fillRule="evenodd">
         <path
-          d="M811.8,483V346.8c2-.8,6.4-1.7,13-2.7a164.81,164.81,0,0,1,23.9-1.5c8.6,0,15.8,1,21.5,3.1A28.62,28.62,0,0,1,884,356.1q5.25,7.2,7.5,18.6c1.5,7.6,2.2,16.9,2.2,27.9h0V483h19.5V396.3a131.41,131.41,0,0,0-3-29.1,61.1,61.1,0,0,0-10-22.7A45.29,45.29,0,0,0,881.3,330c-7.9-3.4-17.8-5.1-29.5-5.1q-21.3,0-36,3t-23.4,5.4h0V483Zm217.1,3.3a100.28,100.28,0,0,0,27.2-3.3c7.7-2.2,12.9-4.1,15.8-5.7h0l-3.6-16.8a105.18,105.18,0,0,1-13.5,5.1q-9.3,3-25.2,3-28.8,0-42-15.3t-14.1-43.8h108.9c.2-1.4.3-2.9.4-4.5s.2-3.2.2-4.8q0-38.7-17-57.3t-45.4-18.6a65.24,65.24,0,0,0-25,5A61.35,61.35,0,0,0,974,344.4a77.5,77.5,0,0,0-15.3,25.4c-3.9,10.1-5.8,22-5.8,35.5a119.68,119.68,0,0,0,4.2,32.6,66.21,66.21,0,0,0,13.5,25.6,62.29,62.29,0,0,0,23.7,16.8C1003.7,484.3,1015.3,486.3,1028.9,486.3Zm33.9-93.3H974a70.46,70.46,0,0,1,4-19.5,51.72,51.72,0,0,1,9.6-16.4,47.46,47.46,0,0,1,14.4-11.2,41,41,0,0,1,18.8-4.2q19.8,0,30.6,13.5t11.4,37.8Zm65.3,90c2.4-4.4,5.3-9.5,8.7-15.1s7.1-11.6,11.2-17.9,8.3-12.5,12.8-18.9,8.8-12.5,13.2-18.3c4.2,5.8,8.6,11.9,13.1,18.3s8.8,12.7,12.9,18.9,7.9,12.1,11.2,17.9,6.3,10.8,8.7,15.1h21c-3.8-7.4-8-14.9-12.5-22.5s-9.1-15-13.9-22-9.6-14-14.4-20.6-9.3-12.7-13.5-18.3h0l49.5-71.7h-21.3L1174,387.3l-40.2-59.4H1111l50.4,72.9q-14.1,19.2-27.6,39.2a474.65,474.65,0,0,0-25.8,43h20.1Zm195.2,3.3a72.65,72.65,0,0,0,22.8-3.4c7-2.3,11.9-4.4,14.7-6.1h0l-4.8-16.2a75.87,75.87,0,0,1-11.7,5.2c-5,1.8-11.6,2.9-19.8,2.9a54.4,54.4,0,0,1-13.2-1.5,20.45,20.45,0,0,1-10.2-6c-2.8-3-4.9-7.2-6.4-12.8s-2.2-12.6-2.2-21.5h0V344.4h61.8V327.9h-61.8V278.7l-19.5,3.6V425.1a132.63,132.63,0,0,0,2.4,27c1.6,7.6,4.3,13.9,8.2,19a34.92,34.92,0,0,0,15.6,11.4C1305.7,485,1313.7,486.3,1323.3,486.3Zm107.9-80.7V386.7h-67.8v18.9ZM1474,296.1a14.2,14.2,0,0,0,10.2-4.1c2.8-2.7,4.2-6.3,4.2-10.9s-1.4-8.2-4.2-11a14.11,14.11,0,0,0-10.2-4,14.53,14.53,0,0,0-10.2,4c-2.8,2.7-4.2,6.4-4.2,11s1.4,8.2,4.2,10.9A13.8,13.8,0,0,0,1474,296.1Zm9.9,186.9V327.9h-19.5V483Zm70.1,0V346.8c2-.8,6.3-1.7,13.1-2.7a163.34,163.34,0,0,1,23.8-1.5c8.6,0,15.8,1,21.4,3.1a28.62,28.62,0,0,1,13.8,10.4q5.25,7.2,7.5,18.6c1.5,7.6,2.2,16.9,2.2,27.9h0V483h19.5V396.3a131.41,131.41,0,0,0-3-29.1,58.17,58.17,0,0,0-10.1-22.7,45.29,45.29,0,0,0-18.9-14.5c-7.9-3.4-17.8-5.1-29.5-5.1q-21.3,0-36,3t-23.4,5.4h0V483Zm199.4,3.3a72.65,72.65,0,0,0,22.8-3.4c7-2.3,11.9-4.4,14.7-6.1h0l-4.8-16.2a75.87,75.87,0,0,1-11.7,5.2c-5,1.8-11.6,2.9-19.8,2.9a54.4,54.4,0,0,1-13.2-1.5,20.45,20.45,0,0,1-10.2-6c-2.8-3-4.9-7.2-6.4-12.8s-2.2-12.6-2.2-21.5h0V344.4h61.8V327.9h-61.8V278.7l-19.5,3.6V425.1a132.63,132.63,0,0,0,2.4,27c1.6,7.6,4.3,13.9,8.2,19a34.92,34.92,0,0,0,15.6,11.4C1735.8,485,1743.8,486.3,1753.4,486.3Zm105.2-.6,2.7-16.2a90.28,90.28,0,0,1-10.4-2.1,15.3,15.3,0,0,1-7-3.8,15.7,15.7,0,0,1-4.1-6.9,40.44,40.44,0,0,1-1.3-11.5h0v-195l-19.5,3.6v192c0,7.4.8,13.6,2.6,18.5a29.28,29.28,0,0,0,7.5,12,30.81,30.81,0,0,0,12.3,6.9,65.79,65.79,0,0,0,17.2,2.5Z"
+          d="M184.317 93.257V52.42c.6-.24 1.92-.51 3.898-.81a49.417 49.417 0 0 1 7.166-.45c2.579 0 4.738.3 6.447.93a8.581 8.581 0 0 1 4.138 3.118c1.05 1.44 1.799 3.299 2.248 5.577.45 2.28.66 5.068.66 8.366v24.107h5.847V67.261a39.402 39.402 0 0 0-.9-8.725 18.32 18.32 0 0 0-2.998-6.807 13.58 13.58 0 0 0-5.667-4.348c-2.369-1.019-5.337-1.529-8.845-1.529-4.258 0-7.856.3-10.794.9-2.939.6-5.278 1.14-7.017 1.619v44.886h5.817Zm65.096.99a30.068 30.068 0 0 0 8.155-.99c2.309-.66 3.868-1.23 4.738-1.709l-1.08-5.037a31.537 31.537 0 0 1-4.048 1.529c-1.859.6-4.377.9-7.556.9-5.756 0-9.954-1.53-12.593-4.588-2.638-3.059-4.048-7.436-4.228-13.133h32.653c.06-.42.09-.87.12-1.35.03-.48.06-.959.06-1.439 0-7.736-1.7-13.463-5.097-17.18-3.399-3.719-7.936-5.578-13.613-5.578-2.573.002-5.12.512-7.496 1.5a18.395 18.395 0 0 0-6.477 4.527 23.238 23.238 0 0 0-4.587 7.616c-1.17 3.029-1.74 6.597-1.74 10.644-.031 3.301.393 6.59 1.26 9.775a19.852 19.852 0 0 0 4.048 7.676 18.677 18.677 0 0 0 7.106 5.038c2.819 1.199 6.297 1.799 10.375 1.799Zm10.164-27.976h-26.626a21.127 21.127 0 0 1 1.2-5.846 15.508 15.508 0 0 1 2.878-4.918 14.23 14.23 0 0 1 4.318-3.358 12.293 12.293 0 0 1 5.637-1.26c3.958 0 7.016 1.35 9.175 4.048 2.159 2.699 3.298 6.477 3.418 11.334Zm19.58 26.986c.72-1.32 1.589-2.848 2.608-4.527 1.02-1.68 2.13-3.479 3.359-5.368a189.287 189.287 0 0 1 3.838-5.667c1.349-1.919 2.638-3.748 3.957-5.487 1.26 1.74 2.58 3.568 3.928 5.487a240.442 240.442 0 0 1 3.868 5.667c1.23 1.86 2.37 3.628 3.359 5.368.989 1.739 1.889 3.238 2.608 4.527h6.297a128.627 128.627 0 0 0-3.748-6.746c-1.35-2.28-2.729-4.498-4.168-6.597-1.44-2.099-2.878-4.198-4.318-6.177a465.754 465.754 0 0 0-4.048-5.487l14.843-21.498h-6.387l-12.234 17.81-12.053-17.81h-6.836L289.14 68.61a362.302 362.302 0 0 0-8.275 11.754 142.32 142.32 0 0 0-7.736 12.893h6.027Zm58.529.99a21.783 21.783 0 0 0 6.836-1.02c2.099-.69 3.568-1.32 4.408-1.829l-1.44-4.857a22.749 22.749 0 0 1-3.508 1.559c-1.499.54-3.478.87-5.936.87a16.311 16.311 0 0 1-3.958-.45 6.132 6.132 0 0 1-3.059-1.8c-.84-.899-1.469-2.158-1.919-3.837-.45-1.68-.66-3.778-.66-6.447V51.699h18.53v-4.947h-18.53V32l-5.846 1.08v42.816a39.768 39.768 0 0 0 .72 8.096c.48 2.279 1.289 4.168 2.458 5.697a10.47 10.47 0 0 0 4.678 3.418c1.948.75 4.347 1.14 7.226 1.14Zm32.353-24.198v-5.667h-20.33v5.667h20.33Zm12.833-32.832a4.258 4.258 0 0 0 3.058-1.23c.84-.809 1.26-1.888 1.26-3.268 0-1.379-.42-2.458-1.26-3.298a4.23 4.23 0 0 0-3.058-1.2 4.357 4.357 0 0 0-3.059 1.2c-.84.81-1.259 1.919-1.259 3.298 0 1.38.42 2.459 1.26 3.269a4.138 4.138 0 0 0 3.058 1.229Zm2.968 56.04V46.752h-5.847v46.505h5.847Zm21.019 0V52.42c.6-.24 1.889-.51 3.928-.81a48.976 48.976 0 0 1 7.136-.45c2.579 0 4.738.3 6.417.93a8.581 8.581 0 0 1 4.137 3.118c1.05 1.44 1.8 3.299 2.25 5.577.449 2.28.659 5.068.659 8.366v24.107h5.847V67.261a39.402 39.402 0 0 0-.9-8.725 17.442 17.442 0 0 0-3.028-6.807 13.58 13.58 0 0 0-5.667-4.348c-2.369-1.019-5.337-1.529-8.845-1.529-4.258 0-7.856.3-10.795.9-2.938.6-5.277 1.14-7.016 1.619v44.886h5.877Zm59.788.99a21.783 21.783 0 0 0 6.837-1.02c2.098-.69 3.568-1.32 4.407-1.829l-1.439-4.857a22.749 22.749 0 0 1-3.508 1.559c-1.5.54-3.478.87-5.937.87a16.311 16.311 0 0 1-3.958-.45 6.132 6.132 0 0 1-3.058-1.8c-.84-.899-1.47-2.158-1.92-3.837-.449-1.68-.659-3.778-.659-6.447V51.699h18.53v-4.947h-18.53V32l-5.847 1.08v42.816a39.768 39.768 0 0 0 .72 8.096c.48 2.279 1.29 4.168 2.459 5.697a10.47 10.47 0 0 0 4.677 3.418c1.949.75 4.348 1.14 7.226 1.14Zm31.543-.18.81-4.858a27.07 27.07 0 0 1-3.118-.63 4.588 4.588 0 0 1-2.1-1.139 4.707 4.707 0 0 1-1.229-2.069 12.126 12.126 0 0 1-.39-3.448V23.454l-5.846 1.08v57.569c0 2.219.24 4.078.78 5.547a8.78 8.78 0 0 0 2.248 3.598 9.238 9.238 0 0 0 3.688 2.07c1.679.476 3.413.728 5.157.749Z"
           fill="currentColor"
-          transform="translate(-197.5 -171.5)"
+          fillRule="nonzero"
         />
-        <g>
+        <g transform="translate(3.272 2.88)">
           <path
-            d="M528.8,509q-6.3,6-13.2,11.4a190,190,0,1,1,38-40.2"
-            fill="none"
-            stroke="#5fc3e7"
-            strokeWidth="18"
-            transform="translate(-197.5 -171.5)"
+            d="M96.19 98.498a53.922 53.922 0 0 1-3.958 3.418c-23.445 18.476-57.176 15.723-77.314-6.31-20.139-22.035-19.854-55.877.651-77.57C36.075-3.657 69.848-5.843 92.98 13.025c23.131 18.867 27.82 51.892 10.69 76.339"
+            stroke="var(--logo-color)"
+            strokeWidth="5.4"
           />
-          <circle cx="329.2" cy="339.5" fill="#5fc3e7" r="9" />
-          <line
-            fill="none"
-            stroke="#5fc3e7"
+          <circle
+            cx="95.561"
+            cy="99.097"
+            fill="var(--logo-color)"
+            fillRule="nonzero"
+            r="2.699"
+          />
+          <path
+            d="M8.847 28.785c16.248-1.974 32.318-2.949 48.211-2.923 15.893.025 31.156 1.05 45.789 3.073"
+            stroke="var(--logo-color)"
             strokeLinecap="square"
-            strokeWidth="18"
-            x1="40"
-            x2="353.5"
-            y1="105"
-            y2="105.5"
+            strokeWidth="5.4"
           />
           <ellipse
-            cx="202"
-            cy="199.5"
-            fill="none"
-            rx="93.5"
-            ry="190.5"
-            stroke="#5fc3e7"
-            strokeWidth="18"
+            cx="57.421"
+            cy="57.12"
+            rx="28.035"
+            ry="57.12"
+            stroke="var(--logo-color)"
+            strokeWidth="5.4"
           />
-          <line
-            fill="none"
-            stroke="#5fc3e7"
-            strokeLinecap="square"
-            strokeWidth="18"
-            x1="49.5"
-            x2="353.5"
-            y1="304.5"
-            y2="304.5"
-          />
-          <line
-            fill="none"
-            stroke="#5fc3e7"
+          <path
+            d="M11.695 88.603c14.934 2 30.008 3 45.224 3 15.215 0 30.525-1 45.928-3M1.009 59.069h112.482"
+            stroke="var(--logo-color)"
             strokeLinecap="square"
-            strokeWidth="18"
-            x1="9"
-            x2="389"
-            y1="206"
-            y2="206"
+            strokeWidth="5.4"
           />
         </g>
       </g>