@nx/js 20.2.0-beta.5 → 20.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.2.0-beta.5",
+  "version": "20.2.0-beta.7",
   "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": "20.2.0-beta.5",
-    "@nx/workspace": "20.2.0-beta.5",
+    "@nx/devkit": "20.2.0-beta.7",
+    "@nx/workspace": "20.2.0-beta.7",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

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

@@ -136,7 +136,7 @@ async function syncGenerator(tree) {
     if (hasChanges) {
         await (0, devkit_1.formatFiles)(tree);
         return {
-            outOfSyncMessage: 'Based on the workspace project graph, some TypeScript configuration files are missing project references to the projects they depend on or contain outdated project references.',
+            outOfSyncMessage: 'Some TypeScript configuration files are missing project references to the projects they depend on or contain outdated project references.',
         };
     }
 }
@@ -325,7 +325,7 @@ function getTsConfigPathFromReferencePath(tree, ownerTsConfigPath, referencePath
  */
 function patchTsconfigJsonReferences(tree, tsconfigInfoCaches, tsconfigPath, updatedReferences) {
     const stringifiedJsonContents = readRawTsconfigContents(tree, tsconfigInfoCaches, tsconfigPath);
-    const edits = (0, jsonc_parser_1.modify)(stringifiedJsonContents, ['references'], updatedReferences, {});
+    const edits = (0, jsonc_parser_1.modify)(stringifiedJsonContents, ['references'], updatedReferences, { formattingOptions: { keepLines: false } });
     const updatedJsonContents = (0, jsonc_parser_1.applyEdits)(stringifiedJsonContents, edits);
     // The final contents will be formatted by formatFiles() later
     tree.write(tsconfigPath, updatedJsonContents);

package/src/utils/buildable-libs-utils.js

@@ -109,14 +109,12 @@ function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps =
     });
     return acc;
 }
-function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependencies) {
+function readTsConfigWithRemappedPaths(originalTsconfigPath, generatedTsconfigPath, dependencies, workspaceRoot) {
     const generatedTsConfig = { compilerOptions: {} };
-    const dirnameTsConfig = (0, path_1.dirname)(generatedTsConfigPath);
-    const relativeTsconfig = (0, path_1.isAbsolute)(dirnameTsConfig)
-        ? (0, path_1.relative)(devkit_1.workspaceRoot, dirnameTsConfig)
-        : dirnameTsConfig;
-    generatedTsConfig.extends = (0, path_1.relative)(relativeTsconfig, tsConfig);
-    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(tsConfig, dependencies);
+    const normalizedTsConfig = (0, path_1.resolve)(workspaceRoot, originalTsconfigPath);
+    const normalizedGeneratedTsConfigDir = (0, path_1.resolve)(workspaceRoot, (0, path_1.dirname)(generatedTsconfigPath));
+    generatedTsConfig.extends = (0, path_1.relative)(normalizedGeneratedTsConfigDir, normalizedTsConfig);
+    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(originalTsconfigPath, dependencies);
     if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
         output_1.output.log({
             title: 'TypeScript path mappings have been rewritten.',
@@ -232,7 +230,7 @@ function computeCompilerOptionsPaths(tsConfig, dependencies) {
 }
 function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies, useWorkspaceAsBaseUrl = false) {
     const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', 'tsconfig.generated.json');
-    const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies);
+    const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies, workspaceRoot);
     process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
     if (useWorkspaceAsBaseUrl) {
         parsedTSConfig.compilerOptions ??= {};