@nx/vitest 23.0.0-beta.12 → 23.0.0-beta.14

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

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

@@ -3,7 +3,7 @@ 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");

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAmCjD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAmNlB;AAuOD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAWjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAmCjD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAkNlB;AAuPD,eAAe,sBAAsB,CAAC"}

package/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,7 +123,7 @@ 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: [
@@ -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/src/generators/init/init.d.ts.map

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

package/src/generators/init/init.js

@@ -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);
 }

package/src/plugins/plugin.js

@@ -37,7 +37,7 @@ exports.createNodesV2 = exports.createNodes = exports.createDependencies = void
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_2 = 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");
@@ -417,7 +417,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/src/utils/generator-utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addOrChangeTestTarget = addOrChangeTestTarget;
 exports.createOrEditViteConfig = createOrEditViteConfig;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const vite_config_edit_utils_1 = require("./vite-config-edit-utils");
 const deprecation_1 = require("./deprecation");
 const versions_1 = require("./versions");
@@ -41,7 +41,7 @@ function createOrEditViteConfig(tree, options, onlyVitest, extraOptions = {}) {
     const viteConfigPath = extraOptions.vitestFileName
         ? `${projectRoot}/vitest.config.${extension}`
         : `${projectRoot}/vite.config.${extension}`;
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(tree);
     const buildOutDir = isTsSolutionSetup
         ? './dist'
         : projectRoot === '.'