nx 22.7.2 → 22.7.4

package/dist/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk_nx_graph_client=self.webpackChunk_nx_graph_client||[]).push([[869],{1614:()=>{}},e=>{var n;n=1614,e(e.s=n)}]);
+"use strict";(self.webpackChunk_nx_graph_client=self.webpackChunk_nx_graph_client||[]).push([[869],{4074(){}},e=>{var n;n=4074,e(e.s=n)}]);

package/dist/src/plugins/js/utils/typescript.d.ts

@@ -13,4 +13,11 @@ export declare function readTsConfigOptions(tsConfigPath: string): ts.CompilerOp
 export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
 export declare function getRootTsConfigFileName(): string | null;
 export declare function getRootTsConfigPath(): string | null;
+export declare function getRootTsConfigCustomConditions(root?: string): string[];
+/**
+ * Conditions list for `resolve.exports`: workspace `customConditions` plus
+ * `development` as backward-compat for workspaces not yet migrated by
+ * `migrate-development-custom-condition` (21.5).
+ */
+export declare function getRootTsConfigResolveExportsConditions(root?: string): string[];
 export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];

package/dist/src/plugins/js/utils/typescript.js

@@ -6,6 +6,8 @@ exports.readTsConfigOptions = readTsConfigOptions;
 exports.resolveModuleByImport = resolveModuleByImport;
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
 exports.getRootTsConfigPath = getRootTsConfigPath;
+exports.getRootTsConfigCustomConditions = getRootTsConfigCustomConditions;
+exports.getRootTsConfigResolveExportsConditions = getRootTsConfigResolveExportsConditions;
 exports.findNodes = findNodes;
 const workspace_root_1 = require("../../../utils/workspace-root");
 const fs_1 = require("fs");
@@ -74,6 +76,43 @@ function getRootTsConfigPath() {
     const tsConfigFileName = getRootTsConfigFileName();
     return tsConfigFileName ? (0, path_1.join)(workspace_root_1.workspaceRoot, tsConfigFileName) : null;
 }
