@nx/vitest 22.6.0-beta.10 → 22.6.0-beta.12

package/migrations.json

@@ -17,6 +17,11 @@
       },
       "description": "Create AI Instructions to help migrate users workspaces past breaking changes for Vitest 4.",
       "implementation": "./src/migrations/update-22-1-0/create-ai-instructions-for-vitest-4"
+    },
+    "update-22-6-0-prefix-reports-directory": {
+      "version": "22.6.0-beta.11",
+      "description": "Prefix reportsDirectory with {projectRoot} to maintain correct resolution after workspace-root-relative behavior change.",
+      "implementation": "./src/migrations/update-22-6-0/prefix-reports-directory-with-project-root"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/vitest",
   "description": "The Nx Plugin for Vitest to enable fast unit testing with Vitest.",
-  "version": "22.6.0-beta.10",
+  "version": "22.6.0-beta.12",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -52,8 +52,8 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "22.6.0-beta.10",
-    "@nx/js": "22.6.0-beta.10",
+    "@nx/devkit": "22.6.0-beta.12",
+    "@nx/js": "22.6.0-beta.12",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.1.4"
@@ -71,7 +71,7 @@
     }
   },
   "devDependencies": {
-    "nx": "22.6.0-beta.10"
+    "nx": "22.6.0-beta.12"
   },
   "types": "./src/index.d.ts"
 }

package/src/executors/test/lib/utils.d.ts

@@ -1,5 +1,12 @@
 import { ExecutorContext } from '@nx/devkit';
 import { VitestExecutorOptions } from '../schema';
 export declare function getOptions(options: VitestExecutorOptions, context: ExecutorContext, projectRoot: string): Promise<Record<string, any>>;
+/**
+ * Nx's resolveNxTokensInOptions strips {workspaceRoot}/ from option values,
+ * leaving a workspace-root-relative path. However, vitest resolves
+ * reportsDirectory relative to the project root. This function converts
+ * the path to absolute so vitest resolves it correctly.
+ */
+export declare function resolveReportsDirectory(reportsDirectory: string): string;
 export declare function getOptionsAsArgv(obj: Record<string, any>): string[];
 //# sourceMappingURL=utils.d.ts.map

package/src/executors/test/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/executors/test/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQlD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAkG9B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAcnE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/executors/test/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQlD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAoG9B;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAKxE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAcnE"}

package/src/executors/test/lib/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOptions = getOptions;
+exports.resolveReportsDirectory = resolveReportsDirectory;
 exports.getOptionsAsArgv = getOptionsAsArgv;
 const devkit_1 = require("@nx/devkit");
 const options_utils_1 = require("../../../utils/options-utils");
@@ -66,10 +67,24 @@ async function getOptions(options, context, projectRoot) {
             resolved?.config?.['test']?.reporters,
         coverage: {
             ...(coverage ?? {}),
-            ...(reportsDirectory && { reportsDirectory }),
+            ...(reportsDirectory && {
+                reportsDirectory: resolveReportsDirectory(reportsDirectory),
+            }),
         },
     };
 }
