@nx/js 20.2.0-beta.4 → 20.2.0-beta.6

package/migrations.json

@@ -111,6 +111,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "x-prompt": "Do you want to update to TypeScript v5.6?",
+      "requires": {
+        "typescript": ">=5.5.0 <5.6.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.6.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/src/executors/node/node.impl.d.ts

@@ -3,5 +3,5 @@ import { NodeExecutorOptions } from './schema';
 export declare function nodeExecutor(options: NodeExecutorOptions, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
     options?: Record<string, any>;
-}, void, undefined>;
+}, void, any>;
 export default nodeExecutor;

package/src/executors/swc/swc.impl.d.ts

@@ -6,5 +6,5 @@ export declare function swcExecutor(_options: SwcExecutorOptions, context: Execu
 } | {
     success: boolean;
     outfile: string;
-}, any, undefined>;
+}, any, any>;
 export default swcExecutor;

package/src/executors/tsc/tsc.impl.d.ts

@@ -3,5 +3,5 @@ import type { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/t
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
 export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string): 'cjs' | 'esm';
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
-export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
+export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, any>;
 export default tscExecutor;

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 ??= {};

package/src/utils/swc/compile-swc.d.ts

@@ -10,4 +10,4 @@ export declare function compileSwc(context: ExecutorContext, normalizedOptions:
 export declare function compileSwcWatch(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>): AsyncGenerator<{
     success: boolean;
     outfile: string;
-}, any, undefined>;
+}, any, any>;

package/src/utils/versions.d.ts

@@ -8,10 +8,10 @@ export declare const swcNodeVersion = "~1.9.1";
 export declare const tsLibVersion = "^2.3.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const verdaccioVersion = "^5.0.4";
-export declare const typescriptVersion = "~5.5.2";
+export declare const typescriptVersion = "~5.6.2";
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.
- * `npm view @angular/compiler-cli@14.0.0 peerDependencies.typescript`
+ * `npm view @angular/compiler-cli@17.0.0 peerDependencies.typescript`
  */
-export declare const supportedTypescriptVersions = ">=4.9.3";
+export declare const supportedTypescriptVersions = ">=5.2.0";

package/src/utils/versions.js

@@ -12,10 +12,10 @@ exports.tsLibVersion = '^2.3.0';
 exports.typesNodeVersion = '18.16.9';
 exports.verdaccioVersion = '^5.0.4';
 // Typescript
-exports.typescriptVersion = '~5.5.2';
+exports.typescriptVersion = '~5.6.2';
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.
- * `npm view @angular/compiler-cli@14.0.0 peerDependencies.typescript`
+ * `npm view @angular/compiler-cli@17.0.0 peerDependencies.typescript`
  */
-exports.supportedTypescriptVersions = '>=4.9.3';
+exports.supportedTypescriptVersions = '>=5.2.0';