@nuxt/test-utils-nightly 3.8.2-1701501460.05dbe7f → 3.8.2-1701549256.62a6ffe

package/dist/config.mjs

@@ -1,7 +1,6 @@
 import { defineConfig } from 'vite';
-import vuePlugin from '@vitejs/plugin-vue';
-import viteJsxPlugin from '@vitejs/plugin-vue-jsx';
 import { defu } from 'defu';
+import { createResolver } from '@nuxt/kit';
 
 async function startNuxtAndGetViteConfig(rootDir = process.cwd(), overrides) {
   const { loadNuxt, buildNuxt } = await import('@nuxt/kit');
@@ -23,7 +22,7 @@ async function startNuxtAndGetViteConfig(rootDir = process.cwd(), overrides) {
     );
   }
   const promise = new Promise((resolve, reject) => {
-    nuxt.hook("vite:extendConfig", (viteConfig, { isClient }) => {
+    nuxt.hook("vite:configResolved", (viteConfig, { isClient }) => {
       if (isClient) {
         resolve({ nuxt, viteConfig });
         throw new Error("_stop_");
@@ -37,30 +36,19 @@ async function startNuxtAndGetViteConfig(rootDir = process.cwd(), overrides) {
   }).finally(() => nuxt.close());
   return promise;
 }
-const vuePlugins = {
-  "vite:vue": [vuePlugin, "vue"],
-  "vite:vue-jsx": [viteJsxPlugin, "vueJsx"]
-};
 async function getVitestConfigFromNuxt(options, overrides) {
+  var _a;
   const { rootDir = process.cwd(), ..._overrides } = overrides || {};
-  if (!options)
+  if (!options) {
     options = await startNuxtAndGetViteConfig(rootDir, {
       test: true,
       ..._overrides
     });
-  options.viteConfig.plugins = options.viteConfig.plugins || [];
-  options.viteConfig.plugins = options.viteConfig.plugins.filter(
+  }
+  (_a = options.viteConfig).plugins || (_a.plugins = []);
+  options.viteConfig.plugins = options.viteConfig.plugins?.filter(
     (p) => p?.name !== "nuxt:import-protection"
   );
-  for (const name in vuePlugins) {
-    if (!options.viteConfig.plugins?.some((p) => p?.name === name)) {
-      const [plugin, key] = vuePlugins[name];
-      options.viteConfig.plugins.unshift(
-        // @ts-expect-error mismatching component options
-        plugin(options.viteConfig[key])
-      );
-    }
-  }
   const resolvedConfig = defu(
     // overrides
     {
@@ -82,17 +70,25 @@ async function getVitestConfigFromNuxt(options, overrides) {
           ["{test,tests}/nuxt/**.*", "nuxt"]
         ],
         deps: {
+          // TODO: move to server.deps.inline when we update to vite v1
           inline: [
             // vite-node defaults
             /\/node_modules\/(.*\/)?(nuxt|nuxt3|nuxt-nightly)\//,
             /^#/,
             // additional deps
             "@nuxt/test-utils",
+            "@nuxt/test-utils-nightly",
+            "@nuxt/test-utils-edge",
             "vitest-environment-nuxt",
             ...options.nuxt.options.build.transpile.filter(
               (r) => typeof r === "string" || r instanceof RegExp
             )
-          ]
+          ],
+          optimizer: {
+            web: {
+              enabled: false
+            }
+          }
         }
       }
     },
@@ -131,6 +127,11 @@ async function getVitestConfigFromNuxt(options, overrides) {
     }
   );
   delete resolvedConfig.define["process.browser"];
+  if (!Array.isArray(resolvedConfig.test.setupFiles)) {
+    resolvedConfig.test.setupFiles = [resolvedConfig.test.setupFiles].filter(Boolean);
+  }
+  const resolver = createResolver(import.meta.url);
+  resolvedConfig.test.setupFiles.unshift(resolver.resolve("./runtime/entry"));
   return resolvedConfig;
 }
 function defineVitestConfig(config = {}) {

package/dist/index.d.mts

@@ -37,6 +37,11 @@ interface TestContext {
     url?: string;
     serverProcess?: ExecaChildProcess;
     mockFn?: Function;
+    /**
+     * Functions to run on the vitest `afterAll` hook.
+     * Useful for removing anything created during the test.
+     */
+    teardown?: (() => void)[];
 }
 interface TestHooks {
     beforeEach: () => void;

package/dist/index.d.ts

@@ -37,6 +37,11 @@ interface TestContext {
     url?: string;
     serverProcess?: ExecaChildProcess;
     mockFn?: Function;
+    /**
+     * Functions to run on the vitest `afterAll` hook.
+     * Useful for removing anything created during the test.
+     */
+    teardown?: (() => void)[];
 }
 interface TestHooks {
     beforeEach: () => void;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { u as useTestContext, a as url, c as createTestContext, s as setTestContext, b as stopServer, d as startServer } from './shared/test-utils-nightly.ddf5bsCK.mjs';
 export { $ as $fetch, e as exposeContextToEnv, f as fetch, i as isDev, r as recoverContextFromEnv } from './shared/test-utils-nightly.ddf5bsCK.mjs';
 import { consola } from 'consola';
-import { promises, existsSync } from 'node:fs';
+import { existsSync, promises } from 'node:fs';
 import { resolve } from 'node:path';
 import { defu } from 'defu';
 import * as _kit from '@nuxt/kit';
@@ -83,12 +83,12 @@ async function loadFixture() {
   ctx.options.rootDir = resolveRootDir();
   if (!ctx.options.dev) {
     const randomId = Math.random().toString(36).slice(2, 8);
-    const buildDir = ctx.options.buildDir || resolve(ctx.options.rootDir, ".nuxt", randomId);
+    const buildDir2 = ctx.options.buildDir || resolve(ctx.options.rootDir, ".nuxt", "test", randomId);
     ctx.options.nuxtConfig = defu(ctx.options.nuxtConfig, {
-      buildDir,
+      buildDir: buildDir2,
       nitro: {
         output: {
-          dir: resolve(buildDir, "output")
+          dir: resolve(buildDir2, "output")
         }
       }
     });
@@ -99,7 +99,12 @@ async function loadFixture() {
     overrides: ctx.options.nuxtConfig,
     configFile: ctx.options.configFile
   });
-  await promises.mkdir(ctx.nuxt.options.buildDir, { recursive: true });
+  const buildDir = ctx.nuxt.options.buildDir;
+  if (!existsSync(buildDir)) {
+    await promises.mkdir(buildDir, { recursive: true });
+    ctx.teardown = ctx.teardown || [];
+    ctx.teardown.push(() => promises.rm(buildDir, { recursive: true, force: true }));
+  }
 }
 async function buildFixture() {
   const ctx = useTestContext();
@@ -151,6 +156,7 @@ function createTest(options) {
     if (ctx.browser) {
       await ctx.browser.close();
     }
+    await Promise.all((ctx.teardown || []).map((fn) => fn()));
   };
   const setup2 = async () => {
     if (ctx.options.fixture) {

package/dist/module.mjs

@@ -1,20 +1,19 @@
 import { pathToFileURL } from 'node:url';
-import { useNuxt, resolveIgnorePatterns, addVitePlugin, defineNuxtModule, resolvePath, logger } from '@nuxt/kit';
+import { resolvePath, useNuxt, resolveIgnorePatterns, addVitePlugin, defineNuxtModule, createResolver, logger } from '@nuxt/kit';
 import { mergeConfig } from 'vite';
-import { getVitestConfigFromNuxt } from './config.mjs';
 import { getPort } from 'get-port-please';
 import { h } from 'vue';
 import { debounce } from 'perfect-debounce';
 import { isCI } from 'std-env';
+import { defu } from 'defu';
+import { getVitestConfigFromNuxt } from './config.mjs';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { normalize, resolve } from 'node:path';
 import { createUnplugin } from 'unplugin';
-import '@vitejs/plugin-vue';
-import '@vitejs/plugin-vue-jsx';
-import 'defu';
+import { readFileSync } from 'node:fs';
 
-const PLUGIN_NAME = "nuxt:vitest:mock-transform";
+const PLUGIN_NAME$1 = "nuxt:vitest:mock-transform";
 const HELPER_MOCK_IMPORT = "mockNuxtImport";
 const HELPER_MOCK_COMPONENT = "mockComponent";
 const HELPER_MOCK_HOIST = "__NUXT_VITEST_MOCKS";
@@ -153,17 +152,11 @@ const createMockPlugin = (ctx) => createUnplugin(() => {
           ([from, mocks]) => {
             importPathsList.add(from);
             const lines = [
-              `vi.mock(${JSON.stringify(
-                from
-              )}, async (importOriginal) => {`,
-              `  const mocks = global.${HELPER_MOCK_HOIST}`,
-              `  if (!mocks[${JSON.stringify(
-                from
-              )}]) { mocks[${JSON.stringify(
-                from
-              )}] = { ...await importOriginal(${JSON.stringify(
-                from
-              )}) } }`
+              `vi.mock(${JSON.stringify(from)}, async (importOriginal) => {`,
+              `  const mocks = globalThis.${HELPER_MOCK_HOIST}`,
+              `  if (!mocks[${JSON.stringify(from)}]) {`,
+              `    mocks[${JSON.stringify(from)}] = { ...await importOriginal(${JSON.stringify(from)}) }`,
+              `  }`
             ];
             for (const mock of mocks) {
               if (mock.import.name === "default") {
@@ -172,9 +165,7 @@ const createMockPlugin = (ctx) => createUnplugin(() => {
                 );
               } else {
                 lines.push(
-                  `  mocks[${JSON.stringify(from)}][${JSON.stringify(
-                    mock.name
-                  )}] = await (${mock.factory})();`
+                  `  mocks[${JSON.stringify(from)}][${JSON.stringify(mock.name)}] = await (${mock.factory})();`
                 );
               }
             }
@@ -201,7 +192,7 @@ const createMockPlugin = (ctx) => createUnplugin(() => {
     if (!mockLines.length)
       return;
     s.prepend(`vi.hoisted(() => { 
-        if(!global.${HELPER_MOCK_HOIST}){
+        if(!globalThis.${HELPER_MOCK_HOIST}){
           vi.stubGlobal(${JSON.stringify(HELPER_MOCK_HOIST)}, {})
         }
       });
@@ -222,28 +213,29 @@ const createMockPlugin = (ctx) => createUnplugin(() => {
     };
   }
   return {
-    name: PLUGIN_NAME,
+    name: PLUGIN_NAME$1,
     enforce: "post",
     vite: {
       transform,
       // Place Vitest's mock plugin after all Nuxt plugins
-      configResolved(config) {
-        const firstSetupFile = Array.isArray(config.test?.setupFiles) ? config.test.setupFiles[0] : config.test?.setupFiles;
+      async configResolved(config) {
+        const firstSetupFile = Array.isArray(config.test?.setupFiles) ? config.test.setupFiles.find((p) => !p.includes("runtime/entry")) : config.test?.setupFiles;
         if (firstSetupFile) {
-          resolvedFirstSetupFile = normalize(resolve(firstSetupFile));
+          resolvedFirstSetupFile = await resolvePath(normalize(resolve(firstSetupFile)));
         }
         const plugins = config.plugins || [];
-        const mockPluginIndex = plugins.findIndex(
-          (i) => i.name === "vite:mocks" || i.name === "vitest:mocks"
-        );
+        const vitestPlugins = plugins.filter((p) => (p.name === "vite:mocks" || p.name.startsWith("vitest:")) && (p.enforce || p.order) === "post");
         const lastNuxt = findLastIndex(
           plugins,
           (i) => i.name?.startsWith("nuxt:")
         );
-        if (mockPluginIndex !== -1 && lastNuxt !== -1) {
-          if (mockPluginIndex < lastNuxt) {
-            const [mockPlugin] = plugins.splice(mockPluginIndex, 1);
-            plugins.splice(lastNuxt, 0, mockPlugin);
+        if (lastNuxt === -1)
+          return;
+        for (const plugin of vitestPlugins) {
+          const index = plugins.indexOf(plugin);
+          if (index < lastNuxt) {
+            plugins.splice(index, 1);
+            plugins.splice(lastNuxt, 0, plugin);
           }
         }
       }
@@ -307,6 +299,27 @@ function setupImportMocking() {
   addVitePlugin(createMockPlugin(ctx).vite());
 }
 
+const PLUGIN_NAME = "nuxt:vitest:nuxt-root-stub";
+const NuxtRootStubPlugin = createUnplugin((options) => {
+  return {
+    name: PLUGIN_NAME,
+    enforce: "pre",
+    vite: {
+      async resolveId(id) {
+        if (id.endsWith("nuxt-vitest-app-entry")) {
+          return id;
+        }
+      },
+      async load(id) {
+        if (id.endsWith("nuxt-vitest-app-entry")) {
+          const entryContents = readFileSync(options.entry, "utf-8");
+          return entryContents.replace("#build/root-component.mjs", options.rootStubPath);
+        }
+      }
+    }
+  };
+});
+
 const vitePluginBlocklist = ["vite-plugin-vue-inspector", "vite-plugin-inspect"];
 const module = defineNuxtModule({
   meta: {
@@ -321,6 +334,11 @@ const module = defineNuxtModule({
     if (nuxt.options.test || nuxt.options.dev) {
       setupImportMocking();
     }
+    const resolver = createResolver(import.meta.url);
+    addVitePlugin(NuxtRootStubPlugin.vite({
+      entry: await resolvePath("#app/entry", { alias: nuxt.options.alias }),
+      rootStubPath: await resolvePath(resolver.resolve("./runtime/nuxt-root"))
+    }));
     if (!nuxt.options.dev)
       return;
     if (nuxt.options.test && nuxt.options.app.rootId === "__nuxt") {
@@ -330,7 +348,7 @@ const module = defineNuxtModule({
       return;
     const rawViteConfigPromise = new Promise((resolve) => {
       nuxt.hook("app:resolve", () => {
-        nuxt.hook("vite:extendConfig", (config, { isClient }) => {
+        nuxt.hook("vite:configResolved", (config, { isClient }) => {
           if (isClient)
             resolve(config);
         });
@@ -347,7 +365,7 @@ const module = defineNuxtModule({
     }, 100);
     async function start() {
       const rawViteConfig = mergeConfig({}, await rawViteConfigPromise);
-      const viteConfig = await getVitestConfigFromNuxt({ nuxt, viteConfig: rawViteConfig });
+      const viteConfig = await getVitestConfigFromNuxt({ nuxt, viteConfig: defu({ test: options.vitestConfig }, rawViteConfig) });
       viteConfig.plugins = (viteConfig.plugins || []).filter((p) => {
         return !vitePluginBlocklist.includes(p?.name);
       });
@@ -367,9 +385,8 @@ const module = defineNuxtModule({
         }
       };
       const watchMode = !process.env.NUXT_VITEST_DEV_TEST && !isCI;
-      const vitestConfig = watchMode ? {
+      const overrides = watchMode ? {
         passWithNoTests: true,
-        ...options.vitestConfig,
         reporters: options.logToConsole ? [
           ...toArray(options.vitestConfig?.reporters ?? ["default"]),
           customReporter
@@ -381,12 +398,8 @@ const module = defineNuxtModule({
         api: {
           port: PORT
         }
-      } : {
-        ...options.vitestConfig,
-        watch: false
-      };
-      viteConfig.configFile = false;
-      const promise2 = startVitest("test", [], vitestConfig, viteConfig);
+      } : { watch: false };
+      const promise2 = startVitest("test", [], defu(overrides, viteConfig.test), viteConfig);
       promise2.catch(() => process.exit(1));
       if (watchMode) {
         logger.info(`Vitest UI starting on ${URL}`);

package/dist/runtime/entry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/runtime/entry.mjs

@@ -0,0 +1,8 @@
+if (typeof window !== "undefined" && // @ts-expect-error undefined property
+window.__NUXT_VITEST_ENVIRONMENT__) {
+  await import("#app/nuxt-vitest-app-entry").then((r) => r.default());
+  const nuxtApp = useNuxtApp();
+  await nuxtApp.callHook("page:finish");
+  useRouter().afterEach(() => nuxtApp.callHook("page:finish"));
+}
+export {};

package/dist/runtime/nuxt-root.d.ts

@@ -0,0 +1,4 @@
+declare const _default: import("vue").DefineComponent<{}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/dist/runtime/nuxt-root.mjs

@@ -0,0 +1,21 @@
+import { Suspense, defineComponent, h, onErrorCaptured, provide } from "vue";
+import { isNuxtError, useNuxtApp, useRoute } from "#imports";
+import { PageRouteSymbol } from "#app/components/injections";
+export default defineComponent({
+  setup(_options, { slots }) {
+    const nuxtApp = useNuxtApp();
+    provide(PageRouteSymbol, useRoute());
+    const done = nuxtApp.deferHydration();
+    const results = nuxtApp.hooks.callHookWith((hooks) => hooks.map((hook) => hook()), "vue:setup");
+    if (import.meta.dev && results && results.some((i) => i && "then" in i)) {
+      console.error("[nuxt] Error in `vue:setup`. Callbacks must be synchronous.");
+    }
+    onErrorCaptured((err, target, info) => {
+      nuxtApp.hooks.callHook("vue:error", err, target, info).catch((hookError) => console.error("[nuxt] Error in `vue:error` hook", hookError));
+      if (isNuxtError(err) && (err.fatal || err.unhandled)) {
+        return false;
+      }
+    });
+    return () => h(Suspense, { onResolve: done }, slots.default?.());
+  }
+});

package/dist/vitest-environment.d.mts

@@ -7,6 +7,7 @@ type NuxtBuiltinEnvironment = 'happy-dom' | 'jsdom';
 interface NuxtWindow extends Window {
     __app: App;
     __registry: Set<string>;
+    __NUXT_VITEST_ENVIRONMENT__?: boolean;
     __NUXT__: any;
     $fetch: any;
     fetch: any;

package/dist/vitest-environment.d.ts

@@ -7,6 +7,7 @@ type NuxtBuiltinEnvironment = 'happy-dom' | 'jsdom';
 interface NuxtWindow extends Window {
     __app: App;
     __registry: Set<string>;
+    __NUXT_VITEST_ENVIRONMENT__?: boolean;
     __NUXT__: any;
     $fetch: any;
     fetch: any;

package/dist/vitest-environment.mjs

@@ -72,6 +72,7 @@ const index = {
       happyDom: { url },
       jsdom: { url }
     }));
+    win.__NUXT_VITEST_ENVIRONMENT__ = true;
     win.__NUXT__ = {
       serverRendered: false,
       config: {
@@ -160,13 +161,12 @@ const index = {
     registry.add(`${manifestOutputPath}/latest.json`);
     registry.add(`${manifestOutputPath}/meta/test.json`);
     registry.add(`${manifestOutputPath}/meta/dev.json`);
-    await import('#app/entry').then((r) => r.default());
     return {
       // called after all tests with this env have been run
       teardown() {
-        teardown();
         keys.forEach((key) => delete global[key]);
         originals.forEach((v, k) => global[k] = v);
+        teardown();
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/test-utils-nightly",
-  "version": "3.8.2-1701501460.05dbe7f",
+  "version": "3.8.2-1701549256.62a6ffe",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/test-utils.git"
@@ -65,8 +65,6 @@
     "@testing-library/vue": "8.0.1",
     "@types/estree": "1.0.5",
     "@types/jsdom": "21.1.6",
-    "@vitejs/plugin-vue": "4.5.1",
-    "@vitejs/plugin-vue-jsx": "3.1.0",
     "@vitest/ui": "0.33.0",
     "@vue/test-utils": "2.4.3",
     "changelogen": "0.5.5",
@@ -82,15 +80,13 @@
     "unbuild": "latest",
     "unimport": "3.6.0",
     "vite": "5.0.4",
-    "vitest": "0.33.0",
+    "vitest": "0.34.6",
     "vue-router": "4.2.5",
     "vue-tsc": "1.8.24"
   },
   "peerDependencies": {
     "@jest/globals": "^29.5.0",
     "@testing-library/vue": "^7.0.0 || ^8.0.1",
-    "@vitejs/plugin-vue": "*",
-    "@vitejs/plugin-vue-jsx": "*",
     "@vitest/ui": "0.33.0",
     "@vue/test-utils": "^2.4.2",
     "h3": "*",
@@ -98,7 +94,7 @@
     "jsdom": "^22.0.0 || ^23.0.0",
     "playwright-core": "^1.34.3",
     "vite": "*",
-    "vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.33.0",
+    "vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.33.0 || ^0.34.6",
     "vue": "^3.3.4",
     "vue-router": "^4.0.0"
   },