@nx/vite 22.1.0-beta.6 → 22.1.0-beta.7

package/generators.json

@@ -27,7 +27,7 @@
       "description": "Convert existing Vite project(s) using `@nx/vite:*` executors to use `@nx/vite/plugin`. Defaults to migrating all projects. Pass '--project' to migrate only one target."
     },
     "vitest": {
-      "factory": "./src/generators/vitest/vitest-generator#vitestGeneratorInternal",
+      "factory": "./src/generators/vitest/vitest-generator",
       "schema": "./src/generators/vitest/schema.json",
       "description": "Generate a vitest configuration."
     }

package/migrations.json

@@ -10,11 +10,6 @@
       "description": "Add gitignore entry for temporary vite config files and remove previous incorrect glob.",
       "implementation": "./src/migrations/update-20-0-4/add-vite-temp-files-to-git-ignore"
     },
-    "update-20-3-0": {
-      "version": "20.3.0-beta.2",
-      "description": "Add gitignore entry for temporary vitest config files.",
-      "implementation": "./src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore"
-    },
     "update-20-5-0-install-jiti": {
       "version": "20.5.0-beta.2",
       "description": "Install jiti as a devDependency to allow vite to parse TS postcss files.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.1.0-beta.6",
+  "version": "22.1.0-beta.7",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -30,10 +30,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.1.0-beta.6",
+    "@nx/devkit": "22.1.0-beta.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.1.0-beta.6",
+    "@nx/js": "22.1.0-beta.7",
+    "@nx/vitest": "22.1.0-beta.7",
     "picomatch": "4.0.2",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -41,7 +42,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.6"
+    "nx": "22.1.0-beta.7"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",

package/src/executors/test/vitest.impl.d.ts

@@ -1,7 +1,8 @@
 import { ExecutorContext } from '@nx/devkit';
 import { VitestExecutorOptions } from './schema';
-export declare function vitestExecutor(options: VitestExecutorOptions, context: ExecutorContext): AsyncGenerator<never, {
-    success: boolean;
-}, unknown>;
+/**
+ * @deprecated Use `@nx/vitest:test` instead. This executor will be removed in Nx 23.
+ */
+export declare function vitestExecutor(options: VitestExecutorOptions, context: ExecutorContext): AsyncGenerator<never, void, unknown>;
 export default vitestExecutor;
 //# sourceMappingURL=vitest.impl.d.ts.map

package/src/executors/test/vitest.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAuB,cAAc,CACnC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;YAkEzB;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"vitest.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/executors/test/vitest.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,YAAY,CAAC;AAGrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;GAEG;AACH,wBAAuB,cAAc,CACnC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,wCAWzB;AAED,eAAe,cAAc,CAAC"}

package/src/executors/test/vitest.impl.js

@@ -2,58 +2,14 @@
 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 nx_reporter_1 = require("./lib/nx-reporter");
