fix: Handle case where the locale param is an array and set cookie …

…expiration to one year (#435)
amannn · Aug 1, 2023 · 82e842c · 82e842c · vercel · Aug 1, 2023
1 parent 431764d
commit 82e842c
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 29 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -16,7 +16,7 @@
     "@vercel/analytics": "^1.0.1",
     "clsx": "^1.2.1",
     "http-status-codes": "^2.2.0",
-    "next": "^13.4.7",
+    "next": "13.4.7",
     "nextra": "^2.8.0",
     "nextra-theme-docs": "^2.8.0",
     "react": "^18.2.0",

diff --git a/examples/example-advanced/package.json b/examples/example-advanced/package.json
@@ -12,8 +12,8 @@
   "dependencies": {
     "accept-language-parser": "^1.5.0",
     "lodash": "^4.17.21",
-    "next": "^13.4.7",
-    "next-intl": "^2.14.3",
+    "next": "13.4.7",
+    "next-intl": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

diff --git a/examples/example-next-13-next-auth/package.json b/examples/example-next-13-next-auth/package.json
@@ -10,9 +10,9 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "^13.4.7",
+    "next": "13.4.7",
     "next-auth": "^4.22.1",
-    "next-intl": "^2.14.3",
+    "next-intl": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

diff --git a/examples/example-next-13/package.json b/examples/example-next-13/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "clsx": "^1.2.1",
-    "next": "^13.4.7",
-    "next-intl": "^2.14.3",
+    "next": "13.4.7",
+    "next-intl": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tailwindcss": "^3.2.4"

diff --git a/examples/example-next-13/tests/main.spec.ts b/examples/example-next-13/tests/main.spec.ts
@@ -51,7 +51,10 @@ it('can be used to localize the page', async ({page}) => {
 
 it('sets a cookie', async ({page}) => {
   const response = await page.goto('/');
-  expect(await response?.headerValue('set-cookie')).toBe(
-    'NEXT_LOCALE=en; Path=/; SameSite=strict'
-  );
+  const value = await response?.headerValue('set-cookie');
+  expect(value).toContain('NEXT_LOCALE=en;');
+  expect(value).toContain('Path=/;');
+  expect(value).toContain('SameSite=strict');
+  expect(value).toContain('Max-Age=31536000;');
+  expect(value).toContain('Expires=');
 });
diff --git a/examples/example/package.json b/examples/example/package.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "date-fns": "^2.16.1",
-    "next": "^13.4.7",
-    "next-intl": "^2.14.3",
+    "next": "13.4.7",
+    "next-intl": "latest",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

diff --git a/packages/next-intl/package.json b/packages/next-intl/package.json
@@ -83,7 +83,7 @@
     "eslint": "^8.39.0",
     "eslint-config-molindo": "^6.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
-    "next": "^13.4.7",
+    "next": "13.4.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "size-limit": "^8.2.6",

diff --git a/packages/next-intl/src/client/useClientLocale.tsx b/packages/next-intl/src/client/useClientLocale.tsx
@@ -9,7 +9,7 @@ export default function useClientLocale(): string {
   // `useParams` can be called, but the return type is `null`.
   const params = useParams() as ReturnType<typeof useParams> | null;
 
-  if (params?.[LOCALE_SEGMENT_NAME]) {
+  if (typeof params?.[LOCALE_SEGMENT_NAME] === 'string') {
     locale = params[LOCALE_SEGMENT_NAME];
   } else {
     // eslint-disable-next-line react-hooks/rules-of-hooks -- Reading from context conditionally is fine

diff --git a/packages/next-intl/src/middleware/middleware.tsx b/packages/next-intl/src/middleware/middleware.tsx
@@ -185,7 +185,8 @@ export default function createMiddleware(config: MiddlewareConfig) {
 
     if (hasOutdatedCookie) {
       response.cookies.set(COOKIE_LOCALE_NAME, locale, {
-        sameSite: 'strict'
+        sameSite: 'strict',
+        maxAge: 31536000 // 1 year
       });
     }
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml