@nx/vite 22.6.4 → 22.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.6.4",
+  "version": "22.6.5",
   "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.6.4",
+    "@nx/devkit": "22.6.5",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.6.4",
-    "@nx/vitest": "22.6.4",
+    "@nx/js": "22.6.5",
+    "@nx/vitest": "22.6.5",
     "picomatch": "4.0.4",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -42,7 +42,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.6.4"
+    "nx": "22.6.5"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",

package/src/generators/init/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAMhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAmC5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAyBhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAuD5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C"}

package/src/generators/init/lib/utils.js

@@ -3,33 +3,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependenciesInstalled = checkDependenciesInstalled;
 exports.moveToDevDependencies = moveToDevDependencies;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
+const versions_1 = require("@nx/js/src/utils/versions");
+const semver_1 = require("semver");
+const versions_2 = require("../../../utils/versions");
 const version_utils_1 = require("../../../utils/version-utils");
+function hasIncompatibleInstalledEsbuild(host) {
+    const installedEsbuildVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(host, 'esbuild');
+    if (!installedEsbuildVersion) {
+        return false;
+    }
+    try {
+        return !(0, semver_1.intersects)(installedEsbuildVersion, versions_1.esbuildVersion, {
+            includePrerelease: true,
+        });
+    }
+    catch {
+        return true;
+    }
+}
 async function checkDependenciesInstalled(host, schema) {
     const { vitest } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(host);
     // Determine which vite version to install:
     // 1. Explicit flags take priority (useViteV5/V6/V7)
     // 2. If vite is already installed, keep the matching major version
-    // 3. Otherwise, use the latest default (^8.0.0)
+    // 3. If esbuild is already installed but incompatible with Vite 8, use Vite 7
+    // 4. Otherwise, use the latest default (^8.0.0)
     const installedMajor = (0, version_utils_1.getInstalledViteMajorVersion)(host);
+    const installedEsbuildVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(host, 'esbuild');
+    const useViteV7ForEsbuildCompatibility = installedMajor == null && hasIncompatibleInstalledEsbuild(host);
+    if (useViteV7ForEsbuildCompatibility) {
+        devkit_1.output.warn({
+            title: 'Installed esbuild is incompatible with Vite 8. Using Vite 7.',
+            bodyLines: [
+                `Found esbuild version "${installedEsbuildVersion}" in the workspace root package.json.`,
+                `Update esbuild to a range compatible with ${versions_1.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
+            ],
+        });
+    }
     const viteVersionToInstall = schema.useViteV5
-        ? versions_1.viteV5Version
+        ? versions_2.viteV5Version
         : schema.useViteV6
-            ? versions_1.viteV6Version
-            : schema.useViteV7 || installedMajor === 7
-                ? versions_1.viteV7Version
+            ? versions_2.viteV6Version
+            : schema.useViteV7 ||
+                installedMajor === 7 ||
+                useViteV7ForEsbuildCompatibility
+                ? versions_2.viteV7Version
                 : installedMajor === 6
-                    ? versions_1.viteV6Version
+                    ? versions_2.viteV6Version
                     : installedMajor === 5
-                        ? versions_1.viteV5Version
-                        : versions_1.viteVersion;
+                        ? versions_2.viteV5Version
+                        : versions_2.viteVersion;
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-        '@nx/vite': versions_1.nxVersion,
-        '@nx/web': versions_1.nxVersion,
+        '@nx/vite': versions_2.nxVersion,
+        '@nx/web': versions_2.nxVersion,
         vite: viteVersionToInstall,
         vitest: vitest,
         '@vitest/ui': vitest,
-        jiti: versions_1.jitiVersion,
+        jiti: versions_2.jitiVersion,
     }, undefined, schema.keepExistingVersions);
 }
 function moveToDevDependencies(tree) {

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EAQd,MAAM,YAAY,CAAC;AAiBpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAuGxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAGlB,aAAa,EASd,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAiBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAIF,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAwGxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -14,7 +14,6 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugins_1 = require("nx/src/utils/plugins");
 const executor_utils_1 = require("../utils/executor-utils");
 const picomatch = require("picomatch");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
     return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
         ? (0, devkit_1.readJsonFile)(cachePath)
@@ -50,7 +49,9 @@ exports.createNodes = [
             roots: [],
             configFiles: [],
         });
-        const lockfile = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const detectedPackageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(detectedPackageManager);
+        const lockfile = (0, js_1.getLockFileName)(detectedPackageManager);
         const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((r) => [lockfile]));
         try {
             return await (0, devkit_1.createNodesFromFiles)(async (configFile, _, context, idx) => {
@@ -70,7 +71,7 @@ exports.createNodes = [
                 // for different config files.
                 const hash = hashes[idx] + configFile;
                 const { projectType, metadata, targets } = (targetsCache[hash] ??=
-                    await buildViteTargets(configFile, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context));
+                    await buildViteTargets(configFile, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc));
                 const project = {
                     root: projectRoot,
                     targets,
@@ -94,7 +95,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context) {
+async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc) {
     const absoluteConfigFilePath = (0, devkit_1.joinPathFragments)(context.workspaceRoot, configFilePath);
     // Workaround for the `build$3 is not a function` error that we sometimes see in agents.
     // This should be removed later once we address the issue properly
@@ -141,7 +142,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
     const targets = {};
     // if file is vitest.config or vite.config has definition for test, create targets for test and/or atomized tests
     if (configFilePath.includes('vitest.config') || hasTest) {
-        targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot);
+        targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot, pmc);
         if (options.ciTargetName) {
             const groupName = options.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options.ciTargetName);
             const targetGroup = [];
@@ -224,10 +225,10 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
     if (!configFilePath.includes('vitest.config') &&
         !hasRemixPlugin &&
         isBuildable) {
-        targets[options.buildTargetName] = await buildTarget(options.buildTargetName, namedInputs, buildOutputs, projectRoot, isUsingTsSolutionSetup);
+        targets[options.buildTargetName] = await buildTarget(options.buildTargetName, namedInputs, buildOutputs, projectRoot, isUsingTsSolutionSetup, pmc);
         // If running in library mode, then there is nothing to serve.
         if (!viteBuildConfig.build?.lib || hasServeConfig) {
-            const devTarget = serveTarget(projectRoot, isUsingTsSolutionSetup);
+            const devTarget = serveTarget(projectRoot, isUsingTsSolutionSetup, pmc);
             targets[options.serveTargetName] = {
                 ...devTarget,
                 metadata: {
@@ -236,7 +237,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
                 },
             };
             targets[options.devTargetName] = devTarget;
-            targets[options.previewTargetName] = previewTarget(projectRoot, options.buildTargetName);
+            targets[options.previewTargetName] = previewTarget(projectRoot, options.buildTargetName, pmc);
             targets[options.serveStaticTargetName] = serveStaticTarget(options, isUsingTsSolutionSetup);
         }
     }
@@ -290,7 +291,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
         projectType: viteBuildConfig.build?.lib ? 'library' : 'application',
     };
 }
-async function buildTarget(buildTargetName, namedInputs, outputs, projectRoot, isUsingTsSolutionSetup) {
+async function buildTarget(buildTargetName, namedInputs, outputs, projectRoot, isUsingTsSolutionSetup, pmc) {
     const buildTarget = {
         command: `vite build`,
         options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot) },
@@ -324,7 +325,7 @@ async function buildTarget(buildTargetName, namedInputs, outputs, projectRoot, i
     }
     return buildTarget;
 }
-function serveTarget(projectRoot, isUsingTsSolutionSetup) {
+function serveTarget(projectRoot, isUsingTsSolutionSetup, pmc) {
     const targetConfig = {
         continuous: true,
         command: `vite`,
@@ -349,7 +350,7 @@ function serveTarget(projectRoot, isUsingTsSolutionSetup) {
     }
     return targetConfig;
 }
-function previewTarget(projectRoot, buildTargetName) {
+function previewTarget(projectRoot, buildTargetName, pmc) {
     const targetConfig = {
         continuous: true,
         command: `vite preview`,
@@ -372,7 +373,7 @@ function previewTarget(projectRoot, buildTargetName) {
     };
     return targetConfig;
 }
-async function testTarget(namedInputs, outputs, projectRoot) {
+async function testTarget(namedInputs, outputs, projectRoot, pmc) {
     return {
         command: `vitest`,
         options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot) },
@@ -453,10 +454,10 @@ function normalizeOutputPath(outputPath, projectRoot, workspaceRoot, path) {
         }
         else {
             if (outputPath.startsWith('..')) {
-                return (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, outputPath));
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', projectRoot, outputPath);
             }
             else {
-                return (0, node_path_1.join)('{projectRoot}', outputPath);
+                return (0, devkit_1.joinPathFragments)('{projectRoot}', outputPath);
             }
         }
     }
@@ -493,5 +494,5 @@ async function getTestPathsRelativeToProjectRoot(projectRoot, workspaceRoot) {
     const relevantTestSpecifications = await vitest.getRelevantTestSpecifications();
     return relevantTestSpecifications
         .filter((ts) => projectRoot === '.' ? true : ts.moduleId.startsWith(fullProjectRoot))
-        .map((ts) => (0, node_path_1.relative)(projectRoot, ts.moduleId));
+        .map((ts) => (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, ts.moduleId)));
 }