@nx/js 20.7.0 → 20.7.2

package/migrations.json

@@ -146,6 +146,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.7.1-beta.0": {
+      "version": "20.7.1-beta.0",
+      "packages": {
+        "@swc/cli": {
+          "version": "~0.6.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/src/plugins/typescript/plugin.js

@@ -147,7 +147,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, projectRoot, opt
         ...(packageJson ? [(0, file_hasher_1.hashObject)(packageJson)] : []),
         // change this to bust the cache when making changes that would yield
         // different results for the same hash
-        (0, file_hasher_1.hashObject)({ bust: 1 }),
+        (0, file_hasher_1.hashObject)({ bust: 2 }),
     ]);
 }
 function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, context) {
@@ -196,13 +196,27 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
                 // `tsc --build` does not work with `noEmit: true`
                 command = `echo "The 'typecheck' target is disabled because one or more project references set 'noEmit: true' in their tsconfig. Remove this property to resolve this issue."`;
             }
+            const dependsOn = [`^${targetName}`];
+            if (options.build && targets[options.build.targetName]) {
+                // we already processed and have a build target
+                dependsOn.unshift(options.build.targetName);
+            }
+            else if (options.build) {
+                // check if the project will have a build target
+                const buildConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, options.build.configName);
+                if (context.configFiles.some((f) => f === buildConfigPath) &&
+                    (0, util_1.isValidPackageJsonBuildConfig)(retrieveTsConfigFromCache(buildConfigPath, context.workspaceRoot), context.workspaceRoot, projectRoot)) {
+                    dependsOn.unshift(options.build.targetName);
+                }
+            }
             targets[targetName] = {
-                dependsOn: [`^${targetName}`],
+                dependsOn,
                 command,
                 options: { cwd: projectRoot },
                 cache: true,
                 inputs: getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot),
-                outputs: getOutputs(configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot),
+                outputs: getOutputs(configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot, 
+                /* emitDeclarationOnly */ true),
                 syncGenerators: ['@nx/js:typescript-sync'],
                 metadata: {
                     technologies: ['typescript'],
@@ -229,7 +243,9 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
             options: { cwd: projectRoot },
             cache: true,
             inputs: getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot),
-            outputs: getOutputs(configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot),
+            outputs: getOutputs(configFilePath, tsConfig, internalProjectReferences, context.workspaceRoot, projectRoot, 
+            // should be false for build target, but providing it just in case is set to true
+            tsConfig.options.emitDeclarationOnly),
             syncGenerators: ['@nx/js:typescript-sync'],
             metadata: {
                 technologies: ['typescript'],
@@ -362,7 +378,7 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
     inputs.push({ externalDependencies });
     return inputs;
 }
-function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspaceRoot, projectRoot) {
+function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspaceRoot, projectRoot, emitDeclarationOnly) {
     const outputs = new Set();
     // We could have more surgical outputs based on the tsconfig options, but the
     // user could override them through the command line and that wouldn't be
@@ -384,9 +400,18 @@ function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspa
                 : pathToInputOrOutput((0, devkit_1.joinPathFragments)(outDir, `${outFileName}.tsbuildinfo`), workspaceRoot, projectRoot));
         }
         else if (config.options.outDir) {
-            outputs.add(pathToInputOrOutput(config.options.outDir, workspaceRoot, projectRoot));
+            if (emitDeclarationOnly) {
+                outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.options.outDir, '**/*.d.ts'), workspaceRoot, projectRoot));
+                if (tsConfig.options.declarationMap) {
+                    outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.options.outDir, '**/*.d.ts.map'), workspaceRoot, projectRoot));
+                }
+            }
+            else {
+                outputs.add(pathToInputOrOutput(config.options.outDir, workspaceRoot, projectRoot));
+            }
             if (config.options.tsBuildInfoFile) {
-                if (!(0, node_path_1.normalize)(config.options.tsBuildInfoFile).startsWith(`${(0, node_path_1.normalize)(config.options.outDir)}${node_path_1.sep}`)) {
+                if (emitDeclarationOnly ||
+                    !(0, node_path_1.normalize)(config.options.tsBuildInfoFile).startsWith(`${(0, node_path_1.normalize)(config.options.outDir)}${node_path_1.sep}`)) {
                     // https://www.typescriptlang.org/tsconfig#tsBuildInfoFile
                     outputs.add(pathToInputOrOutput(config.options.tsBuildInfoFile, workspaceRoot, projectRoot));
                 }
@@ -396,6 +421,11 @@ function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspa
                 const relativeRootDir = (0, node_path_1.relative)(config.options.rootDir, (0, node_path_1.join)(workspaceRoot, projectRoot));
                 outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.options.outDir, relativeRootDir, `*.tsbuildinfo`), workspaceRoot, projectRoot));
             }
