@nuxt/test-utils 3.22.0 → 4.0.0

package/dist/runtime/shared/environment.mjs

@@ -1,8 +1,9 @@
 import { createFetch } from "ofetch";
 import { joinURL } from "ufo";
-import { createApp, defineEventHandler, toNodeListener } from "h3";
+import { defineEventHandler } from "./h3.mjs";
 import { createRouter as createRadixRouter, exportMatcher, toRouteMatcher } from "radix3";
-import { fetchNodeRequestHandler } from "node-mock-http";
+import { createFetchForH3V1 } from "./h3-v1.mjs";
+import { createFetchForH3V2 } from "./h3-v2.mjs";
 export async function setupWindow(win, environmentOptions) {
   win.__NUXT_VITEST_ENVIRONMENT__ = true;
   win.__NUXT__ = {
@@ -15,16 +16,6 @@ export async function setupWindow(win, environmentOptions) {
     data: {},
     state: {}
   };
-  const rootId = environmentOptions.nuxt.rootId || "nuxt-test";
-  let el;
-  try {
-    el = win.document.querySelector(rootId);
-  } catch {
-  }
-  if (el) {
-    return () => {
-    };
-  }
   const consoleInfo = console.info;
   console.info = (...args) => {
     if (args[0] === "<Suspense> is an experimental feature and its API will likely change.") {
@@ -33,9 +24,8 @@ export async function setupWindow(win, environmentOptions) {
     return consoleInfo(...args);
   };
   const app = win.document.createElement("div");
-  app.id = rootId;
+  app.id = environmentOptions.nuxt.rootId || "nuxt-test";
   win.document.body.appendChild(app);
-  const h3App = createApp();
   if (!win.fetch || !("Request" in win)) {
     await import("node-fetch-native/polyfill");
     win.URLSearchParams = globalThis.URLSearchParams;
@@ -49,37 +39,11 @@ export async function setupWindow(win, environmentOptions) {
       }
     };
   }
-  const nodeHandler = toNodeListener(h3App);
-  const registry = /* @__PURE__ */ new Set();
-  const _fetch = fetch;
-  win.fetch = async (input, _init) => {
-    let url;
-    let init = _init;
-    if (typeof input === "string") {
-      url = input;
-    } else if (input instanceof URL) {
-      url = input.toString();
-    } else {
-      url = input.url;
-      init = {
-        method: init?.method ?? input.method,
-        body: init?.body ?? input.body,
-        headers: init?.headers ?? input.headers
-      };
-    }
-    const base = url.split("?")[0];
-    if (registry.has(base) || registry.has(url)) {
-      url = "/_" + url;
-    }
-    if (url.startsWith("/")) {
-      const response = await fetchNodeRequestHandler(nodeHandler, url, init);
-      return normalizeFetchResponse(response);
-    }
-    return _fetch(input, _init);
-  };
+  const res = environmentOptions.nuxt.h3Version === 2 ? await createFetchForH3V2() : await createFetchForH3V1();
+  win.fetch = res.fetch;
   win.$fetch = createFetch({ fetch: win.fetch, Headers: win.Headers });
-  win.__registry = registry;
-  win.__app = h3App;
+  win.__registry = res.registry;
+  win.__app = res.h3App;
   const timestamp = Date.now();
   const routeRulesMatcher = toRouteMatcher(
     createRadixRouter({ routes: environmentOptions.nuxtRouteRules || {} })
@@ -92,14 +56,14 @@ export async function setupWindow(win, environmentOptions) {
   );
   const manifestBaseRoutePath = joinURL("/_", manifestOutputPath);
   const buildId = win.__NUXT__.config?.app.buildId || "test";
-  h3App.use(
+  res.h3App.use(
     `${manifestBaseRoutePath}/latest.json`,
     defineEventHandler(() => ({
       id: buildId,
       timestamp
     }))
   );
-  h3App.use(
+  res.h3App.use(
     `${manifestBaseRoutePath}/meta/${buildId}.json`,
     defineEventHandler(() => ({
       id: buildId,
@@ -108,38 +72,9 @@ export async function setupWindow(win, environmentOptions) {
       prerendered: []
     }))
   );
-  registry.add(`${manifestOutputPath}/latest.json`);
-  registry.add(`${manifestOutputPath}/meta/${buildId}.json`);
+  res.registry.add(`${manifestOutputPath}/latest.json`);
+  res.registry.add(`${manifestOutputPath}/meta/${buildId}.json`);
   return () => {
     console.info = consoleInfo;
   };
 }
-function normalizeFetchResponse(response) {
-  if (!response.headers.has("set-cookie")) {
-    return response;
-  }
-  return new Response(response.body, {
-    status: response.status,
-    statusText: response.statusText,
-    headers: normalizeCookieHeaders(response.headers)
-  });
-}
-function normalizeCookieHeader(header = "") {
-  return splitCookiesString(joinHeaders(header));
-}
-function normalizeCookieHeaders(headers) {
-  const outgoingHeaders = new Headers();
-  for (const [name, header] of headers) {
-    if (name === "set-cookie") {
-      for (const cookie of normalizeCookieHeader(header)) {
-        outgoingHeaders.append("set-cookie", cookie);
-      }
-    } else {
-      outgoingHeaders.set(name, joinHeaders(header));
-    }
-  }
-  return outgoingHeaders;
-}
-function joinHeaders(value) {
-  return Array.isArray(value) ? value.join(", ") : String(value);
-}

package/dist/runtime/shared/h3-v1.d.ts

@@ -0,0 +1,6 @@
+import type { GenericApp } from '../../vitest-environment';
+export declare function createFetchForH3V1(): Promise<{
+    h3App: GenericApp;
+    registry: Set<string>;
+    fetch: typeof fetch;
+}>;

package/dist/runtime/shared/h3-v1.mjs

@@ -0,0 +1,69 @@
+export async function createFetchForH3V1() {
+  const [{ createApp, toNodeListener }, { fetchNodeRequestHandler }] = await Promise.all([
+    import("h3"),
+    import("node-mock-http")
+  ]);
+  const h3App = createApp();
+  const nodeHandler = toNodeListener(h3App);
+  const registry = /* @__PURE__ */ new Set();
+  const _fetch = fetch;
+  const h3Fetch = (async (input, _init) => {
+    let url;
+    let init = _init;
+    if (typeof input === "string") {
+      url = input;
+    } else if (input instanceof URL) {
+      url = input.toString();
+    } else {
+      url = input.url;
+      init = {
+        method: init?.method ?? input.method,
+        body: init?.body ?? input.body,
+        headers: init?.headers ?? input.headers
+      };
+    }
+    const base = url.split("?")[0];
+    if (registry.has(base) || registry.has(url)) {
+      url = "/_" + url;
+    }
+    if (url.startsWith("/")) {
+      const response = await fetchNodeRequestHandler(nodeHandler, url, init);
+      return normalizeFetchResponse(response);
+    }
+    return _fetch(input, _init);
+  });
+  return {
+    h3App,
+    registry,
+    fetch: h3Fetch
+  };
+}
+function normalizeFetchResponse(response) {
+  if (!response.headers.has("set-cookie")) {
+    return response;
+  }
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: normalizeCookieHeaders(response.headers)
+  });
+}
+function normalizeCookieHeader(header = "") {
+  return splitCookiesString(joinHeaders(header));
+}
+function normalizeCookieHeaders(headers) {
+  const outgoingHeaders = new Headers();
+  for (const [name, header] of headers) {
+    if (name === "set-cookie") {
+      for (const cookie of normalizeCookieHeader(header)) {
+        outgoingHeaders.append("set-cookie", cookie);
+      }
+    } else {
+      outgoingHeaders.set(name, joinHeaders(header));
+    }
+  }
+  return outgoingHeaders;
+}
+function joinHeaders(value) {
+  return Array.isArray(value) ? value.join(", ") : String(value);
+}

package/dist/runtime/shared/h3-v2.d.ts

@@ -0,0 +1,6 @@
+import type { GenericApp } from '../../vitest-environment';
+export declare function createFetchForH3V2(): Promise<{
+    h3App: GenericApp;
+    registry: Set<string>;
+    fetch: typeof fetch;
+}>;

package/dist/runtime/shared/h3-v2.mjs

@@ -0,0 +1,35 @@
+export async function createFetchForH3V2() {
+  const { H3 } = await import("h3-next/generic");
+  const h3App = new H3();
+  const registry = /* @__PURE__ */ new Set();
+  const _fetch = fetch;
+  const h3Fetch = (async (input, _init) => {
+    let url;
+    let init = _init;
+    if (typeof input === "string") {
+      url = input;
+    } else if (input instanceof URL) {
+      url = input.toString();
+    } else {
+      url = input.url;
+      init = {
+        method: init?.method ?? input.method,
+        body: init?.body ?? input.body,
+        headers: init?.headers ?? input.headers
+      };
+    }
+    const base = url.split("?")[0];
+    if (registry.has(base) || registry.has(url)) {
+      return h3App.fetch(new Request("/_" + url, init));
+    }
+    if (url.startsWith("/")) {
+      return new Response("Not Found", { status: 404, statusText: "Not Found" });
+    }
+    return _fetch(input, _init);
+  });
+  return {
+    h3App,
+    registry,
+    fetch: h3Fetch
+  };
+}

package/dist/runtime/shared/h3.d.ts

@@ -0,0 +1,3 @@
+type RawHandler = () => unknown | Promise<unknown>;
+export declare function defineEventHandler(handler: RawHandler): RawHandler;
+export {};

package/dist/runtime/shared/h3.mjs

@@ -0,0 +1,3 @@
+export function defineEventHandler(handler) {
+  return Object.assign(handler, { __is_handler__: true });
+}

package/dist/runtime/shared/vue-wrapper-plugin.mjs

@@ -1,7 +1,7 @@
 import { config } from "@vue/test-utils";
 const PLUGIN_NAME = "nuxt-test-utils";
 export function getVueWrapperPlugin() {
-  const installed = config.plugins.VueWrapper.installedPlugins.find(({ options: options2 }) => options2._name === PLUGIN_NAME);
+  const installed = config.plugins.VueWrapper.installedPlugins.find(({ options: options2 }) => options2?._name === PLUGIN_NAME);
   if (installed) return installed.options;
   const options = createPluginOptions();
   config.plugins.VueWrapper.install((instance, options2) => {

package/dist/runtime-utils/index.d.mts

@@ -1,4 +1,5 @@
-import { EventHandler, HTTPMethod } from 'h3';
+import { EventHandler } from 'h3';
+import { HTTPMethod } from 'h3-next';
 import { SetupContext, RenderFunction, ComputedOptions, MethodOptions, ComponentOptionsMixin, EmitsOptions, ComponentInjectOptions, ComponentOptionsWithoutProps, ComponentOptionsWithArrayProps, ComponentPropsOptions, ComponentOptionsWithObjectProps } from 'vue';
 import { mount } from '@vue/test-utils';
 import { RouteLocationRaw } from 'vue-router';
@@ -57,7 +58,7 @@ declare function registerEndpoint(url: string, options: EventHandler | {
  * ```
  * @see https://nuxt.com/docs/getting-started/testing#mocknuxtimport
  */
-declare function mockNuxtImport<T = unknown>(_target: string | T, _factory: () => T | Promise<T>): void;
+declare function mockNuxtImport<T = unknown>(_target: string | T, _factory: (original: T) => T | Promise<T>): void;
 /**
  * `mockComponent` allows you to mock Nuxt's component.
  * @param path - component name in PascalCase, or the relative path of the component.

package/dist/runtime-utils/index.mjs

@@ -1,41 +1,36 @@
-import { defineEventHandler } from 'h3';
 import { mount } from '@vue/test-utils';
-import { reactive, h as h$1, Suspense, nextTick as nextTick$1, getCurrentInstance, onErrorCaptured, effectScope } from 'vue';
+import { reactive, h as h$1, Suspense, nextTick, getCurrentInstance, onErrorCaptured, effectScope } from 'vue';
 import { defu } from 'defu';
 import { defineComponent, useRouter, h, tryUseNuxtApp } from '#imports';
 import NuxtRoot from '#build/root-component.mjs';
 
-const endpointRegistry = {};
+function getEndpointRegistry() {
+  const app = window.__app ?? {};
+  return app._registeredEndpointRegistry ||= {};
+}
+function findEndpointRegistryHandlers(url) {
+  const endpointRegistry = getEndpointRegistry();
+  const pathname = url.replace(/[?#].*$/, "");
+  for (const [key, handlers] of Object.entries(endpointRegistry)) {
+    if (key === url || key === pathname) {
+      if (handlers?.length) {
+        return handlers;
+      }
+    }
+  }
+}
 function registerEndpoint(url, options) {
   const app = window.__app;
   if (!app) {
     throw new Error("registerEndpoint() can only be used in a `@nuxt/test-utils` runtime environment");
   }
-  const config = typeof options === "function" ? { handler: options, method: void 0, once: false } : options;
-  config.handler = defineEventHandler(config.handler);
-  const hasBeenRegistered = window.__registry.has(url);
+  const config = typeof options === "function" ? { url, handler: options, method: void 0, once: false } : { ...options, url };
+  config.handler = Object.assign(config.handler, { __is_handler__: true });
+  const endpointRegistry = getEndpointRegistry();
   endpointRegistry[url] ||= [];
   endpointRegistry[url].push(config);
-  if (!hasBeenRegistered) {
-    window.__registry.add(url);
-    app.use("/_" + url, defineEventHandler(async (event) => {
-      const latestHandler = [...endpointRegistry[url] || []].reverse().find((config2) => config2.method ? event.method === config2.method : true);
-      if (!latestHandler) return;
-      const result = await latestHandler.handler(event);
-      if (!latestHandler.once) return result;
-      const index = endpointRegistry[url]?.indexOf(latestHandler);
-      if (index === void 0 || index === -1) return result;
-      endpointRegistry[url]?.splice(index, 1);
-      if (endpointRegistry[url]?.length === 0) {
-        window.__registry.delete(url);
-      }
-      return result;
-    }), {
-      match(_, event) {
-        return endpointRegistry[url]?.some((config2) => config2.method ? event?.method === config2.method : true) ?? false;
-      }
-    });
-  }
+  window.__registry.add(url);
+  app._registered ||= registerGlobalHandler(app);
   return () => {
     endpointRegistry[url]?.splice(endpointRegistry[url].indexOf(config), 1);
     if (endpointRegistry[url]?.length === 0) {
@@ -53,6 +48,33 @@ function mockComponent(_path, _component) {
     "mockComponent() is a macro and it did not get transpiled. This may be an internal bug of @nuxt/test-utils."
   );
 }
+const handler = Object.assign(async (event) => {
+  const url = "url" in event && event.url ? (event.url.pathname + event.url.search).replace(/^\/_/, "") : event.path.replace(/^\/_/, "");
+  const registeredHandlers = findEndpointRegistryHandlers(url);
+  const latestHandler = [...registeredHandlers || []].reverse().find((config) => config.method ? event.method === config.method : true);
+  if (!latestHandler) return;
+  const result = await latestHandler.handler(event);
+  if (!latestHandler.once) return result;
+  const index = registeredHandlers?.indexOf(latestHandler);
+  if (index === void 0 || index === -1) return result;
+  registeredHandlers?.splice(index, 1);
+  if (registeredHandlers?.length === 0) {
+    window.__registry.delete(latestHandler.url);
+  }
+  return result;
+}, { __is_handler__: true });
+function registerGlobalHandler(app) {
+  app.use(handler, {
+    match: (...args) => {
+      const [eventOrPath, _event = eventOrPath] = args;
+      const url = typeof eventOrPath === "string" ? eventOrPath.replace(/^\/_/, "") : (eventOrPath.url.pathname + eventOrPath.url.search).replace(/^\/_/, "");
+      const event = _event;
+      const registeredHandlers = findEndpointRegistryHandlers(url);
+      return registeredHandlers?.some((config) => config.method ? event?.method === config.method : true) ?? false;
+    }
+  });
+  return true;
+}
 
 const RouterLink = defineComponent({
   functional: true,
@@ -192,7 +214,7 @@ function wrapperSuspended(component, options, {
         render: wrappedRender(() => h$1(
           Suspense,
           {
-            onResolve: () => nextTick$1().then(() => {
+            onResolve: () => nextTick().then(() => {
               if (isMountSettled) return;
               isMountSettled = true;
               wrapper.setupState = setupState;

package/dist/shared/{test-utils.ZByFDqps.d.mts → test-utils.BLyxqr96.d.mts}

@@ -1,6 +1,7 @@
-import { Browser, Page, Response as Response$1, BrowserContextOptions, LaunchOptions } from 'playwright-core';
+import { Page, Response as Response$1, BrowserContextOptions, Browser, LaunchOptions } from 'playwright-core';
 import { NuxtConfig, Nuxt } from '@nuxt/schema';
 import { exec } from 'tinyexec';
+import { $Fetch } from 'ofetch';
 
 declare function createBrowser(): Promise<void>;
 declare function getBrowser(): Promise<Browser>;
@@ -20,7 +21,7 @@ interface StartServerOptions {
 declare function startServer(options?: StartServerOptions): Promise<void>;
 declare function stopServer(): Promise<void>;
 declare function fetch(path: string, options?: RequestInit): Promise<Response>;
-declare const $fetch: (typeof globalThis)["$fetch"];
+declare const $fetch: "$fetch" extends keyof typeof globalThis ? typeof globalThis.$fetch : $Fetch;
 declare function url(path: string): string;
 
 type TestRunner = 'vitest' | 'jest' | 'cucumber' | 'bun';
@@ -115,5 +116,5 @@ interface TestHooks {
     ctx: TestContext;
 }
 
-export { $fetch as $, createBrowser as c, createPage as d, stopServer as e, fetch as f, getBrowser as g, startServer as s, url as u, waitForHydration as w };
-export type { GotoOptions as G, NuxtPage as N, StartServerOptions as S, TestOptions as T, TestHooks as a, TestContext as b, TestRunner as h };
+export { $fetch as $, createBrowser as d, createPage as e, fetch as f, getBrowser as g, stopServer as h, startServer as s, url as u, waitForHydration as w };
+export type { GotoOptions as G, NuxtPage as N, StartServerOptions as S, TestOptions as T, TestHooks as a, TestContext as b, TestRunner as c };

package/dist/shared/{test-utils.C_clWQBc.mjs → test-utils.BsmyE2FA.mjs}

@@ -1,6 +1,6 @@
 import { x } from 'tinyexec';
 import { getRandomPort, waitForPort } from 'get-port-please';
-import { $fetch as $fetch$1, fetch as fetch$1 } from 'ofetch';
+import { createFetch, fetch as fetch$1 } from 'ofetch';
 import { resolve as resolve$1 } from 'pathe';
 import { withTrailingSlash, joinURL } from 'ufo';
 import { resolve } from 'node:path';
@@ -72,6 +72,7 @@ function exposeContextToEnv() {
   process.env.NUXT_TEST_CONTEXT = JSON.stringify({ options, browser, url });
 }
 
+const globalFetch = globalThis.fetch || fetch$1;
 async function startServer(options = {}) {
   const ctx = useTestContext();
   await stopServer();
@@ -144,10 +145,11 @@ async function stopServer() {
   }
 }
 function fetch(path, options) {
-  return fetch$1(url(path), options);
+  return globalFetch(url(path), options);
 }
-const $fetch = function(path, options) {
-  return $fetch$1(url(path), options);
+const _$fetch = createFetch({ fetch: globalFetch });
+const $fetch = function $fetch2(path, options) {
+  return _$fetch(url(path), options);
 };
 function url(path) {
   const ctx = useTestContext();

package/dist/shared/{test-utils.D2ZzXztg.mjs → test-utils.E_cAGA8l.mjs}

@@ -1,4 +1,4 @@
-import { u as useTestContext, d as url, c as createTestContext, a as startServer, b as stopServer, s as setTestContext } from './test-utils.C_clWQBc.mjs';
+import { u as useTestContext, d as url, c as createTestContext, a as startServer, b as stopServer, s as setTestContext } from './test-utils.BsmyE2FA.mjs';
 import { existsSync, promises } from 'node:fs';
 import { resolve } from 'node:path';
 import { defu } from 'defu';
@@ -117,10 +117,10 @@ async function buildFixture() {
 async function setupBun(hooks) {
   const bunTest = await import('bun:test');
   hooks.ctx.mockFn = bunTest.mock;
-  bunTest.beforeAll(hooks.beforeAll);
+  bunTest.beforeAll(hooks.beforeAll, hooks.ctx.options.setupTimeout);
   bunTest.beforeEach(hooks.beforeEach);
   bunTest.afterEach(hooks.afterEach);
-  bunTest.afterAll(hooks.afterAll);
+  bunTest.afterAll(hooks.afterAll, hooks.ctx.options.teardownTimeout);
 }
 
 async function setupCucumber(hooks) {
@@ -209,4 +209,4 @@ async function setup(options = {}) {
   await setupFn(hooks);
 }
 
-export { createPage as a, buildFixture as b, createBrowser as c, createTest as d, setup as e, getBrowser as g, loadFixture as l, setupMaps as s, waitForHydration as w };
+export { createPage as a, buildFixture as b, createBrowser as c, createTest as d, setupMaps as e, getBrowser as g, loadFixture as l, setup as s, waitForHydration as w };

package/dist/vitest-environment.d.mts

@@ -1,13 +1,25 @@
 import { Environment } from 'vitest/environments';
-import { App } from 'h3';
+import { H3Event as H3Event$1 } from 'h3';
+import { H3Event } from 'h3-next';
 import { $Fetch } from 'nitropack';
-import { JSDOMOptions, HappyDOMOptions } from 'vitest/node';
+import { EnvironmentOptions } from 'vitest/node';
 
 declare const _default: Environment;
 
 type NuxtBuiltinEnvironment = 'happy-dom' | 'jsdom';
+interface GenericAppUse {
+    (route: string, handler: (event: H3Event | H3Event$1) => unknown, options?: {
+        match: (...args: [string, H3Event$1 | undefined] | [H3Event]) => boolean;
+    }): void;
+    (handler: (event: H3Event | H3Event$1) => unknown, options?: {
+        match: (...args: [string, H3Event$1 | undefined] | [H3Event]) => boolean;
+    }): void;
+}
+interface GenericApp {
+    use: GenericAppUse;
+}
 interface NuxtWindow extends Window {
-    __app: App;
+    __app?: GenericApp;
     __registry: Set<string>;
     __NUXT_VITEST_ENVIRONMENT__?: boolean;
     __NUXT__: Record<string, unknown>;
@@ -17,8 +29,8 @@ interface NuxtWindow extends Window {
     Headers: typeof Headers;
 }
 interface EnvironmentNuxtOptions {
-    jsdom?: JSDOMOptions;
-    happyDom?: HappyDOMOptions;
+    jsdom?: EnvironmentOptions['jsdom'];
+    happyDom?: EnvironmentOptions['happyDOM'];
 }
 type EnvironmentNuxt = (global: typeof globalThis, options: EnvironmentNuxtOptions) => Promise<{
     window: NuxtWindow;
@@ -26,4 +38,4 @@ type EnvironmentNuxt = (global: typeof globalThis, options: EnvironmentNuxtOptio
 }>;
 
 export { _default as default };
-export type { EnvironmentNuxt, EnvironmentNuxtOptions, NuxtBuiltinEnvironment, NuxtWindow };
+export type { EnvironmentNuxt, EnvironmentNuxtOptions, GenericApp, NuxtBuiltinEnvironment, NuxtWindow };