diff --git a/package.json b/package.json index 5470dc9b97..034c7b1923 100644 --- 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 index 5b801b3795..912f1040fa 100644 --- 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 index 4b2cbd9aed..d14f2c575b 100644 --- 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> = { [K in keyof T]: T[K] extends Function ? T[K] : T[K] extends Record ? ComputedOptions | Ref | T[K] : Ref | T[K] } -type ComputedFetchOptions = ComputedOptions +type ComputedFetchOptions = ComputedOptions> export interface UseFetchOptions< DataT, Transform extends _Transform = _Transform, - PickKeys extends KeyOfRes = KeyOfRes -> extends AsyncDataOptions, ComputedFetchOptions { + PickKeys extends KeyOfRes = KeyOfRes, + R extends NitroFetchRequest = string & {} +> extends AsyncDataOptions, ComputedFetchOptions { key?: string } @@ -31,7 +32,7 @@ export function useFetch< PickKeys extends KeyOfRes = KeyOfRes > ( request: Ref | ReqT | (() => ReqT), - opts?: UseFetchOptions<_ResT, Transform, PickKeys> + opts?: UseFetchOptions<_ResT, Transform, PickKeys, ReqT> ): AsyncData, PickKeys>, ErrorT | null> export function useFetch< ResT = void, @@ -42,7 +43,7 @@ export function useFetch< PickKeys extends KeyOfRes = KeyOfRes > ( request: Ref | 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 index d15bcfdc42..2db1568f48 100644 --- 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 index 90ed7a402a..91a8398500 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -435,7 +435,7 @@ importers: 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: workspace:* ofetch: ^1.0.0 ohash: ^1.0.0 @@ -444,7 +444,7 @@ importers: scule: ^1.0.0 strip-literal: ^1.0.0 ufo: ^1.0.1 - ultrahtml: ^1.1.0 + ultrahtml: ^1.2.0 unbuild: ^1.0.2 unctx: ^2.1.1 unenv: ^1.0.0 @@ -481,7 +481,7 @@ importers: knitwork: 1.0.0 magic-string: 0.27.0 mlly: 1.0.0 - nitropack: /nitropack-edge/2.0.0-27847479.5831707 + nitropack: /nitropack-edge/2.0.0-27847631.8186a02 nuxi: link:../nuxi ofetch: 1.0.0 ohash: 1.0.0 @@ -490,7 +490,7 @@ importers: 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 unhead: 1.0.13 @@ -517,7 +517,7 @@ importers: defu: ^6.1.1 hookable: ^5.4.2 jiti: ^1.16.0 - nitropack: npm:nitropack-edge@2.0.0-27847479.5831707 + nitropack: npm:nitropack-edge@2.0.0-27847631.8186a02 pathe: ^1.0.0 pkg-types: ^1.0.1 postcss-import-resolver: ^2.0.0 @@ -547,7 +547,7 @@ importers: '@types/semver': 7.3.12 '@unhead/schema': 1.0.13 '@vitejs/plugin-vue': 4.0.0_vite@4.0.0 - nitropack: /nitropack-edge/2.0.0-27847479.5831707 + nitropack: /nitropack-edge/2.0.0-27847631.8186a02 unbuild: 1.0.2 vite: 4.0.0 @@ -4028,7 +4028,7 @@ packages: dev: true /ee-first/1.1.1: - resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} + resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} /electron-to-chromium/1.4.266: resolution: {integrity: sha512-saJTYECxUSv7eSpnXw0XIEvUkP9x4s/x2mm3TVX7k4rIFS6f5TjBih1B5h437WzIhHQjid+d8ouQzPQskMervQ==} @@ -5477,7 +5477,7 @@ packages: engines: {node: '>=12.0.0'} dependencies: ansi-escapes: 6.0.0 - chalk: 5.1.2 + chalk: 5.2.0 cli-cursor: 4.0.0 cli-width: 4.0.0 external-editor: 3.1.0 @@ -6321,8 +6321,8 @@ packages: /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack-edge/2.0.0-27847479.5831707: - resolution: {integrity: sha512-ZmQ28gjv+fHfLBSIYNpD+mv82gnmCt7DlohqT/QeI9hj834cWBp6OQv7aIDEOVHFcYeDwzMCjVNlsJhF0ovpMw==} + /nitropack-edge/2.0.0-27847631.8186a02: + resolution: {integrity: sha512-ZDQH0sRkXC7tVUw+CVFqfMlyS79tne4cTMs1oSRGAiQJbvaLarXpCiYNoXraXPWkO2Y06vSQvr1l7wDGwJ4w0Q==} engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} hasBin: true dependencies: @@ -6609,7 +6609,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: bl: 5.0.0 - chalk: 5.1.2 + chalk: 5.2.0 cli-cursor: 4.0.0 cli-spinners: 2.7.0 is-interactive: 2.0.0 @@ -7931,19 +7931,9 @@ packages: jest-worker: 27.5.1 schema-utils: 3.1.1 serialize-javascript: 6.0.0 - terser: 5.15.0 + terser: 5.16.1 webpack: 5.75.0 - /terser/5.15.0: - resolution: {integrity: sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==} - engines: {node: '>=10'} - hasBin: true - dependencies: - '@jridgewell/source-map': 0.3.2 - acorn: 8.8.1 - commander: 2.20.3 - source-map-support: 0.5.21 - /terser/5.16.1: resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==} engines: {node: '>=10'} @@ -8143,8 +8133,8 @@ packages: /ufo/1.0.1: resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==} - /ultrahtml/1.1.0: - resolution: {integrity: sha512-6r1tMBTuzduqCAvqrtPL4WqgHOLYZSVuWhx3gwoLC8M3KILnm8ewe3R65MatMT4/GPCZlZTC1MlPGGM5MV5Hog==} + /ultrahtml/1.2.0: + resolution: {integrity: sha512-vxZM2yNvajRmCj/SknRYGNXk2tqiy6kRNvZjJLaleG3zJbSh/aNkOqD1/CVzypw8tyHyhpzYuwQgMMhUB4ZVNQ==} dev: false /unbox-primitive/1.0.2: @@ -8549,40 +8539,6 @@ packages: optionalDependencies: fsevents: 2.3.2 - /vite/4.0.0_@types+node@18.11.11: - resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 18.11.11 - esbuild: 0.16.4 - postcss: 8.4.20 - resolve: 1.22.1 - rollup: 3.7.3 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /vite/4.0.0_@types+node@18.11.13: resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==} engines: {node: ^14.18.0 || >=16.0.0} @@ -8641,7 +8597,7 @@ packages: dependencies: '@types/chai': 4.3.3 '@types/chai-subset': 1.3.3 - '@types/node': 18.11.11 + '@types/node': 18.11.13 acorn: 8.8.1 acorn-walk: 8.2.0 chai: 4.3.6 @@ -8652,7 +8608,7 @@ packages: tinybench: 2.3.1 tinypool: 0.3.0 tinyspy: 1.0.2 - vite: 4.0.0_@types+node@18.11.11 + vite: 4.0.0_@types+node@18.11.13 transitivePeerDependencies: - less - sass