+            else if (emitDeclarationOnly) {
+                // https://www.typescriptlang.org/tsconfig#tsBuildInfoFile
+                const name = (0, node_path_1.basename)(configFilePath, '.json');
+                outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.options.outDir, `${name}.tsbuildinfo`), workspaceRoot, projectRoot));
+            }
         }
         else if (config.raw?.include?.length ||
             config.raw?.files?.length ||
@@ -431,17 +461,15 @@ function pathToInputOrOutput(path, workspaceRoot, projectRoot) {
     }
     return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
 }
-function getExtendedConfigFiles(tsConfig, workspaceRoot) {
-    const extendedConfigFiles = new Set();
-    const extendedExternalPackages = new Set();
-    let currentExtendedConfigFile = tsConfig.extendedConfigFile;
-    while (currentExtendedConfigFile) {
-        if (currentExtendedConfigFile.externalPackage) {
-            extendedExternalPackages.add(currentExtendedConfigFile.externalPackage);
-            break;
-        }
-        extendedConfigFiles.add(currentExtendedConfigFile.filePath);
-        currentExtendedConfigFile = retrieveTsConfigFromCache(currentExtendedConfigFile.filePath, workspaceRoot).extendedConfigFile;
+function getExtendedConfigFiles(tsConfig, workspaceRoot, extendedConfigFiles = new Set(), extendedExternalPackages = new Set()) {
+    for (const extendedConfigFile of tsConfig.extendedConfigFiles) {
+        if (extendedConfigFile.externalPackage) {
+            extendedExternalPackages.add(extendedConfigFile.externalPackage);
+        }
+        else if (extendedConfigFile.filePath) {
+            extendedConfigFiles.add(extendedConfigFile.filePath);
+            getExtendedConfigFiles(retrieveTsConfigFromCache(extendedConfigFile.filePath, workspaceRoot), workspaceRoot, extendedConfigFiles, extendedExternalPackages);
+        }
     }
     return {
         files: Array.from(extendedConfigFiles),
@@ -577,40 +605,51 @@ function readTsConfigAndCache(tsConfigPath, workspaceRoot) {
     let extendedFilesHash;
     if (tsConfigCache[relativePath] &&
         tsConfigCache[relativePath].hash === hash) {
-        extendedFilesHash = getExtendedFilesHash(tsConfigCache[relativePath].data.extendedConfigFile, workspaceRoot);
+        extendedFilesHash = getExtendedFilesHash(tsConfigCache[relativePath].data.extendedConfigFiles, workspaceRoot);
         if (tsConfigCache[relativePath].extendedFilesHash === extendedFilesHash) {
             return tsConfigCache[relativePath].data;
         }
     }
     const tsConfig = readTsConfig(tsConfigPath, workspaceRoot);
-    const extendedConfigFile = tsConfig.raw?.extends
-        ? resolveExtendedTsConfigPath(tsConfig.raw.extends, (0, node_path_1.dirname)(tsConfigPath))
-        : null;
-    extendedFilesHash ??= getExtendedFilesHash(extendedConfigFile, workspaceRoot);
+    const extendedConfigFiles = [];
+    if (tsConfig.raw?.extends) {
+        const extendsArray = typeof tsConfig.raw.extends === 'string'
+            ? [tsConfig.raw.extends]
+            : tsConfig.raw.extends;
+        for (const extendsPath of extendsArray) {
+            const extendedConfigFile = resolveExtendedTsConfigPath(extendsPath, (0, node_path_1.dirname)(tsConfigPath));
+            if (extendedConfigFile) {
+                extendedConfigFiles.push(extendedConfigFile);
+            }
+        }
+    }
+    extendedFilesHash ??= getExtendedFilesHash(extendedConfigFiles, workspaceRoot);
     tsConfigCache[relativePath] = {
         data: {
             options: tsConfig.options,
             projectReferences: tsConfig.projectReferences,
             raw: tsConfig.raw,
-            extendedConfigFile: extendedConfigFile ?? null,
+            extendedConfigFiles,
         },
         hash,
         extendedFilesHash,
     };
     return tsConfigCache[relativePath].data;
 }
-function getExtendedFilesHash(extendedConfigFile, workspaceRoot) {
+function getExtendedFilesHash(extendedConfigFiles, workspaceRoot) {
     const hashes = [];
-    if (!extendedConfigFile) {
+    if (!extendedConfigFiles.length) {
         return '';
     }
-    if (extendedConfigFile.externalPackage) {
-        hashes.push(extendedConfigFile.externalPackage);
-    }
-    else if (extendedConfigFile.filePath) {
-        hashes.push(getFileHash(extendedConfigFile.filePath, workspaceRoot));
-        hashes.push(getExtendedFilesHash(readTsConfigAndCache(extendedConfigFile.filePath, workspaceRoot)
-            .extendedConfigFile, workspaceRoot));
+    for (const extendedConfigFile of extendedConfigFiles) {
+        if (extendedConfigFile.externalPackage) {
+            hashes.push(extendedConfigFile.externalPackage);
+        }
+        else if (extendedConfigFile.filePath) {
+            hashes.push(getFileHash(extendedConfigFile.filePath, workspaceRoot));
+            hashes.push(getExtendedFilesHash(readTsConfigAndCache(extendedConfigFile.filePath, workspaceRoot)
+                .extendedConfigFiles, workspaceRoot));
+        }
     }
     return hashes.join('|');
 }
@@ -673,7 +712,8 @@ function resolveExtendedTsConfigPath(tsConfigPath, directory) {
         const resolvedPath = require.resolve(tsConfigPath, {
             paths: directory ? [directory] : undefined,
         });
-        if (tsConfigPath.startsWith('.')) {
+        if (tsConfigPath.startsWith('.') ||
+            !resolvedPath.includes('/node_modules/')) {
             return { filePath: resolvedPath };
         }
         // parse the package from the tsconfig path
@@ -711,7 +751,7 @@ function toAbsolutePaths(cache, workspaceRoot) {
                 raw: {
                     nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
                 },
-                extendedConfigFile: data.extendedConfigFile,
+                extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,
             hash,
@@ -728,8 +768,10 @@ function toAbsolutePaths(cache, workspaceRoot) {
         if (data.options.tsBuildInfoFile) {
             updatedCache[key].data.options.tsBuildInfoFile = (0, node_path_1.join)(workspaceRoot, data.options.tsBuildInfoFile);
         }
-        if (data.extendedConfigFile?.filePath) {
-            updatedCache[key].data.extendedConfigFile.filePath = (0, node_path_1.join)(workspaceRoot, data.extendedConfigFile.filePath);
+        if (data.extendedConfigFiles.length) {
+            updatedCache[key].data.extendedConfigFiles.forEach((file) => {
+                file.filePath = (0, node_path_1.join)(workspaceRoot, file.filePath);
+            });
         }
         if (data.projectReferences) {
             updatedCache[key].data.projectReferences = data.projectReferences.map((ref) => ({ ...ref, path: (0, node_path_1.join)(workspaceRoot, ref.path) }));
@@ -746,7 +788,7 @@ function toRelativePaths(cache, workspaceRoot) {
                 raw: {
                     nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
                 },
-                extendedConfigFile: data.extendedConfigFile,
+                extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,
             hash,
@@ -763,8 +805,10 @@ function toRelativePaths(cache, workspaceRoot) {
         if (data.options.tsBuildInfoFile) {
             updatedCache[key].data.options.tsBuildInfoFile = posixRelative(workspaceRoot, data.options.tsBuildInfoFile);
         }
-        if (data.extendedConfigFile?.filePath) {
-            updatedCache[key].data.extendedConfigFile.filePath = posixRelative(workspaceRoot, data.extendedConfigFile.filePath);
+        if (data.extendedConfigFiles.length) {
+            updatedCache[key].data.extendedConfigFiles.forEach((file) => {
+                file.filePath = posixRelative(workspaceRoot, file.filePath);
+            });
         }
         if (data.projectReferences) {
             updatedCache[key].data.projectReferences = data.projectReferences.map((ref) => ({

package/src/plugins/typescript/util.d.ts

@@ -1,11 +1,12 @@
 import { type TargetConfiguration } from '@nx/devkit';
 import { type PackageManagerCommands } from 'nx/src/utils/package-manager';
 import { type ParsedCommandLine } from 'typescript';
+export type ExtendedConfigFile = {
+    filePath: string;
+    externalPackage?: string;
+};
 export type ParsedTsconfigData = Pick<ParsedCommandLine, 'options' | 'projectReferences' | 'raw'> & {
-    extendedConfigFile: {
-        filePath: string;
-        externalPackage?: string;
-    } | null;
+    extendedConfigFiles: ExtendedConfigFile[];
 };
 /**
  * Allow uses that use incremental builds to run `nx watch-deps` to continuously build all dependencies.

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

@@ -114,7 +114,7 @@ function readTsConfigWithRemappedPaths(originalTsconfigPath, generatedTsconfigPa
     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);
+    generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(normalizedTsConfig, dependencies);
     if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
         output_1.output.log({
             title: 'TypeScript path mappings have been rewritten.',

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
 export declare const esbuildVersion = "^0.19.2";
 export declare const prettierVersion = "^2.6.2";
-export declare const swcCliVersion = "~0.3.12";
+export declare const swcCliVersion = "~0.6.0";
 export declare const swcCoreVersion = "~1.5.7";
 export declare const swcHelpersVersion = "~0.5.11";
 export declare const swcNodeVersion = "~1.9.1";

package/src/utils/versions.js

@@ -4,7 +4,7 @@ exports.supportedTypescriptVersions = exports.typescriptVersion = exports.verdac
 exports.nxVersion = require('../../package.json').version;
 exports.esbuildVersion = '^0.19.2';
 exports.prettierVersion = '^2.6.2';
-exports.swcCliVersion = '~0.3.12';
+exports.swcCliVersion = '~0.6.0';
 exports.swcCoreVersion = '~1.5.7';
 exports.swcHelpersVersion = '~0.5.11';
 exports.swcNodeVersion = '~1.9.1';