+const customConditionsCache = new Map();
+function getRootTsConfigCustomConditions(root = workspace_root_1.workspaceRoot) {
+    if (customConditionsCache.has(root)) {
+        return customConditionsCache.get(root);
+    }
+    // Resolve via the TypeScript API rather than a raw JSON read so that
+    // `customConditions` inherited through `extends` chains are honored —
+    // matches what TypeScript itself sees when resolving package exports.
+    let conditions = [];
+    for (const name of ['tsconfig.base.json', 'tsconfig.json']) {
+        const tsConfigPath = (0, path_1.join)(root, name);
+        if (!(0, fs_1.existsSync)(tsConfigPath)) {
+            continue;
+        }
+        try {
+            const options = readTsConfigOptions(tsConfigPath);
+            if (Array.isArray(options.customConditions)) {
+                conditions = options.customConditions.filter((c) => typeof c === 'string');
+            }
+        }
+        catch { }
+        break;
+    }
+    customConditionsCache.set(root, conditions);
+    return conditions;
+}
+/**
+ * Conditions list for `resolve.exports`: workspace `customConditions` plus
+ * `development` as backward-compat for workspaces not yet migrated by
+ * `migrate-development-custom-condition` (21.5).
+ */
+function getRootTsConfigResolveExportsConditions(root = workspace_root_1.workspaceRoot) {
+    const conditions = getRootTsConfigCustomConditions(root);
+    return conditions.includes('development')
+        ? conditions
+        : [...conditions, 'development'];
+}
 function findNodes(node, kind, max = Infinity) {
     if (!node || max == 0) {
         return [];

package/dist/src/project-graph/plugins/resolve-plugin.d.ts

@@ -1,15 +1,18 @@
 import type { ProjectConfiguration } from '../../config/workspace-json-project-json';
+type LocalPluginMatch = {
+    path: string;
+    projectConfig: ProjectConfiguration;
+    resolvedFile?: string;
+};
 export declare function resolveNxPlugin(moduleName: string, root: string, paths: string[]): Promise<{
     pluginPath: string;
     name: any;
     shouldRegisterTSTranspiler: boolean;
 }>;
-export declare function resolveLocalNxPlugin(importPath: string, projects: Record<string, ProjectConfiguration>, root?: string): {
-    path: string;
-    projectConfig: ProjectConfiguration;
-} | null;
+export declare function resolveLocalNxPlugin(importPath: string, projects: Record<string, ProjectConfiguration>, root?: string): LocalPluginMatch | null;
 export declare function getPluginPathAndName(moduleName: string, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): {
     pluginPath: string;
     name: any;
     shouldRegisterTSTranspiler: boolean;
 };
+export {};

package/dist/src/project-graph/plugins/resolve-plugin.js

@@ -6,28 +6,59 @@ exports.getPluginPathAndName = getPluginPathAndName;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("node:path"));
 const node_fs_1 = require("node:fs");
+const resolve_exports_1 = require("resolve.exports");
 const packages_1 = require("../../plugins/js/utils/packages");
+const typescript_1 = require("../../plugins/js/utils/typescript");
 const fileutils_1 = require("../../utils/fileutils");
 const logger_1 = require("../../utils/logger");
 const path_1 = require("../../utils/path");
 const workspace_root_1 = require("../../utils/workspace-root");
 const find_project_for_path_1 = require("../utils/find-project-for-path");
 const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
+const TS_SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.cts', '.mts']);
 let projectsWithoutInference;
 let projectsWithoutInferencePromise = null;
 async function resolveNxPlugin(moduleName, root, paths) {
-    try {
-        require.resolve(moduleName, { paths });
-    }
-    catch {
-        // If a plugin cannot be resolved, we will need projects to resolve it
-        projectsWithoutInferencePromise ??=
-            (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
-        projectsWithoutInference ??= await projectsWithoutInferencePromise;
+    // Default plugins (see `getDefaultPlugins` in `get-plugins.ts`) are passed
+    // as absolute file paths to compiled bundles inside `nx` itself; they are
+    // never workspace-local. Skip the project load entirely for them to avoid
+    // recursing through `retrieveProjectConfigurationsWithoutPluginInference`,
+    // which itself triggers default-plugin loading.
+    if (!path.isAbsolute(moduleName)) {
+        let resolvedFromNode;
+        try {
+            resolvedFromNode = require.resolve(moduleName, { paths });
+        }
+        catch { }
+        // Load projects if Node couldn't resolve (so the local fallback can run)
+        // OR if Node resolved to a workspace-internal path (a symlinked workspace
+        // package whose source-first lookup should win over the symlinked dist).
+        if (!resolvedFromNode ||
+            isWorkspaceLocalResolution(resolvedFromNode, root)) {
+            projectsWithoutInferencePromise ??=
+                (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+            projectsWithoutInference ??= await projectsWithoutInferencePromise;
+        }
     }
     const { pluginPath, name, shouldRegisterTSTranspiler } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
     return { pluginPath, name, shouldRegisterTSTranspiler };
 }
+/**
+ * Distinguishes a symlinked workspace package (where `require.resolve`
+ * follows the package-manager symlink into the workspace source tree) from
+ * a truly-installed dependency under `node_modules/`. The former needs the
+ * source-first lookup to bypass the dist that Node would otherwise return.
+ */
+function isWorkspaceLocalResolution(resolvedPath, root) {
+    const normalizedRoot = path.normalize(root);
+    const normalizedPath = path.normalize(resolvedPath);
+    return (normalizedPath.startsWith(normalizedRoot + path.sep) &&
+        !normalizedPath.includes(path.sep + 'node_modules' + path.sep));
+}
+function isPackageResolutionError(e) {
+    const code = e.code;
+    return (code === 'MODULE_NOT_FOUND' || code === 'ERR_PACKAGE_PATH_NOT_EXPORTED');
+}
 function readPluginMainFromProjectConfiguration(plugin) {
     const { main } = Object.values(plugin.targets).find((x) => [
         '@nx/js:tsc',
@@ -46,31 +77,44 @@ function resolveLocalNxPlugin(importPath, projects, root = workspace_root_1.work
 }
 function getPluginPathAndName(moduleName, paths, projects, root) {
     let pluginPath;
-    let shouldRegisterTSTranspiler = false;
-    try {
-        pluginPath = require.resolve(moduleName, {
-            paths,
-        });
-        const extension = path.extname(pluginPath);
-        shouldRegisterTSTranspiler = extension === '.ts';
+    // Resolve local workspace plugins from source first so the workspace's
+    // `customConditions`/`development` exports condition wins over the built
+    // `dist` artifact that Node's resolver would otherwise pick up via the
+    // `default` condition (Node ignores TypeScript custom conditions). Skipped
+    // when `projects` weren't loaded — the caller already determined that the
+    // import isn't a workspace package.
+    const localPlugin = projects
+        ? resolveLocalNxPlugin(moduleName, projects, root)
+        : null;
+    if (localPlugin) {
+        pluginPath = tryResolveLocalPluginFromSource(moduleName, localPlugin, root);
+        if (!pluginPath && getSubpathOfLocalPackage(moduleName, localPlugin)) {
+            throwUnresolvableLocalPluginError(moduleName, localPlugin, root);
+        }
     }
-    catch (e) {
-        if (e.code === 'MODULE_NOT_FOUND') {
-            const plugin = resolveLocalNxPlugin(moduleName, projects, root);
-            if (plugin) {
-                shouldRegisterTSTranspiler = true;
-                const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
-                pluginPath = main ? path.join(root, main) : plugin.path;
+    if (!pluginPath) {
+        try {
+            pluginPath = require.resolve(moduleName, { paths });
+        }
+        catch (e) {
+            if (localPlugin && isPackageResolutionError(e)) {
+                throwUnresolvableLocalPluginError(moduleName, localPlugin, root);
             }
-            else {
-                logger_1.logger.error(`Plugin listed in \`nx.json\` not found: ${moduleName}`);
+            if (e.code !== 'MODULE_NOT_FOUND') {
                 throw e;
             }
-        }
-        else {
+            if (localPlugin) {
+                throwUnresolvableLocalPluginError(moduleName, localPlugin, root);
+            }
+            logger_1.logger.error(`Plugin listed in \`nx.json\` not found: ${moduleName}`);
             throw e;
         }
     }
+    const ext = path.extname(pluginPath);
+    // Directory paths fall through to Node's `package.json` `main` resolution
+    // which may land on a TS file; only opt out of TS transpiler registration
+    // when the resolved path is unambiguously JS.
+    const shouldRegisterTSTranspiler = ext === '' || TS_SOURCE_EXTENSIONS.has(ext);
     const packageJsonPath = path.join(pluginPath, 'package.json');
     const { name } = !['.ts', '.js'].some((x) => path.extname(moduleName) === x) && // Not trying to point to a ts or js file
         (0, node_fs_1.existsSync)(packageJsonPath) // plugin has a package.json
@@ -78,12 +122,84 @@ function getPluginPathAndName(moduleName, paths, projects, root) {
         : { name: moduleName };
     return { pluginPath, name, shouldRegisterTSTranspiler };
 }
+function getSubpathOfLocalPackage(moduleName, plugin) {
+    const packageName = plugin.projectConfig.metadata?.js?.packageName;
+    if (!packageName || !moduleName.startsWith(packageName + '/')) {
+        return null;
+    }
+    return '.' + moduleName.slice(packageName.length);
+}
+function tryResolveLocalPluginFromSource(moduleName, plugin, root) {
+    if (plugin.resolvedFile) {
+        return plugin.resolvedFile;
+    }
+    const subpath = getSubpathOfLocalPackage(moduleName, plugin);
+    if (subpath) {
+        return resolveSubpathFromExports(plugin.projectConfig, plugin.path, subpath, root);
+    }
+    const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
+    return main ? path.join(root, main) : null;
+}
+function throwUnresolvableLocalPluginError(moduleName, plugin, root) {
+    const subpath = getSubpathOfLocalPackage(moduleName, plugin);
+    const packageName = plugin.projectConfig.metadata?.js?.packageName;
+    if (subpath) {
+        throw new Error(`Unable to resolve local plugin "${moduleName}". The import targets ` +
+            `the subpath "${subpath}" of the local package "${packageName}", but ` +
+            `the package's "exports" map has no resolvable entry for "${subpath}", ` +
+            `or none of the matched paths exist on disk. Check the "exports" field ` +
+            `in "${path.relative(root, path.join(plugin.path, 'package.json'))}" ` +
+            `and ensure the source file referenced by "${subpath}" exists.`);
+    }
+    throw new Error(`Unable to resolve local plugin "${moduleName}". The local package ` +
+        `"${packageName ?? moduleName}" does not declare a build target with ` +
+        `a "main" source path, and Node could not resolve it either.`);
+}
+function resolveSubpathFromExports(projectConfig, projectPath, subpath, root) {
+    const packageExports = projectConfig.metadata?.js?.packageExports;
+    if (!packageExports) {
+        return null;
+    }
+    const pkg = {
+        name: projectConfig.metadata.js.packageName,
+        exports: packageExports,
+    };
+    try {
+        const matches = (0, resolve_exports_1.resolve)(pkg, subpath, {
+            conditions: (0, typescript_1.getRootTsConfigResolveExportsConditions)(root),
+        });
+        if (!matches || !matches.length) {
+            return null;
+        }
+        for (const match of matches) {
+            const candidate = path.join(projectPath, match);
+            if ((0, node_fs_1.existsSync)(candidate)) {
+                return candidate;
+            }
+        }
+    }
+    catch (e) {
+        logger_1.logger.verbose(`Failed to resolve subpath "${subpath}" of local plugin via package.json exports`, e);
+    }
+    return null;
+}
 function lookupLocalPlugin(importPath, projects, root = workspace_root_1.workspaceRoot) {
-    const projectConfig = findNxProjectForImportPath(importPath, projects, root);
-    if (!projectConfig) {
+    const match = findNxProjectForImportPath(importPath, projects, root);
+    if (!match) {
         return null;
     }
-    return { path: path.join(root, projectConfig.root), projectConfig };
+    let resolvedFile;
+    if (match.tsPathFile) {
+        const candidate = path.join(root, match.tsPathFile);
+        if (path.extname(candidate) && (0, node_fs_1.existsSync)(candidate)) {
+            resolvedFile = candidate;
+        }
+    }
+    return {
+        path: path.join(root, match.projectConfig.root),
+        projectConfig: match.projectConfig,
+        resolvedFile,
+    };
 }
 let packageEntryPointsToProjectMap;
 let wildcardEntryPointsToProjectMap;
@@ -101,7 +217,10 @@ function findNxProjectForImportPath(importPath, projects, root = workspace_root_
         for (const tsConfigPath of possibleTsPaths) {
             const nxProject = (0, find_project_for_path_1.findProjectForPath)(tsConfigPath, projectRootMappings);
             if (nxProject) {
-                return projectNameMap.get(nxProject);
+                return {
+                    projectConfig: projectNameMap.get(nxProject),
+                    tsPathFile: tsConfigPath,
+                };
             }
         }
     }
@@ -112,14 +231,14 @@ function findNxProjectForImportPath(importPath, projects, root = workspace_root_
         } = (0, packages_1.getWorkspacePackagesMetadata)(projects));
     }
     if (packageEntryPointsToProjectMap[importPath]) {
-        return packageEntryPointsToProjectMap[importPath];
+        return { projectConfig: packageEntryPointsToProjectMap[importPath] };
     }
     const project = (0, packages_1.matchImportToWildcardEntryPointsToProjectMap)(wildcardEntryPointsToProjectMap, importPath);
     if (project) {
-        return project;
+        return { projectConfig: project };
     }
     logger_1.logger.verbose('Unable to find local plugin', possibleTsPaths, projectRootMappings);
-    throw new Error('Unable to resolve local plugin with import path ' + importPath);
+    return null;
 }
 let tsconfigPaths;
 function readTsConfigPaths(root = workspace_root_1.workspaceRoot) {

package/dist/src/project-graph/plugins/utils.js

@@ -3,22 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesFromFiles = createNodesFromFiles;
 const error_types_1 = require("../error-types");
 async function createNodesFromFiles(createNodes, configFiles, options, context) {
-    const results = [];
-    const errors = [];
-    await Promise.all(configFiles.map(async (file, idx) => {
+    const settled = await Promise.all(configFiles.map(async (file, idx) => {
         try {
             const value = await createNodes(file, options, {
                 ...context,
                 configFiles,
             }, idx);
-            if (value) {
-                results.push([file, value]);
-            }
+            return value ? { kind: 'value', file, value } : { kind: 'empty' };
         }
         catch (e) {
-            errors.push([file, e]);
+            return { kind: 'error', file, error: e };
         }
     }));
+    const results = [];
+    const errors = [];
+    for (const entry of settled) {
+        if (entry.kind === 'value') {
+            results.push([entry.file, entry.value]);
+        }
+        else if (entry.kind === 'error') {
+            errors.push([entry.file, entry.error]);
+        }
+    }
     if (errors.length > 0) {
         throw new error_types_1.AggregateCreateNodesError(errors, results);
     }

package/dist/src/tasks-runner/tasks-schedule.js

@@ -223,9 +223,9 @@ class TasksSchedule {
         }
     }
     canBatchTaskBeScheduled(task, batchTaskGraph) {
-        // task self needs to have parallelism true
+        // task self needs to support parallelism (undefined defaults to parallel)
         // all deps have either completed or belong to the same batch
-        return (task.parallelism === true &&
+        return (task.parallelism !== false &&
             this.taskGraph.dependencies[task.id].every((id) => this.completedTasks.has(id) || !!batchTaskGraph?.tasks[id]));
     }
     canBeScheduled(taskId) {
@@ -248,7 +248,7 @@ class TasksSchedule {
         }
         else {
             // if all running tasks support parallelism, can only schedule task with parallelism
-            return this.taskGraph.tasks[taskId].parallelism === true;
+            return this.taskGraph.tasks[taskId].parallelism !== false;
         }
     }
     getEstimatedTaskTimings() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.2",
+  "version": "22.7.4",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -64,7 +64,7 @@
     "balanced-match": "4.0.3",
     "base64-js": "1.5.1",
     "bl": "4.1.0",
-    "brace-expansion": "5.0.5",
+    "brace-expansion": "5.0.6",
     "buffer": "5.7.1",
     "call-bind-apply-helpers": "1.0.2",
     "chalk": "4.1.2",
@@ -154,7 +154,7 @@
     "wrap-ansi": "7.0.0",
     "wrappy": "1.0.2",
     "y18n": "5.0.8",
-    "yaml": "2.8.0",
+    "yaml": "2.9.0",
     "yargs": "17.7.2",
     "yargs-parser": "21.1.1"
   },
@@ -171,16 +171,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.7.2",
-    "@nx/nx-darwin-x64": "22.7.2",
-    "@nx/nx-freebsd-x64": "22.7.2",
-    "@nx/nx-linux-arm-gnueabihf": "22.7.2",
-    "@nx/nx-linux-arm64-gnu": "22.7.2",
-    "@nx/nx-linux-arm64-musl": "22.7.2",
-    "@nx/nx-linux-x64-gnu": "22.7.2",
-    "@nx/nx-linux-x64-musl": "22.7.2",
-    "@nx/nx-win32-arm64-msvc": "22.7.2",
-    "@nx/nx-win32-x64-msvc": "22.7.2"
+    "@nx/nx-darwin-arm64": "22.7.4",
+    "@nx/nx-darwin-x64": "22.7.4",
+    "@nx/nx-freebsd-x64": "22.7.4",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.4",
+    "@nx/nx-linux-arm64-gnu": "22.7.4",
+    "@nx/nx-linux-arm64-musl": "22.7.4",
+    "@nx/nx-linux-x64-gnu": "22.7.4",
+    "@nx/nx-linux-x64-musl": "22.7.4",
+    "@nx/nx-win32-arm64-msvc": "22.7.4",
+    "@nx/nx-win32-x64-msvc": "22.7.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",