Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(nuxt): simplify request computation inside useFetch #26191

Merged
merged 4 commits into from
Mar 11, 2024
Merged

refactor(nuxt): simplify request computation inside useFetch #26191

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
596ae29
refactor: simplify `request` computation with `toRef`
Mini-ghost Mar 11, 2024
4696832
chore: remove unused import
danielroe Mar 11, 2024
3600eca
[autofix.ci] apply automated fixes
autofix-ci[bot] Mar 11, 2024
e2f403b
refactor(nuxt): use more balanced approach
Mini-ghost Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions packages/nuxt/src/app/composables/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { FetchError, FetchOptions } from 'ofetch'
import type { NitroFetchRequest, TypedInternalResponse, AvailableRouterMethod as _AvailableRouterMethod } from 'nitropack'
import type { MaybeRef, Ref } from 'vue'
import { computed, reactive, toValue } from 'vue'
import { reactive, toRef, toValue } from 'vue'
import { hash } from 'ohash'

import { useRequestFetch } from './ssr'
Expand Down Expand Up @@ -94,13 +94,7 @@ export function useFetch<
) {
const [opts = {}, autoKey] = typeof arg1 === 'string' ? [{}, arg1] : [arg1, arg2]

const _request = computed(() => {
let r = request
if (typeof r === 'function') {
r = r()
}
return toValue(r)
})
const _request = toRef(request)

const _key = opts.key || hash([autoKey, typeof _request.value === 'string' ? _request.value : '', ...generateOptionSegments(opts)])
if (!_key || typeof _key !== 'string') {
Expand Down