@nuxt/test-utils 3.21.0 → 3.23.0

package/README.md

@@ -11,7 +11,7 @@ Nuxt Test Utils is currently powering [the tests we use on Nuxt itself](https://
 You can find out more about how to use Nuxt Test Utils:
 
 - in [a general overview](https://nuxt.com/docs/getting-started/testing)
-- in [an in-depth guide for module authors](https://nuxt.com/docs/guide/going-further/modules#testing)
+- in [an in-depth guide for module authors](https://nuxt.com/docs/4.x/guide/modules/testing)
 
 ## License
 

package/dist/config.d.mts

@@ -1,9 +1,8 @@
-import * as vite from 'vite';
-import { UserConfig } from 'vite';
 import { NuxtConfig, Nuxt } from '@nuxt/schema';
 import { InlineConfig } from 'vitest/node';
 import { TestProjectInlineConfiguration } from 'vitest/config';
 import { DotenvOptions } from 'c12';
+import { UserConfig, UserConfigFnPromise } from 'vite';
 
 interface GetVitestConfigOptions {
     nuxt: Nuxt;
@@ -19,7 +18,7 @@ declare function getVitestConfigFromNuxt(options?: GetVitestConfigOptions, loadN
 declare function defineVitestProject(config: TestProjectInlineConfiguration): Promise<TestProjectInlineConfiguration>;
 declare function defineVitestConfig(config?: UserConfig & {
     test?: InlineConfig;
-}): vite.UserConfigFnPromise;
+}): UserConfigFnPromise;
 interface NuxtEnvironmentOptions {
     rootDir?: string;
     /**
@@ -47,6 +46,7 @@ interface NuxtEnvironmentOptions {
      * @default 'happy-dom'
      */
     domEnvironment?: 'happy-dom' | 'jsdom';
+    h3Version?: 1 | 2;
     mock?: {
         intersectionObserver?: boolean;
         indexedDb?: boolean;

package/dist/config.mjs

@@ -3,11 +3,31 @@ import { defineConfig } from 'vite';
 import { setupDotenv } from 'c12';
 import { defu } from 'defu';
 import { createResolver, findPath } from '@nuxt/kit';
-import { a as applyEnv, l as loadKit } from './shared/test-utils.G1ew4kEe.mjs';
+import { resolveModulePath } from 'exsolve';
+import { getPackageInfoSync } from 'local-pkg';
+import { a as applyEnv, l as loadKit } from './shared/test-utils.BIY9XRkB.mjs';
 import 'destr';
 import 'scule';
 import 'node:url';
-import 'exsolve';
+
+const PLUGIN_NAME = "nuxt:vitest:nuxt-environment-options";
+const STUB_ID = "nuxt-vitest-environment-options";
+function NuxtVitestEnvironmentOptionsPlugin(environmentOptions = {}) {
+  return {
+    name: PLUGIN_NAME,
+    enforce: "pre",
+    resolveId(id) {
+      if (id.endsWith(STUB_ID)) {
+        return STUB_ID;
+      }
+    },
+    load(id) {
+      if (id.endsWith(STUB_ID)) {
+        return `export default ${JSON.stringify(environmentOptions || {})}`;
+      }
+    }
+  };
+}
 
 async function startNuxtAndGetViteConfig(rootDir = process.cwd(), options = {}) {
   const { buildNuxt, loadNuxt } = await loadKit(rootDir);
@@ -73,7 +93,23 @@ async function getVitestConfigFromNuxt(options, loadNuxtOptions = {}) {
       }
     });
   }
+  delete options.viteConfig.root;
   options.viteConfig.plugins = (options.viteConfig.plugins || []).filter((p) => !p || !("name" in p) || !excludedPlugins.includes(p.name));
+  const nuxtServerIntegration = getPackageInfoSync("@nuxt/nitro-server", {
+    paths: [options.nuxt.options.appDir]
+  });
+  let nitroPath;
+  for (const nitroCandidate of [
+    ...nuxtServerIntegration?.packageJson.dependencies?.nitro ? ["nitro", "nitro-nightly"] : ["nitropack", "nitropack-nightly"]
+  ]) {
+    nitroPath = resolveModulePath(nitroCandidate, { from: nuxtServerIntegration?.rootPath || options.nuxt.options.appDir, try: true });
+    if (nitroPath) {
+      break;
+    }
+  }
+  const h3Info = getPackageInfoSync("h3", {
+    paths: nitroPath ? [nitroPath] : options.nuxt.options.modulesDir
+  });
   const resolver = createResolver(import.meta.url);
   const resolvedConfig = defu(
     // overrides
@@ -91,7 +127,6 @@ async function getVitestConfigFromNuxt(options, loadNuxtOptions = {}) {
         noDiscovery: true
       },
       test: {
-        dir: process.cwd(),
         environmentOptions: {
           nuxtRuntimeConfig: applyEnv(structuredClone(options.nuxt.options.runtimeConfig), {
             prefix: "NUXT_",
@@ -169,6 +204,7 @@ async function getVitestConfigFromNuxt(options, loadNuxtOptions = {}) {
         environmentOptions: {
           nuxt: {
             rootId: options.nuxt.options.app.rootId || void 0,
+            h3Version: h3Info?.version?.startsWith("2.") ? 2 : 1,
             mock: {
               intersectionObserver: true,
               indexedDb: false
@@ -188,14 +224,12 @@ async function getVitestConfigFromNuxt(options, loadNuxtOptions = {}) {
   return resolvedConfig;
 }
 async function defineVitestProject(config) {
-  if (process.env.__NUXT_VITEST_RESOLVED__) return config;
   const resolvedConfig = await resolveConfig(config);
   resolvedConfig.test.environment = "nuxt";
   return resolvedConfig;
 }
 function defineVitestConfig(config = {}) {
   return defineConfig(async () => {
-    if (process.env.__NUXT_VITEST_RESOLVED__) return config;
     const resolvedConfig = await resolveConfig(config);
     if (resolvedConfig.test.browser?.enabled) {
       return resolvedConfig;
@@ -256,22 +290,7 @@ async function resolveConfig(config) {
       overrides: structuredClone(overrides)
     })
   );
-  const PLUGIN_NAME = "nuxt:vitest:nuxt-environment-options";
-  const STUB_ID = "nuxt-vitest-environment-options";
-  resolvedConfig.plugins.push({
-    name: PLUGIN_NAME,
-    enforce: "pre",
-    resolveId(id) {
-      if (id.endsWith(STUB_ID)) {
-        return STUB_ID;
-      }
-    },
-    load(id) {
-      if (id.endsWith(STUB_ID)) {
-        return `export default ${JSON.stringify(resolvedConfig.test.environmentOptions || {})}`;
-      }
-    }
-  });
+  resolvedConfig.plugins.push(NuxtVitestEnvironmentOptionsPlugin(resolvedConfig.test.environmentOptions));
   if (resolvedConfig.test.browser?.enabled) {
     if (resolvedConfig.test.environment === "nuxt") {
       resolvedConfig.test.setupFiles = Array.isArray(resolvedConfig.test.setupFiles) ? resolvedConfig.test.setupFiles : [resolvedConfig.test.setupFiles].filter(Boolean);

package/dist/e2e.d.mts

@@ -1,9 +1,10 @@
-import { T as TestOptions, a as TestContext, b as TestHooks } from './shared/test-utils.20kU0tZa.mjs';
-export { $ as $fetch, G as GotoOptions, N as NuxtPage, S as StartServerOptions, h as TestRunner, c as createBrowser, d as createPage, f as fetch, g as getBrowser, s as startServer, e as stopServer, u as url, w as waitForHydration } from './shared/test-utils.20kU0tZa.mjs';
+import { T as TestOptions, b as TestContext, a as TestHooks } from './shared/test-utils.C9GKP_T5.mjs';
+export { $ as $fetch, G as GotoOptions, N as NuxtPage, S as StartServerOptions, h as TestRunner, c as createBrowser, d as createPage, f as fetch, g as getBrowser, s as startServer, e as stopServer, u as url, w as waitForHydration } from './shared/test-utils.C9GKP_T5.mjs';
 import { LogType } from 'consola';
 import 'playwright-core';
 import '@nuxt/schema';
 import 'tinyexec';
+import 'ofetch';
 
 declare function createTestContext(options: Partial<TestOptions>): TestContext;
 declare function useTestContext(): TestContext;

package/dist/e2e.mjs

@@ -1,13 +1,13 @@
-export { b as buildFixture, c as createBrowser, a as createPage, d as createTest, g as getBrowser, l as loadFixture, e as setup, s as setupMaps, w as waitForHydration } from './shared/test-utils.3NR-so9-.mjs';
-import { u as useTestContext } from './shared/test-utils.CtwoJP76.mjs';
-export { $ as $fetch, c as createTestContext, e as exposeContextToEnv, f as fetch, i as isDev, r as recoverContextFromEnv, s as setTestContext, a as startServer, b as stopServer, d as url } from './shared/test-utils.CtwoJP76.mjs';
+export { b as buildFixture, c as createBrowser, a as createPage, d as createTest, g as getBrowser, l as loadFixture, e as setup, s as setupMaps, w as waitForHydration } from './shared/test-utils.5cnw0YZR.mjs';
+import { u as useTestContext } from './shared/test-utils.BsmyE2FA.mjs';
+export { $ as $fetch, c as createTestContext, e as exposeContextToEnv, f as fetch, i as isDev, r as recoverContextFromEnv, s as setTestContext, a as startServer, b as stopServer, d as url } from './shared/test-utils.BsmyE2FA.mjs';
 import { consola } from 'consola';
 import { resolve } from 'pathe';
 import { distDir } from '#dirs';
 import 'node:fs';
 import 'node:path';
 import 'defu';
-import './shared/test-utils.G1ew4kEe.mjs';
+import './shared/test-utils.BIY9XRkB.mjs';
 import 'destr';
 import 'scule';
 import 'node:url';
@@ -52,8 +52,10 @@ async function runTests(opts) {
     {
       root: opts.rootDir,
       run: !opts.watch,
-      deps: {
-        inline: [/@nuxt\/test-utils/]
+      server: {
+        deps: {
+          inline: [/@nuxt\/test-utils/]
+        }
       }
     },
     // Vite options
@@ -63,13 +65,15 @@ async function runTests(opts) {
       },
       test: {
         dir: opts.rootDir,
-        deps: {
-          inline: [
-            distDir,
-            "@nuxt/test-utils",
-            "@nuxt/test-utils-nightly",
-            "@nuxt/test-utils-edge"
-          ]
+        server: {
+          deps: {
+            inline: [
+              distDir,
+              "@nuxt/test-utils",
+              "@nuxt/test-utils-nightly",
+              "@nuxt/test-utils-edge"
+            ]
+          }
         },
         globals: true,
         globalSetup: [

package/dist/experimental.mjs

@@ -1,6 +1,6 @@
 import { resolve } from 'pathe';
 import { stringifyQuery } from 'ufo';
-import { $ as $fetch, u as useTestContext } from './shared/test-utils.CtwoJP76.mjs';
+import { $ as $fetch, u as useTestContext } from './shared/test-utils.BsmyE2FA.mjs';
 import 'tinyexec';
 import 'get-port-please';
 import 'ofetch';