@nx/js 22.6.0-beta.11 → 22.6.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.6.0-beta.11",
+  "version": "22.6.0-beta.13",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.6.0-beta.11",
-    "@nx/workspace": "22.6.0-beta.11",
+    "@nx/devkit": "22.6.0-beta.13",
+    "@nx/workspace": "22.6.0-beta.13",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0-beta.11"
+    "nx": "22.6.0-beta.13"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/plugins/typescript/plugin.js

@@ -456,15 +456,21 @@ function getInputs(namedInputs, config, tsConfig, internalProjectReferences, wor
     if (excludePaths.size) {
         inputs.push(...Array.from(excludePaths).map((p) => `!${pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.project.root, p), workspaceRoot, config.project)}`));
     }
-    if (hasExternalProjectReferences(config.originalPath, tsConfig, workspaceRoot, config.project, cache)) {
-        // tsc --build reads .d.ts and .tsbuildinfo files from referenced projects
-        // https://www.typescriptlang.org/docs/handbook/project-references.html#what-is-a-project-reference
-        inputs.push({
-            dependentTasksOutputFiles: '**/*.{d.ts,tsbuildinfo}',
-        });
-    }
-    else {
-        inputs.push('production' in namedInputs ? '^production' : '^default');
+    // tsc --build reads .d.ts and .tsbuildinfo files from dependent tasks, not
+    // the source files of dependencies. This correctly tracks build outputs from
+    // both external project references and same-project task dependencies (e.g.
+    // build-native producing .d.ts files that may be excluded from file watching
+    // via .nxignore).
+    inputs.push({
+        dependentTasksOutputFiles: '**/*.{d.ts,tsbuildinfo}',
+        transitive: true,
+    });
+    const externalRefConfigFiles = getExternalProjectReferenceConfigFiles(tsConfig, internalProjectReferences, workspaceRoot, config.project, cache, configFiles);
+    if (externalRefConfigFiles.length > 0) {
+        // tsc --build also reads the tsconfig files from external project
+        // references (and their extended configs) when processing project
+        // references, so we need to add them as inputs
+        inputs.push(...externalRefConfigFiles.map((p) => pathToInputOrOutput(p, workspaceRoot, config.project)));
     }
     // inputs.push({ externalDependencies });
     return inputs;
@@ -617,33 +623,35 @@ function resolveShallowExternalProjectReferences(tsConfig, workspaceRoot, projec
     }
     return projectReferences;
 }
-function hasExternalProjectReferences(tsConfigPath, tsConfig, workspaceRoot, project, cache, seen = new Set()) {
-    if (!tsConfig.projectReferences?.length) {
-        return false;
-    }
-    seen.add(tsConfigPath);
-    for (const ref of tsConfig.projectReferences) {
-        let refConfigPath = ref.path;
-        if (seen.has(refConfigPath)) {
-            continue;
-        }
-        if (!(0, node_fs_1.existsSync)(refConfigPath)) {
-            continue;
-        }
-        if (!refConfigPath.endsWith('.json')) {
-            refConfigPath = (0, node_path_1.join)(refConfigPath, 'tsconfig.json');
-        }
-        const refContext = getConfigContext(refConfigPath, workspaceRoot, cache);
-        if (isExternalProjectReference(refContext, project, workspaceRoot, cache)) {
-            return true;
-        }
-        const refTsConfig = retrieveTsConfigFromCache(refConfigPath, workspaceRoot, cache);
-        const result = hasExternalProjectReferences(refConfigPath, refTsConfig, workspaceRoot, project, cache, seen);
-        if (result) {
-            return true;
+/**
+ * Collects config file paths from external project references, including their
+ * extended config files. It checks the root tsconfig and all internal project
+ * references for their direct external references.
+ */
+function getExternalProjectReferenceConfigFiles(tsConfig, internalProjectReferences, workspaceRoot, project, cache, existingConfigFiles) {
+    const externalRefs = {};
+    // Collect direct external references from the root tsconfig
+    resolveShallowExternalProjectReferences(tsConfig, workspaceRoot, project, cache, externalRefs);
+    // Collect external references from internal project references
+    for (const refTsConfig of Object.values(internalProjectReferences)) {
+        resolveShallowExternalProjectReferences(refTsConfig, workspaceRoot, project, cache, externalRefs);
+    }
+    const result = [];
+    const seen = new Set();
+    for (const [refConfigPath, refTsConfig] of Object.entries(externalRefs)) {
+        if (!existingConfigFiles.has(refConfigPath) && !seen.has(refConfigPath)) {
+            result.push(refConfigPath);
+            seen.add(refConfigPath);
+        }
+        const extendedFiles = getExtendedConfigFiles(refTsConfig, workspaceRoot, cache);
+        for (const extFile of extendedFiles.files) {
+            if (!existingConfigFiles.has(extFile) && !seen.has(extFile)) {
+                result.push(extFile);
+                seen.add(extFile);
+            }
         }
     }
-    return false;
+    return result;
 }
 function isExternalProjectReference(refConfig, project, workspaceRoot, cache) {
     const owner = cache.configOwners.get(refConfig.relativePath);