@nuxt/test-utils 3.9.0-alpha.1 → 3.9.0-alpha.3

package/dist/config.d.mts

@@ -2,12 +2,17 @@ import * as vite from 'vite';
 import { InlineConfig } from 'vite';
 import { NuxtConfig, Nuxt } from '@nuxt/schema';
 import { InlineConfig as InlineConfig$1 } from 'vitest';
+import { DotenvOptions } from 'c12';
 
 interface GetVitestConfigOptions {
     nuxt: Nuxt;
     viteConfig: InlineConfig;
 }
-declare function getVitestConfigFromNuxt(options?: GetVitestConfigOptions, overrides?: NuxtConfig): Promise<InlineConfig & {
+interface LoadNuxtOptions {
+    dotenv?: Partial<DotenvOptions>;
+    overrides?: Partial<NuxtConfig>;
+}
+declare function getVitestConfigFromNuxt(options?: GetVitestConfigOptions, loadNuxtOptions?: LoadNuxtOptions): Promise<InlineConfig & {
     test: InlineConfig$1;
 }>;
 declare function defineVitestConfig(config?: InlineConfig & {
@@ -22,6 +27,13 @@ declare module 'vitest' {
              * @default {http://localhost:3000}
              */
             url?: string;
+            /**
+             * You can define how environment options are read when loading the Nuxt configuration.
+             */
+            dotenv?: Partial<DotenvOptions>;
+            /**
+             * Configuration that will override the values in your `nuxt.config` file.
+             */
             overrides?: NuxtConfig;
             /**
              * The id of the root div to which the app should be mounted. You should also set `app.rootId` to the same value.

package/dist/config.d.ts

@@ -2,12 +2,17 @@ import * as vite from 'vite';
 import { InlineConfig } from 'vite';
 import { NuxtConfig, Nuxt } from '@nuxt/schema';
 import { InlineConfig as InlineConfig$1 } from 'vitest';
+import { DotenvOptions } from 'c12';
 
 interface GetVitestConfigOptions {
     nuxt: Nuxt;
     viteConfig: InlineConfig;
 }
-declare function getVitestConfigFromNuxt(options?: GetVitestConfigOptions, overrides?: NuxtConfig): Promise<InlineConfig & {
+interface LoadNuxtOptions {
+    dotenv?: Partial<DotenvOptions>;
+    overrides?: Partial<NuxtConfig>;
+}
+declare function getVitestConfigFromNuxt(options?: GetVitestConfigOptions, loadNuxtOptions?: LoadNuxtOptions): Promise<InlineConfig & {
     test: InlineConfig$1;
 }>;
 declare function defineVitestConfig(config?: InlineConfig & {
@@ -22,6 +27,13 @@ declare module 'vitest' {
              * @default {http://localhost:3000}
              */
             url?: string;
+            /**
+             * You can define how environment options are read when loading the Nuxt configuration.
+             */
+            dotenv?: Partial<DotenvOptions>;
+            /**
+             * Configuration that will override the values in your `nuxt.config` file.
+             */
             overrides?: NuxtConfig;
             /**
              * The id of the root div to which the app should be mounted. You should also set `app.rootId` to the same value.

package/dist/config.mjs

@@ -1,19 +1,56 @@
 import { defineConfig } from 'vite';
+import { setupDotenv } from 'c12';
 import { defu } from 'defu';
 import { createResolver } from '@nuxt/kit';
+import destr from 'destr';
+import { snakeCase } from 'scule';
 
-async function startNuxtAndGetViteConfig(rootDir = process.cwd(), overrides) {
+function getEnv(key, opts) {
+  const env = opts.env ?? process.env;
+  const envKey = snakeCase(key).toUpperCase();
+  return destr(
+    env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey]
+  );
+}
+function _isObject(input) {
+  return typeof input === "object" && !Array.isArray(input);
+}
+function applyEnv(obj, opts, parentKey = "") {
+  for (const key in obj) {
+    const subKey = parentKey ? `${parentKey}_${key}` : key;
+    const envValue = getEnv(subKey, opts);
+    if (_isObject(obj[key])) {
+      if (_isObject(envValue)) {
+        obj[key] = { ...obj[key], ...envValue };
+        applyEnv(obj[key], opts, subKey);
+      } else if (envValue === void 0) {
+        applyEnv(obj[key], opts, subKey);
+      } else {
+        obj[key] = envValue ?? obj[key];
+      }
+    } else {
+      obj[key] = envValue ?? obj[key];
+    }
+  }
+  return obj;
+}
+
+async function startNuxtAndGetViteConfig(rootDir = process.cwd(), options = {}) {
   const { loadNuxt, buildNuxt } = await import('@nuxt/kit');
   const nuxt = await loadNuxt({
     cwd: rootDir,
     dev: false,
+    dotenv: defu(options.dotenv, {
+      cwd: rootDir,
+      fileName: ".env.test"
+    }),
     overrides: defu(
       {
         ssr: false,
         test: true,
         modules: ["@nuxt/test-utils/module"]
       },
-      overrides
+      options.overrides
     )
   });
   if (!nuxt.options._installedModules.find((i) => i?.meta?.name === "@nuxt/test-utils")) {
@@ -40,12 +77,15 @@ const excludedPlugins = [
   "nuxt:import-protection",
   "vite-plugin-checker"
 ];
-async function getVitestConfigFromNuxt(options, overrides) {
-  const { rootDir = process.cwd(), ..._overrides } = overrides || {};
+async function getVitestConfigFromNuxt(options, loadNuxtOptions = {}) {
+  const { rootDir = process.cwd(), ..._overrides } = loadNuxtOptions.overrides || {};
   if (!options) {
     options = await startNuxtAndGetViteConfig(rootDir, {
-      test: true,
-      ..._overrides
+      dotenv: loadNuxtOptions.dotenv,
+      overrides: {
+        test: true,
+        ..._overrides
+      }
     });
   }
   options.viteConfig.plugins = (options.viteConfig.plugins || []).filter((p) => !excludedPlugins.includes(p?.name));
@@ -58,7 +98,13 @@ async function getVitestConfigFromNuxt(options, overrides) {
       test: {
         dir: process.cwd(),
         environmentOptions: {
-          nuxtRuntimeConfig: options.nuxt.options.runtimeConfig,
+          nuxtRuntimeConfig: applyEnv(structuredClone(options.nuxt.options.runtimeConfig), {
+            prefix: "NUXT_",
+            env: await setupDotenv(defu(loadNuxtOptions.dotenv, {
+              cwd: rootDir,
+              fileName: ".env.test"
+            }))
+          }),
           nuxtRouteRules: defu(
             {},
             options.nuxt.options.routeRules,
@@ -69,21 +115,24 @@ async function getVitestConfigFromNuxt(options, overrides) {
           ["**/*.nuxt.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}", "nuxt"],
           ["{test,tests}/nuxt/**.*", "nuxt"]
         ],
+        server: {
+          deps: {
+            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
+              )
+            ]
+          }
+        },
         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
@@ -101,8 +150,8 @@ async function getVitestConfigFromNuxt(options, overrides) {
           transform(code, id) {
             if (id.match(/nuxt(3|-nightly)?\/.*\/entry\./)) {
               return code.replace(
-                /(?<!vueAppPromise = )entry\(\)\.catch/,
-                "Promise.resolve().catch"
+                /(?<!vueAppPromise = )entry\(\)/,
+                "Promise.resolve()"
               );
             }
           }
@@ -140,9 +189,15 @@ function defineVitestConfig(config = {}) {
       return config;
     const overrides = config.test?.environmentOptions?.nuxt?.overrides || {};
     overrides.rootDir = config.test?.environmentOptions?.nuxt?.rootDir;
+    if (config.test?.setupFiles && !Array.isArray(config.test.setupFiles)) {
+      config.test.setupFiles = [config.test.setupFiles].filter(Boolean);
+    }
     return defu(
       config,
-      await getVitestConfigFromNuxt(void 0, structuredClone(overrides))
+      await getVitestConfigFromNuxt(void 0, {
+        dotenv: config.test?.environmentOptions?.nuxt?.dotenv,
+        overrides: structuredClone(overrides)
+      })
     );
   });
 }

