nx 19.0.3 → 19.0.5

package/src/daemon/client/client.js

@@ -19,6 +19,7 @@ const nx_json_1 = require("../../config/nx-json");
 const daemon_socket_messenger_1 = require("./daemon-socket-messenger");
 const cache_1 = require("../cache");
 const error_types_1 = require("../../project-graph/error-types");
+const dotenv_1 = require("../../utils/dotenv");
 const DAEMON_ENV_SETTINGS = {
     NX_PROJECT_GLOB_CACHE: 'false',
     NX_CACHE_PROJECTS_CONFIG: 'false',
@@ -36,6 +37,7 @@ class DaemonClient {
         this._daemonReady = null;
         this._out = null;
         this._err = null;
+        (0, dotenv_1.loadRootEnvFiles)(workspace_root_1.workspaceRoot);
         try {
             this.nxJson = (0, configuration_1.readNxJson)();
         }
@@ -139,7 +141,7 @@ class DaemonClient {
         }
         let messenger;
         await this.queue.sendToQueue(() => {
-            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH)).listen((message) => {
+            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => {
                 try {
                     const parsedMessage = JSON.parse(message);
                     callback(null, parsedMessage);
@@ -184,7 +186,7 @@ class DaemonClient {
     async isServerAvailable() {
         return new Promise((resolve) => {
             try {
-                const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH, () => {
+                const socket = (0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)(), () => {
                     socket.destroy();
                     resolve(true);
                 });
@@ -201,7 +203,7 @@ class DaemonClient {
         return this.queue.sendToQueue(() => this.sendMessageToDaemon(messageToDaemon));
     }
     setUpConnection() {
-        this.socketMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH)).listen((message) => this.handleMessage(message), () => {
+        this.socketMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => this.handleMessage(message), () => {
             // it's ok for the daemon to terminate if the client doesn't wait on
             // any messages from the daemon
             if (this.queue.isEmpty()) {

package/src/daemon/server/server.js

@@ -198,7 +198,7 @@ const handleWorkspaceChanges = async (err, changeEvents) => {
             });
             return;
         }
-        if (err || !changeEvents || !changeEvents.length) {
+        if (err) {
             let error = typeof err === 'string' ? new Error(err) : err;
             logger_1.serverLogger.watcherLog('Unexpected workspace watcher error', error.message);
             console.error(error);
@@ -273,9 +273,9 @@ async function startServer() {
     }
     return new Promise(async (resolve, reject) => {
         try {
-            server.listen(socket_utils_1.FULL_OS_SOCKET_PATH, async () => {
+            server.listen((0, socket_utils_1.getFullOsSocketPath)(), async () => {
                 try {
-                    logger_1.serverLogger.log(`Started listening on: ${socket_utils_1.FULL_OS_SOCKET_PATH}`);
+                    logger_1.serverLogger.log(`Started listening on: ${(0, socket_utils_1.getFullOsSocketPath)()}`);
                     // this triggers the storage of the lock file hash
                     daemonIsOutdated();
                     if (!(0, shutdown_utils_1.getWatcherInstance)()) {

package/src/daemon/server/watcher.js

@@ -8,7 +8,10 @@ const shutdown_utils_1 = require("./shutdown-utils");
 const path_2 = require("../../utils/path");
 const ignore_1 = require("../../utils/ignore");
 const cache_1 = require("../cache");
-const ALWAYS_IGNORE = [...(0, ignore_1.getAlwaysIgnore)(workspace_root_1.workspaceRoot), socket_utils_1.FULL_OS_SOCKET_PATH];
+const ALWAYS_IGNORE = [
+    ...(0, ignore_1.getAlwaysIgnore)(workspace_root_1.workspaceRoot),
+    (0, socket_utils_1.getFullOsSocketPath)(),
+];
 async function watchWorkspace(server, cb) {
     const { Watcher } = await Promise.resolve().then(() => require('../../native'));
     let relativeServerProcess = (0, path_2.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, cache_1.serverProcessJsonPath));

package/src/daemon/socket-utils.d.ts

@@ -5,7 +5,7 @@ export declare const isWindows: boolean;
  * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections for a full breakdown
  * of OS differences between Unix domain sockets and named pipes.
  */
-export declare const FULL_OS_SOCKET_PATH: string;
-export declare const FORKED_PROCESS_OS_SOCKET_PATH: (id: string) => string;
+export declare const getFullOsSocketPath: () => string;
+export declare const getForkedProcessOsSocketPath: (id: string) => string;
 export declare function killSocketOrPath(): void;
 export declare function serializeResult(error: Error | null, serializedProjectGraph: string | null, serializedSourceMaps: string | null): string | null;

package/src/daemon/socket-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeResult = exports.killSocketOrPath = exports.FORKED_PROCESS_OS_SOCKET_PATH = exports.FULL_OS_SOCKET_PATH = exports.isWindows = void 0;
+exports.serializeResult = exports.killSocketOrPath = exports.getForkedProcessOsSocketPath = exports.getFullOsSocketPath = exports.isWindows = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -13,17 +13,18 @@ exports.isWindows = (0, os_1.platform)() === 'win32';
  * See https://nodejs.org/dist/latest-v14.x/docs/api/net.html#net_identifying_paths_for_ipc_connections for a full breakdown
  * of OS differences between Unix domain sockets and named pipes.
  */
-exports.FULL_OS_SOCKET_PATH = exports.isWindows
-    ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)(tmp_dir_1.DAEMON_SOCKET_PATH)
-    : (0, path_1.resolve)(tmp_dir_1.DAEMON_SOCKET_PATH);
-const FORKED_PROCESS_OS_SOCKET_PATH = (id) => {
-    let path = (0, path_1.resolve)((0, path_1.join)(tmp_dir_1.socketDir, 'fp' + id + '.sock'));
+const getFullOsSocketPath = () => exports.isWindows
+    ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)((0, tmp_dir_1.getDaemonSocketDir)())
+    : (0, path_1.resolve)((0, tmp_dir_1.getDaemonSocketDir)());
+exports.getFullOsSocketPath = getFullOsSocketPath;
+const getForkedProcessOsSocketPath = (id) => {
+    let path = (0, path_1.resolve)((0, path_1.join)((0, tmp_dir_1.getSocketDir)(), 'fp' + id + '.sock'));
     return exports.isWindows ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)(path) : (0, path_1.resolve)(path);
 };
-exports.FORKED_PROCESS_OS_SOCKET_PATH = FORKED_PROCESS_OS_SOCKET_PATH;
+exports.getForkedProcessOsSocketPath = getForkedProcessOsSocketPath;
 function killSocketOrPath() {
     try {
-        (0, fs_1.unlinkSync)(exports.FULL_OS_SOCKET_PATH);
+        (0, fs_1.unlinkSync)((0, exports.getFullOsSocketPath)());
     }
     catch { }
 }

package/src/daemon/tmp-dir.d.ts

@@ -1,8 +1,12 @@
 export declare const DAEMON_DIR_FOR_CURRENT_WORKSPACE: string;
 export declare const DAEMON_OUTPUT_LOG_FILE: string;
-export declare const socketDir: string;
-export declare const DAEMON_SOCKET_PATH: string;
+export declare const getDaemonSocketDir: () => string;
 export declare function writeDaemonLogs(error?: string): string;
 export declare function markDaemonAsDisabled(): void;
 export declare function isDaemonDisabled(): boolean;
+/**
+ * We try to create a socket file in a tmp dir, but if it doesn't work because
+ * for instance we don't have permissions, we create it in DAEMON_DIR_FOR_CURRENT_WORKSPACE
+ */
+export declare function getSocketDir(): string;
 export declare function removeSocketDir(): void;

package/src/daemon/tmp-dir.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSocketDir = exports.isDaemonDisabled = exports.markDaemonAsDisabled = exports.writeDaemonLogs = exports.DAEMON_SOCKET_PATH = exports.socketDir = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = void 0;
+exports.removeSocketDir = exports.getSocketDir = exports.isDaemonDisabled = exports.markDaemonAsDisabled = exports.writeDaemonLogs = exports.getDaemonSocketDir = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = void 0;
 /**
  * Per workspace (to avoid subtle differences and issues), we want to have a deterministic
  * location within the OS's tmp directory where we write log files for background processes
@@ -15,10 +15,10 @@ const tmp_1 = require("tmp");
 const workspace_root_1 = require("../utils/workspace-root");
 exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'd');
 exports.DAEMON_OUTPUT_LOG_FILE = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'daemon.log');
-exports.socketDir = createSocketDir();
-exports.DAEMON_SOCKET_PATH = (0, path_1.join)(exports.socketDir, 
+const getDaemonSocketDir = () => (0, path_1.join)(getSocketDir(), 
 // As per notes above on socket/named pipe length limitations, we keep this intentionally short
 'd.sock');
+exports.getDaemonSocketDir = getDaemonSocketDir;
 function writeDaemonLogs(error) {
     const file = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'daemon-error.log');
     (0, fs_1.writeFileSync)(file, error);
@@ -49,7 +49,7 @@ function socketDirName() {
  * We try to create a socket file in a tmp dir, but if it doesn't work because
  * for instance we don't have permissions, we create it in DAEMON_DIR_FOR_CURRENT_WORKSPACE
  */
-function createSocketDir() {
+function getSocketDir() {
     try {
         const dir = process.env.NX_DAEMON_SOCKET_DIR ?? socketDirName();
         (0, fs_extra_1.ensureDirSync)(dir);
@@ -59,9 +59,10 @@ function createSocketDir() {
         return exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE;
     }
 }
+exports.getSocketDir = getSocketDir;
 function removeSocketDir() {
     try {
-        (0, fs_extra_1.rmSync)(exports.socketDir, { recursive: true, force: true });
+        (0, fs_extra_1.rmSync)(getSocketDir(), { recursive: true, force: true });
     }
     catch (e) { }
 }

package/src/devkit-internals.d.ts

@@ -4,13 +4,12 @@
  * These may not be available in certain version of Nx, so be sure to check them first.
  */
 export { createTempNpmDirectory } from './utils/package-manager';
-export { deepEquals } from './utils/json-diff';
 export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
 export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
 export { mergeTargetConfigurations } from './project-graph/utils/project-configuration-utils';
-export { readProjectConfigurationsFromRootMap, isCompatibleTarget, } from './project-graph/utils/project-configuration-utils';
+export { readProjectConfigurationsFromRootMap } from './project-graph/utils/project-configuration-utils';
 export { splitTarget } from './utils/split-target';
 export { combineOptionsForExecutor } from './utils/params';
 export { sortObjectByKeys } from './utils/object-sort';
@@ -21,6 +20,6 @@ export { hashObject } from './hasher/file-hasher';
 export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
 export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-workspace-files';
-export { LoadedNxPlugin, loadNxPlugins, } from './project-graph/plugins/internal-api';
+export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
 export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.loadNxPlugins = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.isCompatibleTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.deepEquals = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -9,8 +9,6 @@ const tslib_1 = require("tslib");
  */
 var package_manager_1 = require("./utils/package-manager");
 Object.defineProperty(exports, "createTempNpmDirectory", { enumerable: true, get: function () { return package_manager_1.createTempNpmDirectory; } });
-var json_diff_1 = require("./utils/json-diff");
-Object.defineProperty(exports, "deepEquals", { enumerable: true, get: function () { return json_diff_1.deepEquals; } });
 var executor_utils_1 = require("./command-line/run/executor-utils");
 Object.defineProperty(exports, "getExecutorInformation", { enumerable: true, get: function () { return executor_utils_1.getExecutorInformation; } });
 var nx_json_1 = require("./config/nx-json");
@@ -23,7 +21,6 @@ var project_configuration_utils_1 = require("./project-graph/utils/project-confi
 Object.defineProperty(exports, "mergeTargetConfigurations", { enumerable: true, get: function () { return project_configuration_utils_1.mergeTargetConfigurations; } });
 var project_configuration_utils_2 = require("./project-graph/utils/project-configuration-utils");
 Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_configuration_utils_2.readProjectConfigurationsFromRootMap; } });
-Object.defineProperty(exports, "isCompatibleTarget", { enumerable: true, get: function () { return project_configuration_utils_2.isCompatibleTarget; } });
 var split_target_1 = require("./utils/split-target");
 Object.defineProperty(exports, "splitTarget", { enumerable: true, get: function () { return split_target_1.splitTarget; } });
 var params_1 = require("./utils/params");
@@ -47,7 +44,6 @@ var retrieve_workspace_files_2 = require("./project-graph/utils/retrieve-workspa
 Object.defineProperty(exports, "retrieveProjectConfigurations", { enumerable: true, get: function () { return retrieve_workspace_files_2.retrieveProjectConfigurations; } });
 var internal_api_1 = require("./project-graph/plugins/internal-api");
 Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: function () { return internal_api_1.LoadedNxPlugin; } });
-Object.defineProperty(exports, "loadNxPlugins", { enumerable: true, get: function () { return internal_api_1.loadNxPlugins; } });
 tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });

package/src/executors/run-commands/run-commands.impl.js

@@ -44,7 +44,9 @@ const propKeys = [
 ];
 async function default_1(options, context) {
     registerProcessListener();
-    await loadEnvVars(options.envFile);
+    if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false') {
+        await loadEnvVars(options.envFile);
+    }
     const normalized = normalizeOptions(options);
     if (options.readyWhen && !options.parallel) {
         throw new Error('ERROR: Bad executor config for run-commands - "readyWhen" can only be used when "parallel=true".');

package/src/generators/utils/json.js

@@ -30,7 +30,8 @@ exports.readJson = readJson;
  * @param options Optional JSON Serialize Options
  */
 function writeJson(tree, path, value, options) {
-    tree.write(path, (0, json_1.serializeJson)(value, options));
+    const serialized = (0, json_1.serializeJson)(value, options);
+    tree.write(path, `${serialized}\n`);
 }
 exports.writeJson = writeJson;
 /**

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("../../utils/logger");
 const project_configuration_1 = require("../../generators/utils/project-configuration");
 /**
  * This function escapes dollar sign in env variables
@@ -41,11 +42,17 @@ function parseEnvFile(tree, envFilePath) {
         return;
     }
     let envFileContent = tree.read(envFilePath, 'utf-8');
+    if (!envFileContent) {
+        // envFileContent is null if we fail to read the file for any reason
+        // e.g. the file is not utf-8 encoded
+        logger_1.logger.info(`Unable to update ${envFilePath}. Nx interpolates environment variables in the form of $VAR_NAME. To escape the dollar sign, use \\$VAR_NAME.`);
+        return;
+    }
     envFileContent = envFileContent
         .split('\n')
         .map((line) => {
         line = line.trim();
-        if (!line.includes('$')) {
+        if (!line || !line.includes('$')) {
             return line;
         }
         const declarations = line.split('=');

package/src/native/index.js

@@ -2,7 +2,7 @@ const { join, basename } = require('path');
 const { copyFileSync, existsSync, mkdirSync } = require('fs');
 const Module = require('module');
 const { nxVersion } = require('../utils/versions');
-const { cacheDir } = require('../utils/cache-directory');
+const { nativeFileCacheLocation } = require('./native-file-cache-location');
 
 const nxPackages = new Set([
   '@nx/nx-android-arm64',
@@ -52,13 +52,14 @@ Module._load = function (request, parent, isMain) {
   ) {
     const nativeLocation = require.resolve(modulePath);
     const fileName = basename(nativeLocation);
-    // we copy the file to the cache directory (.nx/cache by default) and prefix with nxVersion to avoid stale files being loaded
-    const tmpFile = join(cacheDir, nxVersion + '-' + fileName);
+
+    // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
+    const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
     if (existsSync(tmpFile)) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
-    if (!existsSync(cacheDir)) {
-      mkdirSync(cacheDir, { recursive: true });
+    if (!existsSync(nativeFileCacheLocation)) {
+      mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
     copyFileSync(nativeLocation, tmpFile);
     return originalLoad.apply(this, [tmpFile, parent, isMain]);

package/src/native/native-file-cache-location.d.ts

@@ -0,0 +1 @@
+export declare const nativeFileCacheLocation: string;

package/src/native/native-file-cache-location.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nativeFileCacheLocation = void 0;
+const os_1 = require("os");
+const path_1 = require("path");
+const crypto_1 = require("crypto");
+const workspace_root_1 = require("../utils/workspace-root");
+exports.nativeFileCacheLocation = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-native-file-cache', (0, crypto_1.createHash)('sha256').update(workspace_root_1.workspaceRoot).digest('hex'));

package/src/plugins/js/lock-file/npm-parser.js

@@ -175,7 +175,16 @@ function findTarget(sourcePath, keyMap, targetName, versionRange) {
     const searchPath = `${sourcePath}node_modules/${targetName}`;
     if (keyMap.has(searchPath)) {
         const child = keyMap.get(searchPath);
-        if (child.data.version === versionRange ||
+        // if the version is alias to another package we need to parse the versions to compare
+        if (child.data.version.startsWith('npm:') &&
+            versionRange.startsWith('npm:')) {
+            const nodeVersion = child.data.version.slice(child.data.version.indexOf('@', 5) + 1);
+            const depVersion = versionRange.slice(versionRange.indexOf('@', 5) + 1);
+            if (nodeVersion === depVersion || (0, semver_1.satisfies)(nodeVersion, depVersion)) {
+                return child;
+            }
+        }
+        else if (child.data.version === versionRange ||
             (0, semver_1.satisfies)(child.data.version, versionRange)) {
             return child;
         }

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -16,7 +16,7 @@ function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
     if ((0, fs_1.existsSync)(fullPath)) {
         const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        const { load } = require('@zkochan/js-yaml');
+        const { load } = require('js-yaml');
         return load(content)?.hoistedDependencies ?? {};
     }
     else {
@@ -32,7 +32,7 @@ exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
  * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L91
  */
 function parseAndNormalizePnpmLockfile(content) {
-    const { load } = require('@zkochan/js-yaml');
+    const { load } = require('js-yaml');
     const lockFileData = load(content);
     return revertFromInlineSpecifiersFormatIfNecessary(convertFromLockfileFileMutable(lockFileData));
 }
@@ -77,7 +77,7 @@ function stringifyToPnpmYaml(lockfile) {
     const adaptedLockfile = isLockfileV6
         ? convertToInlineSpecifiersFormat(lockfile)
         : lockfile;
-    const { dump } = require('@zkochan/js-yaml');
+    const { dump } = require('js-yaml');
     return dump(sortLockfileKeys(normalizeLockfile(adaptedLockfile, isLockfileV6)), LOCKFILE_YAML_FORMAT);
 }
 exports.stringifyToPnpmYaml = stringifyToPnpmYaml;

package/src/project-graph/affected/locators/workspace-projects.js

@@ -60,7 +60,7 @@ function extractFilesFromInputs(inputs, namedInputs) {
     const globalFiles = [];
     for (const input of inputs) {
         if (typeof input === 'string' && input in namedInputs) {
-            return extractFilesFromInputs(namedInputs[input], namedInputs);
+            globalFiles.push(...extractFilesFromInputs(namedInputs[input], namedInputs));
         }
         else if (typeof input === 'string' &&
             input.startsWith('{workspaceRoot}/')) {

package/src/project-graph/plugins/internal-api.d.ts

@@ -25,5 +25,5 @@ export declare const nxPluginCache: Map<unknown, [
     Promise<LoadedNxPlugin>,
     () => void
 ]>;
-export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string, skipDefaultPlugins?: boolean): Promise<[LoadedNxPlugin[], () => void]>;
+export declare function loadNxPlugins(plugins: PluginConfiguration[], root?: string): Promise<[LoadedNxPlugin[], () => void]>;
 export declare function getDefaultPlugins(root: string): Promise<string[]>;

package/src/project-graph/plugins/internal-api.js

@@ -38,14 +38,12 @@ exports.LoadedNxPlugin = LoadedNxPlugin;
 // Allows loaded plugins to not be reloaded when
 // referenced multiple times.
 exports.nxPluginCache = new Map();
-async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot, skipDefaultPlugins = false) {
+async function loadNxPlugins(plugins, root = workspace_root_1.workspaceRoot) {
     const result = [];
     const loadingMethod = process.env.NX_ISOLATE_PLUGINS === 'true'
         ? isolation_1.loadNxPluginInIsolation
         : loader_1.loadNxPlugin;
-    plugins = skipDefaultPlugins
-        ? plugins ?? []
-        : await normalizePlugins(plugins, root);
+    plugins = await normalizePlugins(plugins, root);
     const cleanupFunctions = [];
     for (const plugin of plugins) {
         const [loadedPluginPromise, cleanup] = loadingMethod(plugin, root);

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -331,7 +331,7 @@ function writeCompletedTaskResultLine(line) {
 function writeCommandOutputBlock(commandOutput) {
     commandOutput = commandOutput || '';
     commandOutput = commandOutput.trimStart();
-    const lines = commandOutput.split(os_1.EOL);
+    const lines = commandOutput.split(/\r?\n/);
     let totalTrailingEmptyLines = 0;
     for (let i = lines.length - 1; i >= 0; i--) {
         if (lines[i] !== '') {

package/src/tasks-runner/pseudo-terminal.js

@@ -20,7 +20,7 @@ class PseudoTerminal {
     }
     constructor(rustPseudoTerminal) {
         this.rustPseudoTerminal = rustPseudoTerminal;
-        this.pseudoIPCPath = (0, socket_utils_1.FORKED_PROCESS_OS_SOCKET_PATH)(process.pid.toString());
+        this.pseudoIPCPath = (0, socket_utils_1.getForkedProcessOsSocketPath)(process.pid.toString());
         this.pseudoIPC = new pseudo_ipc_1.PseudoIPCServer(this.pseudoIPCPath);
         this.initialized = false;
         this.setupProcessListeners();

package/src/utils/json.js

@@ -57,6 +57,6 @@ function formatParseError(input, parseError) {
  * @returns the formatted JSON representation of the object
  */
 function serializeJson(input, options) {
-    return JSON.stringify(input, null, options?.spaces ?? 2) + '\n';
+    return JSON.stringify(input, null, options?.spaces ?? 2);
 }
 exports.serializeJson = serializeJson;

package/src/utils/package-manager.js

@@ -254,11 +254,20 @@ async function resolvePackageVersionUsingRegistry(packageName, version) {
         if (!result) {
             throw new Error(`Unable to resolve version ${packageName}@${version}.`);
         }
-        // get the last line of the output, strip the package version and quotes
-        const resolvedVersion = result
-            .split('\n')
-            .pop()
-            .split(' ')
+        const lines = result.split('\n');
+        if (lines.length === 1) {
+            return lines[0];
+        }
+        /**
+         * The output contains multiple lines ordered by release date, so the last
+         * version might not be the last one in the list. We need to sort it. Each
+         * line looks like:
+         *
+         * <package>@<version> '<version>'
+         */
+        const resolvedVersion = lines
+            .map((line) => line.split(' ')[1])
+            .sort()
             .pop()
             .replace(/'/g, '');
         return resolvedVersion;

package/src/utils/plugins/plugin-capabilities.js

@@ -114,7 +114,7 @@ async function listPluginCapabilities(pluginName, projects) {
     if (hasBuilders) {
         bodyLines.push(chalk.bold(chalk.green('EXECUTORS/BUILDERS')));
         bodyLines.push('');
-        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${plugin.executors[name].description}`));
+        bodyLines.push(...Object.keys(plugin.executors).map((name) => `${chalk.bold(name)} : ${resolveExecutorDescription(plugin.executors[name], projects)}`));
     }
     if (hasProjectGraphExtension) {
         bodyLines.push(`✔️  Project Graph Extension`);
@@ -128,3 +128,26 @@ async function listPluginCapabilities(pluginName, projects) {
     });
 }
 exports.listPluginCapabilities = listPluginCapabilities;
+function resolveExecutorDescription(executorJsonEntry, projects) {
+    try {
+        if (typeof executorJsonEntry === 'string') {
+            // it points to another executor, resolve it
+            const [pkgName, executor] = executorJsonEntry.split(':');
+            const collection = loadExecutorsCollection(workspace_root_1.workspaceRoot, pkgName, projects);
+            return resolveExecutorDescription(collection[executor], projects);
+        }
+        return executorJsonEntry.description;
+    }
+    catch {
+        return 'No description available';
+    }
+}
+function loadExecutorsCollection(workspaceRoot, pluginName, projects) {
+    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(pluginName, projects, (0, installation_directory_1.getNxRequirePaths)(workspaceRoot));
+    return {
+        ...tryGetCollection(packageJsonPath, packageJson.builders, 'builders'),
+        ...tryGetCollection(packageJsonPath, packageJson.executors, 'builders'),
+        ...tryGetCollection(packageJsonPath, packageJson.builders, 'executors'),
+        ...tryGetCollection(packageJsonPath, packageJson.executors, 'executors'),
+    };
+}