nx 19.1.0-canary.20240517-312b271 → 19.1.0-canary.20240521-1255603

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);

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/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'),
+    };
+}