@nx/js 19.7.1 → 19.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.7.1",
+  "version": "19.7.3",
   "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": "19.7.1",
-    "@nx/workspace": "19.7.1",
+    "@nx/devkit": "19.7.3",
+    "@nx/workspace": "19.7.3",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -61,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "19.7.1"
+    "@nrwl/js": "19.7.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/typescript-sync/typescript-sync.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncGenerator = syncGenerator;
 const devkit_1 = require("@nx/devkit");
+const ignore_1 = require("ignore");
 const jsonc_parser_1 = require("jsonc-parser");
 const posix_1 = require("node:path/posix");
 const ts = require("typescript");
@@ -84,28 +85,30 @@ async function syncGenerator(tree) {
             patchTsconfigJsonReferences(tree, rawTsconfigContentsCache, rootTsconfigPath, updatedReferences);
         }
     }
-    const runtimeTsConfigFileNames = nxJson.sync?.generatorOptions?.['@nx/js:typescript-sync']
-        ?.runtimeTsConfigFileNames ??
-        COMMON_RUNTIME_TS_CONFIG_FILE_NAMES;
+    const userOptions = nxJson.sync?.generatorOptions?.['@nx/js:typescript-sync'];
+    const { runtimeTsConfigFileNames } = {
+        runtimeTsConfigFileNames: userOptions?.runtimeTsConfigFileNames ??
+            COMMON_RUNTIME_TS_CONFIG_FILE_NAMES,
+    };
     const collectedDependencies = new Map();
-    for (const [name, data] of Object.entries(projectGraph.dependencies)) {
-        if (!projectGraph.nodes[name] ||
-            projectGraph.nodes[name].data.root === '.' ||
+    for (const [projectName, data] of Object.entries(projectGraph.dependencies)) {
+        if (!projectGraph.nodes[projectName] ||
+            projectGraph.nodes[projectName].data.root === '.' ||
             !data.length) {
             continue;
         }
         // Get the source project nodes for the source and target
-        const sourceProjectNode = projectGraph.nodes[name];
+        const sourceProjectNode = projectGraph.nodes[projectName];
         // Find the relevant tsconfig file for the source project
         const sourceProjectTsconfigPath = (0, devkit_1.joinPathFragments)(sourceProjectNode.data.root, 'tsconfig.json');
         if (!tsconfigExists(tree, rawTsconfigContentsCache, sourceProjectTsconfigPath)) {
             if (process.env.NX_VERBOSE_LOGGING === 'true') {
-                devkit_1.logger.warn(`Skipping project "${name}" as there is no tsconfig.json file found in the project root "${sourceProjectNode.data.root}".`);
+                devkit_1.logger.warn(`Skipping project "${projectName}" as there is no tsconfig.json file found in the project root "${sourceProjectNode.data.root}".`);
             }
             continue;
         }
         // Collect the dependencies of the source project
-        const dependencies = collectProjectDependencies(tree, name, projectGraph, collectedDependencies);
+        const dependencies = collectProjectDependencies(tree, projectName, projectGraph, collectedDependencies);
         if (!dependencies.length) {
             continue;
         }
@@ -152,6 +155,7 @@ function tsconfigExists(tree, rawTsconfigContentsCache, tsconfigPath) {
 function updateTsConfigReferences(tree, tsSysFromTree, rawTsconfigContentsCache, tsconfigHasCompositeEnabledCache, tsConfigPath, dependencies, projectRoot, projectRoots, runtimeTsConfigFileName, possibleRuntimeTsConfigFileNames) {
     const stringifiedJsonContents = readRawTsconfigContents(tree, rawTsconfigContentsCache, tsConfigPath);
     const tsConfig = (0, devkit_1.parseJson)(stringifiedJsonContents);
+    const ignoredReferences = new Set(tsConfig.nx?.sync?.ignoredReferences ?? []);
     // We have at least one dependency so we can safely set it to an empty array if not already set
     const references = [];
     const originalReferencesSet = new Set();
@@ -159,10 +163,17 @@ function updateTsConfigReferences(tree, tsSysFromTree, rawTsconfigContentsCache,
     for (const ref of tsConfig.references ?? []) {
         const normalizedPath = normalizeReferencePath(ref.path);
         originalReferencesSet.add(normalizedPath);
+        if (ignoredReferences.has(ref.path)) {
+            // we keep the user-defined ignored references
+            references.push(ref);
+            newReferencesSet.add(normalizedPath);
+            continue;
+        }
         // reference path is relative to the tsconfig file
         const resolvedRefPath = getTsConfigPathFromReferencePath(tree, tsConfigPath, ref.path);
-        if (isProjectReferenceWithinNxProject(tree, rawTsconfigContentsCache, resolvedRefPath, projectRoot, projectRoots)) {
-            // we keep all references within the current Nx project
+        if (isProjectReferenceWithinNxProject(tree, rawTsconfigContentsCache, resolvedRefPath, projectRoot, projectRoots) ||
+            isProjectReferenceIgnored(tree, resolvedRefPath)) {
+            // we keep all references within the current Nx project or that are ignored
             references.push(ref);
             newReferencesSet.add(normalizedPath);
         }
@@ -277,6 +288,17 @@ function isProjectReferenceWithinNxProject(tree, rawTsconfigContentsCache, refTs
     // it's inside the project root, so it's an internal project reference
     return true;
 }
+function isProjectReferenceIgnored(tree, refTsConfigPath) {
+    const ig = (0, ignore_1.default)();
+    if (tree.exists('.gitignore')) {
+        ig.add('.git');
+        ig.add(tree.read('.gitignore', 'utf-8'));
+    }
+    if (tree.exists('.nxignore')) {
+        ig.add(tree.read('.nxignore', 'utf-8'));
+    }
+    return ig.ignores(refTsConfigPath);
+}
 function getTsConfigDirName(tree, rawTsconfigContentsCache, tsConfigPath) {
     return (rawTsconfigContentsCache.has(tsConfigPath)
         ? true