@nx/js 21.2.1 → 21.2.3

package/package.json

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

package/src/generators/library/library.js

@@ -384,14 +384,14 @@ function createFiles(tree, options) {
             hasUnitTestRunner: options.unitTestRunner !== 'none',
         });
     }
-    if (options.bundler === 'swc' || options.bundler === 'rollup') {
+    if (options.includeBabelRc) {
+        addBabelRc(tree, options);
+    }
+    else if (options.bundler === 'swc' || options.bundler === 'rollup') {
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' && !options.isUsingTsSolutionConfig
             ? 'commonjs'
             : 'es6');
     }
-    else if (options.includeBabelRc) {
-        addBabelRc(tree, options);
-    }
     if (options.unitTestRunner === 'none') {
         tree.delete((0, path_1.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
         tree.delete((0, path_1.join)(options.projectRoot, 'src/app', `${options.fileName}.spec.ts`));

package/src/generators/setup-build/generator.js

@@ -5,12 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const plugin_1 = require("../../utils/typescript/plugin");
 const get_import_path_1 = require("../../utils/get-import-path");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const ensure_typescript_1 = require("../../utils/typescript/ensure-typescript");
+const plugin_1 = require("../../utils/typescript/plugin");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
@@ -29,7 +29,7 @@ async function setupBuildGenerator(tree, options) {
         mainFile = options.main;
     }
     else {
-        const root = project.sourceRoot ?? project.root;
+        const root = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
         for (const f of [
             (0, devkit_1.joinPathFragments)(root, 'main.ts'),
             (0, devkit_1.joinPathFragments)(root, 'main.js'),

package/src/plugins/typescript/util.js

@@ -6,6 +6,7 @@ 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");
+const picomatch = require("picomatch");
 /**
  * Allow uses that use incremental builds to run `nx watch-deps` to continuously build all dependencies.
  */
@@ -46,22 +47,98 @@ function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot) {
         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 projectAbsolutePath = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath);
+    // Handle outFile first (has precedence over outDir)
+    if (tsConfig.options.outFile) {
+        const outFile = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, tsConfig.options.outFile);
+        const relativeToProject = (0, node_path_1.relative)(projectAbsolutePath, outFile);
+        // If outFile is outside project root: buildable
+        if (relativeToProject.startsWith('..')) {
+            return true;
+        }
+        // If outFile is inside project root: check if entry points point to outFile
+        const isPathSourceFile = (path) => {
+            const normalizedPath = (0, node_path_1.isAbsolute)(path)
+                ? (0, node_path_1.resolve)(workspaceRoot, path.startsWith('/') ? path.slice(1) : path)
+                : (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, path);
+            // For outFile case, check if path points to the specific outFile
+            return normalizedPath === outFile;
+        };
+        // Check if any entry points match the outFile
+        const exports = packageJson?.exports;
+        if (exports) {
+            if (typeof exports === 'string') {
+                return !isPathSourceFile(exports);
+            }
+            if (typeof exports === 'object' && '.' in exports) {
+                const dotExport = exports['.'];
+                if (typeof dotExport === 'string') {
+                    return !isPathSourceFile(dotExport);
+                }
+                else if (typeof dotExport === 'object') {
+                    const hasMatch = Object.entries(dotExport).some(([key, value]) => {
+                        if (key === 'types' || key === 'development')
+                            return false;
+                        return typeof value === 'string' && isPathSourceFile(value);
+                    });
+                    return !hasMatch;
+                }
+            }
+        }
+        const buildPaths = ['main', 'module'];
+        for (const field of buildPaths) {
+            if (packageJson[field] && isPathSourceFile(packageJson[field])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    // Handle outDir
+    const outDir = tsConfig.options.outDir;
+    let resolvedOutDir;
+    if (outDir) {
+        const potentialOutDir = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, outDir);
+        const relativePath = (0, node_path_1.relative)(projectAbsolutePath, potentialOutDir);
+        // If outDir is outside project root: buildable
+        if (relativePath.startsWith('..')) {
+            return true;
+        }
+        // If outDir is inside project root, then we should check entry points
+        if (!relativePath.startsWith('..')) {
+            resolvedOutDir = potentialOutDir;
+        }
+    }
     const isPathSourceFile = (path) => {
+        const normalizedPath = (0, node_path_1.isAbsolute)(path)
+            ? (0, node_path_1.resolve)(workspaceRoot, path.startsWith('/') ? path.slice(1) : path)
+            : (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, path);
         if (resolvedOutDir) {
-            const pathToCheck = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath, path);
-            return !pathToCheck.startsWith(resolvedOutDir);
+            // If the path is within the outDir, we assume it's not a source file.
+            const relativePath = (0, node_path_1.relative)(resolvedOutDir, normalizedPath);
+            if (!relativePath.startsWith('..')) {
+                return false;
+            }
         }
-        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);
+        // If no include patterns, TypeScript includes all TS files by default
+        const include = tsConfig.raw?.include;
+        if (!include || !Array.isArray(include)) {
+            const ext = (0, node_path_1.extname)(path);
+            const tsExtensions = ['.ts', '.tsx', '.cts', '.mts'];
+            if (tsExtensions.includes(ext)) {
+                return true;
+            }
+            // If include is not defined and it's not a TS file, assume it's not a source file
+            return false;
+        }
+        const projectAbsolutePath = (0, node_path_1.resolve)(workspaceRoot, resolvedProjectPath);
+        const relativeToProject = (0, node_path_1.relative)(projectAbsolutePath, normalizedPath);
+        for (const pattern of include) {
+            if (picomatch(pattern)(relativeToProject)) {
+                return true;
+            }
+        }
+        return false;
     };
-    // Checks if the value is a path within the `src` directory.
     const containsInvalidPath = (value) => {
         if (typeof value === 'string') {
             return isPathSourceFile(value);

package/src/utils/assets/copy-assets-handler.js

@@ -52,16 +52,19 @@ class CopyAssetsHandler {
             let input;
             let output;
             let ignore = null;
+            const resolvedOutputDir = path.isAbsolute(opts.outputDir)
+                ? opts.outputDir
+                : path.resolve(opts.rootDir, opts.outputDir);
             if (typeof f === 'string') {
                 pattern = f;
                 input = path.relative(opts.rootDir, opts.projectDir);
-                output = path.relative(opts.rootDir, opts.outputDir);
+                output = path.relative(opts.rootDir, resolvedOutputDir);
             }
             else {
                 isGlob = true;
                 pattern = pathPosix.join(f.input, f.glob);
                 input = f.input;
-                output = pathPosix.join(path.relative(opts.rootDir, opts.outputDir), f.output);
+                output = pathPosix.join(path.relative(opts.rootDir, resolvedOutputDir), f.output);
                 if (f.ignore)
                     ignore = f.ignore.map((ig) => pathPosix.join(f.input, ig));
             }

package/src/utils/inline.js

@@ -7,6 +7,7 @@ exports.getRootTsConfigPath = getRootTsConfigPath;
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
+const ts_solution_setup_1 = require("./typescript/ts-solution-setup");
 function isInlineGraphEmpty(inlineGraph) {
     return Object.keys(inlineGraph.nodes).length === 0;
 }
@@ -72,7 +73,7 @@ function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutput
     return {
         name: projectNode.name,
         root: projectNode.data.root,
-        sourceRoot: projectNode.data.sourceRoot,
+        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
         pathAlias,
         buildOutputPath,
     };

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

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
+import { type ProjectConfiguration, 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;
@@ -6,4 +6,4 @@ export declare function findRuntimeTsConfigName(projectRoot: string, tree?: Tree
 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): Promise<void>;
 export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';
-export declare function getProjectSourceRoot(tree: Tree, projectSourceRoot: string | undefined, projectRoot: string): string | undefined;
+export declare function getProjectSourceRoot(project: ProjectConfiguration, tree?: Tree): string;

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

@@ -9,6 +9,7 @@ exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 exports.getProjectType = getProjectType;
 exports.getProjectSourceRoot = getProjectSourceRoot;
 const devkit_1 = require("@nx/devkit");
+const node_fs_1 = require("node:fs");
 const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
@@ -206,9 +207,15 @@ function getProjectType(tree, projectRoot, projectType) {
         return 'application';
     return 'library';
 }
-function getProjectSourceRoot(tree, projectSourceRoot, projectRoot) {
-    return (projectSourceRoot ??
-        (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'src'))
-            ? (0, devkit_1.joinPathFragments)(projectRoot, 'src')
-            : projectRoot));
+function getProjectSourceRoot(project, tree) {
+    if (tree) {
+        return (project.sourceRoot ??
+            (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src'))
+                ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+                : project.root));
+    }
+    return (project.sourceRoot ??
+        ((0, node_fs_1.existsSync)((0, posix_1.join)(devkit_1.workspaceRoot, project.root, 'src'))
+            ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+            : project.root));
 }