package/dist/e2e.mjs

@@ -1,5 +1,5 @@
-import { u as useTestContext, a as url, c as createTestContext, s as setTestContext, b as stopServer, d as startServer } from './shared/test-utils.ddf5bsCK.mjs';
-export { $ as $fetch, e as exposeContextToEnv, f as fetch, i as isDev, r as recoverContextFromEnv } from './shared/test-utils.ddf5bsCK.mjs';
+import { u as useTestContext, a as url, c as createTestContext, s as setTestContext, b as stopServer, d as startServer } from './shared/test-utils.B1uaYm8K.mjs';
+export { $ as $fetch, e as exposeContextToEnv, f as fetch, i as isDev, r as recoverContextFromEnv } from './shared/test-utils.B1uaYm8K.mjs';
 import { consola } from 'consola';
 import { existsSync, promises } from 'node:fs';
 import { resolve } from 'node:path';

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.ddf5bsCK.mjs';
+import { $ as $fetch, u as useTestContext } from './shared/test-utils.B1uaYm8K.mjs';
 import 'execa';
 import 'get-port-please';
 import 'ofetch';

package/dist/module.mjs

@@ -13,6 +13,9 @@ import { normalize, resolve } from 'node:path';
 import { createUnplugin } from 'unplugin';
 import { readFileSync } from 'node:fs';
 import { extname, join, dirname } from 'pathe';
