diff --git a/docs/content/1.getting-started/6.data-fetching.md b/docs/content/1.getting-started/6.data-fetching.md index ffde5f7279a0..921d71d9ab5e 100644 --- a/docs/content/1.getting-started/6.data-fetching.md +++ b/docs/content/1.getting-started/6.data-fetching.md @@ -352,7 +352,7 @@ export default defineComponent({ ## Directly Calling an API Endpoint -There are instances where you may need to directly call the API. Nuxt 3 provides a globally available `$fetch` method using [unjs/ohmyfetch](https://github.com/unjs/ohmyfetch) (in addition to `fetch`) +There are instances where you may need to directly call the API. Nuxt 3 provides a globally available `$fetch` method using [unjs/ofetch](https://github.com/unjs/ofetch) (in addition to `fetch`) with the same API as the [Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch). Using `$fetch` has a number of benefits, including: diff --git a/docs/content/2.guide/1.concepts/4.server-engine.md b/docs/content/2.guide/1.concepts/4.server-engine.md index 000e3bdc20b5..47bbbe0bdfb5 100644 --- a/docs/content/2.guide/1.concepts/4.server-engine.md +++ b/docs/content/2.guide/1.concepts/4.server-engine.md @@ -32,12 +32,12 @@ Learn more about the API layer in the [`server/`](/guide/directory-structure/ser Nitro allows 'direct' calling of routes via the globally-available `$fetch` helper. This will make an API call to the server if run on the browser, but will directly call the relevant function if run on the server, **saving an additional API call**. -`$fetch` API is using [ohmyfetch](https://github.com/unjs/ohmyfetch), with key features including: +`$fetch` API is using [ofetch](https://github.com/unjs/ofetch), with key features including: - Automatic parsing of JSON responses (with access to raw response if needed) - Request body and params are automatically handled, with correct `Content-Type` headers -For more information on `$fetch` features, check out [ohmyfetch](https://github.com/unjs/ohmyfetch). +For more information on `$fetch` features, check out [ofetch](https://github.com/unjs/ofetch). ## Typed API Routes diff --git a/docs/content/2.guide/2.directory-structure/1.server.md b/docs/content/2.guide/2.directory-structure/1.server.md index 0d259f08119d..f52580236a62 100644 --- a/docs/content/2.guide/2.directory-structure/1.server.md +++ b/docs/content/2.guide/2.directory-structure/1.server.md @@ -11,7 +11,7 @@ Nuxt automatically scans files inside the `~/server/api`, `~/server/routes`, and Each file should export a default function defined with `defineEventHandler()`. -The handler can directly return JSON data, a `Promise` or use `event.res.end()` to send response. +The handler can directly return JSON data, a `Promise` or use `event.node.res.end()` to send response. ::ReadMore{link="https://nitro.unjs.io/guide/introduction/routing" title="Nitro Route Handling Docs"} :: @@ -57,7 +57,7 @@ Middleware handlers should not return anything (nor close or respond to the requ ```ts [server/middleware/log.ts] export default defineEventHandler((event) => { - console.log('New request: ' + event.req.url) + console.log('New request: ' + event.node.req.url) }) ``` diff --git a/docs/content/3.api/1.composables/use-fetch.md b/docs/content/3.api/1.composables/use-fetch.md index 4cc70fc607b6..ba511bf979d5 100644 --- a/docs/content/3.api/1.composables/use-fetch.md +++ b/docs/content/3.api/1.composables/use-fetch.md @@ -41,7 +41,7 @@ type AsyncData = { ## Params * **Url**: The URL to fetch. -* **Options (extends [unjs/ohmyfetch](https://github.com/unjs/ohmyfetch) options & [AsyncDataOptions](/api/composables/use-async-data#params))**: +* **Options (extends [unjs/ofetch](https://github.com/unjs/ofetch) options & [AsyncDataOptions](/api/composables/use-async-data#params))**: * `method`: Request method. * `query`: Adds query search params to URL using [ufo](https://github.com/unjs/ufo) * `params`: Alias for `query` @@ -89,7 +89,7 @@ const { data, pending, error, refresh } = await useFetch('https://api.nuxtjs.dev Adding Query Search Params: -Using the `query` option, you can add search parameters to your query. This option is extended from [unjs/ohmyfetch](https://github.com/unjs/ohmyfetch) and is using [ufo](https://github.com/unjs/ufo) to create the URL. Objects are automatically stringified. +Using the `query` option, you can add search parameters to your query. This option is extended from [unjs/ofetch](https://github.com/unjs/ofetch) and is using [unjs/ufo](https://github.com/unjs/ufo) to create the URL. Objects are automatically stringified. ```ts const param1 = ref('value1') @@ -100,7 +100,7 @@ const { data, pending, error, refresh } = await useFetch('https://api.nuxtjs.dev Results in `https://api.nuxtjs.dev/mountains?param1=value1¶m2=value2` -Using [interceptors](https://github.com/unjs/ohmyfetch#%EF%B8%8F-interceptors): +Using [interceptors](https://github.com/unjs/ofetch#%EF%B8%8F-interceptors): ```ts const { data, pending, error, refresh } = await useFetch('/api/auth/login', { diff --git a/docs/content/3.api/1.composables/use-request-event.md b/docs/content/3.api/1.composables/use-request-event.md index 54d1fb1a0a21..bb71f4e75fcd 100644 --- a/docs/content/3.api/1.composables/use-request-event.md +++ b/docs/content/3.api/1.composables/use-request-event.md @@ -12,7 +12,7 @@ Within your pages, components, and plugins you can use `useRequestEvent` to acce const event = useRequestEvent() // Get the URL -const url = event.req.url +const url = event.node.req.url ``` ::alert{icon=👉} diff --git a/docs/content/3.api/3.utils/$fetch.md b/docs/content/3.api/3.utils/$fetch.md index 35830f027bcf..d08a51bdc5f2 100644 --- a/docs/content/3.api/3.utils/$fetch.md +++ b/docs/content/3.api/3.utils/$fetch.md @@ -1,11 +1,11 @@ --- title: "$fetch" -description: Nuxt uses ohmyfetch to expose globally the $fetch helper for making HTTP requests. +description: Nuxt uses ofetch to expose globally the $fetch helper for making HTTP requests. --- # `$fetch` -Nuxt uses [ohmyfetch](https://github.com/unjs/ohmyfetch) to expose globally the `$fetch` helper for making HTTP requests within your Vue app or API routes. +Nuxt uses [ofetch](https://github.com/unjs/ofetch) to expose globally the `$fetch` helper for making HTTP requests within your Vue app or API routes. ::ReadMore{link="/getting-started/data-fetching"} :: diff --git a/docs/content/7.migration/7.component-options.md b/docs/content/7.migration/7.component-options.md index 13abbfcb431d..a6998cff20ef 100644 --- a/docs/content/7.migration/7.component-options.md +++ b/docs/content/7.migration/7.component-options.md @@ -11,7 +11,7 @@ Nuxt 3 provides new options for [fetching data from an API](/getting-started/dat In Nuxt 2 you might use `@nuxtjs/axios` or `@nuxt/http` to fetch your data - or just the polyfilled global `fetch`. -In Nuxt 3 you can use a globally available `fetch` method that has the same API as [the Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch) or `$fetch` method which is using [unjs/ohmyfetch](https://github.com/unjs/ohmyfetch). It has a number of benefits, including: +In Nuxt 3 you can use a globally available `fetch` method that has the same API as [the Fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch) or `$fetch` method which is using [unjs/ofetch](https://github.com/unjs/ofetch). It has a number of benefits, including: 1. It will handle 'smartly' making [direct API calls](/guide/concepts/server-engine#direct-api-calls) if it's running on the server, or making a client-side call to your API if it's running on the client. (It can also handle calling third-party APIs.) diff --git a/docs/package.json b/docs/package.json index 38db4770d2ca..4300467e9474 100644 --- a/docs/package.json +++ b/docs/package.json @@ -12,8 +12,8 @@ "@nuxt-themes/website": "0.1.9", "jiti": "^1.16.0", "nuxt": "^3.0.0-rc.12", - "pathe": "^0.3.9", - "scule": "^0.3.2", + "pathe": "^1.0.0", + "scule": "^1.0.0", "untyped": "^0.5.0" }, "packageManager": "yarn@3.2.4" diff --git a/examples/composables/use-async-data/server/api/hello/[slug].ts b/examples/composables/use-async-data/server/api/hello/[slug].ts index ef0eb68aba8d..0cec73da7fdb 100644 --- a/examples/composables/use-async-data/server/api/hello/[slug].ts +++ b/examples/composables/use-async-data/server/api/hello/[slug].ts @@ -1 +1 @@ -export default defineEventHandler(event => `Hello world (${event.req.url.substr(1)}) (Generated at ${new Date().toUTCString()})`) +export default defineEventHandler(event => `Hello world (${event.node.req.url.substr(1)}) (Generated at ${new Date().toUTCString()})`) diff --git a/package.json b/package.json index 1dabf721d275..b9efd6c0853d 100644 --- a/package.json +++ b/package.json @@ -64,13 +64,13 @@ "markdownlint-cli": "^0.32.2", "nuxi": "workspace:*", "nuxt": "workspace:*", - "ohmyfetch": "^0.4.21", - "pathe": "^0.3.9", + "ofetch": "^1.0.0", + "pathe": "^1.0.0", "rimraf": "^3.0.2", "semver": "^7.3.8", "std-env": "^3.3.0", "typescript": "^4.8.4", - "ufo": "^0.8.6", + "ufo": "^1.0.0", "unbuild": "^0.9.4", "vite": "^3.2.3", "vitest": "^0.25.1", diff --git a/packages/kit/package.json b/packages/kit/package.json index 1c359112b739..01f98156aec7 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -14,22 +14,22 @@ }, "dependencies": { "@nuxt/schema": "3.0.0-rc.13", - "c12": "^0.2.13", + "c12": "^1.0.1", "consola": "^2.15.3", "defu": "^6.1.0", "globby": "^13.1.2", "hash-sum": "^2.0.0", "ignore": "^5.2.0", "jiti": "^1.16.0", - "knitwork": "^0.1.2", + "knitwork": "^1.0.0", "lodash.template": "^4.5.0", - "mlly": "^0.5.16", - "pathe": "^0.3.9", - "pkg-types": "^0.3.6", - "scule": "^0.3.2", + "mlly": "^1.0.0", + "pathe": "^1.0.0", + "pkg-types": "^1.0.1", + "scule": "^1.0.0", "semver": "^7.3.8", "unctx": "^2.0.2", - "unimport": "^0.7.0", + "unimport": "^1.0.0", "untyped": "^0.5.0" }, "devDependencies": { diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json index 8496d1edb132..03d83ad85b1e 100644 --- a/packages/nuxi/package.json +++ b/packages/nuxi/package.json @@ -24,7 +24,7 @@ "@types/flat": "^5.0.2", "@types/mri": "^1.1.1", "@types/semver": "^7", - "c12": "^0.2.13", + "c12": "^1.0.1", "chokidar": "^3.5.3", "clear": "^0.1.0", "clipboardy": "^3.0.0", @@ -35,15 +35,15 @@ "execa": "^6.1.0", "flat": "^5.0.2", "giget": "^0.1.7", - "h3": "^0.8.6", + "h3": "^1.0.1", "jiti": "^1.16.0", "listhen": "^0.3.5", - "mlly": "^0.5.16", + "mlly": "^1.0.0", "mri": "^1.2.0", - "pathe": "^0.3.9", + "pathe": "^1.0.0", "perfect-debounce": "^0.1.3", - "pkg-types": "^0.3.6", - "scule": "^0.3.2", + "pkg-types": "^1.0.1", + "scule": "^1.0.0", "semver": "^7.3.8", "unbuild": "latest" }, diff --git a/packages/nuxi/src/commands/analyze.ts b/packages/nuxi/src/commands/analyze.ts index 43b5be5d36e5..019f2689fc3d 100644 --- a/packages/nuxi/src/commands/analyze.ts +++ b/packages/nuxi/src/commands/analyze.ts @@ -39,7 +39,7 @@ export default defineNuxtCommand({ const serveFile = (filePath: string) => lazyEventHandler(async () => { const contents = await fsp.readFile(filePath, 'utf-8') - return eventHandler((event) => { event.res.end(contents) }) + return eventHandler((event) => { event.node.res.end(contents) }) }) console.warn('Do not deploy analyze results! Use `nuxi build` before deploying.') diff --git a/packages/nuxt/build.config.ts b/packages/nuxt/build.config.ts index 231e8e3538da..eaa4f0972044 100644 --- a/packages/nuxt/build.config.ts +++ b/packages/nuxt/build.config.ts @@ -17,7 +17,7 @@ export default defineBuildConfig({ dependencies: [ 'nuxi', 'vue-router', - 'ohmyfetch' + 'ofetch' ], externals: [ '@vue/reactivity', diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 1db032f8df36..315e7974b386 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -53,25 +53,25 @@ "estree-walker": "^3.0.1", "fs-extra": "^10.1.0", "globby": "^13.1.2", - "h3": "^0.8.6", + "h3": "^1.0.1", "hash-sum": "^2.0.0", "hookable": "^5.4.1", - "knitwork": "^0.1.2", + "knitwork": "^1.0.0", "magic-string": "^0.26.7", - "mlly": "^0.5.16", - "nitropack": "^0.6.1", + "mlly": "^1.0.0", + "nitropack": "^1.0.0-0", "nuxi": "3.0.0-rc.13", - "ohash": "^0.1.5", - "ohmyfetch": "^0.4.21", - "pathe": "^0.3.9", + "ohash": "^1.0.0", + "ofetch": "^1.0.0", + "pathe": "^1.0.0", "perfect-debounce": "^0.1.3", - "scule": "^0.3.2", - "strip-literal": "^0.4.2", - "ufo": "^0.8.6", + "scule": "^1.0.0", + "strip-literal": "^1.0.0", + "ufo": "^1.0.0", "ultrahtml": "^1.0.0", "unctx": "^2.0.2", "unenv": "^0.6.2", - "unimport": "^0.7.0", + "unimport": "^1.0.0", "unplugin": "^0.10.2", "untyped": "^0.5.0", "vue": "^3.2.45", diff --git a/packages/nuxt/src/app/composables/fetch.ts b/packages/nuxt/src/app/composables/fetch.ts index dc9b9be706eb..dfd2bbc8e29e 100644 --- a/packages/nuxt/src/app/composables/fetch.ts +++ b/packages/nuxt/src/app/composables/fetch.ts @@ -1,4 +1,4 @@ -import type { FetchError, FetchOptions } from 'ohmyfetch' +import type { FetchError, FetchOptions } from 'ofetch' import type { TypedInternalResponse, NitroFetchRequest } from 'nitropack' import { computed, unref, Ref, reactive } from 'vue' import type { AsyncDataOptions, _Transform, KeyOfRes, AsyncData, PickFrom } from './asyncData' diff --git a/packages/nuxt/src/app/composables/ssr.ts b/packages/nuxt/src/app/composables/ssr.ts index 53765f022d21..19de024e19ce 100644 --- a/packages/nuxt/src/app/composables/ssr.ts +++ b/packages/nuxt/src/app/composables/ssr.ts @@ -6,7 +6,7 @@ export function useRequestHeaders (include: K[]): Rec export function useRequestHeaders (): Readonly> export function useRequestHeaders (include?: any[]) { if (process.client) { return {} } - const headers = useNuxtApp().ssrContext?.event.req.headers ?? {} + const headers = useNuxtApp().ssrContext?.event.node.req.headers ?? {} if (!include) { return headers } return Object.fromEntries(include.map(key => key.toLowerCase()).filter(key => headers[key]).map(key => [key, headers[key]])) } @@ -18,9 +18,9 @@ export function useRequestEvent (nuxtApp: NuxtApp = useNuxtApp()): H3Event { export function setResponseStatus (code: number, message?: string) { const event = process.server && useRequestEvent() if (event) { - event.res.statusCode = code + event.node.res.statusCode = code if (message) { - event.res.statusMessage = message + event.node.res.statusMessage = message } } } diff --git a/packages/nuxt/src/app/entry.ts b/packages/nuxt/src/app/entry.ts index 0220465b16e9..02aea3abb3a8 100644 --- a/packages/nuxt/src/app/entry.ts +++ b/packages/nuxt/src/app/entry.ts @@ -1,6 +1,6 @@ // We set __webpack_public_path via this import with webpack builder import { createSSRApp, createApp, nextTick } from 'vue' -import { $fetch } from 'ohmyfetch' +import { $fetch } from 'ofetch' // @ts-ignore import { baseURL } from '#build/paths.mjs' import { createNuxtApp, applyPlugins, normalizePlugins, CreateOptions } from '#app' diff --git a/packages/nuxt/src/core/runtime/nitro/error.ts b/packages/nuxt/src/core/runtime/nitro/error.ts index cf423894adb5..e73fa554a6d0 100644 --- a/packages/nuxt/src/core/runtime/nitro/error.ts +++ b/packages/nuxt/src/core/runtime/nitro/error.ts @@ -10,7 +10,7 @@ export default async function errorhandler (error: H3Error, // Create an error object const errorObject = { - url: event.req.url, + url: event.node.req.url, statusCode, statusMessage, message, @@ -21,9 +21,9 @@ export default async function errorhandler (error: H3Error, } // Set response code and message - event.res.statusCode = (errorObject.statusCode !== 200 && errorObject.statusCode) as any as number || 500 + event.node.res.statusCode = (errorObject.statusCode !== 200 && errorObject.statusCode) as any as number || 500 if (errorObject.statusMessage) { - event.res.statusMessage = errorObject.statusMessage + event.node.res.statusMessage = errorObject.statusMessage } // Console output if (error.unhandled || error.fatal) { @@ -39,13 +39,13 @@ export default async function errorhandler (error: H3Error, // JSON response if (isJsonRequest(event)) { - event.res.setHeader('Content-Type', 'application/json') - event.res.end(JSON.stringify(errorObject)) + event.node.res.setHeader('Content-Type', 'application/json') + event.node.res.end(JSON.stringify(errorObject)) return } // HTML response (via SSR) - const isErrorPage = event.req.url?.startsWith('/__nuxt_error') + const isErrorPage = event.node.req.url?.startsWith('/__nuxt_error') const res = !isErrorPage ? await useNitroApp().localFetch(withQuery(joinURL(useRuntimeConfig().app.baseURL, '/__nuxt_error'), errorObject), { headers: getRequestHeaders(event) as Record, @@ -64,8 +64,8 @@ export default async function errorhandler (error: H3Error, // TODO: Support `message` in template (errorObject as any).description = errorObject.message } - event.res.setHeader('Content-Type', 'text/html;charset=UTF-8') - event.res.end(template(errorObject)) + event.node.res.setHeader('Content-Type', 'text/html;charset=UTF-8') + event.node.res.end(template(errorObject)) return } @@ -74,12 +74,12 @@ export default async function errorhandler (error: H3Error, } if (res.status && res.status !== 200) { - event.res.statusCode = res.status + event.node.res.statusCode = res.status } if (res.statusText) { - event.res.statusMessage = res.statusText + event.node.res.statusMessage = res.statusText } - event.res.end(await res.text()) + event.node.res.end(await res.text()) } diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts index 092900d521e4..89d13c69c887 100644 --- a/packages/nuxt/src/core/runtime/nitro/renderer.ts +++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts @@ -119,20 +119,20 @@ const PRERENDER_NO_SSR_ROUTES = new Set(['/index.html', '/200.html', '/404.html' export default defineRenderHandler(async (event) => { // Whether we're rendering an error page - const ssrError = event.req.url?.startsWith('/__nuxt_error') + const ssrError = event.node.req.url?.startsWith('/__nuxt_error') ? getQuery(event) as Exclude : null - if (ssrError && event.req.socket.readyState !== 'readOnly' /* direct request */) { + if (ssrError && event.node.req.socket.readyState !== 'readOnly' /* direct request */) { throw createError('Cannot directly render error page!') } - let url = ssrError?.url as string || event.req.url! + let url = ssrError?.url as string || event.node.req.url! // Whether we are rendering payload route const isRenderingPayload = PAYLOAD_URL_RE.test(url) if (isRenderingPayload) { url = url.substring(0, url.lastIndexOf('/')) || '/' - event.req.url = url + event.node.req.url = url if (process.env.prerender && PAYLOAD_CACHE!.has(url)) { return PAYLOAD_CACHE!.get(url) } @@ -148,7 +148,7 @@ export default defineRenderHandler(async (event) => { runtimeConfig: useRuntimeConfig() as NuxtSSRContext['runtimeConfig'], noSSR: !!(process.env.NUXT_NO_SSR) || - !!(event.req.headers['x-nuxt-no-ssr']) || + !!(event.node.req.headers['x-nuxt-no-ssr']) || routeOptions.ssr === false || (process.env.prerender ? PRERENDER_NO_SSR_ROUTES.has(url) : false), error: !!ssrError, @@ -247,8 +247,8 @@ export default defineRenderHandler(async (event) => { // Construct HTML response const response: RenderResponse = { body: renderHTMLDocument(htmlContext), - statusCode: event.res.statusCode, - statusMessage: event.res.statusMessage, + statusCode: event.node.res.statusCode, + statusMessage: event.node.res.statusMessage, headers: { 'Content-Type': 'text/html;charset=UTF-8', 'X-Powered-By': 'Nuxt' @@ -304,8 +304,8 @@ async function renderInlineStyles (usedModules: Set | string[]) { function renderPayloadResponse (ssrContext: NuxtSSRContext) { return { body: `export default ${devalue(splitPayload(ssrContext).payload)}`, - statusCode: ssrContext.event.res.statusCode, - statusMessage: ssrContext.event.res.statusMessage, + statusCode: ssrContext.event.node.res.statusCode, + statusMessage: ssrContext.event.node.res.statusMessage, headers: { 'content-type': 'text/javascript;charset=UTF-8', 'x-powered-by': 'Nuxt' diff --git a/packages/schema/package.json b/packages/schema/package.json index 21752708542f..bad50e5f1f7c 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -18,22 +18,22 @@ "@types/semver": "^7", "@vitejs/plugin-vue": "^3.2.0", "@vueuse/head": "~1.0.0-rc.14", - "nitropack": "^0.6.1", + "nitropack": "^1.0.0-0", "unbuild": "latest", "vite": "~3.2.3" }, "dependencies": { - "c12": "^0.2.13", + "c12": "^1.0.1", "create-require": "^1.1.1", "defu": "^6.1.0", "jiti": "^1.16.0", - "pathe": "^0.3.9", - "pkg-types": "^0.3.6", + "pathe": "^1.0.0", + "pkg-types": "^1.0.1", "postcss-import-resolver": "^2.0.0", - "scule": "^0.3.2", + "scule": "^1.0.0", "std-env": "^3.3.0", - "ufo": "^0.8.6", - "unimport": "^0.7.0", + "ufo": "^1.0.0", + "unimport": "^1.0.0", "untyped": "^0.5.0" }, "engines": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 0d56076ffdcc..eed3202a02f8 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -20,8 +20,8 @@ "execa": "^6.1.0", "get-port-please": "^2.6.1", "jiti": "^1.16.0", - "ohmyfetch": "^0.4.21", - "pathe": "^0.3.9" + "ofetch": "^1.0.0", + "pathe": "^1.0.0" }, "devDependencies": { "playwright": "^1.27.1", diff --git a/packages/test-utils/src/server.ts b/packages/test-utils/src/server.ts index 8ec3ec387043..7dd1213f9e70 100644 --- a/packages/test-utils/src/server.ts +++ b/packages/test-utils/src/server.ts @@ -1,7 +1,7 @@ import { resolve } from 'node:path' import { execa } from 'execa' import { getRandomPort, waitForPort } from 'get-port-please' -import { fetch as _fetch, $fetch as _$fetch, FetchOptions } from 'ohmyfetch' +import { fetch as _fetch, $fetch as _$fetch, FetchOptions } from 'ofetch' import * as _kit from '@nuxt/kit' import { useTestContext } from './context' diff --git a/packages/vite/package.json b/packages/vite/package.json index 002462ea5573..0187a3fa9b14 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -30,23 +30,23 @@ "esbuild": "^0.15.13", "escape-string-regexp": "^5.0.0", "estree-walker": "^3.0.1", - "externality": "^0.2.2", + "externality": "^1.0.0", "fs-extra": "^10.1.0", "get-port-please": "^2.6.1", - "h3": "^0.8.6", - "knitwork": "^0.1.2", + "h3": "^1.0.1", + "knitwork": "^1.0.0", "magic-string": "^0.26.7", - "mlly": "^0.5.16", - "ohash": "^0.1.5", - "pathe": "^0.3.9", + "mlly": "^1.0.0", + "ohash": "^1.0.0", + "pathe": "^1.0.0", "perfect-debounce": "^0.1.3", - "pkg-types": "^0.3.6", + "pkg-types": "^1.0.1", "postcss": "^8.4.19", "postcss-import": "^15.0.0", "postcss-url": "^10.1.3", "rollup": "^2.79.1", "rollup-plugin-visualizer": "^5.8.3", - "ufo": "^0.8.6", + "ufo": "^1.0.0", "unplugin": "^0.10.2", "vite": "~3.2.3", "vite-node": "^0.25.1", diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts index 6c2bf0c04d98..1615db5ceba8 100644 --- a/packages/vite/src/client.ts +++ b/packages/vite/src/client.ts @@ -112,13 +112,13 @@ export async function buildClient (ctx: ViteBuildContext) { const viteRoutes = viteServer.middlewares.stack.map(m => m.route).filter(r => r.length > 1) const viteMiddleware = defineEventHandler(async (event) => { // Workaround: vite devmiddleware modifies req.url - const originalURL = event.req.url! + const originalURL = event.node.req.url! if (!viteRoutes.some(route => originalURL.startsWith(route)) && !originalURL.startsWith(clientConfig.base!)) { - event.req.url = joinURL('/__url', originalURL) + event.node.req.url = joinURL('/__url', originalURL) } await new Promise((resolve, reject) => { - viteServer.middlewares.handle(event.req, event.res, (err: Error) => { - event.req.url = originalURL + viteServer.middlewares.handle(event.node.req, event.node.res, (err: Error) => { + event.node.req.url = originalURL return err ? reject(err) : resolve(null) }) }) diff --git a/packages/vite/src/runtime/vite-node-shared.mjs b/packages/vite/src/runtime/vite-node-shared.mjs index ebe6fe45011e..2220bcd2de6b 100644 --- a/packages/vite/src/runtime/vite-node-shared.mjs +++ b/packages/vite/src/runtime/vite-node-shared.mjs @@ -1,5 +1,5 @@ import { Agent as HTTPSAgent } from 'node:https' -import { $fetch } from 'ohmyfetch' +import { $fetch } from 'ofetch' export const viteNodeOptions = JSON.parse(process.env.NUXT_VITE_NODE_OPTIONS || '{}') diff --git a/packages/vite/src/vite-node.ts b/packages/vite/src/vite-node.ts index 42f7af2220d9..28dc74eae6ee 100644 --- a/packages/vite/src/vite-node.ts +++ b/packages/vite/src/vite-node.ts @@ -117,7 +117,7 @@ function createViteNodeApp (ctx: ViteBuildContext, invalidates: Set = ne } return eventHandler(async (event) => { - const moduleId = decodeURI(event.req.url!).substring(1) + const moduleId = decodeURI(event.node.req.url!).substring(1) if (moduleId === '/') { throw createError({ statusCode: 400 }) } diff --git a/packages/webpack/package.json b/packages/webpack/package.json index af92a3017f19..8ee35785acf6 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -34,9 +34,9 @@ "magic-string": "^0.26.7", "memfs": "^3.4.10", "mini-css-extract-plugin": "^2.6.1", - "mlly": "^0.5.16", - "ohash": "^0.1.5", - "pathe": "^0.3.9", + "mlly": "^1.0.0", + "ohash": "^1.0.0", + "pathe": "^1.0.0", "pify": "^6.1.0", "postcss": "^8.4.19", "postcss-import": "^15.0.0", @@ -44,7 +44,7 @@ "postcss-url": "^10.1.3", "style-resources-loader": "^1.5.0", "time-fix-plugin": "^2.0.7", - "ufo": "^0.8.6", + "ufo": "^1.0.0", "unplugin": "^0.10.2", "url-loader": "^4.1.1", "vue-bundle-renderer": "^0.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b3c0db84163f..e18a10bc76f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,13 +41,13 @@ importers: markdownlint-cli: ^0.32.2 nuxi: workspace:* nuxt: workspace:* - ohmyfetch: ^0.4.21 - pathe: ^0.3.9 + ofetch: ^1.0.0 + pathe: ^1.0.0 rimraf: ^3.0.2 semver: ^7.3.8 std-env: ^3.3.0 typescript: ^4.8.4 - ufo: ^0.8.6 + ufo: ^1.0.0 unbuild: ^0.9.4 vite: ^3.2.3 vitest: ^0.25.1 @@ -77,13 +77,13 @@ importers: markdownlint-cli: 0.32.2 nuxi: link:packages/nuxi nuxt: link:packages/nuxt - ohmyfetch: 0.4.21 - pathe: 0.3.9 + ofetch: 1.0.0 + pathe: 1.0.0 rimraf: 3.0.2 semver: 7.3.8 std-env: 3.3.0 typescript: 4.8.4 - ufo: 0.8.6 + ufo: 1.0.0 unbuild: 0.9.4 vite: 3.2.3_@types+node@18.11.9 vitest: 0.25.1 @@ -121,7 +121,7 @@ importers: devDependencies: '@nuxt/test-utils': link:../../../packages/test-utils nuxt: link:../../../packages/nuxt - vitest: 0.25.1 + vitest: 0.25.2 examples/app-config: specifiers: @@ -302,42 +302,42 @@ importers: '@nuxt/schema': workspace:* '@types/lodash.template': ^4 '@types/semver': ^7 - c12: ^0.2.13 + c12: ^1.0.1 consola: ^2.15.3 defu: ^6.1.0 globby: ^13.1.2 hash-sum: ^2.0.0 ignore: ^5.2.0 jiti: ^1.16.0 - knitwork: ^0.1.2 + knitwork: ^1.0.0 lodash.template: ^4.5.0 - mlly: ^0.5.16 - pathe: ^0.3.9 - pkg-types: ^0.3.6 - scule: ^0.3.2 + mlly: ^1.0.0 + pathe: ^1.0.0 + pkg-types: ^1.0.1 + scule: ^1.0.0 semver: ^7.3.8 unbuild: ^0.9.4 unctx: ^2.0.2 - unimport: ^0.7.0 + unimport: ^1.0.0 untyped: ^0.5.0 dependencies: '@nuxt/schema': link:../schema - c12: 0.2.13 + c12: 1.0.1 consola: 2.15.3 defu: 6.1.0 globby: 13.1.2 hash-sum: 2.0.0 ignore: 5.2.0 jiti: 1.16.0 - knitwork: 0.1.2 + knitwork: 1.0.0 lodash.template: 4.5.0 - mlly: 0.5.16 - pathe: 0.3.9 - pkg-types: 0.3.6 - scule: 0.3.2 + mlly: 1.0.0 + pathe: 1.0.0 + pkg-types: 1.0.1 + scule: 1.0.0 semver: 7.3.8 unctx: 2.0.2 - unimport: 0.7.0 + unimport: 1.0.0 untyped: 0.5.0 devDependencies: '@types/lodash.template': 4.5.1 @@ -352,7 +352,7 @@ importers: '@types/flat': ^5.0.2 '@types/mri': ^1.1.1 '@types/semver': ^7 - c12: ^0.2.13 + c12: ^1.0.1 chokidar: ^3.5.3 clear: ^0.1.0 clipboardy: ^3.0.0 @@ -364,15 +364,15 @@ importers: flat: ^5.0.2 fsevents: ~2.3.2 giget: ^0.1.7 - h3: ^0.8.6 + h3: ^1.0.1 jiti: ^1.16.0 listhen: ^0.3.5 - mlly: ^0.5.16 + mlly: ^1.0.0 mri: ^1.2.0 - pathe: ^0.3.9 + pathe: ^1.0.0 perfect-debounce: ^0.1.3 - pkg-types: ^0.3.6 - scule: ^0.3.2 + pkg-types: ^1.0.1 + scule: ^1.0.0 semver: ^7.3.8 unbuild: ^0.9.4 optionalDependencies: @@ -384,7 +384,7 @@ importers: '@types/flat': 5.0.2 '@types/mri': 1.1.1 '@types/semver': 7.3.12 - c12: 0.2.13 + c12: 1.0.1 chokidar: 3.5.3 clear: 0.1.0 clipboardy: 3.0.0 @@ -395,15 +395,15 @@ importers: execa: 6.1.0 flat: 5.0.2 giget: 0.1.7 - h3: 0.8.6 + h3: 1.0.1 jiti: 1.16.0 listhen: 0.3.5 - mlly: 0.5.16 + mlly: 1.0.0 mri: 1.2.0 - pathe: 0.3.9 + pathe: 1.0.0 perfect-debounce: 0.1.3 - pkg-types: 0.3.6 - scule: 0.3.2 + pkg-types: 1.0.1 + scule: 1.0.0 semver: 7.3.8 unbuild: 0.9.4 @@ -428,26 +428,26 @@ importers: estree-walker: ^3.0.1 fs-extra: ^10.1.0 globby: ^13.1.2 - h3: ^0.8.6 + h3: ^1.0.1 hash-sum: ^2.0.0 hookable: ^5.4.1 - knitwork: ^0.1.2 + knitwork: ^1.0.0 magic-string: ^0.26.7 - mlly: ^0.5.16 - nitropack: ^0.6.1 + mlly: ^1.0.0 + nitropack: ^1.0.0-0 nuxi: workspace:* - ohash: ^0.1.5 - ohmyfetch: ^0.4.21 - pathe: ^0.3.9 + ofetch: ^1.0.0 + ohash: ^1.0.0 + pathe: ^1.0.0 perfect-debounce: ^0.1.3 - scule: ^0.3.2 - strip-literal: ^0.4.2 - ufo: ^0.8.6 + scule: ^1.0.0 + strip-literal: ^1.0.0 + ufo: ^1.0.0 ultrahtml: ^1.0.0 unbuild: ^0.9.4 unctx: ^2.0.2 unenv: ^0.6.2 - unimport: ^0.7.0 + unimport: ^1.0.0 unplugin: ^0.10.2 untyped: ^0.5.0 vue: 3.2.45 @@ -473,25 +473,25 @@ importers: estree-walker: 3.0.1 fs-extra: 10.1.0 globby: 13.1.2 - h3: 0.8.6 + h3: 1.0.1 hash-sum: 2.0.0 hookable: 5.4.1 - knitwork: 0.1.2 + knitwork: 1.0.0 magic-string: 0.26.7 - mlly: 0.5.16 - nitropack: 0.6.1 + mlly: 1.0.0 + nitropack: 1.0.0-0 nuxi: link:../nuxi - ohash: 0.1.5 - ohmyfetch: 0.4.21 - pathe: 0.3.9 + ofetch: 1.0.0 + ohash: 1.0.0 + pathe: 1.0.0 perfect-debounce: 0.1.3 - scule: 0.3.2 - strip-literal: 0.4.2 - ufo: 0.8.6 + scule: 1.0.0 + strip-literal: 1.0.0 + ufo: 1.0.0 ultrahtml: 1.0.0 unctx: 2.0.2 unenv: 0.6.2 - unimport: 0.7.0 + unimport: 1.0.0 unplugin: 0.10.2 untyped: 0.5.0 vue: 3.2.45 @@ -510,40 +510,40 @@ importers: '@types/semver': ^7 '@vitejs/plugin-vue': ^3.2.0 '@vueuse/head': ~1.0.0-rc.14 - c12: ^0.2.13 + c12: ^1.0.1 create-require: ^1.1.1 defu: ^6.1.0 jiti: ^1.16.0 - nitropack: ^0.6.1 - pathe: ^0.3.9 - pkg-types: ^0.3.6 + nitropack: ^1.0.0-0 + pathe: ^1.0.0 + pkg-types: ^1.0.1 postcss-import-resolver: ^2.0.0 - scule: ^0.3.2 + scule: ^1.0.0 std-env: ^3.3.0 - ufo: ^0.8.6 + ufo: ^1.0.0 unbuild: ^0.9.4 - unimport: ^0.7.0 + unimport: ^1.0.0 untyped: ^0.5.0 vite: ^3.2.3 dependencies: - c12: 0.2.13 + c12: 1.0.1 create-require: 1.1.1 defu: 6.1.0 jiti: 1.16.0 - pathe: 0.3.9 - pkg-types: 0.3.6 + pathe: 1.0.0 + pkg-types: 1.0.1 postcss-import-resolver: 2.0.0 - scule: 0.3.2 + scule: 1.0.0 std-env: 3.3.0 - ufo: 0.8.6 - unimport: 0.7.0 + ufo: 1.0.0 + unimport: 1.0.0 untyped: 0.5.0 devDependencies: '@types/lodash.template': 4.5.1 '@types/semver': 7.3.12 '@vitejs/plugin-vue': 3.2.0_vite@3.2.3 '@vueuse/head': 1.0.0-rc.14 - nitropack: 0.6.1 + nitropack: 1.0.0-0 unbuild: 0.9.4 vite: 3.2.3 @@ -556,8 +556,8 @@ importers: execa: ^6.1.0 get-port-please: ^2.6.1 jiti: ^1.16.0 - ohmyfetch: ^0.4.21 - pathe: ^0.3.9 + ofetch: ^1.0.0 + pathe: ^1.0.0 playwright: ^1.27.1 unbuild: ^0.9.4 vitest: ^0.25.1 @@ -569,8 +569,8 @@ importers: execa: 6.1.0 get-port-please: 2.6.1 jiti: 1.16.0 - ohmyfetch: 0.4.21 - pathe: 0.3.9 + ofetch: 1.0.0 + pathe: 1.0.0 devDependencies: playwright: 1.27.1 unbuild: 0.9.4 @@ -591,23 +591,23 @@ importers: esbuild: ^0.15.13 escape-string-regexp: ^5.0.0 estree-walker: ^3.0.1 - externality: ^0.2.2 + externality: ^1.0.0 fs-extra: ^10.1.0 get-port-please: ^2.6.1 - h3: ^0.8.6 - knitwork: ^0.1.2 + h3: ^1.0.1 + knitwork: ^1.0.0 magic-string: ^0.26.7 - mlly: ^0.5.16 - ohash: ^0.1.5 - pathe: ^0.3.9 + mlly: ^1.0.0 + ohash: ^1.0.0 + pathe: ^1.0.0 perfect-debounce: ^0.1.3 - pkg-types: ^0.3.6 + pkg-types: ^1.0.1 postcss: ^8.4.19 postcss-import: ^15.0.0 postcss-url: ^10.1.3 rollup: ^2.79.1 rollup-plugin-visualizer: ^5.8.3 - ufo: ^0.8.6 + ufo: ^1.0.0 unbuild: ^0.9.4 unplugin: ^0.10.2 vite: ^3.2.3 @@ -627,23 +627,23 @@ importers: esbuild: 0.15.13 escape-string-regexp: 5.0.0 estree-walker: 3.0.1 - externality: 0.2.2 + externality: 1.0.0 fs-extra: 10.1.0 get-port-please: 2.6.1 - h3: 0.8.6 - knitwork: 0.1.2 + h3: 1.0.1 + knitwork: 1.0.0 magic-string: 0.26.7 - mlly: 0.5.16 - ohash: 0.1.5 - pathe: 0.3.9 + mlly: 1.0.0 + ohash: 1.0.0 + pathe: 1.0.0 perfect-debounce: 0.1.3 - pkg-types: 0.3.6 + pkg-types: 1.0.1 postcss: 8.4.19 postcss-import: 15.0.0_postcss@8.4.19 postcss-url: 10.1.3_postcss@8.4.19 rollup: 2.79.1 rollup-plugin-visualizer: 5.8.3_rollup@2.79.1 - ufo: 0.8.6 + ufo: 1.0.0 unplugin: 0.10.2 vite: 3.2.3 vite-node: 0.25.1 @@ -682,9 +682,9 @@ importers: magic-string: ^0.26.7 memfs: ^3.4.10 mini-css-extract-plugin: ^2.6.1 - mlly: ^0.5.16 - ohash: ^0.1.5 - pathe: ^0.3.9 + mlly: ^1.0.0 + ohash: ^1.0.0 + pathe: ^1.0.0 pify: ^6.1.0 postcss: ^8.4.19 postcss-import: ^15.0.0 @@ -692,7 +692,7 @@ importers: postcss-url: ^10.1.3 style-resources-loader: ^1.5.0 time-fix-plugin: ^2.0.7 - ufo: ^0.8.6 + ufo: ^1.0.0 unbuild: ^0.9.4 unplugin: ^0.10.2 url-loader: ^4.1.1 @@ -724,9 +724,9 @@ importers: magic-string: 0.26.7 memfs: 3.4.10 mini-css-extract-plugin: 2.6.1_webpack@5.75.0 - mlly: 0.5.16 - ohash: 0.1.5 - pathe: 0.3.9 + mlly: 1.0.0 + ohash: 1.0.0 + pathe: 1.0.0 pify: 6.1.0 postcss: 8.4.19 postcss-import: 15.0.0_postcss@8.4.19 @@ -734,7 +734,7 @@ importers: postcss-url: 10.1.3_postcss@8.4.19 style-resources-loader: 1.5.0_webpack@5.75.0 time-fix-plugin: 2.0.7_webpack@5.75.0 - ufo: 0.8.6 + ufo: 1.0.0 unplugin: 0.10.2 url-loader: 4.1.1_p5dl6emkcwslbw72e37w4ug7em vue-bundle-renderer: 0.5.0 @@ -1137,6 +1137,14 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm/0.15.14: + resolution: {integrity: sha512-+Rb20XXxRGisNu2WmNKk+scpanb7nL5yhuI1KR9wQFiC43ddPj/V1fmNyzlFC9bKiG4mYzxW7egtoHVcynr+OA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + /@esbuild/linux-loong64/0.14.54: resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==} engines: {node: '>=12'} @@ -1163,6 +1171,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64/0.15.14: + resolution: {integrity: sha512-eQi9rosGNVQFJyJWV0HCA5WZae/qWIQME7s8/j8DMvnylfBv62Pbu+zJ2eUDqNf2O4u3WB+OEXyfkpBoe194sg==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2293,7 +2309,7 @@ packages: hasBin: true dependencies: '@mapbox/node-pre-gyp': 1.0.10 - acorn: 8.8.0 + acorn: 8.8.1 async-sema: 3.1.1 bindings: 1.5.0 estree-walker: 2.0.2 @@ -2795,12 +2811,12 @@ packages: dependencies: acorn: 8.8.0 - /acorn-jsx/5.3.2_acorn@8.8.0: + /acorn-jsx/5.3.2_acorn@8.8.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.8.0 + acorn: 8.8.1 dev: true /acorn-walk/8.2.0: @@ -2812,6 +2828,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + /acorn/8.8.1: + resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==} + engines: {node: '>=0.4.0'} + hasBin: true + /agent-base/6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -3143,14 +3164,27 @@ packages: /c12/0.2.13: resolution: {integrity: sha512-wJL0/knDbqM/3moLb+8Xd+w3JdkggkIIhiNBkxZ1mWlskKC/vajb85wM3UPg/D9nK6RbI1NgaVTg6AeXBVbknA==} dependencies: - defu: 6.1.0 - dotenv: 16.0.2 + defu: 6.1.1 + dotenv: 16.0.3 gittar: 0.1.1 jiti: 1.16.0 mlly: 0.5.16 pathe: 0.3.9 pkg-types: 0.3.6 rc9: 1.2.2 + dev: true + + /c12/1.0.1: + resolution: {integrity: sha512-EN9Rqix2q9X3PseFkUvRFZ/0fvncF35ZR5nykLDwv4Ml/Q1WYPLkcdqlrczFll2G9t4qmxgM4my3EF3IrRGl5Q==} + dependencies: + defu: 6.1.1 + dotenv: 16.0.3 + gittar: 0.1.1 + jiti: 1.16.0 + mlly: 1.0.0 + pathe: 1.0.0 + pkg-types: 1.0.1 + rc9: 2.0.0 /cac/6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} @@ -3760,6 +3794,9 @@ packages: /defu/6.1.0: resolution: {integrity: sha512-pOFYRTIhoKujrmbTRhcW5lYQLBXw/dlTwfI8IguF1QCDJOcJzNH1w+YFjxqy6BAuJrClTy6MUE8q+oKJ2FLsIw==} + /defu/6.1.1: + resolution: {integrity: sha512-aA964RUCsBt0FGoNIlA3uFgo2hO+WWC0fiC6DBps/0SFzkKcYoM/3CzVLIa5xSsrFjdioMdYgAIbwo80qp2MoA==} + /delayed-stream/1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} @@ -3779,6 +3816,9 @@ packages: /destr/1.2.0: resolution: {integrity: sha512-JG+cG4ZPB1L27sl2C2URg8MIOmIUtTbE5wEx02BpmrTCqg/hXxFKXsYsnODl5PdpqNRaS1KQGUQ56V8jk8XpYQ==} + /destr/1.2.1: + resolution: {integrity: sha512-ud8w0qMLlci6iFG7CNgeRr8OcbUWMsbfjtWft1eJ5Luqrz/M8Ebqk/KCzne8rKUlIQWWfLv0wD6QHrqOf4GshA==} + /destroy/1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} @@ -3867,14 +3907,9 @@ packages: dependencies: type-fest: 2.19.0 - /dotenv/16.0.2: - resolution: {integrity: sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==} - engines: {node: '>=12'} - /dotenv/16.0.3: resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==} engines: {node: '>=12'} - dev: false /duplexer/0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -4037,6 +4072,14 @@ packages: requiresBuild: true optional: true + /esbuild-android-64/0.15.14: + resolution: {integrity: sha512-HuilVIb4rk9abT4U6bcFdU35UHOzcWVGLSjEmC58OVr96q5UiRqzDtWjPlCMugjhgUGKEs8Zf4ueIvYbOStbIg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + optional: true + /esbuild-android-arm64/0.14.54: resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} @@ -4063,6 +4106,14 @@ packages: requiresBuild: true optional: true + /esbuild-android-arm64/0.15.14: + resolution: {integrity: sha512-/QnxRVxsR2Vtf3XottAHj7hENAMW2wCs6S+OZcAbc/8nlhbAL/bCQRCVD78VtI5mdwqWkVi3wMqM94kScQCgqg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + /esbuild-darwin-64/0.14.54: resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} @@ -4089,6 +4140,14 @@ packages: requiresBuild: true optional: true + /esbuild-darwin-64/0.15.14: + resolution: {integrity: sha512-ToNuf1uifu8hhwWvoZJGCdLIX/1zpo8cOGnT0XAhDQXiKOKYaotVNx7pOVB1f+wHoWwTLInrOmh3EmA7Fd+8Vg==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + /esbuild-darwin-arm64/0.14.54: resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} @@ -4115,6 +4174,14 @@ packages: requiresBuild: true optional: true + /esbuild-darwin-arm64/0.15.14: + resolution: {integrity: sha512-KgGP+y77GszfYJgceO0Wi/PiRtYo5y2Xo9rhBUpxTPaBgWDJ14gqYN0+NMbu+qC2fykxXaipHxN4Scaj9tUS1A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + /esbuild-freebsd-64/0.14.54: resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} @@ -4141,6 +4208,14 @@ packages: requiresBuild: true optional: true + /esbuild-freebsd-64/0.15.14: + resolution: {integrity: sha512-xr0E2n5lyWw3uFSwwUXHc0EcaBDtsal/iIfLioflHdhAe10KSctV978Te7YsfnsMKzcoGeS366+tqbCXdqDHQA==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + optional: true + /esbuild-freebsd-arm64/0.14.54: resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} @@ -4167,6 +4242,14 @@ packages: requiresBuild: true optional: true + /esbuild-freebsd-arm64/0.15.14: + resolution: {integrity: sha512-8XH96sOQ4b1LhMlO10eEWOjEngmZ2oyw3pW4o8kvBcpF6pULr56eeYVP5radtgw54g3T8nKHDHYEI5AItvskZg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + optional: true + /esbuild-linux-32/0.14.54: resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} @@ -4193,6 +4276,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-32/0.15.14: + resolution: {integrity: sha512-6ssnvwaTAi8AzKN8By2V0nS+WF5jTP7SfuK6sStGnDP7MCJo/4zHgM9oE1eQTS2jPmo3D673rckuCzRlig+HMA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-64/0.14.54: resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} @@ -4219,6 +4310,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-64/0.15.14: + resolution: {integrity: sha512-ONySx3U0wAJOJuxGUlXBWxVKFVpWv88JEv0NZ6NlHknmDd1yCbf4AEdClSgLrqKQDXYywmw4gYDvdLsS6z0hcw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-arm/0.14.54: resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} @@ -4245,6 +4344,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-arm/0.15.14: + resolution: {integrity: sha512-D2LImAIV3QzL7lHURyCHBkycVFbKwkDb1XEUWan+2fb4qfW7qAeUtul7ZIcIwFKZgPcl+6gKZmvLgPSj26RQ2Q==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-arm64/0.14.54: resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} @@ -4271,6 +4378,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-arm64/0.15.14: + resolution: {integrity: sha512-kle2Ov6a1e5AjlHlMQl1e+c4myGTeggrRzArQFmWp6O6JoqqB9hT+B28EW4tjFWgV/NxUq46pWYpgaWXsXRPAg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-mips64le/0.14.54: resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} @@ -4297,6 +4412,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-mips64le/0.15.14: + resolution: {integrity: sha512-FVdMYIzOLXUq+OE7XYKesuEAqZhmAIV6qOoYahvUp93oXy0MOVTP370ECbPfGXXUdlvc0TNgkJa3YhEwyZ6MRA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-ppc64le/0.14.54: resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} @@ -4323,6 +4446,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-ppc64le/0.15.14: + resolution: {integrity: sha512-2NzH+iuzMDA+jjtPjuIz/OhRDf8tzbQ1tRZJI//aT25o1HKc0reMMXxKIYq/8nSHXiJSnYV4ODzTiv45s+h73w==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-riscv64/0.14.54: resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} @@ -4349,6 +4480,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-riscv64/0.15.14: + resolution: {integrity: sha512-VqxvutZNlQxmUNS7Ac+aczttLEoHBJ9e3OYGqnULrfipRvG97qLrAv9EUY9iSrRKBqeEbSvS9bSfstZqwz0T4Q==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + optional: true + /esbuild-linux-s390x/0.14.54: resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} @@ -4375,6 +4514,14 @@ packages: requiresBuild: true optional: true + /esbuild-linux-s390x/0.15.14: + resolution: {integrity: sha512-+KVHEUshX5n6VP6Vp/AKv9fZIl5kr2ph8EUFmQUJnDpHwcfTSn2AQgYYm0HTBR2Mr4d0Wlr0FxF/Cs5pbFgiOw==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + optional: true + /esbuild-loader/2.20.0_webpack@5.75.0: resolution: {integrity: sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==} peerDependencies: @@ -4415,6 +4562,14 @@ packages: requiresBuild: true optional: true + /esbuild-netbsd-64/0.15.14: + resolution: {integrity: sha512-6D/dr17piEgevIm1xJfZP2SjB9Z+g8ERhNnBdlZPBWZl+KSPUKLGF13AbvC+nzGh8IxOH2TyTIdRMvKMP0nEzQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + optional: true + /esbuild-openbsd-64/0.14.54: resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} @@ -4441,6 +4596,14 @@ packages: requiresBuild: true optional: true + /esbuild-openbsd-64/0.15.14: + resolution: {integrity: sha512-rREQBIlMibBetgr2E9Lywt2Qxv2ZdpmYahR4IUlAQ1Efv/A5gYdO0/VIN3iowDbCNTLxp0bb57Vf0LFcffD6kA==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + optional: true + /esbuild-sunos-64/0.14.54: resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} @@ -4467,6 +4630,14 @@ packages: requiresBuild: true optional: true + /esbuild-sunos-64/0.15.14: + resolution: {integrity: sha512-DNVjSp/BY4IfwtdUAvWGIDaIjJXY5KI4uD82+15v6k/w7px9dnaDaJJ2R6Mu+KCgr5oklmFc0KjBjh311Gxl9Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + optional: true + /esbuild-windows-32/0.14.54: resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} @@ -4493,6 +4664,14 @@ packages: requiresBuild: true optional: true + /esbuild-windows-32/0.15.14: + resolution: {integrity: sha512-pHBWrcA+/oLgvViuG9FO3kNPO635gkoVrRQwe6ZY1S0jdET07xe2toUvQoJQ8KT3/OkxqUasIty5hpuKFLD+eg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + /esbuild-windows-64/0.14.54: resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} @@ -4519,6 +4698,14 @@ packages: requiresBuild: true optional: true + /esbuild-windows-64/0.15.14: + resolution: {integrity: sha512-CszIGQVk/P8FOS5UgAH4hKc9zOaFo69fe+k1rqgBHx3CSK3Opyk5lwYriIamaWOVjBt7IwEP6NALz+tkVWdFog==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /esbuild-windows-arm64/0.14.54: resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} @@ -4545,6 +4732,14 @@ packages: requiresBuild: true optional: true + /esbuild-windows-arm64/0.15.14: + resolution: {integrity: sha512-KW9W4psdZceaS9A7Jsgl4WialOznSURvqX/oHZk3gOP7KbjtHLSsnmSvNdzagGJfxbAe30UVGXRe8q8nDsOSQw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + /esbuild/0.14.54: resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} @@ -4633,6 +4828,35 @@ packages: esbuild-windows-64: 0.15.13 esbuild-windows-arm64: 0.15.13 + /esbuild/0.15.14: + resolution: {integrity: sha512-pJN8j42fvWLFWwSMG4luuupl2Me7mxciUOsMegKvwCmhEbJ2covUdFnihxm0FMIBV+cbwbtMoHgMCCI+pj1btQ==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.15.14 + '@esbuild/linux-loong64': 0.15.14 + esbuild-android-64: 0.15.14 + esbuild-android-arm64: 0.15.14 + esbuild-darwin-64: 0.15.14 + esbuild-darwin-arm64: 0.15.14 + esbuild-freebsd-64: 0.15.14 + esbuild-freebsd-arm64: 0.15.14 + esbuild-linux-32: 0.15.14 + esbuild-linux-64: 0.15.14 + esbuild-linux-arm: 0.15.14 + esbuild-linux-arm64: 0.15.14 + esbuild-linux-mips64le: 0.15.14 + esbuild-linux-ppc64le: 0.15.14 + esbuild-linux-riscv64: 0.15.14 + esbuild-linux-s390x: 0.15.14 + esbuild-netbsd-64: 0.15.14 + esbuild-openbsd-64: 0.15.14 + esbuild-sunos-64: 0.15.14 + esbuild-windows-32: 0.15.14 + esbuild-windows-64: 0.15.14 + esbuild-windows-arm64: 0.15.14 + /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -4978,8 +5202,8 @@ packages: resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.8.0 - acorn-jsx: 5.3.2_acorn@8.8.0 + acorn: 8.8.1 + acorn-jsx: 5.3.2_acorn@8.8.1 eslint-visitor-keys: 3.3.0 dev: true @@ -5075,13 +5299,13 @@ packages: tmp: 0.0.33 dev: false - /externality/0.2.2: - resolution: {integrity: sha512-seYffJRrRVI3qrCC0asf2mWAvQ/U0jZA+eECylqIxCDHzBs/W+ZeEv3D0bsjNeEewIYZKfELyY96mRactx8C4w==} + /externality/1.0.0: + resolution: {integrity: sha512-MAU9ci3XdpqOX1aoIoyL2DMzW97P8LYeJxIUkfXhOfsrkH4KLHFaYDwKN0B2l6tqedVJWiTIJtWmxmZfa05vOQ==} dependencies: enhanced-resolve: 5.10.0 - mlly: 0.5.16 - pathe: 0.3.9 - ufo: 0.8.6 + mlly: 1.0.0 + pathe: 1.0.0 + ufo: 1.0.0 dev: false /extsprintf/1.3.0: @@ -5512,13 +5736,13 @@ packages: dependencies: duplexer: 0.1.2 - /h3/0.8.6: - resolution: {integrity: sha512-CSWNOKa3QGo67rFU2PhbFTp0uPJtilNji2Z0pMiSRQt3+OkIW0u3E1WMJqIycLqaTgb9JyFqH/S4mcTyyGtvyQ==} + /h3/1.0.1: + resolution: {integrity: sha512-gDCGpRvjchZW2JBlTqbJ9IOs+mdkXXuwSQkSye+jubHAv/UhdamKqoQvd4RFgyBNjHSId8Y+b10UdTcPlP/V+w==} dependencies: cookie-es: 0.5.0 - destr: 1.2.0 - radix3: 0.2.1 - ufo: 0.8.6 + destr: 1.2.1 + radix3: 1.0.0 + ufo: 1.0.0 /har-schema/2.0.0: resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} @@ -5582,6 +5806,9 @@ packages: hasBin: true dev: true + /hookable/1.0.0: + resolution: {integrity: sha512-l0TZBwD/70hYs79OEakoEONSJOEVBUHNR2aLSswS1LlnQRH8i2ZOu/Dr1OJzVbmZSi4PUAaDjQJnncQ7Ye3/8Q==} + /hookable/5.4.1: resolution: {integrity: sha512-i808BglQ1OuSIcgPSZoWsDapCMLXKe5wLS6XZvIXpaBWdWLUZARM8vOLayu6cXewj5TSbaZaMzKnq+pRnfscEQ==} @@ -5746,8 +5973,8 @@ packages: side-channel: 1.0.4 dev: true - /ioredis/5.2.3: - resolution: {integrity: sha512-gQNcMF23/NpvjCaa1b5YycUyQJ9rBNH2xP94LWinNpodMWVUPP5Ai/xXANn/SM7gfIvI62B5CCvZxhg5pOgyMw==} + /ioredis/5.2.4: + resolution: {integrity: sha512-qIpuAEt32lZJQ0XyrloCRdlEdUUNGG9i0UOk6zgzK6igyudNWqEBxfH6OlbnOOoBBvr1WB02mm8fR55CnikRng==} engines: {node: '>=12.22.0'} dependencies: '@ioredis/commands': 1.2.0 @@ -6087,8 +6314,8 @@ packages: resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==} engines: {node: '>= 8'} - /knitwork/0.1.2: - resolution: {integrity: sha512-2ekmY2S/VB3YGVhrIFadyJQpkjMFSf48tsXCnA+kjs4FEQIT+5FLyOF0No/X58z/2E/VaMyeJfukRoVT4gMsfQ==} + /knitwork/1.0.0: + resolution: {integrity: sha512-dWl0Dbjm6Xm+kDxhPQJsCBTxrJzuGl0aP9rhr+TG8D3l+GL90N8O8lYUi7dTSAN2uuDqCtNgb6aEuQH5wsiV8Q==} /kolorist/1.6.0: resolution: {integrity: sha512-dLkz37Ab97HWMx9KTes3Tbi3D1ln9fCAy2zr2YVExJasDRPGRaKcoE4fycWNtnCAJfjFqe0cnY+f8KT2JePEXQ==} @@ -6132,6 +6359,19 @@ packages: ip-regex: 5.0.0 node-forge: 1.3.1 ufo: 0.8.6 + dev: true + + /listhen/1.0.0: + resolution: {integrity: sha512-frdf7TVqT/JSHzRjEuo/vWIgbBYzEuY3oeTq8Yv1XkQVTKDPs2M4yotXICqYZYj2QxbkqKssSo8Wa6QCtBnFhg==} + dependencies: + clipboardy: 3.0.0 + colorette: 2.0.19 + defu: 6.1.1 + get-port-please: 2.6.1 + http-shutdown: 1.2.2 + ip-regex: 5.0.0 + node-forge: 1.3.1 + ufo: 1.0.0 /loader-runner/4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} @@ -6510,11 +6750,19 @@ packages: /mlly/0.5.16: resolution: {integrity: sha512-LaJ8yuh4v0zEmge/g3c7jjFlhoCPfQn6RCjXgm9A0Qiuochq4BcuOxVfWmdnCoLTlg2MV+hqhOek+W2OhG0Lwg==} dependencies: - acorn: 8.8.0 + acorn: 8.8.1 pathe: 0.3.9 pkg-types: 0.3.6 ufo: 0.8.6 + /mlly/1.0.0: + resolution: {integrity: sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==} + dependencies: + acorn: 8.8.1 + pathe: 1.0.0 + pkg-types: 1.0.1 + ufo: 1.0.0 + /mri/1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -6558,9 +6806,9 @@ packages: /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack/0.6.1: - resolution: {integrity: sha512-BQQTRMvz/PtWg4v9O9C7FTm6SwtxUXa7n6rxe1vYwPNphsVRD8LzSSTB8iFKCgkQssrwunYF/k/Bpg2IQ7ZsmA==} - engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0} + /nitropack/1.0.0-0: + resolution: {integrity: sha512-DlaHkN6o4nxUd1XV444UmlXDa85ZwzWpEAgn1aaKS8cVmymgcSIGxcvtpf0sAcCdmMRKBsYWSnsXy+k0o2jgSA==} + engines: {node: ^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} hasBin: true dependencies: '@cloudflare/kv-asset-handler': 0.2.0 @@ -6575,52 +6823,52 @@ packages: '@rollup/pluginutils': 5.0.2_rollup@2.79.1 '@vercel/nft': 0.22.1 archiver: 5.3.1 - c12: 0.2.13 + c12: 1.0.1 chalk: 5.1.2 chokidar: 3.5.3 consola: 2.15.3 cookie-es: 0.5.0 - defu: 6.1.0 - destr: 1.2.0 + defu: 6.1.1 + destr: 1.2.1 dot-prop: 7.2.0 - esbuild: 0.15.13 + esbuild: 0.15.14 escape-string-regexp: 5.0.0 etag: 1.8.1 fs-extra: 10.1.0 globby: 13.1.2 gzip-size: 7.0.0 - h3: 0.8.6 - hookable: 5.4.1 + h3: 1.0.1 + hookable: 1.0.0 http-proxy: 1.18.1 is-primitive: 3.0.1 jiti: 1.16.0 klona: 2.0.5 - knitwork: 0.1.2 - listhen: 0.3.5 + knitwork: 1.0.0 + listhen: 1.0.0 mime: 3.0.0 - mlly: 0.5.16 + mlly: 1.0.0 mri: 1.2.0 - node-fetch-native: 0.1.8 - ohash: 0.1.5 - ohmyfetch: 0.4.21 - pathe: 0.3.9 + node-fetch-native: 1.0.1 + ofetch: 1.0.0 + ohash: 1.0.0 + pathe: 1.0.0 perfect-debounce: 0.1.3 - pkg-types: 0.3.6 + pkg-types: 1.0.1 pretty-bytes: 6.0.0 - radix3: 0.2.1 + radix3: 1.0.0 rollup: 2.79.1 rollup-plugin-terser: 7.0.2_rollup@2.79.1 rollup-plugin-visualizer: 5.8.3_rollup@2.79.1 - scule: 0.3.2 + scule: 1.0.0 semver: 7.3.8 serve-placeholder: 2.0.1 serve-static: 1.15.0 source-map-support: 0.5.21 - std-env: 3.3.0 - ufo: 0.8.6 - unenv: 0.6.2 - unimport: 0.7.0_rollup@2.79.1 - unstorage: 0.6.0 + std-env: 3.3.1 + ufo: 1.0.0 + unenv: 1.0.0 + unimport: 1.0.0_rollup@2.79.1 + unstorage: 1.0.1 transitivePeerDependencies: - bufferutil - debug @@ -6643,6 +6891,9 @@ packages: /node-fetch-native/0.1.8: resolution: {integrity: sha512-ZNaury9r0NxaT2oL65GvdGDy+5PlSaHTovT6JV5tOW07k1TQmgC0olZETa4C9KZg0+6zBr99ctTYa3Utqj9P/Q==} + /node-fetch-native/1.0.1: + resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==} + /node-fetch/2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -6775,8 +7026,15 @@ packages: es-abstract: 1.20.3 dev: true - /ohash/0.1.5: - resolution: {integrity: sha512-qynly1AFIpGWEAW88p6DhMNqok/Swb52/KsiU+Toi7er058Ptvno3tkfTML6wYcEgFgp2GsUziW4Nqn62ciuyw==} + /ofetch/1.0.0: + resolution: {integrity: sha512-d40aof8czZFSQKJa4+F7Ch3UC5D631cK1TTUoK+iNEut9NoiCL+u0vykl/puYVUS2df4tIQl5upQcolIcEzQjQ==} + dependencies: + destr: 1.2.1 + node-fetch-native: 1.0.1 + ufo: 1.0.0 + + /ohash/1.0.0: + resolution: {integrity: sha512-kxSyzq6tt+6EE/xCnD1XaFhCCjUNUaz3X30rJp6mnjGLXAAvuPFqohMdv0aScWzajR45C29HyBaXZ8jXBwnh9A==} /ohmyfetch/0.4.21: resolution: {integrity: sha512-VG7f/JRvqvBOYvL0tHyEIEG7XHWm7OqIfAs6/HqwWwDfjiJ1g0huIpe5sFEmyb+7hpFa1EGNH2aERWR72tlClw==} @@ -6956,6 +7214,9 @@ packages: /pathe/0.3.9: resolution: {integrity: sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==} + /pathe/1.0.0: + resolution: {integrity: sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==} + /pathval/1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} dev: true @@ -6984,20 +7245,19 @@ packages: engines: {node: '>=14.16'} dev: false - /pkg-types/0.3.5: - resolution: {integrity: sha512-VkxCBFVgQhNHYk9subx+HOhZ4jzynH11ah63LZsprTKwPCWG9pfWBlkElWFbvkP9BVR0dP1jS9xPdhaHQNK74Q==} + /pkg-types/0.3.6: + resolution: {integrity: sha512-uQZutkkh6axl1GxDm5/+8ivVdwuJ5pyDGqJeSiIWIUWIqYiK3p9QKozN/Rv6eVvFoeSWkN1uoYeSDBwwBJBtbg==} dependencies: jsonc-parser: 3.2.0 mlly: 0.5.16 pathe: 0.3.9 - dev: true - /pkg-types/0.3.6: - resolution: {integrity: sha512-uQZutkkh6axl1GxDm5/+8ivVdwuJ5pyDGqJeSiIWIUWIqYiK3p9QKozN/Rv6eVvFoeSWkN1uoYeSDBwwBJBtbg==} + /pkg-types/1.0.1: + resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==} dependencies: jsonc-parser: 3.2.0 - mlly: 0.5.16 - pathe: 0.3.9 + mlly: 1.0.0 + pathe: 1.0.0 /playwright-core/1.27.1: resolution: {integrity: sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==} @@ -7427,8 +7687,8 @@ packages: /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - /radix3/0.2.1: - resolution: {integrity: sha512-FnhArTl5Tq7dodiLeSPKrDUyCQuJqEncP8cKdyy399g8F/cz7GH6FmzA3Rkosu2IZMkpswFFwXfb2ERSiL06pg==} + /radix3/1.0.0: + resolution: {integrity: sha512-6n3AEXth91ASapMVKiEh2wrbFJmI+NBilrWE0AbiGgfm0xet0QXC8+a3K19r1UVYjUjctUgB053c3V/J6V0kCQ==} /randombytes/2.1.0: resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==} @@ -7446,6 +7706,13 @@ packages: destr: 1.2.0 flat: 5.0.2 + /rc9/2.0.0: + resolution: {integrity: sha512-yVeYJHOpJLOhs3V6RKwz7RPPwPurrx3JjwK264sPgvo/lFdhuUrLien7iSvAO6STVkN0gSMk/MehQNHQhflqZw==} + dependencies: + defu: 6.1.1 + destr: 1.2.1 + flat: 5.0.2 + /read-cache/1.0.0: resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==} dependencies: @@ -7740,6 +8007,9 @@ packages: /scule/0.3.2: resolution: {integrity: sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g==} + /scule/1.0.0: + resolution: {integrity: sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==} + /seenreq/3.0.0: resolution: {integrity: sha512-wSe7hb83TKkyweL8Jq5a1xuStmqfwxiJn2SXjA/Wns42aUJjlWzPzj/jWaomOCRY5ZpIRkiyh/+5pNz/20363A==} dependencies: @@ -7795,7 +8065,7 @@ packages: /serve-placeholder/2.0.1: resolution: {integrity: sha512-rUzLlXk4uPFnbEaIz3SW8VISTxMuONas88nYWjAWaM2W9VDbt9tyFOr3lq8RhVOFrT3XISoBw8vni5una8qMnQ==} dependencies: - defu: 6.1.0 + defu: 6.1.1 /serve-static/1.15.0: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} @@ -7943,6 +8213,9 @@ packages: /std-env/3.3.0: resolution: {integrity: sha512-cNNS+VYsXIs5gI6gJipO4qZ8YYT274JHvNnQ1/R/x8Q8mdP0qj0zoMchRXmBNPqp/0eOEhX+3g7g6Fgb7meLIQ==} + /std-env/3.3.1: + resolution: {integrity: sha512-3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q==} + /streamsearch/1.1.0: resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} engines: {node: '>=10.0.0'} @@ -8031,7 +8304,13 @@ packages: /strip-literal/0.4.2: resolution: {integrity: sha512-pv48ybn4iE1O9RLgCAN0iU4Xv7RlBTiit6DKmMiErbs9x1wH6vXBs45tWc0H5wUIF6TLTrKweqkmYF/iraQKNw==} dependencies: - acorn: 8.8.0 + acorn: 8.8.1 + dev: true + + /strip-literal/1.0.0: + resolution: {integrity: sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==} + dependencies: + acorn: 8.8.1 /style-resources-loader/1.5.0_webpack@5.75.0: resolution: {integrity: sha512-fIfyvQ+uvXaCBGGAgfh+9v46ARQB1AWdaop2RpQw0PBVuROsTBqGvx8dj0kxwjGOAyq3vepe4AOK3M6+Q/q2jw==} @@ -8178,7 +8457,7 @@ packages: hasBin: true dependencies: '@jridgewell/source-map': 0.3.2 - acorn: 8.8.0 + acorn: 8.8.1 commander: 2.20.3 source-map-support: 0.5.21 @@ -8368,6 +8647,9 @@ packages: /ufo/0.8.6: resolution: {integrity: sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw==} + /ufo/1.0.0: + resolution: {integrity: sha512-DRty0ZBNlJ2R59y4mEupJRKLbkLQsc4qtxjpQv78AwEDuBkaUogMc2LkeqW3HddFlw6NwnXYfdThEZOiNgkmmQ==} + /ultrahtml/1.0.0: resolution: {integrity: sha512-BOtReLegZ/OlSTVOSt4aH+wrUPwxoXvapUHXjwhDE4k4kMISWdfUR4PH5wvt/vgKjFcAcEUPFEZQiPiB87XO3Q==} dev: false @@ -8404,7 +8686,7 @@ packages: mlly: 0.5.16 mri: 1.2.0 pathe: 0.3.9 - pkg-types: 0.3.5 + pkg-types: 0.3.6 pretty-bytes: 6.0.0 rimraf: 3.0.2 rollup: 3.2.1 @@ -8420,7 +8702,7 @@ packages: resolution: {integrity: sha512-JWefWyjLrDAbzs30sFkzcE9YpvAhN9+UPMZBwnNUmaY9X7QhI+wCGP4hoEWfZDzvkP+WIaZDPcMUJjarpxFvKg==} dependencies: '@antfu/utils': 0.5.2 - defu: 6.1.0 + defu: 6.1.1 jiti: 1.16.0 dev: true @@ -8446,39 +8728,48 @@ packages: mime: 3.0.0 node-fetch-native: 0.1.7 pathe: 0.3.9 + dev: false - /unimport/0.7.0: - resolution: {integrity: sha512-Cr0whz4toYVid3JHlni/uThwavDVVCk6Zw0Gxnol1c7DprTA+Isr4T+asO6rDGkhkgV7r3vSdSs5Ym8F15JA+w==} + /unenv/1.0.0: + resolution: {integrity: sha512-vlyi2Rzj4CNlA1JsEXufX+ItkGr3Z5DfLzKniYEneMlBVtuxS+57f1LwTPj2eiBPSPaGHMUVzEnjSCGE7l8JQg==} + dependencies: + defu: 6.1.1 + mime: 3.0.0 + node-fetch-native: 1.0.1 + pathe: 1.0.0 + + /unimport/1.0.0: + resolution: {integrity: sha512-7M2+6uC6Ik3/imN0VhEBJGnnH5SWLPxhPAPKdMMIt2Bh+YW7F42aZFC9APW3h82r4bvS5qQWaMJko2G9m7SDYA==} dependencies: '@rollup/pluginutils': 5.0.2 escape-string-regexp: 5.0.0 fast-glob: 3.2.12 local-pkg: 0.4.2 magic-string: 0.26.7 - mlly: 0.5.16 - pathe: 0.3.9 - pkg-types: 0.3.6 - scule: 0.3.2 - strip-literal: 0.4.2 - unplugin: 0.10.2 + mlly: 1.0.0 + pathe: 1.0.0 + pkg-types: 1.0.1 + scule: 1.0.0 + strip-literal: 1.0.0 + unplugin: 1.0.0 transitivePeerDependencies: - rollup dev: false - /unimport/0.7.0_rollup@2.79.1: - resolution: {integrity: sha512-Cr0whz4toYVid3JHlni/uThwavDVVCk6Zw0Gxnol1c7DprTA+Isr4T+asO6rDGkhkgV7r3vSdSs5Ym8F15JA+w==} + /unimport/1.0.0_rollup@2.79.1: + resolution: {integrity: sha512-7M2+6uC6Ik3/imN0VhEBJGnnH5SWLPxhPAPKdMMIt2Bh+YW7F42aZFC9APW3h82r4bvS5qQWaMJko2G9m7SDYA==} dependencies: '@rollup/pluginutils': 5.0.2_rollup@2.79.1 escape-string-regexp: 5.0.0 fast-glob: 3.2.12 local-pkg: 0.4.2 magic-string: 0.26.7 - mlly: 0.5.16 - pathe: 0.3.9 - pkg-types: 0.3.6 - scule: 0.3.2 - strip-literal: 0.4.2 - unplugin: 0.10.2 + mlly: 1.0.0 + pathe: 1.0.0 + pkg-types: 1.0.1 + scule: 1.0.0 + strip-literal: 1.0.0 + unplugin: 1.0.0 transitivePeerDependencies: - rollup @@ -8556,29 +8847,38 @@ packages: chokidar: 3.5.3 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.5 + dev: false /unplugin/0.9.6: resolution: {integrity: sha512-YYLtfoNiie/lxswy1GOsKXgnLJTE27la/PeCGznSItk+8METYZErO+zzV9KQ/hXhPwzIJsfJ4s0m1Rl7ZCWZ4Q==} dependencies: - acorn: 8.8.0 + acorn: 8.8.1 + chokidar: 3.5.3 + webpack-sources: 3.2.3 + webpack-virtual-modules: 0.4.6 + + /unplugin/1.0.0: + resolution: {integrity: sha512-H5UnBUxfhTXBXGo2AwKsl0UaLSHzSNDZNehPQSgdhVfO/t+XAS1Yoj3vmLrrlBrS9ZwtH5tejbX/TCp5DcyCKg==} + dependencies: + acorn: 8.8.1 chokidar: 3.5.3 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.6 - /unstorage/0.6.0: - resolution: {integrity: sha512-X05PIq28pVNA1BypX6Y00YNqAsHM25MGemvpjHeYvwJ8/wg936GoO1YD+VdWlqm3LmVX4fNJ5tlC7uhXsMPgeg==} + /unstorage/1.0.1: + resolution: {integrity: sha512-J1c4b8K2KeihHrQtdgl/ybIapArUbPaPb+TyJy/nGSauDwDYqciZsEKdkee568P3c8SSH4TIgnGRHDWMPGw+Lg==} dependencies: anymatch: 3.1.2 chokidar: 3.5.3 - destr: 1.2.0 - h3: 0.8.6 - ioredis: 5.2.3 - listhen: 0.3.5 + destr: 1.2.1 + h3: 1.0.1 + ioredis: 5.2.4 + listhen: 1.0.0 mkdir: 0.0.2 mri: 1.2.0 - ohmyfetch: 0.4.21 - ufo: 0.8.6 - ws: 8.9.0 + ofetch: 1.0.0 + ufo: 1.0.0 + ws: 8.11.0 transitivePeerDependencies: - bufferutil - supports-color @@ -8825,6 +9125,51 @@ packages: - terser dev: true + /vitest/0.25.2: + resolution: {integrity: sha512-qqkzfzglEFbQY7IGkgSJkdOhoqHjwAao/OrphnHboeYHC5JzsVFoLCaB2lnAy8krhj7sbrFTVRApzpkTOeuDWQ==} + engines: {node: '>=v14.16.0'} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@types/chai': 4.3.3 + '@types/chai-subset': 1.3.3 + '@types/node': 18.11.9 + acorn: 8.8.1 + acorn-walk: 8.2.0 + chai: 4.3.6 + debug: 4.3.4 + local-pkg: 0.4.2 + source-map: 0.6.1 + strip-literal: 0.4.2 + tinybench: 2.3.1 + tinypool: 0.3.0 + tinyspy: 1.0.2 + vite: 3.2.3_@types+node@18.11.9 + transitivePeerDependencies: + - less + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vscode-jsonrpc/6.0.0: resolution: {integrity: sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==} engines: {node: '>=8.0.0 || >=10.0.0'} @@ -9060,6 +9405,7 @@ packages: /webpack-virtual-modules/0.4.5: resolution: {integrity: sha512-8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg==} + dev: false /webpack-virtual-modules/0.4.6: resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==} @@ -9182,8 +9528,8 @@ packages: optional: true dev: false - /ws/8.9.0: - resolution: {integrity: sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==} + /ws/8.11.0: + resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 diff --git a/scripts/bump-edge.ts b/scripts/bump-edge.ts index 9a1fa9d95405..f48951bb7011 100644 --- a/scripts/bump-edge.ts +++ b/scripts/bump-edge.ts @@ -1,5 +1,5 @@ import { execSync } from 'node:child_process' -import { $fetch } from 'ohmyfetch' +import { $fetch } from 'ofetch' import { inc } from 'semver' import { loadWorkspace } from './_utils' diff --git a/test/basic.test.ts b/test/basic.test.ts index cb91e963803b..b1a9105930e5 100644 --- a/test/basic.test.ts +++ b/test/basic.test.ts @@ -9,7 +9,8 @@ import { expectNoClientErrors, renderPage, withLogs } from './utils' await setup({ rootDir: fileURLToPath(new URL('./fixtures/basic', import.meta.url)), server: true, - browser: true + browser: true, + setupTimeout: (isWindows ? 240 : 120) * 1000 }) describe('server api', () => { diff --git a/test/bundle.test.ts b/test/bundle.test.ts index fa515f9116e3..1ec71193e989 100644 --- a/test/bundle.test.ts +++ b/test/bundle.test.ts @@ -62,14 +62,13 @@ describe.skipIf(isWindows)('minimal nuxt application', () => { "@vueuse/shared", "buffer-from", "cookie-es", - "defu", "destr", "estree-walker", "h3", "hookable", "node-fetch-native", + "ofetch", "ohash", - "ohmyfetch", "pathe", "radix3", "scule", diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts index c5cb34002b32..11ea9ea0c41f 100644 --- a/test/fixtures/basic/types.ts +++ b/test/fixtures/basic/types.ts @@ -3,12 +3,12 @@ import { describe, it } from 'vitest' import type { Ref } from 'vue' import type { AppConfig } from '@nuxt/schema' -import type { FetchError } from 'ohmyfetch' +import type { FetchError } from 'ofetch' import { NavigationFailure, RouteLocationNormalizedLoaded, RouteLocationRaw, useRouter as vueUseRouter } from 'vue-router' -import { defineNuxtConfig } from '~~/../../../packages/nuxt/config' import type { NavigateToOptions } from '~~/../../../packages/nuxt/dist/app/composables/router' // eslint-disable-next-line import/order import { isVue3 } from '#app' +import { defineNuxtConfig } from '~~/../../../packages/nuxt/config' import { useRouter } from '#imports' interface TestResponse { message: string }