Chore: Update Next.js and remove custom type for WritableCookies (#552)

* update next.js and remove custom type

.changeset/strange-mugs-know.md

@@ -0,0 +1,5 @@
+---
+'@supabase/auth-helpers-nextjs': patch
+---
+
+Upgrade Next.js and remove custom type for WritableRequestCookies

packages/nextjs/package.json

@@ -31,7 +31,7 @@
 		"@types/set-cookie-parser": "^2.4.2",
 		"@supabase/supabase-js": "2.19.0",
 		"config": "workspace:*",
-		"next": "^13.4.2",
+		"next": "^13.4.3",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"rimraf": "^4.1.1",

packages/nextjs/src/index.ts

@@ -1,14 +1,6 @@
-import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies';
-import type { CookieOptions } from '@supabase/auth-helpers-shared';
-
 // Types
 export type { Session, User, SupabaseClient } from '@supabase/supabase-js';
 
-// TODO! Remove this one 👇 when Next.js update their types for Route Handlers and Server Actions
-export type WritableRequestCookies = ReadonlyRequestCookies & {
-	set: (name: string, value: string, options?: CookieOptions) => void;
-};
-
 export { createPagesBrowserClient } from './pagesBrowserClient';
 export { createPagesServerClient } from './pagesServerClient';
 export { createMiddlewareClient } from './middlewareClient';

packages/nextjs/src/routeHandlerClient.ts

@@ -6,13 +6,12 @@ import {
 	createSupabaseClient
 } from '@supabase/auth-helpers-shared';
 
-import type { WritableRequestCookies } from './index';
-import { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies';
+import type { ReadonlyRequestCookies } from 'next/dist/server/web/spec-extension/adapters/request-cookies';
 
 class NextRouteHandlerAuthStorageAdapter extends CookieAuthStorageAdapter {
 	constructor(
 		private readonly context: {
-			cookies: () => WritableRequestCookies;
+			cookies: () => ReadonlyRequestCookies;
 		},
 		cookieOptions?: CookieOptions
 	) {
@@ -29,6 +28,7 @@ class NextRouteHandlerAuthStorageAdapter extends CookieAuthStorageAdapter {
 	}
 	protected deleteCookie(name: string): void {
 		const nextCookies = this.context.cookies();
+		// @ts-expect-error Next.js need to fix their type for cookie options (3rd parameter on .set method)
 		nextCookies.set(name, '', {
 			maxAge: 0
 		});
@@ -42,8 +42,7 @@ export function createRouteHandlerClient<
 		: string & keyof Database
 >(
 	context: {
-		// TODO! Remove `ReadonlyRequestCookies` when Next.js fixes ts defs for Route Handlers and Server Actions
-		cookies: () => ReadonlyRequestCookies | WritableRequestCookies;
+		cookies: () => ReadonlyRequestCookies;
 	},
 	{
 		supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL,
@@ -63,12 +62,6 @@ export function createRouteHandlerClient<
 		);
 	}
 
-	// TODO! Remove this type narrowing statement 👇 when Next.js fixes ts defs for Route Handlers and Server Actions
-	const narrowedContext = {
-		...context,
-		cookies: context.cookies as () => WritableRequestCookies
-	};
-
 	return createSupabaseClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
 		...options,
 		global: {
@@ -80,7 +73,7 @@ export function createRouteHandlerClient<
 		},
 		auth: {
 			storageKey: cookieOptions?.name,
-			storage: new NextRouteHandlerAuthStorageAdapter(narrowedContext, cookieOptions)
+			storage: new NextRouteHandlerAuthStorageAdapter(context, cookieOptions)
 		}
 	});
 }