nx 19.1.0-canary.20240518-3523720 → 19.1.0-canary.20240522-89fdd42

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.20240522-89fdd42",
   "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.20240522-89fdd42"
   },
   "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.20240522-89fdd42",
+    "@nx/nx-darwin-arm64": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240522-89fdd42",
+    "@nx/nx-freebsd-x64": "19.1.0-canary.20240522-89fdd42"
   },
   "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/migrate/migrate.js

@@ -874,7 +874,14 @@ function runInstall() {
     (0, child_process_1.execSync)(pmCommands.install, { stdio: [0, 1, 2] });
 }
 async function executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix) {
-    const depsBeforeMigrations = getStringifiedPackageJsonDeps(root);
+    let initialDeps = getStringifiedPackageJsonDeps(root);
+    const installDepsIfChanged = () => {
+        const currentDeps = getStringifiedPackageJsonDeps(root);
+        if (initialDeps !== currentDeps) {
+            runInstall();
+        }
+        initialDeps = currentDeps;
+    };
     const migrationsWithNoChanges = [];
     const sortedMigrations = migrations.sort((a, b) => {
         // special case for the split configuration migration to run first
@@ -915,6 +922,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 loggingQueue.forEach((log) => logger_1.logger.info('  ' + log));
             }
             if (shouldCreateCommits) {
+                installDepsIfChanged();
                 const commitMessage = `${commitPrefix}${m.name}`;
                 try {
                     const committedSha = commitChanges(commitMessage);
@@ -938,9 +946,8 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
             throw e;
         }
     }
-    const depsAfterMigrations = getStringifiedPackageJsonDeps(root);
-    if (depsBeforeMigrations !== depsAfterMigrations) {
-        runInstall();
+    if (!shouldCreateCommits) {
+        installDepsIfChanged();
     }
     return migrationsWithNoChanges;
 }

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/release/utils/shared.js

@@ -162,9 +162,11 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         }
         // For fixed groups we want one tag for the overall group
         const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
-        tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
-            version: projectVersionData.newVersion,
-        }));
+        if (projectVersionData.newVersion !== null) {
+            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                version: projectVersionData.newVersion,
+            }));
+        }
     }
     return tags;
 }

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/config/workspace-json-project-json.d.ts

@@ -109,6 +109,7 @@ export interface ProjectMetadata {
     targetGroups?: Record<string, string[]>;
 }
 export interface TargetMetadata {
+    [k: string]: any;
     description?: string;
     technologies?: string[];
 }