chore(deps): update all non-major dependencies (nuxt#9670)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Roe <daniel@roe.dev>
linhln2508 · Dec 12, 2022 · 3733f12 · 3733f12
1 parent 2a2f21b
commit 3733f12
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "vitest": "^0.25.7",
     "vue-tsc": "^1.0.13"
   },
-  "packageManager": "pnpm@7.18.1",
+  "packageManager": "pnpm@7.18.2",
   "engines": {
     "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   }

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -61,7 +61,7 @@
     "knitwork": "^1.0.0",
     "magic-string": "^0.27.0",
     "mlly": "^1.0.0",
-    "nitropack": "npm:nitropack-edge@2.0.0-27847479.5831707",
+    "nitropack": "npm:nitropack-edge@2.0.0-27847631.8186a02",
     "nuxi": "3.0.0",
     "ohash": "^1.0.0",
     "ofetch": "^1.0.0",
@@ -70,7 +70,7 @@
     "scule": "^1.0.0",
     "strip-literal": "^1.0.0",
     "ufo": "^1.0.1",
-    "ultrahtml": "^1.1.0",
+    "ultrahtml": "^1.2.0",
     "unctx": "^2.1.1",
     "unenv": "^1.0.0",
     "unimport": "^1.0.2",

diff --git a/packages/nuxt/src/app/composables/fetch.ts b/packages/nuxt/src/app/composables/fetch.ts
@@ -1,5 +1,5 @@
-import type { FetchError, FetchOptions } from 'ofetch'
-import type { TypedInternalResponse, NitroFetchRequest } from 'nitropack'
+import type { FetchError } from 'ofetch'
+import type { TypedInternalResponse, NitroFetchOptions, NitroFetchRequest } from 'nitropack'
 import type { Ref } from 'vue'
 import { computed, unref, reactive } from 'vue'
 import { hash } from 'ohash'
@@ -12,13 +12,14 @@ type ComputedOptions<T extends Record<string, any>> = {
   [K in keyof T]: T[K] extends Function ? T[K] : T[K] extends Record<string, any> ? ComputedOptions<T[K]> | Ref<T[K]> | T[K] : Ref<T[K]> | T[K]
 }
 
-type ComputedFetchOptions = ComputedOptions<FetchOptions>
+type ComputedFetchOptions<R extends NitroFetchRequest> = ComputedOptions<NitroFetchOptions<R>>
 
 export interface UseFetchOptions<
   DataT,
   Transform extends _Transform<DataT, any> = _Transform<DataT, DataT>,
-  PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>
-> extends AsyncDataOptions<DataT, Transform, PickKeys>, ComputedFetchOptions {
+  PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>,
+  R extends NitroFetchRequest = string & {}
+> extends AsyncDataOptions<DataT, Transform, PickKeys>, ComputedFetchOptions<R> {
   key?: string
 }
 
@@ -31,7 +32,7 @@ export function useFetch<
   PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>
 > (
   request: Ref<ReqT> | ReqT | (() => ReqT),
-  opts?: UseFetchOptions<_ResT, Transform, PickKeys>
+  opts?: UseFetchOptions<_ResT, Transform, PickKeys, ReqT>
 ): AsyncData<PickFrom<ReturnType<Transform>, PickKeys>, ErrorT | null>
 export function useFetch<
   ResT = void,
@@ -42,7 +43,7 @@ export function useFetch<
   PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>
 > (
   request: Ref<ReqT> | ReqT | (() => ReqT),
-  arg1?: string | UseFetchOptions<_ResT, Transform, PickKeys>,
+  arg1?: string | UseFetchOptions<_ResT, Transform, PickKeys, ReqT>,
   arg2?: string
 ) {
   const [opts = {}, autoKey] = typeof arg1 === 'string' ? [{}, arg1] : [arg1, arg2]
@@ -98,7 +99,7 @@ export function useFetch<
   const asyncData = useAsyncData<_ResT, ErrorT, Transform, PickKeys>(key, () => {
     controller?.abort?.()
     controller = typeof AbortController !== 'undefined' ? new AbortController() : {} as AbortController
-    return $fetch(_request.value, { signal: controller.signal, ..._fetchOptions }) as Promise<_ResT>
+    return $fetch(_request.value, { signal: controller.signal, ..._fetchOptions } as any) as Promise<_ResT>
   }, _asyncDataOptions)
 
   return asyncData

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -18,7 +18,7 @@
     "@types/semver": "^7",
     "@unhead/schema": "^1.0.13",
     "@vitejs/plugin-vue": "^4.0.0",
-    "nitropack": "npm:nitropack-edge@2.0.0-27847479.5831707",
+    "nitropack": "npm:nitropack-edge@2.0.0-27847631.8186a02",
     "unbuild": "latest",
     "vite": "~4.0.0"
   },

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