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

* chore(deps): update all non-major dependencies * update lock * fix: update types * fix: update error type * test: update useFetch url Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Pooya Parsa <pyapar@gmail.com> Co-authored-by: Daniel Roe <daniel@roe.dev>
husayt · May 11, 2022 · 7e89fe8 · 7e89fe8
1 parent 5c8c045
commit 7e89fe8
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 184 deletions.
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "@types/rimraf": "^3",
     "@unocss/reset": "^0.33.2",
     "case-police": "^0.5.3",
-    "changelogen": "^0.0.5",
+    "changelogen": "^0.0.6",
     "eslint": "^8.15.0",
     "eslint-plugin-jsdoc": "^39.2.9",
     "execa": "^6.1.0",

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -52,7 +52,7 @@
     "knitwork": "^0.1.1",
     "magic-string": "^0.26.1",
     "mlly": "^0.5.2",
-    "nitropack": "^0.4.2",
+    "nitropack": "^0.4.3",
     "nuxi": "^3.0.0-rc.3",
     "ohash": "^0.1.0",
     "ohmyfetch": "^0.4.16",

diff --git a/packages/nuxt/src/app/composables/fetch.ts b/packages/nuxt/src/app/composables/fetch.ts
@@ -1,11 +1,11 @@
 import type { FetchOptions, FetchRequest } from 'ohmyfetch'
-import type { TypedInternalResponse } from 'nitropack'
+import type { TypedInternalResponse, NitroFetchRequest } from 'nitropack'
 import { hash } from 'ohash'
 import { computed, isRef, Ref } from 'vue'
 import type { AsyncDataOptions, _Transform, KeyOfRes } from './asyncData'
 import { useAsyncData } from './asyncData'
 
-export type FetchResult<ReqT extends FetchRequest> = TypedInternalResponse<ReqT, unknown>
+export type FetchResult<ReqT extends NitroFetchRequest> = TypedInternalResponse<ReqT, unknown>
 
 export interface UseFetchOptions<
   DataT,
@@ -18,7 +18,7 @@ export interface UseFetchOptions<
 export function useFetch<
   ResT = void,
   ErrorT = Error,
-  ReqT extends FetchRequest = FetchRequest,
+  ReqT extends NitroFetchRequest = NitroFetchRequest,
   _ResT = ResT extends void ? FetchResult<ReqT> : ResT,
   Transform extends (res: _ResT) => any = (res: _ResT) => _ResT,
   PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>
@@ -30,12 +30,12 @@ export function useFetch<
     console.warn('[nuxt] You should provide a key for `useFetch` when using a custom transform function.')
   }
   const key = '$f_' + (opts.key || hash([request, { ...opts, transform: null }]))
-  const _request = computed<FetchRequest>(() => {
-    let r = request
+  const _request = computed(() => {
+    let r = request as Ref<FetchRequest> | FetchRequest | (() => FetchRequest)
     if (typeof r === 'function') {
       r = r()
     }
-    return isRef(r) ? r.value : r
+    return (isRef(r) ? r.value : r) as NitroFetchRequest
   })
 
   const _fetchOptions = {
@@ -61,7 +61,7 @@ export function useFetch<
 export function useLazyFetch<
   ResT = void,
   ErrorT = Error,
-  ReqT extends string = string,
+  ReqT extends NitroFetchRequest = NitroFetchRequest,
   _ResT = ResT extends void ? FetchResult<ReqT> : ResT,
   Transform extends (res: _ResT) => any = (res: _ResT) => _ResT,
   PickKeys extends KeyOfRes<Transform> = KeyOfRes<Transform>

diff --git a/packages/nuxt/src/core/runtime/nitro/error.ts b/packages/nuxt/src/core/runtime/nitro/error.ts
@@ -1,5 +1,5 @@
 import { withQuery } from 'ufo'
-import type { NitroErrorHandler } from 'nitropack'
+import type { NitroErrorHandler, NitroFetchRequest } from 'nitropack'
 // @ts-ignore TODO
 import { normalizeError, isJsonRequest } from '#internal/nitro/utils'
 
@@ -36,7 +36,7 @@ export default <NitroErrorHandler> async function errorhandler (_error, event) {
   }
 
   // HTML response
-  const url = withQuery('/__nuxt_error', errorObject as any)
+  const url = withQuery('/__nuxt_error', errorObject as any) as NitroFetchRequest
   const html = await $fetch(url).catch((error) => {
     console.error('[nitro] Error while generating error response', error)
     return errorObject.statusMessage

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -47,7 +47,7 @@
     "url-loader": "^4.1.1",
     "vue-loader": "^17.0.0",
     "vue-style-loader": "^4.1.3",
-    "webpack": "^5.72.0",
+    "webpack": "^5.72.1",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-middleware": "^5.3.1",
     "webpack-hot-middleware": "^2.25.1",

diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts
@@ -131,7 +131,7 @@ describe('composables', () => {
     // @ts-expect-error
     expectTypeOf(useAsyncData('test', () => Promise.resolve('500'), { default: () => 500 }).data).toMatchTypeOf<Ref<number>>()
 
-    expectTypeOf(useFetch('test', { default: () => ref(500) }).data).toMatchTypeOf<Ref<number>>()
-    expectTypeOf(useFetch('test', { default: () => 500 }).data).toMatchTypeOf<Ref<number>>()
+    expectTypeOf(useFetch('/test', { default: () => ref(500) }).data).toMatchTypeOf<Ref<number>>()
+    expectTypeOf(useFetch('/test', { default: () => 500 }).data).toMatchTypeOf<Ref<number>>()
   })
 })