Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-25 10:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(nuxt): use isEqual from ohash/utils

Browse Source
This commit is contained in:
Daniel Roe 2025-02-25 09:35:32 +00:00
parent f709e5730b
commit 2e27cd30c2
No known key found for this signature in database
GPG Key ID: 3714AB03996F442B
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eslint.config.mjs
View File

@ -203,6 +203,7 @@ export default createConfigForNuxt({
'perfect-debounce', 'perfect-debounce',
'radix3', 'radix3',
'ohash', 'ohash',
'ohash/utils',
'pathe', 'pathe',
'uncrypto', 'uncrypto',
// internal deps // internal deps

8
packages/nuxt/src/app/composables/cookie.ts
View File

@ -5,7 +5,7 @@ import { parse, serialize } from 'cookie-es'
import { deleteCookie, getCookie, getRequestHeader, setCookie } from 'h3' import { deleteCookie, getCookie, getRequestHeader, setCookie } from 'h3'
import type { H3Event } from 'h3' import type { H3Event } from 'h3'
import destr from 'destr' import destr from 'destr'
import { hash } from 'ohash' import { isEqual } from 'ohash/utils'
import { klona } from 'klona' import { klona } from 'klona'
import { useNuxtApp } from '../nuxt' import { useNuxtApp } from '../nuxt'
import { useRequestEvent } from './ssr' import { useRequestEvent } from './ssr'
@ -75,7 +75,7 @@ export function useCookie<T = string | null | undefined> (name: string, _opts?:
// or running in an iframe: see https://github.com/nuxt/nuxt/issues/26338 // or running in an iframe: see https://github.com/nuxt/nuxt/issues/26338
} }
const callback = () => { const callback = () => {
if (opts.readonly || hash(cookie.value) === hash(cookies[name])) { return } if (opts.readonly || isEqual(cookie.value, cookies[name])) { return }
writeClientCookie(name, cookie.value, opts as CookieSerializeOptions) writeClientCookie(name, cookie.value, opts as CookieSerializeOptions)
cookies[name] = klona(cookie.value) cookies[name] = klona(cookie.value)
@ -136,11 +136,11 @@ export function useCookie<T = string | null | undefined> (name: string, _opts?:
} else if (import.meta.server) { } else if (import.meta.server) {
const nuxtApp = useNuxtApp() const nuxtApp = useNuxtApp()
const writeFinalCookieValue = () => { const writeFinalCookieValue = () => {
if (opts.readonly || hash(cookie.value) === hash(cookies[name])) { return } if (opts.readonly || isEqual(cookie.value, cookies[name])) { return }
nuxtApp._cookies ||= {} nuxtApp._cookies ||= {}
if (name in nuxtApp._cookies) { if (name in nuxtApp._cookies) {
// do not append a second `set-cookie` header // do not append a second `set-cookie` header
if (hash(cookie.value) === hash(nuxtApp._cookies[name])) { return } if (isEqual(cookie.value, nuxtApp._cookies[name])) { return }
// warn in dev mode // warn in dev mode
if (import.meta.dev) { if (import.meta.dev) {
console.warn(`[nuxt] cookie \`${name}\` was previously set to \`${opts.encode(nuxtApp._cookies[name] as any)}\` and is being overridden to \`${opts.encode(cookie.value as any)}\`. This may cause unexpected issues.`) console.warn(`[nuxt] cookie \`${name}\` was previously set to \`${opts.encode(nuxtApp._cookies[name] as any)}\` and is being overridden to \`${opts.encode(cookie.value as any)}\`. This may cause unexpected issues.`)