@nx/js 22.1.0-rc.4 → 22.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.1.0-rc.4",
+  "version": "22.1.0",
   "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.1.0-rc.4",
-    "@nx/workspace": "22.1.0-rc.4",
+    "@nx/devkit": "22.1.0",
+    "@nx/workspace": "22.1.0",
     "@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.1.0-rc.4"
+    "nx": "22.1.0"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/generators/typescript-sync/typescript-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA2CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgQ5E;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA2CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyQ5E;AAED,eAAe,aAAa,CAAC"}

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

@@ -139,11 +139,15 @@ async function syncGenerator(tree) {
             // Update project references for the runtime tsconfig
             updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, runtimeTsConfigPath, dependencies, sourceProjectNode.data.root, projectRoots, changedFiles, runtimeTsConfigFileName, runtimeTsConfigFileNames);
         }
-        updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, sourceProjectTsconfigPath, 
-        // If we find a runtime tsconfig file, we make sure the external
-        // dependencies are emptied from the tsconfig.json file instead,
-        // otherwise we update the project references for the tsconfig.json file
-        foundRuntimeTsConfig ? [] : dependencies, sourceProjectNode.data.root, projectRoots, changedFiles);
+        // We keep the project references in the tsconfig.json file if it has files
+        // or if we don't find a runtime tsconfig file, otherwise we don't need to
+        // duplicate the project references in the tsconfig.json file
+        let keepReferencesInTsconfigJson = true;
+        if (foundRuntimeTsConfig) {
+            const sourceProjectTsconfig = parseTsconfig(sourceProjectTsconfigPath, tsSysFromTree);
+            keepReferencesInTsconfigJson = sourceProjectTsconfig.fileNames.length > 0;
+        }
+        updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, sourceProjectTsconfigPath, keepReferencesInTsconfigJson ? dependencies : [], sourceProjectNode.data.root, projectRoots, changedFiles);
     }
     if (changedFiles.size > 0) {
         await (0, devkit_1.formatFiles)(tree);
@@ -177,6 +181,9 @@ function readRawTsconfigContents(tree, tsconfigInfoCaches, tsconfigPath) {
     }
     return tsconfigInfoCaches.content.get(tsconfigPath);
 }
+function parseTsconfig(tsconfigPath, sys) {
+    return ts.parseJsonConfigFileContent(ts.readConfigFile(tsconfigPath, sys.readFile).config, sys, (0, posix_1.dirname)(tsconfigPath));
+}
 /**
  * Within the context of a sync generator, performance is a key concern,
  * so avoid FS interactions whenever possible.
@@ -391,7 +398,7 @@ function patchTsconfigJsonReferences(tree, tsconfigInfoCaches, tsconfigPath, upd
 }
 function hasCompositeEnabled(tsSysFromTree, tsconfigInfoCaches, tsconfigPath) {
     if (!tsconfigInfoCaches.composite.has(tsconfigPath)) {
-        const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsconfigPath, tsSysFromTree.readFile).config, tsSysFromTree, (0, posix_1.dirname)(tsconfigPath));
+        const parsed = parseTsconfig(tsconfigPath, tsSysFromTree);
         tsconfigInfoCaches.composite.set(tsconfigPath, parsed.options.composite === true);
     }
     return tsconfigInfoCaches.composite.get(tsconfigPath);