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

package/generators.json

@@ -13,6 +13,11 @@
       "factory": "./src/generators/configuration/configuration",
       "schema": "./src/generators/configuration/schema.json",
       "description": "Add Vitest configuration to a project."
+    },
+    "convert-to-inferred": {
+      "factory": "./src/generators/convert-to-inferred/convert-to-inferred",
+      "schema": "./src/generators/convert-to-inferred/schema.json",
+      "description": "Convert a project to use the `@nx/vitest` inferred plugin."
     }
   }
 }

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.7",
+  "version": "23.0.0-beta.9",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -52,14 +52,14 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.7",
-    "@nx/js": "23.0.0-beta.7",
+    "@nx/devkit": "23.0.0-beta.9",
+    "@nx/js": "23.0.0-beta.9",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "peerDependencies": {
-    "@nx/eslint": "23.0.0-beta.7",
+    "@nx/eslint": "23.0.0-beta.9",
     "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.7"
+    "nx": "23.0.0-beta.9"
   }
 }

package/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/executors/test/vitest.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/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/vitest/src/executors/test/vitest.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,wBAAuB,cAAc,CACnC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;YAoEzB;AAED,eAAe,cAAc,CAAC"}

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

@@ -7,7 +7,9 @@ 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 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/generators/convert-to-inferred/convert-to-inferred.d.ts

@@ -0,0 +1,8 @@
+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;
+//# sourceMappingURL=convert-to-inferred.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAQ7E,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA2BlE;AAED,eAAe,iBAAiB,CAAC"}

package/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/src/generators/convert-to-inferred/lib/test-post-target-transformer.d.ts

@@ -0,0 +1,6 @@
+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>;
+//# sourceMappingURL=test-post-target-transformer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"test-post-target-transformer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/generators/convert-to-inferred/lib/test-post-target-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIjE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,2BAA2B,EAAE,mBAAmB,4BA+CjD"}

package/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/src/generators/convert-to-inferred/lib/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function toProjectRelativePath(path: string, projectRoot: string): string;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/generators/convert-to-inferred/lib/utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,CAWR"}

package/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/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/utils/deprecation.d.ts

@@ -0,0 +1,4 @@
+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;
+//# sourceMappingURL=deprecation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/utils/deprecation.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,wCAAwC,iQAC2M,CAAC;AAEjQ,wBAAgB,iCAAiC,IAAI,IAAI,CAExD;AAMD,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}

package/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/utils/generator-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;IACnD,gBAAgB,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,OAAO,QAsCnB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,CAAC,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,OAAO,EACnB,YAAY,GAAE;IACZ,4BAA4B,CAAC,EAAE,WAAW,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,QA8MP"}
+{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vitest/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAGL,MAAM,YAAY,CAAC;AAOpB,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;IACnD,gBAAgB,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;IAC3B,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACzC;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,OAAO,QAuCnB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,MAAM,CAAC;IAC3E,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,CAAC,EAAE,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,OAAO,EACnB,YAAY,GAAE;IACZ,4BAA4B,CAAC,EAAE,WAAW,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,QA8MP"}

package/src/utils/generator-utils.js

@@ -5,6 +5,7 @@ exports.createOrEditViteConfig = createOrEditViteConfig;
 const devkit_1 = require("@nx/devkit");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const vite_config_edit_utils_1 = require("./vite-config-edit-utils");
+const deprecation_1 = require("./deprecation");
 const versions_1 = require("./versions");
 function addOrChangeTestTarget(tree, options, hasPlugin) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -25,6 +26,7 @@ function addOrChangeTestTarget(tree, options, hasPlugin) {
         throw new Error(`Target "${target}" already exists in the project.`);
     }
     else {
+        (0, deprecation_1.warnVitestExecutorGenerating)();
         project.targets[target] = {
             executor: '@nx/vitest:test',
             outputs: ['{options.reportsDirectory}'],