+/**
+ * Nx's resolveNxTokensInOptions strips {workspaceRoot}/ from option values,
+ * leaving a workspace-root-relative path. However, vitest resolves
+ * reportsDirectory relative to the project root. This function converts
+ * the path to absolute so vitest resolves it correctly.
+ */
+function resolveReportsDirectory(reportsDirectory) {
+    if ((0, path_1.isAbsolute)(reportsDirectory)) {
+        return reportsDirectory;
+    }
+    return (0, path_1.resolve)(devkit_1.workspaceRoot, reportsDirectory);
+}
 function getOptionsAsArgv(obj) {
     const argv = [];
     for (const [key, value] of Object.entries(obj)) {

package/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.d.ts

@@ -0,0 +1,10 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Migrates reportsDirectory option for @nx/vitest:test and @nx/vite:test executors.
+ *
+ * Previously, reportsDirectory was resolved relative to the project root (cwd).
+ * Now it is resolved relative to the workspace root. This migration prepends
+ * {projectRoot}/ to existing naked paths so the resolved location stays the same.
+ */
+export default function prefixReportsDirectoryWithProjectRoot(tree: Tree): void;
+//# sourceMappingURL=prefix-reports-directory-with-project-root.d.ts.map

package/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prefix-reports-directory-with-project-root.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EAIV,MAAM,YAAY,CAAC;AAQpB;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,qCAAqC,CAAC,IAAI,EAAE,IAAI,QAGvE"}

package/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = prefixReportsDirectoryWithProjectRoot;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const path_1 = require("path");
+/**
+ * Migrates reportsDirectory option for @nx/vitest:test and @nx/vite:test executors.
+ *
+ * Previously, reportsDirectory was resolved relative to the project root (cwd).
+ * Now it is resolved relative to the workspace root. This migration prepends
+ * {projectRoot}/ to existing naked paths so the resolved location stays the same.
+ */
+function prefixReportsDirectoryWithProjectRoot(tree) {
+    migrateProjectConfigurations(tree);
+    migrateTargetDefaults(tree);
+}
+function migrateProjectConfigurations(tree) {
+    const projectsToUpdate = new Map();
+    for (const executorName of ['@nx/vitest:test', '@nx/vite:test']) {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executorName, (options, projectName, targetName, configuration) => {
+            if (needsMigration(options.reportsDirectory)) {
+                if (!projectsToUpdate.has(projectName)) {
+                    projectsToUpdate.set(projectName, new Map());
+                }
+                const key = configuration
+                    ? `${targetName}::${configuration}`
+                    : targetName;
+                projectsToUpdate
+                    .get(projectName)
+                    .set(key, { target: targetName, configuration });
+            }
+        });
+    }
+    for (const [projectName] of projectsToUpdate) {
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        for (const [_targetName, target] of Object.entries(projectConfig.targets || {})) {
+            if (target.executor !== '@nx/vitest:test' &&
+                target.executor !== '@nx/vite:test') {
+                continue;
+            }
+            if (needsMigration(target.options?.reportsDirectory)) {
+                target.options.reportsDirectory = prependProjectRoot(target.options.reportsDirectory);
+            }
+            if (target.configurations) {
+                for (const config of Object.values(target.configurations)) {
+                    if (needsMigration(config?.reportsDirectory)) {
+                        config.reportsDirectory = prependProjectRoot(config.reportsDirectory);
+                    }
+                }
+            }
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    }
+}
+function migrateTargetDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.targetDefaults) {
+        return;
+    }
+    let hasChanges = false;
+    for (const [_key, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (targetConfig.executor !== '@nx/vitest:test' &&
+            targetConfig.executor !== '@nx/vite:test' &&
+            _key !== '@nx/vitest:test' &&
+            _key !== '@nx/vite:test') {
+            continue;
+        }
+        if (needsMigration(targetConfig.options?.reportsDirectory)) {
+            targetConfig.options.reportsDirectory = prependProjectRoot(targetConfig.options.reportsDirectory);
+            hasChanges = true;
+        }
+        if (targetConfig.configurations) {
+            for (const config of Object.values(targetConfig.configurations)) {
+                if (needsMigration(config?.reportsDirectory)) {
+                    config.reportsDirectory = prependProjectRoot(config.reportsDirectory);
+                    hasChanges = true;
+                }
+            }
+        }
+    }
+    if (hasChanges) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+function needsMigration(reportsDirectory) {
+    if (!reportsDirectory) {
+        return false;
+    }
+    if ((0, path_1.isAbsolute)(reportsDirectory)) {
+        return false;
+    }
+    // Already starts with {projectRoot} — already project-root-relative
+    if (reportsDirectory.startsWith('{projectRoot}')) {
+        return false;
+    }
+    // Already starts with {workspaceRoot} — user intended workspace-root-relative
+    if (reportsDirectory.startsWith('{workspaceRoot}')) {
+        return false;
+    }
+    return true;
+}
+function prependProjectRoot(reportsDirectory) {
+    return `{projectRoot}/${reportsDirectory}`;
+}

package/src/utils/generator-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;IACnD,gBAAgB,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,OAAO,QAuCnB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,CAAC,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,OAAO,EACnB,YAAY,GAAE;IACZ,4BAA4B,CAAC,EAAE,WAAW,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,QA8MP"}
+{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;IACnD,gBAAgB,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,OAAO,QAsCnB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,CAAC,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,OAAO,EACnB,YAAY,GAAE;IACZ,4BAA4B,CAAC,EAAE,WAAW,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,QA8MP"}

package/src/utils/generator-utils.js

@@ -16,7 +16,7 @@ function addOrChangeTestTarget(tree, options, hasPlugin) {
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const target = options.testTarget ?? 'test';
-    const reportsDirectory = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(project.root), 'coverage', project.root === '.' ? options.project : project.root);
+    const reportsDirectory = (0, devkit_1.joinPathFragments)('coverage', project.root === '.' ? options.project : project.root);
     const testOptions = {
         reportsDirectory,
     };