nx 19.1.0-canary.20240518-3523720 → 19.1.0-canary.20240521-1255603

package/.eslintrc.json

@@ -100,7 +100,8 @@
               "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
-              "util" // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "util", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "js-yaml" // The rule is failing with alias dependencies
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.1.0-canary.20240518-3523720",
+  "version": "19.1.0-canary.20240521-1255603",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -35,7 +35,6 @@
   "dependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
-    "@zkochan/js-yaml": "0.0.6",
     "axios": "^1.6.0",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
@@ -49,7 +48,7 @@
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "jest-diff": "^29.4.1",
-    "js-yaml": "4.1.0",
+    "js-yaml": "npm:@zkochan/js-yaml@0.0.7",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "~2.0.3",
     "minimatch": "9.0.3",
@@ -66,7 +65,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.1.0-canary.20240518-3523720"
+    "@nrwl/tao": "19.1.0-canary.20240521-1255603"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-darwin-arm64": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240518-3523720",
-    "@nx/nx-freebsd-x64": "19.1.0-canary.20240518-3523720"
+    "@nx/nx-darwin-x64": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-darwin-arm64": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240521-1255603",
+    "@nx/nx-freebsd-x64": "19.1.0-canary.20240521-1255603"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.js

@@ -791,12 +791,10 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             const [packageName, builderName] = builderStr.split(':');
             const { executorsFilePath, executorConfig } = this.readExecutorsJson(packageName, builderName);
             const builderInfo = this.readExecutor(packageName, builderName);
-            const { builders, executors } = (0, fileutils_1.readJsonFile)(executorsFilePath);
             return {
                 name: builderStr,
                 builderName,
-                description: builders?.[builderName]?.description ??
-                    executors?.[builderName]?.description,
+                description: executorConfig.description,
                 optionSchema: builderInfo.schema,
                 import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
             };
@@ -813,6 +811,11 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             if (!executorConfig) {
                 throw new Error(`Cannot find builder '${builder}' in ${executorsFilePath}.`);
             }
+            if (typeof executorConfig === 'string') {
+                // Angular CLI can have a builder pointing to another package:builder
+                const [packageName, executorName] = executorConfig.split(':');
+                return this.readExecutorsJson(packageName, executorName);
+            }
             return { executorsFilePath, executorConfig, isNgCompat: true };
         }
         readExecutor(nodeModule, executor) {

package/src/command-line/release/utils/github.js

@@ -223,7 +223,7 @@ async function resolveGithubToken() {
     const ghCLIPath = (0, path_1.joinPathFragments)(process.env.XDG_CONFIG_HOME || (0, path_1.joinPathFragments)((0, node_os_1.homedir)(), '.config'), 'gh', 'hosts.yml');
     if ((0, node_fs_1.existsSync)(ghCLIPath)) {
         const yamlContents = await node_fs_1.promises.readFile(ghCLIPath, 'utf8');
-        const { load } = require('@zkochan/js-yaml');
+        const { load } = require('js-yaml');
         const ghCLIConfig = load(yamlContents);
         if (ghCLIConfig['github.com']) {
             // Web based session (the token is already embedded in the config)

package/src/command-line/run/executor-utils.js

@@ -68,6 +68,11 @@ function readExecutorJson(nodeModule, executor, root, projects) {
     if (!executorConfig) {
         throw new Error(`Cannot find executor '${executor}' in ${executorsFilePath}.`);
     }
+    if (typeof executorConfig === 'string') {
+        // Angular CLI can have a builder pointing to another package:builder
+        const [packageName, executorName] = executorConfig.split(':');
+        return readExecutorJson(packageName, executorName, root, projects);
+    }
     const isNgCompat = !executorsJson.executors?.[executor];
     return { executorsFilePath, executorConfig, isNgCompat };
 }

package/src/config/misc-interfaces.d.ts

@@ -25,13 +25,14 @@ export interface GeneratorsJsonEntry {
     'x-use-standalone-layout'?: boolean;
 }
 export type OutputCaptureMethod = 'direct-nodejs' | 'pipe';
-export interface ExecutorsJsonEntry {
+export interface ExecutorJsonEntryConfig {
     schema: string;
     implementation: string;
     batchImplementation?: string;
     description?: string;
     hasher?: string;
 }
+export type ExecutorsJsonEntry = string | ExecutorJsonEntryConfig;
 export type Dependencies = 'dependencies' | 'devDependencies';
 export interface PackageJsonUpdateForPackage {
     version: string;

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/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

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