-const utils_1 = require("./lib/utils");
-const executor_utils_1 = require("../../utils/executor-utils");
+const devkit_2 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+/**
+ * @deprecated Use `@nx/vitest:test` instead. This executor will be removed in Nx 23.
+ */
 async function* vitestExecutor(options, context) {
-    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';
-    // Allows ESM to be required in CJS modules. Vite will be published as ESM in the future.
-    const { startVitest } = await (0, executor_utils_1.loadVitestDynamicImport)();
-    const resolvedOptions = (await (0, utils_1.getOptions)(options, context, projectRoot)) ?? {};
-    const watch = resolvedOptions['watch'] === true;
-    const nxReporter = new nx_reporter_1.NxReporter(watch);
-    if (resolvedOptions['reporters'] === undefined) {
-        resolvedOptions['reporters'] = [];
-    }
-    else if (typeof resolvedOptions['reporters'] === 'string') {
-        resolvedOptions['reporters'] = [resolvedOptions['reporters']];
-    }
-    resolvedOptions['reporters'].push(nxReporter);
-    const cliFilters = options.testFiles ?? [];
-    const ctx = await startVitest(resolvedOptions['mode'] ?? 'test', cliFilters, resolvedOptions);
-    let hasErrors = false;
-    const processExit = () => {
-        ctx.exit();
-        if (hasErrors) {
-            process.exit(1);
-        }
-        else {
-            process.exit(0);
-        }
-    };
-    if (watch) {
-        process.on('SIGINT', processExit);
-        process.on('SIGTERM', processExit);
-        process.on('exit', processExit);
-    }
-    // vitest sets the exitCode in case of exception without notifying reporters
-    if (process.exitCode === undefined ||
-        (watch && ctx.state.getFiles().length > 0)) {
-        for await (const report of nxReporter) {
-            // vitest sets the exitCode = 1 when code coverage isn't met
-            hasErrors =
-                report.hasErrors || (process.exitCode && process.exitCode !== 0);
-        }
-    }
-    else {
-        hasErrors = process.exitCode !== 0;
-    }
-    return {
-        success: !hasErrors,
-    };
+    devkit_1.logger.warn(`The '@nx/vite:test' executor is deprecated. Please use '@nx/vitest:test' instead. This executor will be removed in Nx 23.`);
+    const { vitestExecutor: actualVitestExecutor } = (0, devkit_2.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+    yield* actualVitestExecutor(options, context);
 }
 exports.default = vitestExecutor;

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QA+B9C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAEpE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BA2D5B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QAe9C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAEpE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BA2D5B;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -16,18 +16,6 @@ function updateNxJsonSettings(tree) {
         productionFileSet.push('!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json', '!{projectRoot}/src/test-setup.[jt]s');
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/vite/plugin'
-        : p.plugin === '@nx/vite/plugin');
-    if (!hasPlugin) {
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['@nx/vite:test'] ??= {};
-        nxJson.targetDefaults['@nx/vite:test'].cache ??= true;
-        nxJson.targetDefaults['@nx/vite:test'].inputs ??= [
-            'default',
-            productionFileSet ? '^production' : '^default',
-        ];
-    }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function initGenerator(tree, schema) {

package/src/generators/init/lib/utils.d.ts

@@ -2,5 +2,4 @@ import { Tree } from '@nx/devkit';
 import { InitGeneratorSchema } from '../schema';
 export declare function checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export declare function moveToDevDependencies(tree: Tree): () => void;
-export declare function createVitestConfig(tree: Tree): void;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAqB5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,QAc5C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAqB5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C"}

package/src/generators/init/lib/utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependenciesInstalled = checkDependenciesInstalled;
 exports.moveToDevDependencies = moveToDevDependencies;
-exports.createVitestConfig = createVitestConfig;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../../utils/version-utils");
@@ -36,12 +35,3 @@ function moveToDevDependencies(tree) {
     });
     return wasUpdated ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
 }
-function createVitestConfig(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');
-        nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}

package/src/generators/vitest/schema.d.ts

