@nx/vite 22.0.0-beta.4 → 22.0.0-beta.6

package/package.json

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

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,8BAuLlB;AA0LD,eAAe,eAAe,CAAC"}
+{"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"}

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

@@ -29,9 +29,9 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
     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 pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const useViteV5 = (0, semver_1.major)((0, semver_1.coerce)(pkgJson.devDependencies['vite']) ?? '7.0.0') === 5;
-    const useViteV6 = (0, semver_1.major)((0, semver_1.coerce)(pkgJson.devDependencies['vite']) ?? '7.0.0') === 6;
+    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,
@@ -274,8 +274,7 @@ function tryFindSetupFile(tree, projectRoot) {
     }
 }
 function isAngularV20(tree) {
-    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    const angularVersion = dependencies?.['@angular/core'] ?? devDependencies?.['@angular/core'];
+    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;

package/src/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAYnD,KAAK,0BAA0B,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,0BAA0B,CAAC,CAcrC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,oBAM1C;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAgB5D;AAED,wBAAsB,kCAAkC,oBASvD"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAWnD,KAAK,0BAA0B,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,0BAA0B,CAAC,CAcrC;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,IAAI,oBAM1C;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAiB5D;AAED,wBAAsB,kCAAkC,oBASvD"}

package/src/utils/version-utils.js

@@ -4,9 +4,9 @@ exports.getVitestDependenciesVersionsToInstall = getVitestDependenciesVersionsTo
 exports.isVitestV1 = isVitestV1;
 exports.getInstalledVitestVersion = getInstalledVitestVersion;
 exports.getInstalledVitestVersionFromGraph = getInstalledVitestVersionFromGraph;
-const versions_1 = require("./versions");
-const semver_1 = require("semver");
 const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
 async function getVitestDependenciesVersionsToInstall(tree) {
     if (await isVitestV1(tree)) {
         return {
@@ -31,8 +31,7 @@ async function isVitestV1(tree) {
     return (0, semver_1.major)(installedVitestVersion) === 1;
 }
 function getInstalledVitestVersion(tree) {
-    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const installedVitestVersion = pkgJson.dependencies && pkgJson.dependencies['vitest'];
+    const installedVitestVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vitest');
     if (!installedVitestVersion ||
         installedVitestVersion === 'latest' ||
         installedVitestVersion === 'beta') {