+import 'c12';
+import 'destr';
+import 'scule';
 
 const PLUGIN_NAME$1 = "nuxt:vitest:mock-transform";
 const HELPER_MOCK_IMPORT = "mockNuxtImport";
@@ -405,10 +408,10 @@ const module = defineNuxtModule({
       promise2.catch(() => process.exit(1));
       if (watchMode) {
         logger.info(`Vitest UI starting on ${URL}`);
+        nuxt.hook("close", () => promise2.then((v) => v?.close()));
         await new Promise((resolve) => setTimeout(resolve, 1e3));
       } else {
-        promise2.then((v) => v?.close()).then(() => process.exit());
-        promise2.catch(() => process.exit(1));
+        promise2.then((v) => nuxt.close().then(() => v?.close()).then(() => process.exit()));
       }
       loaded = true;
     }

package/dist/runtime-utils/index.mjs

@@ -1,6 +1,6 @@
 import { defineEventHandler } from 'h3';
 import { mount } from '@vue/test-utils';
-import { h as h$1, Suspense, nextTick } from 'vue';
+import { reactive, h as h$1, Suspense, nextTick, isReadonly, unref } from 'vue';
 import { defu } from 'defu';
 import { defineComponent, useRouter, h } from '#imports';
 import NuxtRoot from '#build/root-component.mjs';
@@ -74,7 +74,10 @@ async function mountSuspended(component, options) {
   const { render, setup } = component;
   let setupContext;
   let setupState;
+  const setProps = reactive({});
+  let passedProps;
   const wrappedSetup = async (props2, setupContext2) => {
+    passedProps = props2;
     if (setup) {
       setupState = await setup(props2, setupContext2);
       return setupState;
@@ -97,6 +100,9 @@ async function mountSuspended(component, options) {
             {
               onResolve: () => nextTick().then(() => {
                 vm.setupState = setupState;
+                vm.__setProps = (props2) => {
+                  Object.assign(setProps, props2);
+                };
                 resolve(vm);
               })
             },
@@ -110,17 +116,20 @@ async function mountSuspended(component, options) {
                     name: "MountSuspendedComponent",
                     ...component,
                     render: render ? function(_ctx, ...args) {
+                      for (const key in setupState || {}) {
+                        renderContext[key] = isReadonly(setupState[key]) ? unref(setupState[key]) : setupState[key];
+                      }
                       for (const key in props || {}) {
                         renderContext[key] = _ctx[key];
                       }
-                      for (const key in setupState || {}) {
-                        renderContext[key] = setupState[key];
+                      for (const key in passedProps || {}) {
+                        renderContext[key] = passedProps[key];
                       }
                       return render.call(this, renderContext, ...args);
                     } : void 0,
                     setup: setup ? (props2) => wrappedSetup(props2, setupContext) : void 0
                   };
-                  return () => h$1(clonedComponent, { ...props, ...attrs }, slots);
+                  return () => h$1(clonedComponent, { ...defu(setProps, props), ...attrs }, slots);
                 }
               })
             }

package/dist/shared/{test-utils.ddf5bsCK.mjs → test-utils.B1uaYm8K.mjs}

@@ -18,8 +18,7 @@ function createTestContext(options) {
     server: true,
     build: options.browser !== false || options.server !== false,
     nuxtConfig: {},
-    // TODO: auto detect based on process.env
-    runner: "vitest",
+    runner: process.env.VITEST === "true" ? "vitest" : "jest",
     browserOptions: {
       type: "chromium"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/test-utils",
-  "version": "3.9.0-alpha.1",
+  "version": "3.9.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/test-utils.git"
@@ -30,8 +30,10 @@
   "dependencies": {
     "@nuxt/kit": "^3.8.2",
     "@nuxt/schema": "^3.8.2",
+    "c12": "^1.5.1",
     "consola": "^3.2.3",
     "defu": "^6.1.3",
+    "destr": "^2.0.2",
     "estree-walker": "^3.0.3",
     "execa": "^8.0.1",
     "fake-indexeddb": "^5.0.1",
@@ -43,6 +45,7 @@
     "pathe": "^1.1.1",
     "perfect-debounce": "^1.0.0",
     "radix3": "^1.1.0",
+    "scule": "^1.1.1",
     "std-env": "^3.6.0",
     "ufo": "^1.3.2",
     "unenv": "^1.8.0",
@@ -51,7 +54,7 @@
   },
   "devDependencies": {
     "@jest/globals": "29.7.0",
-    "@nuxt/devtools": "1.0.5",
+    "@nuxt/devtools": "1.0.6",
     "@nuxt/eslint-config": "0.2.0",
     "@nuxt/module-builder": "0.5.4",
     "@testing-library/vue": "8.0.1",
@@ -61,35 +64,35 @@
     "@vitest/ui": "1.0.4",
     "@vue/test-utils": "2.4.3",
     "changelogen": "0.5.5",
-    "eslint": "8.55.0",
-    "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-jsdoc": "46.9.0",
+    "eslint": "8.56.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsdoc": "46.9.1",
     "eslint-plugin-no-only-tests": "3.1.0",
     "eslint-plugin-unicorn": "49.0.0",
     "h3": "1.9.0",
     "jiti": "1.21.0",
     "nuxt": "3.8.2",
     "playwright-core": "1.40.1",
-    "rollup": "4.8.0",
+    "rollup": "4.9.1",
     "semver": "7.5.4",
     "unbuild": "latest",
     "unimport": "3.6.1",
-    "vite": "5.0.7",
-    "vitest": "1.0.4",
+    "vite": "5.0.10",
+    "vitest": "latest",
     "vue-router": "4.2.5",
     "vue-tsc": "1.8.25"
   },
   "peerDependencies": {
     "@jest/globals": "^29.5.0",
     "@testing-library/vue": "^7.0.0 || ^8.0.1",
-    "@vitest/ui": "^0.33.0 || ^0.34.6 || ^1.0.0",
+    "@vitest/ui": "^0.34.6 || ^1.0.0",
     "@vue/test-utils": "^2.4.2",
     "h3": "*",
     "happy-dom": "^9.10.9 || ^10.0.0 || ^11.0.0 || ^12.0.0",
     "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 || ^0.34.6 || ^1.0.0",
+    "vitest": "^0.34.6 || ^1.0.0",
     "vue": "^3.3.4",
     "vue-router": "^4.0.0"
   },
@@ -121,13 +124,13 @@
   },
   "resolutions": {
     "@nuxt/test-utils": "workspace:*",
-    "rollup": "4.8.0",
-    "vite": "5.0.7"
+    "rollup": "4.9.1",
+    "vite": "5.0.10"
   },
   "engines": {
     "node": "^14.18.0 || >=16.10.0"
   },
-  "packageManager": "pnpm@8.12.0",
+  "packageManager": "pnpm@8.12.1",
   "scripts": {
     "lint": "eslint --ext .vue,.ts,.js,.mjs .",
     "lint:fix": "eslint --ext .vue,.ts,.js,.mjs . --fix",
@@ -135,6 +138,6 @@
     "test:types": "vue-tsc --noEmit",
     "test:unit": "vitest test/unit --run",
     "dev:prepare": "nuxi prepare && unbuild --stub && pnpm -r dev:prepare",
-    "release": "pnpm test:examples && pnpm build && changelogen --release --push && pnpm publish"
+    "release": "pnpm test:examples && pnpm prepack && changelogen --release --push && pnpm publish"
   }
 }