@@ -1,6 +1,6 @@
 export interface VitestGeneratorSchema {
   project: string;
-  uiFramework?: 'angular' | 'react' | 'none';
+  uiFramework?: 'angular' | 'react' | 'vue' | 'none';
   coverageProvider: 'v8' | 'istanbul' | 'custom';
   inSourceTests?: boolean;
   skipViteConfig?: boolean;

package/src/generators/vitest/schema.json

@@ -15,7 +15,7 @@
     },
     "uiFramework": {
       "type": "string",
-      "enum": ["angular", "react", "none"],
+      "enum": ["angular", "react", "vue", "none"],
       "description": "UI framework to use with vitest."
     },
     "inSourceTests": {

package/src/generators/vitest/vitest-generator.d.ts

@@ -1,9 +1,8 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { VitestGeneratorSchema } from './schema';
 /**
- * @param hasPlugin some frameworks (e.g. Nuxt) provide their own plugin. Their generators handle the plugin detection.
+ * @deprecated Use `@nx/vitest:configuration` instead. This generator will be removed in Nx 23.
  */
-export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
-export declare function vitestGeneratorInternal(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
+export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<import("@nx/devkit").GeneratorCallback>;
 export default vitestGenerator;
 //# sourceMappingURL=vitest-generator.d.ts.map

package/src/generators/vitest/vitest-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest-generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAsLlB;AA2LD,eAAe,eAAe,CAAC"}
+{"version":3,"file":"vitest-generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAU,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,mDAYlB;AAED,eAAe,eAAe,CAAC"}

package/src/generators/vitest/vitest-generator.js

@@ -1,285 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vitestGenerator = vitestGenerator;
-exports.vitestGeneratorInternal = vitestGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-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 path_1 = require("path");
-const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
-const generator_utils_1 = require("../../utils/generator-utils");
-const init_1 = require("../init/init");
-const detect_ui_framework_1 = require("../../utils/detect-ui-framework");
-const version_utils_1 = require("../../utils/version-utils");
-const semver_1 = require("semver");
+const devkit_2 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
 /**
- * @param hasPlugin some frameworks (e.g. Nuxt) provide their own plugin. Their generators handle the plugin detection.
+ * @deprecated Use `@nx/vitest:configuration` instead. This generator will be removed in Nx 23.
  */
-function vitestGenerator(tree, schema, hasPlugin = false) {
-    return vitestGeneratorInternal(tree, { addPlugin: false, ...schema }, hasPlugin);
-}
-async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
-    // Setting default to jsdom since it is the most common use case (React, Web).
-    // The @nx/js:lib generator specifically sets this to node to be more generic.
-    schema.testEnvironment ??= 'jsdom';
-    const tasks = [];
-    const { root, projectType: _projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    const projectType = schema.projectType ?? _projectType;
-    const uiFramework = schema.uiFramework ?? (await (0, detect_ui_framework_1.detectUiFramework)(schema.project));
-    const isRootProject = root === '.';
-    tasks.push(await (0, js_1.initGenerator)(tree, { ...schema, skipFormat: true }));
-    const viteVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vite') ?? '7.0.0';
-    const useViteV5 = (0, semver_1.major)((0, semver_1.coerce)(viteVersion)) === 5;
-    const useViteV6 = (0, semver_1.major)((0, semver_1.coerce)(viteVersion)) === 6;
-    const initTask = await (0, init_1.default)(tree, {
-        projectRoot: root,
-        skipFormat: true,
-        addPlugin: schema.addPlugin,
-        useViteV5,
-        useViteV6,
-    });
-    tasks.push(initTask);
-    tasks.push((0, ensure_dependencies_1.ensureDependencies)(tree, { ...schema, uiFramework }));
-    (0, generator_utils_1.addOrChangeTestTarget)(tree, schema, hasPlugin);
-    if (!schema.skipViteConfig) {
-        if (uiFramework === 'angular') {
-            const relativeTestSetupPath = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
-            const setupFile = (0, devkit_1.joinPathFragments)(root, relativeTestSetupPath);
-            if (!tree.exists(setupFile)) {
-                if (isAngularV20(tree)) {
-                    tree.write(setupFile, `import '@angular/compiler';
-import '@analogjs/vitest-angular/setup-zone';
-
-import {
-  BrowserTestingModule,
-  platformBrowserTesting,
-} from '@angular/platform-browser/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserTestingModule,
-  platformBrowserTesting()
-);
-`);
-                }
-                else {
-                    tree.write(setupFile, `import '@analogjs/vitest-angular/setup-zone';
-
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-import { getTestBed } from '@angular/core/testing';
-
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-`);
-                }
-            }
-            (0, generator_utils_1.createOrEditViteConfig)(tree, {
-                project: schema.project,
-                includeLib: false,
-                includeVitest: true,
-                inSourceTests: false,
-                imports: [`import angular from '@analogjs/vite-plugin-angular'`],
-                plugins: ['angular()'],
-                setupFile: relativeTestSetupPath,
-                useEsmExtension: true,
-            }, true);
-        }
-        else if (uiFramework === 'react') {
-            (0, generator_utils_1.createOrEditViteConfig)(tree, {
-                project: schema.project,
-                includeLib: (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'library',
-                includeVitest: true,
-                inSourceTests: schema.inSourceTests,
-                rollupOptionsExternal: [
-                    "'react'",
-                    "'react-dom'",
-                    "'react/jsx-runtime'",
-                ],
-                imports: [
-                    schema.compiler === 'swc'
-                        ? `import react from '@vitejs/plugin-react-swc'`
-                        : `import react from '@vitejs/plugin-react'`,
-                ],
-                plugins: ['react()'],
-                coverageProvider: schema.coverageProvider,
-            }, true);
-        }
-        else {
-            (0, generator_utils_1.createOrEditViteConfig)(tree, {
-                ...schema,
-                includeVitest: true,
-                includeLib: (0, ts_solution_setup_1.getProjectType)(tree, root, projectType) === 'library',
-            }, true);
-        }
-    }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.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 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']));
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
-    const devDependencies = await getCoverageProviderDependency(tree, schema.coverageProvider);
-    devDependencies['@types/node'] = versions_1.typesNodeVersion;
-    const installDependenciesTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-    tasks.push(installDependenciesTask);
-    // Setup workspace config file (https://vitest.dev/guide/workspace.html)
-    if (!isRootProject &&
-        !tree.exists(`vitest.workspace.ts`) &&
-        !tree.exists(`vitest.workspace.js`) &&
-        !tree.exists(`vitest.workspace.json`) &&
-        !tree.exists(`vitest.projects.ts`) &&
-        !tree.exists(`vitest.projects.js`) &&
-        !tree.exists(`vitest.projects.json`)) {
-        tree.write('vitest.workspace.ts', `export default ['**/vite.config.{mjs,js,ts,mts}', '**/vitest.config.{mjs,js,ts,mts}'];`);
-    }
-    if (!schema.skipFormat) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
-}
-function updateTsConfig(tree, options, projectRoot, projectType) {
-    const setupFile = tryFindSetupFile(tree, projectRoot);
-    if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.spec.json'))) {
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.spec.json'), (json) => {
-            if (!json.compilerOptions?.types?.includes('vitest')) {
-                if (json.compilerOptions?.types) {
-                    json.compilerOptions.types.push('vitest');
-                }
-                else {
-                    json.compilerOptions ??= {};
-                    json.compilerOptions.types = ['vitest'];
-                }
-            }
-            if (setupFile) {
-                json.files = [...(json.files ?? []), setupFile];
-            }
-            return json;
-        });
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json'), (json) => {
-            if (json.references &&
-                !json.references.some((r) => r.path === './tsconfig.spec.json')) {
-                json.references.push({
-                    path: './tsconfig.spec.json',
-                });
-            }
-            return json;
-        });
-    }
-    else {
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json'), (json) => {
-            if (!json.compilerOptions?.types?.includes('vitest')) {
-                if (json.compilerOptions?.types) {
-                    json.compilerOptions.types.push('vitest');
-                }
-                else {
-                    json.compilerOptions ??= {};
-                    json.compilerOptions.types = ['vitest'];
-                }
-            }
-            return json;
-        });
-    }
-    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, projectType) === 'application'
-        ? 'tsconfig.app.json'
-        : 'tsconfig.lib.json');
-    if (options.runtimeTsconfigFileName) {
-        runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, options.runtimeTsconfigFileName);
-        if (!tree.exists(runtimeTsconfigPath)) {
-            throw new Error(`Cannot find the specified runtimeTsConfigFileName ("${options.runtimeTsconfigFileName}") at the project root "${projectRoot}".`);
-        }
-    }
-    if (tree.exists(runtimeTsconfigPath)) {
-        (0, devkit_1.updateJson)(tree, runtimeTsconfigPath, (json) => {
-            if (options.inSourceTests) {
-                (json.compilerOptions.types ??= []).push('vitest/importMeta');
-            }
-            else {
-                const uniqueExclude = new Set([
-                    ...(json.exclude || []),
-                    'vite.config.ts',
-                    'vite.config.mts',
-                    'vitest.config.ts',
-                    'vitest.config.mts',
-                    'src/**/*.test.ts',
-                    'src/**/*.spec.ts',
-                    'src/**/*.test.tsx',
-                    'src/**/*.spec.tsx',
-                    'src/**/*.test.js',
-                    'src/**/*.spec.js',
-                    'src/**/*.test.jsx',
-                    'src/**/*.spec.jsx',
-                ]);
-                json.exclude = [...uniqueExclude];
-            }
-            if (setupFile) {
-                json.exclude = [...(json.exclude ?? []), setupFile];
-            }
-            return json;
-        });
-    }
-    else {
-        devkit_1.logger.warn(`Couldn't find a runtime tsconfig file at ${runtimeTsconfigPath} to exclude the test files from. ` +
-            `If you're using a different filename for your runtime tsconfig, please provide it with the '--runtimeTsconfigFileName' flag.`);
-    }
-}
-function createFiles(tree, options, projectRoot, isTsSolutionSetup) {
-    const rootOffset = (0, devkit_1.offsetFromRoot)(projectRoot);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectRoot, {
-        tmpl: '',
-        ...options,
-        projectRoot,
-        extendedConfig: isTsSolutionSetup
-            ? `${rootOffset}tsconfig.base.json`
-            : './tsconfig.json',
-        outDir: isTsSolutionSetup
-            ? `./out-tsc/vitest`
-            : `${rootOffset}dist/out-tsc`,
-    });
-}
-async function getCoverageProviderDependency(tree, coverageProvider) {
-    const { vitestCoverageV8, vitestCoverageIstanbul } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(tree);
-    switch (coverageProvider) {
-        case 'v8':
-            return {
-                '@vitest/coverage-v8': vitestCoverageV8,
-            };
-        case 'istanbul':
-            return {
-                '@vitest/coverage-istanbul': vitestCoverageIstanbul,
-            };
-        default:
-            return {
-                '@vitest/coverage-v8': vitestCoverageV8,
-            };
-    }
-}
-function tryFindSetupFile(tree, projectRoot) {
-    const setupFile = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
-    if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, setupFile))) {
-        return setupFile;
-    }
-}
-function isAngularV20(tree) {
-    const angularVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/core');
-    if (!angularVersion) {
-        // assume the latest version will be installed, which will be 20 or later
-        return true;
-    }
-    const cleanedAngularVersion = (0, semver_1.clean)(angularVersion) ?? (0, semver_1.coerce)(angularVersion).version;
-    return (0, semver_1.major)(cleanedAngularVersion) >= 20;
+async function vitestGenerator(tree, schema, hasPlugin = false) {
+    devkit_1.logger.warn(`The '@nx/vite:vitest' generator is deprecated. Please use '@nx/vitest:configuration' instead. This generator will be removed in Nx 23.`);
+    const { configurationGenerator } = (0, devkit_2.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+    return await configurationGenerator(tree, schema, hasPlugin);
 }
 exports.default = vitestGenerator;

package/src/utils/ignore-vite-temp-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ignore-vite-temp-files.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/ignore-vite-temp-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAG9E,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAe5D;AAoCD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAYrD"}
+{"version":3,"file":"ignore-vite-temp-files.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/ignore-vite-temp-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAG9E,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAW5D;AAiCD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAYrD"}

package/src/utils/ignore-vite-temp-files.js

@@ -17,10 +17,6 @@ function addViteTempFilesToGitIgnore(tree) {
         gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
       vite.config.*.timestamp*`;
     }
-    if (!/^vitest\.config\.\*\.timestamp\*$/m.test(gitIgnoreContents)) {
-        gitIgnoreContents = (0, devkit_1.stripIndents) `${gitIgnoreContents}
-      vitest.config.*.timestamp*`;
-    }
     tree.write('.gitignore', gitIgnoreContents);
 }
 async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
@@ -42,10 +38,7 @@ async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
     }
     // for flat config, we update the root config file
     const directory = isUsingFlatConfig ? '' : projectRoot ?? '';
-    addIgnoresToLintConfig(tree, directory, [
-        '**/vite.config.*.timestamp*',
-        '**/vitest.config.*.timestamp*',
-    ]);
+    addIgnoresToLintConfig(tree, directory, ['**/vite.config.*.timestamp*']);
 }
 function isEslintInstalled(tree) {
     try {

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

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

package/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-vitest-temp-files-to-git-ignore.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGlC,MAAM,CAAC,OAAO,UAAU,2BAA2B,CAAC,IAAI,EAAE,IAAI,QAsB7D"}

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

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = addViteTempFilesToGitIgnore;
-const ignore_vite_temp_files_1 = require("../../utils/ignore-vite-temp-files");
-function addViteTempFilesToGitIgnore(tree) {
-    // need to check if .gitignore exists before adding to it
-    // then need to check if it contains the following pattern
-    // **/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
-    // if it does, remove just this pattern
-    if (tree.exists('.gitignore')) {
-        const gitIgnoreContents = tree.read('.gitignore', 'utf-8');
-        if (gitIgnoreContents.includes('**/vitest.config.{js,ts,mjs,mts,cjs,cts}.timestamp*')) {
-            tree.write('.gitignore', gitIgnoreContents.replace('**/vitest.config.{js,ts,mjs,mts,cjs,cts}.timestamp*', ''));
-        }
-    }
-    (0, ignore_vite_temp_files_1.addViteTempFilesToGitIgnore)(tree);
-}