@nx/vite 23.1.0-rc.3 → 23.2.0-beta.0

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependenciesInstalled = checkDependenciesInstalled;
 exports.moveToDevDependencies = moveToDevDependencies;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const semver_1 = require("semver");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../../utils/version-utils");
@@ -13,7 +14,7 @@ function hasIncompatibleInstalledEsbuild(host) {
         return false;
     }
     try {
-        return !(0, semver_1.intersects)(installedEsbuildVersion, internal_1.esbuildVersion, {
+        return !(0, semver_1.intersects)(installedEsbuildVersion, internal_2.esbuildVersion, {
             includePrerelease: true,
         });
     }
@@ -35,7 +36,7 @@ async function checkDependenciesInstalled(host, schema) {
             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 ${internal_1.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
+                `Update esbuild to a range compatible with ${internal_2.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
             ],
         });
     }
@@ -52,6 +53,11 @@ async function checkDependenciesInstalled(host, schema) {
                     : installedMajor === 5
                         ? versions_1.viteV5Version
                         : versions_1.viteVersion;
+    // vite pulls in esbuild, whose install script only validates the prebuilt
+    // binary shipped via optional dependencies, so skip it.
+    (0, internal_1.acknowledgeBuildScripts)(host, (0, devkit_1.detectPackageManager)(host.root), {
+        esbuild: false,
+    });
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
         '@nx/vite': versions_1.nxVersion,
         '@nx/web': versions_1.nxVersion,

package/dist/src/migrations/update-23-0-0/ai-instructions-for-vitest-4.md

@@ -201,7 +201,7 @@ export default defineConfig({
 - [ ] Inline any external `vitest.workspace.*` content into `test.projects` and delete the workspace file (external file references are no longer supported). The pre-pass already inlined workspace files containing a plain static array of glob strings; the ones you see in `<advisory_context>` were skipped because of dynamic content or because the sibling config could not be merged into mechanically (existing `test.projects`/`test.workspace`, non-object-literal config, or a directory with only a `vite.config.*`). For an existing `test.projects`, merge the workspace entries into it; for a `vite.config.*`-only directory, decide whether its `test` block (if any) and the project list belong in that file or a new `vitest.config.*`.
 - [ ] If projects need different pool/environment options, set them inside each project entry rather than via the (now-removed) `poolMatchGlobs` / `environmentMatchGlobs` — see section 1.5.
 
-When you inline a workspace file yourself, also apply these two checks (the pre-pass applies them for the files it inlines):
+When you inline a workspace file yourself, also apply these checks (the pre-pass applies them for the files it inlines):
 
 - [ ] **Config-less packages**: a root config with `test.projects` breaks `vitest` invocations from package directories that have no `vite.config.*`/`vitest.config.*` of their own (common for packages with a package.json `"test": "vitest run"` script). Vitest 4 finds the root config by walking up from the package directory, but resolves the `test.projects` globs relative to the package directory, so it errors with "No projects were found". For each such package, create a minimal local config so vitest stops at it and `@nx/vitest` infers the test target:
 
@@ -217,6 +217,8 @@ When you inline a workspace file yourself, also apply these two checks (the pre-
 
 - [ ] **Duplicate project names**: when the inlined globs match both a `vite.config.*` and a `vitest.config.*` in the same directory and both resolve to the same project name (the default name is the directory's package.json name, so two name-less configs always collide), vitest errors at startup with "Project name ... is not unique". Append a negative glob excluding the `vite.config.*` file (e.g. `'!packages/foo/vite.config.ts'`), matching vitest's own vitest-over-vite preference. Leave directories whose configs have distinct explicit `test.name` values alone; those are intentionally separate projects.
 
+- [ ] **Root config self-match**: when the inlined globs match the root config file itself (e.g. `**/vitest.config.*` matches the `vitest.config.*` you inlined into), vitest resolves that root config as an extra project. A pure aggregator has no `include` of its own, so this extra project re-runs every test via vitest's default glob without each project's `environment`/`setupFiles`, duplicating runs and failing tests that depend on their project config. Append a negative glob excluding the root config file (e.g. `'!vitest.config.ts'`, relative to its own directory) so vitest treats it only as the projects orchestrator. Skip this when the root config is itself a real project with its own `test.include`: it runs its own tests and needs no exclusion.
+
 <fail_if note="inlining is a semantic merge, not a copy">
 The `vitest.workspace.*` file imports modules / calls functions / uses spreads that you cannot evaluate at edit time (dynamic project arrays, conditional imports). Write status: failed listing the file path and the dynamic shape that needs human resolution.
 </fail_if>

package/dist/src/migrations/update-23-0-0/lib/inline-vitest-workspace.js

@@ -135,7 +135,12 @@ function tryAddProjectsToConfig(tree, configPath, entries) {
     if (countPropertyAssignments(configObject, 'test') > 1)
         return false;
     const testProperty = findPropertyAssignment(configObject, 'test');
-    const projectsText = `projects: ${formatEntriesArray(entries)}`;
+    // Same self-match guard as the create path: exclude this root config from its
+    // own `vitest.config.*` glob so vitest doesn't resolve it as an extra
+    // project. Skip it when the config has its own `test.include`, which vitest
+    // runs as that project's tests and so must not be excluded.
+    const ext = configPath.slice(configPath.lastIndexOf('.'));
+    const selfExclusion = `!vitest.config${ext}`;
     if (testProperty) {
         const testObject = testProperty.initializer;
         if (!ts.isObjectLiteralExpression(testObject))
@@ -152,18 +157,29 @@ function tryAddProjectsToConfig(tree, configPath, entries) {
             // lists is a semantic decision the agent must make.
             return false;
         }
+        const entriesWithGuard = findPropertyAssignment(testObject, 'include')
+            ? entries
+            : [...entries, selfExclusion];
         const insertPos = testObject.getStart() + 1;
         tree.write(configPath, (0, ast_edits_1.applyTextEdits)(contents, [
-            { start: insertPos, end: insertPos, replacement: `${projectsText},` },
+            {
+                start: insertPos,
+                end: insertPos,
+                replacement: `projects: ${formatEntriesArray(entriesWithGuard)},`,
+            },
         ]));
     }
     else {
+        // No `test` block at all, so no own `include`: apply the guard.
         const insertPos = configObject.getStart() + 1;
         tree.write(configPath, (0, ast_edits_1.applyTextEdits)(contents, [
             {
                 start: insertPos,
                 end: insertPos,
-                replacement: `test: {${projectsText},},`,
+                replacement: `test: {projects: ${formatEntriesArray([
+                    ...entries,
+                    selfExclusion,
+                ])},},`,
             },
         ]));
     }
@@ -176,11 +192,17 @@ function createVitestConfig(tree, dir, workspaceFilePath, entries) {
     const ext = ['.ts', '.mts', '.mjs'].includes(workspaceExt)
         ? workspaceExt
         : '.mjs';
+    // Guard the fresh root config against matching its own `vitest.config.*`
+    // glob: vitest would resolve it as an extra project that, having no
+    // `include`, re-runs every test via the default glob without its project
+    // config. The negation is root-anchored, so it only drops this file and is
+    // inert when the globs don't match it.
+    const projects = formatEntriesArray([...entries, `!vitest.config${ext}`]);
     tree.write((0, devkit_1.joinPathFragments)(dir, `vitest.config${ext}`), `import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
-    projects: ${formatEntriesArray(entries)},
+    projects: ${projects},
   },
 });
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.1.0-rc.3",
+  "version": "23.2.0-beta.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -101,13 +101,13 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "ajv": "^8.0.0",
-    "@nx/devkit": "23.1.0-rc.3",
-    "@nx/vitest": "23.1.0-rc.3",
-    "@nx/js": "23.1.0-rc.3"
+    "@nx/devkit": "23.2.0-beta.0",
+    "@nx/js": "23.2.0-beta.0",
+    "@nx/vitest": "23.2.0-beta.0"
   },
   "devDependencies": {
-    "@nx/eslint": "23.1.0-rc.3",
-    "nx": "23.1.0-rc.3"
+    "@nx/eslint": "23.2.0-beta.0",
+    "nx": "23.2.0-beta.0"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"