@nx/vitest 22.6.4 → 22.6.5

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.4",
+  "version": "22.6.5",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -52,8 +52,8 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "22.6.4",
-    "@nx/js": "22.6.4",
+    "@nx/devkit": "22.6.5",
+    "@nx/js": "22.6.5",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.1.4"
@@ -71,7 +71,7 @@
     }
   },
   "devDependencies": {
-    "nx": "22.6.4"
+    "nx": "22.6.5"
   },
   "types": "./src/index.d.ts"
 }

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC5B;AAoBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CA+E1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EASd,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,mBAAmB;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;CAC5B;AAoBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAmF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -11,7 +11,6 @@ const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugins_1 = require("nx/src/utils/plugins");
 const executor_utils_1 = require("../utils/executor-utils");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
         ? (0, devkit_1.readJsonFile)(cachePath)
@@ -31,6 +30,7 @@ const vitestConfigGlob = '**/{vite,vitest}.config.{js,ts,mjs,mts,cjs,cts}';
 exports.createNodes = [
     vitestConfigGlob,
     async (configFilePaths, options, context) => {
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const normalizedOptions = normalizeOptions(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `vitest-${optionsHash}.hash`);
@@ -57,7 +57,7 @@ exports.createNodes = [
                 // for different config files.
                 const hash = hashes[idx] + configFile;
                 const { projectType, metadata, targets } = (targetsCache[hash] ??=
-                    await buildVitestTargets(configFile, projectRoot, normalizedOptions, context));
+                    await buildVitestTargets(configFile, projectRoot, normalizedOptions, context, pmc));
                 const project = {
                     root: projectRoot,
                     targets,
@@ -77,7 +77,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function buildVitestTargets(configFilePath, projectRoot, options, context) {
+async function buildVitestTargets(configFilePath, projectRoot, options, context, pmc) {
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
     // Workaround for the `build$3 is not a function` error that we sometimes see in agents.
     // This should be removed later once we address the issue properly
@@ -132,7 +132,7 @@ async function buildVitestTargets(configFilePath, projectRoot, options, context)
     const targets = {};
     // if file is vitest.config or vite.config has definition for test, create targets for test and/or atomized tests
     if (configFilePath.includes('vitest.config') || hasTest) {
-        targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot, options.testMode);
+        targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot, options.testMode, pmc);
         if (options.ciTargetName) {
             const groupName = options.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options.ciTargetName);
             const targetGroup = [];
@@ -207,7 +207,7 @@ async function buildVitestTargets(configFilePath, projectRoot, options, context)
     }
     return { targets, metadata, projectType: 'library' };
 }
-async function testTarget(namedInputs, outputs, projectRoot, testMode = 'watch') {
+async function testTarget(namedInputs, outputs, projectRoot, testMode = 'watch', pmc) {
     const command = testMode === 'run' ? 'vitest run' : 'vitest';
     return {
         command,
@@ -261,10 +261,10 @@ function normalizeOutputPath(outputPath, projectRoot, workspaceRoot, path) {
         }
         else {
             if (outputPath.startsWith('..')) {
-                return (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, outputPath));
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', projectRoot, outputPath);
             }
             else {
-                return (0, node_path_1.join)('{projectRoot}', outputPath);
+                return (0, devkit_1.joinPathFragments)('{projectRoot}', outputPath);
             }
         }
     }
@@ -296,5 +296,5 @@ async function getTestPathsRelativeToProjectRoot(projectRoot, workspaceRoot) {
     const relevantTestSpecifications = await vitest.getRelevantTestSpecifications();
     return relevantTestSpecifications
         .filter((ts) => fullProjectRoot === '.' ? true : ts.moduleId.startsWith(fullProjectRoot))
-        .map((ts) => (0, node_path_1.relative)(projectRoot, ts.moduleId));
+        .map((ts) => (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, ts.moduleId)));
 }