@nx/vitest 23.0.0-beta.2 → 23.0.0-beta.21

package/{executors.d.ts → dist/executors.d.ts}

@@ -1,3 +1,2 @@
 export { VitestExecutorOptions } from './src/executors/test/schema';
 export { vitestExecutor } from './src/executors/test/vitest.impl';
-//# sourceMappingURL=executors.d.ts.map

package/{generators.d.ts → dist/generators.d.ts}

@@ -1,4 +1,3 @@
 export * from './src/generators/init/init';
 export { configurationGenerator } from './src/generators/configuration/configuration';
 export { VitestGeneratorSchema } from './src/generators/configuration/schema';
-//# sourceMappingURL=generators.d.ts.map

package/{index.d.ts → dist/index.d.ts}

@@ -1,2 +1 @@
 export { createNodesV2, VitestPluginOptions } from './src/plugins/plugin';
-//# sourceMappingURL=index.d.ts.map

package/{src → dist/src}/executors/test/compat.d.ts

@@ -1,3 +1,2 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=compat.d.ts.map

package/{src → dist/src}/executors/test/lib/nx-reporter.d.ts

@@ -17,4 +17,3 @@ export declare class NxReporter implements Reporter {
     onFinished(files: RunnerTestFile[], errors?: unknown[]): void;
     private _handleFinished;
 }
-//# sourceMappingURL=nx-reporter.d.ts.map

package/{src → dist/src}/executors/test/lib/utils.d.ts

