@nx/vite 22.7.0-beta.12 → 22.7.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "22.7.0-beta.12",
+  "version": "22.7.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -31,11 +31,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.12",
+    "@nx/devkit": "22.7.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "enquirer": "~2.3.6",
-    "@nx/js": "22.7.0-beta.12",
-    "@nx/vitest": "22.7.0-beta.12",
+    "@nx/js": "22.7.0-beta.13",
+    "@nx/vitest": "22.7.0-beta.13",
     "picomatch": "4.0.4",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -43,7 +43,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.12"
+    "nx": "22.7.0-beta.13"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",

package/plugins/nx-tsconfig-paths.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-tsconfig-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-tsconfig-paths.plugin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,MAAM,WAAW,oBAAoB;IACnC;;;;QAII;IACJ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;QAKI;IACJ,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC;;;QAGI;IACJ,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GA4KzD,MAAM,CA0EZ"}
+{"version":3,"file":"nx-tsconfig-paths.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-tsconfig-paths.plugin.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,MAAM,WAAW,oBAAoB;IACnC;;;;QAII;IACJ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;QAKI;IACJ,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IACnC;;;QAGI;IACJ,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,aAAa,CAAC,OAAO,GAAE,oBAAyB,GA4KzD,MAAM,CA0EZ"}

package/plugins/nx-tsconfig-paths.plugin.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxViteTsPaths = nxViteTsPaths;
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -84,13 +85,13 @@ function nxViteTsPaths(options = {}) {
                 throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
             }
             tsConfigPathsEsm = parsed;
-            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)(parsed.absoluteBaseUrl, parsed.paths, options.mainFields);
+            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
             const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
             const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
             logIt('fallback parsed tsconfig: ', rootLevelParsed);
             if (rootLevelParsed.resultType === 'success') {
                 tsConfigPathsFallback = rootLevelParsed;
-                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)(rootLevelParsed.absoluteBaseUrl, rootLevelParsed.paths, ['main', 'module']);
+                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
             }
         },
         resolveId(importPath) {

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,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"}
+{"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;AAmBpB,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,CAgHxD,CAAC;AAEF,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -38,6 +38,7 @@ const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
+const internal_1 = require("@nx/js/src/internal");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const node_fs_1 = require("node:fs");
@@ -85,7 +86,11 @@ exports.createNodes = [
         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]));
+        const tsconfigChainsByProjectRoot = collectTsconfigInputsByProjectRoot(projectRoots, context.workspaceRoot);
+        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((root) => [
+            lockfile,
+            ...(tsconfigChainsByProjectRoot.get(root) ?? []),
+        ]));
         try {
             return await (0, devkit_1.createNodesFromFiles)(async (configFile, _, context, idx) => {
                 const projectRoot = (0, node_path_1.dirname)(configFile);
@@ -104,7 +109,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, pmc));
+                    await buildViteTargets(configFile, projectRoot, normalizedOptions, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []));
                 const project = {
                     root: projectRoot,
                     targets,
@@ -128,7 +133,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc) {
+async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFiles, hasReactRouterConfig, isUsingTsSolutionSetup, context, pmc, tsconfigInputs) {
     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
@@ -175,7 +180,9 @@ 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, pmc);
+        const isTypecheckEnabled = !!viteBuildConfig?.test?.typecheck
+            ?.enabled;
+        targets[options.testTargetName] = await testTarget(namedInputs, testOutputs, projectRoot, pmc, isTypecheckEnabled, tsconfigInputs);
         if (options.ciTargetName) {
             const groupName = options.ciGroupName ?? (0, plugins_1.deriveGroupNameFromTarget)(options.ciTargetName);
             const targetGroup = [];
@@ -406,7 +413,8 @@ function previewTarget(projectRoot, buildTargetName, pmc) {
     };
     return targetConfig;
 }
