@nx/vite 22.2.0-beta.1 → 22.2.0-beta.2

package/migrations.json

@@ -32,6 +32,11 @@
       },
       "description": "Create AI Instructions to help migrate users workspaces past breaking changes for Vitest 4.",
       "implementation": "./src/migrations/update-22-2-0/create-ai-instructions-for-vitest-4"
+    },
+    "migrate-vitest-to-vitest-package": {
+      "version": "22.2.0-beta.2",
+      "description": "Migrate Vitest usage from @nx/vite to @nx/vitest package.",
+      "implementation": "./src/migrations/update-22-2-0/migrate-vitest-to-vitest-package"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

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

@@ -3,6 +3,8 @@ import { VitestExecutorOptions } from './schema';
 /**
  * @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 declare function vitestExecutor(options: VitestExecutorOptions, context: ExecutorContext): AsyncGenerator<never, {
+    success: boolean;
+}, 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,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,wCAYzB;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;;YAYzB;AAED,eAAe,cAAc,CAAC"}

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

@@ -11,6 +11,6 @@ async function* vitestExecutor(options, context) {
     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.`);
     (0, devkit_2.ensurePackage)('@nx/vitest', versions_1.nxVersion);
     const { vitestExecutor: actualVitestExecutor } = await Promise.resolve().then(() => require('@nx/vitest/executors'));
-    yield* actualVitestExecutor(options, context);
+    return yield* actualVitestExecutor(options, context);
 }
 exports.default = vitestExecutor;

package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.d.ts

@@ -0,0 +1,12 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+/**
+ * Migrates Vitest usage from @nx/vite to @nx/vitest package.
+ *
+ * This migration:
+ * 1. Installs @nx/vitest package if not present
+ * 2. Converts @nx/vite:test executor usages to @nx/vitest:test
+ * 3. Splits @nx/vite/plugin configurations to add @nx/vitest plugin
+ * 4. Migrates targetDefaults from @nx/vite:test to @nx/vitest:test
+ */
+export default function migrateVitestToVitestPackage(tree: Tree): Promise<GeneratorCallback>;
+//# sourceMappingURL=migrate-vitest-to-vitest-package.d.ts.map

package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-vitest-to-vitest-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAYpB;;;;;;;;GAQG;AACH,wBAA8B,4BAA4B,CACxD,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,iBAAiB,CAAC,CAS5B"}

package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateVitestToVitestPackage;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const versions_1 = require("../../utils/versions");
+/**
+ * Migrates Vitest usage from @nx/vite to @nx/vitest package.
+ *
+ * This migration:
+ * 1. Installs @nx/vitest package if not present
+ * 2. Converts @nx/vite:test executor usages to @nx/vitest:test
+ * 3. Splits @nx/vite/plugin configurations to add @nx/vitest plugin
+ * 4. Migrates targetDefaults from @nx/vite:test to @nx/vitest:test
+ */
+async function migrateVitestToVitestPackage(tree) {
+    const installTask = installVitestPackageIfNeeded(tree);
+    migrateExecutorUsages(tree);
+    migratePluginConfigurations(tree);
+    migrateTargetDefaults(tree);
+    await (0, devkit_1.formatFiles)(tree);
+    return installTask;
+}
+function installVitestPackageIfNeeded(tree) {
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const hasVitest = packageJson.dependencies?.['@nx/vitest'] ||
+        packageJson.devDependencies?.['@nx/vitest'];
+    if (hasVitest) {
+        return () => { };
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/vitest': versions_1.nxVersion });
+}
+function migrateExecutorUsages(tree) {
+    const projectsToUpdate = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/vite:test', (_options, projectName, _targetName, _configuration) => {
+        projectsToUpdate.add(projectName);
+    });
+    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/vite:test') {
+                target.executor = '@nx/vitest:test';
+            }
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
+    }
+}
+function migratePluginConfigurations(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.plugins) {
+        return;
+    }
+    const newPlugins = [];
+    const vitestPluginsToAdd = [];
+    const hasVitestPlugin = nxJson.plugins.some((p) => typeof p === 'string' ? p === '@nx/vitest' : p.plugin === '@nx/vitest');
+    for (const plugin of nxJson.plugins) {
+        // Handle string plugin format
+        if (typeof plugin === 'string') {
+            newPlugins.push(plugin);
+            continue;
+        }
+        // Handle non-vite plugins
+        if (plugin.plugin !== '@nx/vite/plugin') {
+            newPlugins.push(plugin);
+            continue;
+        }
+        const options = plugin.options || {};
+        const { testTargetName, ciTargetName, ciGroupName, ...viteOptions } = options;
+        // Check if this plugin has test-related options
+        if (testTargetName || ciTargetName || ciGroupName) {
+            // Build vitest plugin for THIS specific vite plugin registration
+            const vitestPluginOptions = {};
+            if (testTargetName) {
+                vitestPluginOptions.testTargetName = testTargetName;
+            }
+            if (ciTargetName) {
+                vitestPluginOptions.ciTargetName = ciTargetName;
+            }
+            if (ciGroupName) {
+                vitestPluginOptions.ciGroupName = ciGroupName;
+            }
+            const vitestPlugin = {
+                plugin: '@nx/vitest',
+            };
+            if (Object.keys(vitestPluginOptions).length > 0) {
+                vitestPlugin.options = vitestPluginOptions;
+            }
+            if (plugin.include) {
+                vitestPlugin.include = plugin.include;
+            }
+            if (plugin.exclude) {
+                vitestPlugin.exclude = plugin.exclude;
+            }
+            vitestPluginsToAdd.push(vitestPlugin);
+            // Update the vite plugin to remove test options
+            const updatedVitePlugin = { ...plugin };
+            if (Object.keys(viteOptions).length > 0) {
+                updatedVitePlugin.options = viteOptions;
+            }
+            else {
+                delete updatedVitePlugin.options;
+            }
+            newPlugins.push(updatedVitePlugin);
+        }
+        else {
+            newPlugins.push(plugin);
+        }
+    }
+    // Add all vitest plugins if @nx/vitest not already present
+    if (!hasVitestPlugin && vitestPluginsToAdd.length > 0) {
+        newPlugins.push(...vitestPluginsToAdd);
+    }
+    nxJson.plugins = newPlugins;
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+function migrateTargetDefaults(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.targetDefaults) {
+        return;
+    }
+    let hasChanges = false;
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
+        if (targetOrExecutor === '@nx/vite:test') {
+            // Move config to new executor key
+            nxJson.targetDefaults['@nx/vitest:test'] ??= {};
+            Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
+            delete nxJson.targetDefaults['@nx/vite:test'];
+            hasChanges = true;
+        }
+        // Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
+        else if (targetConfig.executor === '@nx/vite:test') {
+            targetConfig.executor = '@nx/vitest:test';
+            hasChanges = true;
+        }
+    }
+    if (hasChanges) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}