@nx/js 20.5.0-rc.1 → 20.5.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.5.0-rc.1",
+  "version": "20.5.0-rc.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": "20.5.0-rc.1",
-    "@nx/workspace": "20.5.0-rc.1",
+    "@nx/devkit": "20.5.0-rc.3",
+    "@nx/workspace": "20.5.0-rc.3",
     "@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

@@ -216,7 +216,7 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     // Build target
     if (options.build &&
         (0, node_path_1.basename)(configFilePath) === options.build.configName &&
-        isValidPackageJsonBuildConfig(tsConfig, context.workspaceRoot, projectRoot)) {
+        (0, util_1.isValidPackageJsonBuildConfig)(tsConfig, context.workspaceRoot, projectRoot)) {
         internalProjectReferences ??= resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.build.targetName;
         targets[targetName] = {
@@ -371,87 +371,6 @@ function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspa
     });
     return Array.from(outputs);
 }
-/**
- * Validates the build configuration of a `package.json` file by ensuring that paths in the `exports`, `module`,
- * and `main` fields reference valid output paths within the `outDir` defined in the TypeScript configuration.
- * Priority is given to the `exports` field, specifically the `.` export if defined. If `exports` is not defined,
- * the function falls back to validating `main` and `module` fields. If `outFile` is specified, it validates that the file
- * is located within the output directory.
- * If no `package.json` file exists, it assumes the configuration is valid.
- *
- * @param tsConfig The TypeScript configuration object.
- * @param workspaceRoot The workspace root path.
- * @param projectRoot The project root path.
- * @returns `true` if the package has a valid build configuration; otherwise, `false`.
- */
-function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot) {
-    const packageJsonPath = (0, node_path_1.join)(workspaceRoot, projectRoot, 'package.json');
-    if (!(0, node_fs_1.existsSync)(packageJsonPath)) {
-        // If the package.json file does not exist.
-        // Assume it's valid because it would be using `project.json` instead.
-        return true;
-    }
-    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-    const outDir = tsConfig.options.outFile
-        ? (0, node_path_1.dirname)(tsConfig.options.outFile)
-        : tsConfig.options.outDir;
-    const resolvedOutDir = outDir
-        ? (0, node_path_1.resolve)(workspaceRoot, projectRoot, outDir)
-        : undefined;
-    const isPathSourceFile = (path) => {
-        if (resolvedOutDir) {
-            const pathToCheck = (0, node_path_1.resolve)(workspaceRoot, projectRoot, path);
-            return !pathToCheck.startsWith(resolvedOutDir);
-        }
-        const ext = (0, node_path_1.extname)(path);
-        // Check that the file extension is a TS file extension. As the source files are in the same directory as the output files.
-        return ['.ts', '.tsx', '.cts', '.mts'].includes(ext);
-    };
-    // Checks if the value is a path within the `src` directory.
-    const containsInvalidPath = (value) => {
-        if (typeof value === 'string') {
-            return isPathSourceFile(value);
-        }
-        else if (typeof value === 'object') {
-            return Object.entries(value).some(([currentKey, subValue]) => {
-                // Skip types field
-                if (currentKey === 'types') {
-                    return false;
-                }
-                if (typeof subValue === 'string') {
-                    return isPathSourceFile(subValue);
-                }
-                return false;
-            });
-        }
-        return false;
-    };
-    const exports = packageJson?.exports;
-    // Check the `.` export if `exports` is defined.
-    if (exports) {
-        if (typeof exports === 'string') {
-            return !isPathSourceFile(exports);
-        }
-        if (typeof exports === 'object' && '.' in exports) {
-            return !containsInvalidPath(exports['.']);
-        }
-        // Check other exports if `.` is not defined or valid.
-        for (const key in exports) {
-            if (key !== '.' && containsInvalidPath(exports[key])) {
-                return false;
-            }
-        }
-        return true;
-    }
-    // If `exports` is not defined, fallback to `main` and `module` fields.
-    const buildPaths = ['main', 'module'];
-    for (const field of buildPaths) {
-        if (packageJson[field] && isPathSourceFile(packageJson[field])) {
-            return false;
-        }
-    }
-    return true;
-}
 function pathToInputOrOutput(path, workspaceRoot, projectRoot) {
     const fullProjectRoot = (0, node_path_1.resolve)(workspaceRoot, projectRoot);
     const fullPath = (0, node_path_1.resolve)(workspaceRoot, path);

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

@@ -1,5 +1,12 @@
 import { type TargetConfiguration } from '@nx/devkit';
 import { type PackageManagerCommands } from 'nx/src/utils/package-manager';
+import { type ParsedCommandLine } from 'typescript';
+export type ParsedTsconfigData = Pick<ParsedCommandLine, 'options' | 'projectReferences' | 'raw'> & {
+    extendedConfigFile: {
+        filePath: string;
+        externalPackage?: string;
+    } | null;
+};
 /**
  * Allow uses that use incremental builds to run `nx watch-deps` to continuously build all dependencies.
  */
@@ -7,3 +14,4 @@ export declare function addBuildAndWatchDepsTargets(workspaceRoot: string, proje
     buildDepsTargetName?: string;
     watchDepsTargetName?: string;
 }, pmc: PackageManagerCommands): void;
+export declare function isValidPackageJsonBuildConfig(tsConfig: ParsedTsconfigData, workspaceRoot: string, projectRoot: string): boolean;

