@nx/vitest 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/vitest",
   "description": "The Nx Plugin for Vitest to enable fast unit testing with Vitest.",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.7",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -52,14 +52,14 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.5",
-    "@nx/js": "23.0.0-beta.5",
+    "@nx/devkit": "23.0.0-beta.7",
+    "@nx/js": "23.0.0-beta.7",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
-    "@phenomnomnominal/tsquery": "~6.1.4"
+    "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "peerDependencies": {
-    "@nx/eslint": "23.0.0-beta.5",
+    "@nx/eslint": "23.0.0-beta.7",
     "vitest": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
@@ -75,6 +75,6 @@
     }
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.5"
+    "nx": "23.0.0-beta.7"
   }
 }

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAOvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAa/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBA2BzE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QA4B9C;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAkC1E;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAOvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAa/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBA2BzE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QA4B9C;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAkC1E;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = updateDependencies;
 exports.updateNxJsonSettings = updateNxJsonSettings;
 exports.initGenerator = initGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("../../utils/versions");
 const plugin_1 = require("../../plugins/plugin");
 const version_utils_1 = require("../../utils/version-utils");
@@ -53,7 +53,7 @@ async function initGenerator(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/vitest', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/vitest', plugin_1.createNodesV2, {
             testTargetName: ['test', 'vitest:test', 'vitest-test'],
             ciTargetName: ['test-ci', 'vitest:test-ci', 'vitest-test-ci'],
         }, schema.updatePackageScripts);

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

@@ -1 +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"}
+{"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":"AACA,OAAO,EAEL,KAAK,IAAI,EAIV,MAAM,YAAY,CAAC;AAOpB;;;;;;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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = prefixReportsDirectoryWithProjectRoot;
+const internal_1 = require("@nx/devkit/internal");
 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.
@@ -18,7 +18,7 @@ function prefixReportsDirectoryWithProjectRoot(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) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executorName, (options, projectName, targetName, configuration) => {
             if (needsMigration(options.reportsDirectory)) {
                 if (!projectsToUpdate.has(projectName)) {
                     projectsToUpdate.set(projectName, new Map());

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,EASd,MAAM,YAAY,CAAC;AAepB,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,CA2F1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAOd,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;AAOD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAgG1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -34,25 +34,16 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/src/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 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");
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -68,7 +59,7 @@ exports.createNodes = [
         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`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const { roots: projectRoots, configFiles: validConfigFiles } = configFilePaths.reduce((acc, configFile) => {
             const potentialRoot = (0, node_path_1.dirname)(configFile);
             if (checkIfConfigFileShouldBeProject(potentialRoot, context)) {
@@ -82,7 +73,7 @@ exports.createNodes = [
         });
         const lockfile = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         const tsconfigChainsByProjectRoot = collectTsconfigInputsByProjectRoot(projectRoots, context.workspaceRoot);
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, normalizedOptions, context, projectRoots.map((root) => [
+        const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, normalizedOptions, context, projectRoots.map((root) => [
             lockfile,
             ...(tsconfigChainsByProjectRoot.get(root) ?? []),
         ]));
@@ -94,8 +85,10 @@ exports.createNodes = [
                 // Adding the config file path to the hash ensures that the final hash value is different
                 // for different config files.
                 const hash = hashes[idx] + configFile;
-                const { projectType, metadata, targets } = (targetsCache[hash] ??=
-                    await buildVitestTargets(configFile, projectRoot, normalizedOptions, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []));
+                if (!targetsCache.has(hash)) {
+                    targetsCache.set(hash, await buildVitestTargets(configFile, projectRoot, normalizedOptions, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []));
+                }
+                const { projectType, metadata, targets } = targetsCache.get(hash);
                 const project = {
                     root: projectRoot,
                     targets,
@@ -110,7 +103,7 @@ exports.createNodes = [
             }, validConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
@@ -166,7 +159,7 @@ async function buildVitestTargets(configFilePath, projectRoot, options, context,
     }
     let metadata = {};
     const { testOutputs, hasTest } = getOutputs(viteBuildConfig, projectRoot, context.workspaceRoot);
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, 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) {
@@ -370,7 +363,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
         // 1. Walk the project tsconfig's extends chain
         const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
         if ((0, node_fs_1.existsSync)(projectTsconfig)) {
-            (0, internal_1.walkTsconfigExtendsChain)(projectTsconfig, (absPath) => {
+            (0, internal_2.walkTsconfigExtendsChain)(projectTsconfig, (absPath) => {
                 collect(absPath);
                 return 'continue';
             }, { jsonCache });
@@ -381,7 +374,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
         while (dir && dir !== '.') {
             const ancestorTsconfig = (0, node_path_1.join)(workspaceRoot, dir, 'tsconfig.json');
             if ((0, node_fs_1.existsSync)(ancestorTsconfig)) {
-                (0, internal_1.walkTsconfigExtendsChain)(ancestorTsconfig, (absPath) => {
+                (0, internal_2.walkTsconfigExtendsChain)(ancestorTsconfig, (absPath) => {
                     collect(absPath);
                     return 'continue';
                 }, { jsonCache });
@@ -394,7 +387,7 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
         // 3. Check the workspace root itself (dirname loop above stops at '.')
         const rootTsconfig = (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
         if ((0, node_fs_1.existsSync)(rootTsconfig)) {
-            (0, internal_1.walkTsconfigExtendsChain)(rootTsconfig, (absPath) => {
+            (0, internal_2.walkTsconfigExtendsChain)(rootTsconfig, (absPath) => {
                 collect(absPath);
                 return 'continue';
             }, { jsonCache });