@@ -9,4 +9,3 @@ export declare function getOptions(options: VitestExecutorOptions, context: Exec
  */
 export declare function resolveReportsDirectory(reportsDirectory: string): string;
 export declare function getOptionsAsArgv(obj: Record<string, any>): string[];
-//# sourceMappingURL=utils.d.ts.map

package/{src → dist/src}/executors/test/schema.json

@@ -5,6 +5,7 @@
   "title": "Vitest executor",
   "description": "Test using Vitest.",
   "type": "object",
+  "x-deprecated": "The `@nx/vitest:test` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vitest:convert-to-inferred` to migrate to the `@nx/vitest/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "configFile": {
       "type": "string",

package/{src → dist/src}/executors/test/vitest.impl.d.ts

@@ -4,4 +4,3 @@ export declare function vitestExecutor(options: VitestExecutorOptions, context:
     success: boolean;
 }, unknown>;
 export default vitestExecutor;
-//# sourceMappingURL=vitest.impl.d.ts.map

package/{src → dist/src}/executors/test/vitest.impl.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.vitestExecutor = vitestExecutor;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const nx_reporter_1 = require("./lib/nx-reporter");
 const utils_1 = require("./lib/utils");
 const executor_utils_1 = require("../../utils/executor-utils");
+const deprecation_1 = require("../../utils/deprecation");
 async function* vitestExecutor(options, context) {
+    (0, deprecation_1.warnVitestTestExecutorDeprecation)();
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     (0, internal_1.registerTsConfigPaths)((0, path_1.resolve)(devkit_1.workspaceRoot, projectRoot, 'tsconfig.json'));
     process.env.VITE_CJS_IGNORE_WARNING = 'true';

package/{src → dist/src}/generators/configuration/configuration.d.ts

@@ -6,4 +6,3 @@ import { VitestGeneratorSchema } from './schema';
 export declare function configurationGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
 export declare function configurationGeneratorInternal(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
 export default configurationGenerator;
-//# sourceMappingURL=configuration.d.ts.map

package/{src → dist/src}/generators/configuration/configuration.js

@@ -4,9 +4,9 @@ exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const generator_utils_1 = require("../../utils/generator-utils");
@@ -123,10 +123,10 @@ getTestBed().initTestEnvironment(
         else if (uiFramework === 'react') {
             (0, generator_utils_1.createOrEditViteConfig)(tree, {
                 project: schema.project,
-                includeLib: (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'library',
+                includeLib: (0, internal_2.getProjectType)(tree, root, projectType) === 'library',
                 includeVitest: true,
                 inSourceTests: schema.inSourceTests,
-                rollupOptionsExternal: [
+                rolldownOptionsExternal: [
                     "'react'",
                     "'react-dom'",
                     "'react/jsx-runtime'",
@@ -146,7 +146,7 @@ getTestBed().initTestEnvironment(
             (0, generator_utils_1.createOrEditViteConfig)(tree, {
                 ...schema,
                 includeVitest: true,
-                includeLib: (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'library',
+                includeLib: (0, internal_2.getProjectType)(tree, root, projectType) === 'library',
                 useEsmExtension: true,
             }, true, {
                 vitestFileName: useVitestConfig,
@@ -154,22 +154,21 @@ getTestBed().initTestEnvironment(
             });
         }
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     createFiles(tree, schema, root, isTsSolutionSetup);
     updateTsConfig(tree, schema, root, projectType);
     if (isTsSolutionSetup) {
         // in the TS solution setup, the test target depends on the build outputs
         // so we need to setup the task pipeline accordingly
-        const nxJson = (0, devkit_1.readNxJson)(tree);
+        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
         const testTarget = schema.testTarget ?? 'test';
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults[testTarget] ??= {};
-        nxJson.targetDefaults[testTarget].dependsOn ??= [];
-        nxJson.targetDefaults[testTarget].dependsOn = Array.from(new Set([...nxJson.targetDefaults[testTarget].dependsOn, '^build']));
+        const existing = findTestDefault(nxJson.targetDefaults, testTarget);
+        const dependsOn = Array.from(new Set([...(existing?.dependsOn ?? []), '^build']));
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: testTarget, dependsOn });
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     const devDependencies = await getCoverageProviderDependency(tree, schema.coverageProvider);
-    devDependencies['@types/node'] = versions_1.typesNodeVersion;
+    devDependencies['@types/node'] = internal_2.typesNodeVersion;
     if (!schema.skipPackageJson) {
         const installDependenciesTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
         tasks.push(installDependenciesTask);
@@ -231,7 +230,7 @@ function updateTsConfig(tree, options, projectRoot, projectType) {
             return json;
         });
     }
-    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, projectType) === 'application'
+    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, (0, internal_2.getProjectType)(tree, projectRoot, projectType) === 'application'
         ? 'tsconfig.app.json'
         : 'tsconfig.lib.json');
     if (options.runtimeTsconfigFileName) {
@@ -354,4 +353,14 @@ function findBuildTarget(project) {
     }
     return project.targets?.build ?? null;
 }
+function findTestDefault(td, target) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === target &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td[target];
+}
 exports.default = configurationGenerator;

package/dist/src/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -0,0 +1,7 @@
+import { type Tree } from '@nx/devkit';
+interface Schema {
+    project?: string;
+    skipFormat?: boolean;
+}
+export declare function convertToInferred(tree: Tree, options: Schema): Promise<void>;
+export default convertToInferred;

package/dist/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToInferred = convertToInferred;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+const plugin_1 = require("../../plugins/plugin");
+const test_post_target_transformer_1 = require("./lib/test-post-target-transformer");
+async function convertToInferred(tree, options) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/vitest', plugin_1.createNodesV2, { testTargetName: 'test' }, [
+        {
+            executors: ['@nx/vitest:test'],
+            postTargetTransformer: test_post_target_transformer_1.testPostTargetTransformer,
+            targetPluginOptionMapper: (target) => ({ testTargetName: target }),
+        },
+    ], options.project);
+    if (migratedProjects.size === 0) {
+        throw new internal_1.NoTargetsToMigrateError();
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+exports.default = convertToInferred;

package/dist/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts

@@ -0,0 +1,5 @@
+import { type TargetConfiguration, type Tree } from '@nx/devkit';
+export declare function testPostTargetTransformer(target: TargetConfiguration, tree: Tree, projectDetails: {
+    projectName: string;
+    root: string;
+}, inferredTargetConfiguration: TargetConfiguration): TargetConfiguration<any>;

package/dist/src/generators/convert-to-inferred/lib/test-post-target-transformer.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testPostTargetTransformer = testPostTargetTransformer;
+const internal_1 = require("@nx/devkit/internal");
+const utils_1 = require("./utils");
+function testPostTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
+    if (target.options) {
+        removePropertiesFromTargetOptions(target.options, projectDetails.root);
+    }
+    if (target.configurations) {
+        for (const configurationName in target.configurations) {
+            const configuration = target.configurations[configurationName];
+            removePropertiesFromTargetOptions(configuration, projectDetails.root);
+        }
+        if (Object.keys(target.configurations).length === 0) {
+            if ('defaultConfiguration' in target) {
+                delete target.defaultConfiguration;
+            }
+            delete target.configurations;
+        }
+        if ('defaultConfiguration' in target &&
+            !target.configurations[target.defaultConfiguration]) {
+            delete target.defaultConfiguration;
+        }
+    }
+    if (target.outputs) {
+        (0, internal_1.processTargetOutputs)(target, [{ newName: 'coverage.reportsDirectory', oldName: 'reportsDirectory' }], inferredTargetConfiguration, {
+            projectName: projectDetails.projectName,
+            projectRoot: projectDetails.root,
+        });
+    }
+    if (target.inputs &&
+        target.inputs.every((i) => i === 'default' || i === '^production')) {
+        delete target.inputs;
+    }
+    return target;
+}
+function removePropertiesFromTargetOptions(targetOptions, projectRoot) {
+    if ('configFile' in targetOptions) {
+        targetOptions.config = (0, utils_1.toProjectRelativePath)(targetOptions.configFile, projectRoot);
+        delete targetOptions.configFile;
+    }
+    if ('reportsDirectory' in targetOptions) {
+        if (targetOptions.reportsDirectory.startsWith('../')) {
+            targetOptions.reportsDirectory = targetOptions.reportsDirectory.replace(/(\.\.\/)+/, '');
+        }
+        targetOptions['coverage.reportsDirectory'] = (0, utils_1.toProjectRelativePath)(targetOptions.reportsDirectory, projectRoot);
+        delete targetOptions.reportsDirectory;
+    }
+    if ('testFiles' in targetOptions) {
+        targetOptions.testNamePattern = `"/(${targetOptions.testFiles
+            .map((f) => f.replace('.', '\\.'))
+            .join('|')})/"`;
+        delete targetOptions.testFiles;
+    }
+}

package/dist/src/generators/convert-to-inferred/lib/utils.d.ts

@@ -0,0 +1 @@
+export declare function toProjectRelativePath(path: string, projectRoot: string): string;

package/dist/src/generators/convert-to-inferred/lib/utils.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toProjectRelativePath = toProjectRelativePath;
+const posix_1 = require("path/posix");
+const devkit_1 = require("@nx/devkit");
+function toProjectRelativePath(path, projectRoot) {
+    if (projectRoot === '.') {
+        return path.startsWith('.') ? path : `./${path}`;
+    }
+    const relativePath = (0, posix_1.relative)((0, posix_1.resolve)(devkit_1.workspaceRoot, projectRoot), (0, posix_1.resolve)(devkit_1.workspaceRoot, path));
+    return relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+}

package/dist/src/generators/convert-to-inferred/schema.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxVitestConvertToInferred",
+  "description": "Convert existing vitest project(s) using `@nx/vitest:test` executors to use the `@nx/vitest` inferred plugin. Defaults to migrating all projects. Pass '--project' to migrate only one target.",
+  "title": "Convert vitest project from executor to inferred plugin",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The project to convert from using the `@nx/vitest:test` executor to use the `@nx/vitest` inferred plugin.",
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Whether to format files at the end of the migration.",
+      "default": false
+    }
+  }
+}

package/{src → dist/src}/generators/init/init.d.ts

@@ -4,4 +4,3 @@ export declare function updateDependencies(tree: Tree, schema: InitGeneratorSche
 export declare function updateNxJsonSettings(tree: Tree): void;
 export declare function initGenerator(tree: Tree, schema: InitGeneratorSchema): Promise<GeneratorCallback>;
 export default initGenerator;
-//# sourceMappingURL=init.d.ts.map

package/{src → dist/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");
@@ -29,7 +29,7 @@ function updateDependencies(tree, schema) {
     }, undefined, schema.keepExistingVersions);
 }
 function updateNxJsonSettings(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json');
@@ -37,13 +37,18 @@ function updateNxJsonSettings(tree) {
     }
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string' ? p === '@nx/vitest' : p.plugin === '@nx/vitest');
     if (!hasPlugin) {
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['@nx/vitest:test'] ??= {};
-        nxJson.targetDefaults['@nx/vitest:test'].cache ??= true;
-        nxJson.targetDefaults['@nx/vitest:test'].inputs ??= [
-            'default',
-            productionFileSet ? '^production' : '^default',
-        ];
+        const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === '@nx/vitest:test' &&
+            e.target === undefined &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: '@nx/vitest:test',
+            cache: existing?.cache ?? true,
+            inputs: existing?.inputs ?? [
+                'default',
+                productionFileSet ? '^production' : '^default',
+            ],
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
@@ -53,7 +58,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 → dist/src}/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.d.ts

@@ -1,3 +1,2 @@
 import { Tree } from '@nx/devkit';
 export default function addVitestTempFilesToGitIgnore(tree: Tree): void;
-//# sourceMappingURL=add-vitest-temp-files-to-git-ignore.d.ts.map

package/dist/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.md

@@ -0,0 +1,12 @@
+#### Add Vitest Temp Files to Git Ignore
+
+Add gitignore entry for temporary vitest config files.
+
+#### Sample Code Changes
+
+Adds the following entries to the `.gitignore` file.
+
+```text title=".gitignore"
+vite.config.*.timestamp*
+vitest.config.*.timestamp*
+```

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

@@ -7,4 +7,3 @@ import { type Tree } from '@nx/devkit';
  * {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 → dist/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/dist/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.md

@@ -0,0 +1,35 @@
+#### Prefix `reportsDirectory` with `{projectRoot}`
+
+The `reportsDirectory` option for `@nx/vitest:test` (and `@nx/vite:test`) is now resolved relative to the workspace root instead of the project root. This migration prepends `{projectRoot}/` to existing `reportsDirectory` values so the resolved path remains the same.
+
+#### Sample Code Changes
+
+##### Before
+
+```json title="project.json"
+{
+  "targets": {
+    "test": {
+      "executor": "@nx/vitest:test",
+      "options": {
+        "reportsDirectory": "coverage/libs/my-lib"
+      }
+    }
+  }
+}
+```
+
+##### After
+
+```json title="project.json" {6}
+{
+  "targets": {
+    "test": {
+      "executor": "@nx/vitest:test",
+      "options": {
+        "reportsDirectory": "{projectRoot}/coverage/libs/my-lib"
+      }
+    }
+  }
+}
+```

package/{src → dist/src}/plugins/plugin.d.ts

@@ -22,4 +22,3 @@ export interface VitestPluginOptions {
 export declare const createDependencies: CreateDependencies;
 export declare const createNodes: CreateNodesV2<VitestPluginOptions>;
 export declare const createNodesV2: CreateNodesV2<VitestPluginOptions>;
-//# sourceMappingURL=plugin.d.ts.map

package/{src → dist/src}/plugins/plugin.js

@@ -1,58 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 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/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 +26,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 +40,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 +52,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 +70,7 @@ exports.createNodes = [
             }, validConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
@@ -166,7 +126,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 +330,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 +341,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 +354,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 });
@@ -416,7 +376,7 @@ function checkIfConfigFileShouldBeProject(projectRoot, context) {
 }
 async function getTestPathsRelativeToProjectRoot(projectRoot, workspaceRoot) {
     const fullProjectRoot = (0, node_path_1.join)(workspaceRoot, projectRoot);
-    const { createVitest } = await Promise.resolve().then(() => __importStar(require('vitest/node')));
+    const { createVitest } = await import('vitest/node');
     const vitest = await createVitest('test', {
         root: fullProjectRoot,
         dir: fullProjectRoot,
@@ -424,7 +384,11 @@ async function getTestPathsRelativeToProjectRoot(projectRoot, workspaceRoot) {
         watch: false,
     });
     const relevantTestSpecifications = await vitest.getRelevantTestSpecifications();
+    // Sort to keep atomized target name insertion order stable.
+    // vitest.getRelevantTestSpecifications uses tinyglobby internally,
+    // which does not sort its filesystem traversal output.
     return relevantTestSpecifications
         .filter((ts) => fullProjectRoot === '.' ? true : ts.moduleId.startsWith(fullProjectRoot))
-        .map((ts) => (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, ts.moduleId)));
+        .map((ts) => (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, ts.moduleId)))
+        .sort();
 }

package/dist/src/utils/deprecation.d.ts

@@ -0,0 +1,3 @@
+export declare const VITEST_TEST_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/vitest:test` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vitest:convert-to-inferred` to migrate to the `@nx/vitest/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare function warnVitestTestExecutorDeprecation(): void;
+export declare function warnVitestExecutorGenerating(): void;

package/dist/src/utils/deprecation.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VITEST_TEST_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnVitestTestExecutorDeprecation = warnVitestTestExecutorDeprecation;
+exports.warnVitestExecutorGenerating = warnVitestExecutorGenerating;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove the @nx/vitest:test executor. The inferred plugin
+// (@nx/vitest/plugin) and the convert-to-inferred generator stay supported.
+exports.VITEST_TEST_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/vitest:test` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/vitest:convert-to-inferred` to migrate to the `@nx/vitest/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+function warnVitestTestExecutorDeprecation() {
+    devkit_1.logger.warn(exports.VITEST_TEST_EXECUTOR_DEPRECATION_MESSAGE);
+}
+// Fired when the @nx/vitest:configuration generator is about to generate a
+// target that uses the deprecated executor — i.e. when @nx/vitest/plugin
+// isn't registered in nx.json. Surfaces the deprecation at generation time
+// rather than only when the user later runs the generated target.
+function warnVitestExecutorGenerating() {
+    devkit_1.logger.warn('Generating a target that uses the deprecated `@nx/vitest:test` executor. This executor will be removed in Nx v24. Run `nx g @nx/vitest:convert-to-inferred` next to migrate this target to the `@nx/vitest/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+}

package/{src → dist/src}/utils/detect-ui-framework.d.ts

@@ -1,2 +1 @@
 export declare function detectUiFramework(project: string): Promise<'angular' | 'react' | 'none'>;
-//# sourceMappingURL=detect-ui-framework.d.ts.map

package/{src → dist/src}/utils/ensure-dependencies.d.ts

@@ -6,4 +6,3 @@ export type EnsureDependenciesOptions = {
     testEnvironment?: 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime' | string;
 };
 export declare function ensureDependencies(tree: Tree, schema: EnsureDependenciesOptions): Promise<GeneratorCallback>;
-//# sourceMappingURL=ensure-dependencies.d.ts.map