package/src/plugins/typescript/util.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBuildAndWatchDepsTargets = addBuildAndWatchDepsTargets;
+exports.isValidPackageJsonBuildConfig = isValidPackageJsonBuildConfig;
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const path_1 = require("path");
 /**
  * Allow uses that use incremental builds to run `nx watch-deps` to continuously build all dependencies.
@@ -32,3 +34,74 @@ function addBuildAndWatchDepsTargets(workspaceRoot, projectRoot, targets, option
         };
     }
 }
+function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot) {
+    const resolvedProjectPath = (0, node_path_1.isAbsolute)(projectRoot)
+        ? (0, node_path_1.relative)(workspaceRoot, projectRoot)
+        : projectRoot;
+    const packageJsonPath = (0, path_1.join)(workspaceRoot, resolvedProjectPath, 'package.json');
+    if (!(0, node_fs_1.existsSync)(packageJsonPath)) {
+        // If the package.json file does not exist.
+        // Assume it's valid because it would be using `project.json` instead.
+        return true;
+    }
+    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+    const outDir = tsConfig.options.outFile
+        ? (0, node_path_1.dirname)(tsConfig.options.outFile)
+        : tsConfig.options.outDir;
+    const resolvedOutDir = outDir
+        ? (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, outDir)
+        : undefined;
+    const isPathSourceFile = (path) => {
+        if (resolvedOutDir) {
+            const pathToCheck = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, path);
+            return !pathToCheck.startsWith(resolvedOutDir);
+        }
+        const ext = (0, node_path_1.extname)(path);
+        // Check that the file extension is a TS file extension. As the source files are in the same directory as the output files.
+        return ['.ts', '.tsx', '.cts', '.mts'].includes(ext);
+    };
+    // Checks if the value is a path within the `src` directory.
+    const containsInvalidPath = (value) => {
+        if (typeof value === 'string') {
+            return isPathSourceFile(value);
+        }
+        else if (typeof value === 'object') {
+            return Object.entries(value).some(([currentKey, subValue]) => {
+                // Skip types field
+                if (currentKey === 'types') {
+                    return false;
+                }
+                if (typeof subValue === 'string') {
+                    return isPathSourceFile(subValue);
+                }
+                return false;
+            });
+        }
+        return false;
+    };
+    const exports = packageJson?.exports;
+    // Check the `.` export if `exports` is defined.
+    if (exports) {
+        if (typeof exports === 'string') {
+            return !isPathSourceFile(exports);
+        }
+        if (typeof exports === 'object' && '.' in exports) {
+            return !containsInvalidPath(exports['.']);
+        }
+        // Check other exports if `.` is not defined or valid.
+        for (const key in exports) {
+            if (key !== '.' && containsInvalidPath(exports[key])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    // If `exports` is not defined, fallback to `main` and `module` fields.
+    const buildPaths = ['main', 'module'];
+    for (const field of buildPaths) {
+        if (packageJson[field] && isPathSourceFile(packageJson[field])) {
+            return false;
+        }
+    }
+    return true;
+}

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

@@ -17,6 +17,7 @@ const output_1 = require("nx/src/utils/output");
 const path_1 = require("path");
 const ts_config_1 = require("./typescript/ts-config");
 const crypto_1 = require("crypto");
+const project_graph_1 = require("nx/src/config/project-graph");
 function isBuildable(target, node) {
     return (node.data.targets &&
         node.data.targets[target] &&
@@ -49,7 +50,7 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
         .map(({ name: dep, isTopLevel }) => {
         let project = null;
         const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
-        if (depNode.type === 'lib') {
+        if ((0, project_graph_1.isProjectGraphProjectNode)(depNode) && depNode.type === 'lib') {
             if (isBuildable(targetName, depNode)) {
                 const libPackageJsonPath = (0, path_1.join)(root, depNode.data.root, 'package.json');
                 project = {
@@ -68,7 +69,7 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
                 nonBuildableDependencies.push(dep);
             }
         }
-        else if (depNode.type === 'npm') {
+        else if ((0, project_graph_1.isProjectGraphExternalNode)(depNode)) {
             project = {
                 name: depNode.data.packageName,
                 outputs: [],
@@ -284,10 +285,9 @@ function findMissingBuildDependencies(root, projectName, targetName, projectDepe
 function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
-    dependencies.forEach((dep) => {
-        if (dep.node.type === 'npm') {
-            return;
-        }
+    dependencies
+        .filter((dep) => (0, project_graph_1.isProjectGraphProjectNode)(dep.node))
+        .forEach((dep) => {
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
             // Directly map the dependency name to the output paths (dist/packages/..., etc.)
@@ -351,7 +351,8 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
             !hasDependency(packageJson, 'peerDependencies', packageName)) {
             try {
                 let depVersion;
-                if (entry.node.type === 'lib') {
+                if ((0, project_graph_1.isProjectGraphProjectNode)(entry.node) &&
+                    entry.node.type === 'lib') {
                     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
                         project: projectName,
                         target: targetName,

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -2,7 +2,7 @@ import { type Tree } from '@nx/devkit';
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;
 export declare function assertNotUsingTsSolutionSetup(tree: Tree, pluginName: string, generatorName: string): void;
-export declare function findRuntimeTsConfigName(tree: Tree, projectRoot: string): string | null;
+export declare function findRuntimeTsConfigName(projectRoot: string, tree?: Tree): string | null;
 export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[], rootDir?: string): void;
 export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): void;
 export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';

package/src/utils/typescript/ts-solution-setup.js

@@ -71,7 +71,8 @@ function assertNotUsingTsSolutionSetup(tree, pluginName, generatorName) {
     });
     throw new Error(`The ${artifactString} doesn't yet support the existing TypeScript setup. See the error above.`);
 }
-function findRuntimeTsConfigName(tree, projectRoot) {
+function findRuntimeTsConfigName(projectRoot, tree) {
+    tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
     if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.app.json')))
         return 'tsconfig.app.json';
     if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.lib.json')))