@nx/js 22.7.0 → 22.7.1

package/package.json

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

package/src/plugins/typescript/plugin.js

@@ -626,9 +626,9 @@ function resolveShallowExternalProjectReferences(tsConfig, workspaceRoot, projec
 }
 /**
  * Collects unique tsconfig paths (relative to their project root) from the
- * project reference chain and returns them as `^{projectRoot}/...` input
- * patterns. We only need to discover the full set of distinct relative paths
- * from the reference chain.
+ * project reference chain — including any `extends` chains within those refs —
+ * and returns them as `^{projectRoot}/...` input patterns. We only need to
+ * discover the full set of distinct relative paths.
  */
 function getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectReferences, workspaceRoot, project, cache) {
     const externalRefs = {};
@@ -659,7 +659,34 @@ function getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectRe
         visited.add(configPath);
         const wsRelPath = posixRelative(workspaceRoot, configPath);
         const tsConfigData = tsConfigCacheData[wsRelPath]?.data;
-        if (!tsConfigData?.projectReferences?.length) {
+        if (!tsConfigData) {
+            continue;
+        }
+        // Walk `extends` chains for the visited tsconfig. tsc reads extended
+        // configs while resolving project references, so the rel paths must be
+        // emitted as inputs. Workspace-root files (no owning project) are skipped
+        // — those are covered by the local project's own extends walk.
+        if (tsConfigData.extendedConfigFiles?.length) {
+            for (const extended of tsConfigData.extendedConfigFiles) {
+                if (!extended.filePath || visited.has(extended.filePath)) {
+                    continue;
+                }
+                const extendedWsRelPath = posixRelative(workspaceRoot, extended.filePath);
+                if (!tsConfigCacheData[extendedWsRelPath]) {
+                    continue;
+                }
+                const extendedContext = getConfigContext(extended.filePath, workspaceRoot, cache);
+                if (extendedContext.project.root &&
+                    extendedContext.project.root !== '.') {
+                    uniqueRelPaths.add(posixRelative(extendedContext.project.absolute, extended.filePath));
+                    worklist.push({
+                        configPath: extended.filePath,
+                        ownerProject: extendedContext.project,
+                    });
+                }
+            }
+        }
+        if (!tsConfigData.projectReferences?.length) {
             continue;
         }
         for (const ref of tsConfigData.projectReferences) {

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -1,4 +1,6 @@
 import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+import type { JsonInput } from 'nx/src/native';
+export declare const TS_SOLUTION_SETUP_TSCONFIG_INPUT: JsonInput;
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function shouldConfigureTsSolutionSetup(tree: Tree, addPlugins: boolean, addTsPlugin?: boolean): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;

package/src/utils/typescript/ts-solution-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAsBT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAuDD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAClD,MAAM,CAqCR;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAqCvE"}
+{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,gCAAgC,EAAE,SAG9C,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAsBT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAuDD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAClD,MAAM,CAqCR;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAqCvE"}

package/src/utils/typescript/ts-solution-setup.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = void 0;
 exports.isUsingTypeScriptPlugin = isUsingTypeScriptPlugin;
 exports.shouldConfigureTsSolutionSetup = shouldConfigureTsSolutionSetup;
 exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
@@ -17,6 +18,10 @@ const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
 const configuration_1 = require("./configuration");
+exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = {
+    json: '{workspaceRoot}/tsconfig.json',
+    fields: ['extends', 'files', 'include'],
+};
 function isUsingTypeScriptPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     return (nxJson?.plugins?.some((p) => typeof p === 'string'