-async function testTarget(namedInputs, outputs, projectRoot, pmc) {
+async function testTarget(namedInputs, outputs, projectRoot, pmc, isTypecheckEnabled, tsconfigInputs) {
+    const depOutputsGlob = isTypecheckEnabled ? '**/*.{js,d.ts}' : '**/*.js';
     return {
         command: `vitest`,
         options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot) },
@@ -415,10 +423,15 @@ async function testTarget(namedInputs, outputs, projectRoot, pmc) {
             ...('production' in namedInputs
                 ? ['default', '^production']
                 : ['default', '^default']),
+            ...tsconfigInputs.map((f) => ({
+                json: `{workspaceRoot}/${f}`,
+                fields: ['compilerOptions'],
+            })),
             {
                 externalDependencies: ['vitest'],
             },
             { env: 'CI' },
+            { dependentTasksOutputFiles: depOutputsGlob, transitive: true },
         ],
         outputs,
         metadata: {
@@ -506,6 +519,83 @@ function normalizeOptions(options) {
     options.typecheckTargetName ??= 'typecheck';
     return options;
 }
+/**
+ * Collects tsconfig files that Vite's esbuild-based config bundler reads
+ * but are outside the project root (and thus not covered by `default`).
+ *
+ * Vite < 8 uses esbuild's Build API to bundle config files. esbuild walks
+ * UP from the entry point, reading and parsing every `tsconfig.json` in
+ * every ancestor directory plus their `extends` chains. Vite >= 8 uses
+ * rolldown with `tsconfig: false`, but pnpm can resolve different Vite
+ * versions per project, so we always collect — the walk is cheap (cached
+ * JSON reads) and over-declaring inputs for Vite 8 projects is harmless.
+ */
+function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
+    const jsonCache = new Map();
+    const result = new Map();
+    const rootTsConfigName = (0, js_1.getRootTsConfigFileName)();
+    for (const projectRoot of projectRoots) {
+        if (projectRoot === '.')
+            continue;
+        const outside = [];
+        const seen = new Set();
+        const projectPrefix = `${projectRoot}/`;
+        const collect = (absolutePath) => {
+            const wsRelative = (0, node_path_1.relative)(workspaceRoot, absolutePath)
+                .split(node_path_1.sep)
+                .join('/');
+            if (seen.has(wsRelative))
+                return;
+            seen.add(wsRelative);
+            if (wsRelative.startsWith('../') || wsRelative === '..')
+                return;
+            if (wsRelative.startsWith('node_modules/') ||
+                wsRelative.includes('/node_modules/'))
+                return;
+            if (wsRelative === projectRoot || wsRelative.startsWith(projectPrefix))
+                return;
+            if (wsRelative === rootTsConfigName)
+                return;
+            outside.push(wsRelative);
+        };
+        // Walk the project tsconfig's extends chain
+        const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
+        if ((0, node_fs_1.existsSync)(projectTsconfig)) {
+            (0, internal_1.walkTsconfigExtendsChain)(projectTsconfig, (absPath) => {
+                collect(absPath);
+                return 'continue';
+            }, { jsonCache });
+        }
+        // Walk UP ancestor directories — esbuild reads every tsconfig.json
+        // between the entry point and the filesystem root.
+        let dir = (0, node_path_1.dirname)(projectRoot);
+        while (dir && dir !== '.') {
+            const ancestorTsconfig = (0, node_path_1.join)(workspaceRoot, dir, 'tsconfig.json');
+            if ((0, node_fs_1.existsSync)(ancestorTsconfig)) {
+                (0, internal_1.walkTsconfigExtendsChain)(ancestorTsconfig, (absPath) => {
+                    collect(absPath);
+                    return 'continue';
+                }, { jsonCache });
+            }
+            const parent = (0, node_path_1.dirname)(dir);
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
+        // Check the workspace root itself (dirname loop above stops at '.')
+        const rootTsconfig = (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
+        if ((0, node_fs_1.existsSync)(rootTsconfig)) {
+            (0, internal_1.walkTsconfigExtendsChain)(rootTsconfig, (absPath) => {
+                collect(absPath);
+                return 'continue';
+            }, { jsonCache });
+        }
+        if (outside.length > 0) {
+            result.set(projectRoot, outside);
+        }
+    }
+    return result;
+}
 function checkIfConfigFileShouldBeProject(projectRoot, context) {
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));