@nx/vitest 23.0.0-rc.2 → 23.0.0-rc.4

package/dist/src/generators/configuration/configuration.js

@@ -4,9 +4,8 @@ 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 internal_2 = require("@nx/js/internal");
+const internal_1 = 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");
@@ -126,7 +125,7 @@ getTestBed().initTestEnvironment(
         else if (uiFramework === 'react') {
             (0, generator_utils_1.createOrEditViteConfig)(tree, {
                 project: schema.project,
-                includeLib: (0, internal_2.getProjectType)(tree, root, projectType) === 'library',
+                includeLib: (0, internal_1.getProjectType)(tree, root, projectType) === 'library',
                 includeVitest: true,
                 inSourceTests: schema.inSourceTests,
                 rolldownOptionsExternal: [
@@ -149,7 +148,7 @@ getTestBed().initTestEnvironment(
             (0, generator_utils_1.createOrEditViteConfig)(tree, {
                 ...schema,
                 includeVitest: true,
-                includeLib: (0, internal_2.getProjectType)(tree, root, projectType) === 'library',
+                includeLib: (0, internal_1.getProjectType)(tree, root, projectType) === 'library',
                 useEsmExtension: true,
             }, true, {
                 vitestFileName: useVitestConfig,
@@ -157,21 +156,22 @@ getTestBed().initTestEnvironment(
             });
         }
     }
-    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_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 nxJson = (0, devkit_1.readNxJson)(tree);
         const testTarget = schema.testTarget ?? 'test';
-        const existing = findTestDefault(nxJson.targetDefaults, testTarget);
-        const dependsOn = Array.from(new Set([...(existing?.dependsOn ?? []), '^build']));
-        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: testTarget, dependsOn });
+        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'] = internal_2.typesNodeVersion;
+    devDependencies['@types/node'] = internal_1.typesNodeVersion;
     if (!schema.skipPackageJson) {
         const installDependenciesTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
         tasks.push(installDependenciesTask);
@@ -233,7 +233,7 @@ function updateTsConfig(tree, options, projectRoot, projectType) {
             return json;
         });
     }
-    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, (0, internal_2.getProjectType)(tree, projectRoot, projectType) === 'application'
+    let runtimeTsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, (0, internal_1.getProjectType)(tree, projectRoot, projectType) === 'application'
         ? 'tsconfig.app.json'
         : 'tsconfig.lib.json');
     if (options.runtimeTsconfigFileName) {
@@ -356,14 +356,4 @@ 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/init/init.js

@@ -30,7 +30,7 @@ function updateDependencies(tree, schema) {
     }, undefined, schema.keepExistingVersions ?? true);
 }
 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');
@@ -38,18 +38,13 @@ function updateNxJsonSettings(tree) {
     }
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string' ? p === '@nx/vitest' : p.plugin === '@nx/vitest');
     if (!hasPlugin) {
-        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',
-            ],
-        });
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['@nx/vitest:test'] ??= {};
+        nxJson.targetDefaults['@nx/vitest:test'].cache ??= true;
+        nxJson.targetDefaults['@nx/vitest:test'].inputs ??= [
+            'default',
+            productionFileSet ? '^production' : '^default',
+        ];
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

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-rc.2",
+  "version": "23.0.0-rc.4",
   "type": "commonjs",
   "files": [
     "dist",
@@ -73,13 +73,13 @@
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.0.0-rc.2",
-    "@nx/js": "23.0.0-rc.2"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "vitest": "^3.0.0 || ^4.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
-    "@nx/eslint": "23.0.0-rc.2"
+    "@nx/eslint": "23.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@nx/eslint": {
@@ -93,6 +93,6 @@
     }
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.2"
+    "nx": "23.0.0-rc.4"
   }
 }