nx 20.1.0-canary.20241109-77d6704 → 20.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.1.0-canary.20241109-77d6704",
+  "version": "20.2.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-darwin-arm64": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-linux-x64-gnu": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-linux-x64-musl": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-win32-x64-msvc": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-linux-arm64-gnu": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-linux-arm64-musl": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-linux-arm-gnueabihf": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-win32-arm64-msvc": "20.1.0-canary.20241109-77d6704",
-    "@nx/nx-freebsd-x64": "20.1.0-canary.20241109-77d6704"
+    "@nx/nx-darwin-x64": "20.2.0-beta.0",
+    "@nx/nx-darwin-arm64": "20.2.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "20.2.0-beta.0",
+    "@nx/nx-linux-x64-musl": "20.2.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "20.2.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "20.2.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "20.2.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "20.2.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "20.2.0-beta.0",
+    "@nx/nx-freebsd-x64": "20.2.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/generate/command-object.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsGenerateCommand = void 0;
-const path_1 = require("../../utils/path");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsGenerateCommand = {
     command: 'generate <generator> [_..]',
@@ -11,7 +10,7 @@ exports.yargsGenerateCommand = {
     handler: async (args) => {
         // Remove the command from the args
         args._ = args._.slice(1);
-        process.exit(await (await Promise.resolve().then(() => require('./generate'))).generate((0, path_1.getCwd)(), args));
+        process.exit(await (await Promise.resolve().then(() => require('./generate'))).generate(args));
     },
 };
 function withGenerateOptions(yargs) {

package/src/command-line/generate/generate.d.ts

@@ -16,6 +16,6 @@ export declare function parseGeneratorString(value: string): {
     generator: string;
 };
 export declare function printGenHelp(opts: GenerateOptions, schema: Schema, normalizedGeneratorName: string, aliases: string[]): void;
-export declare function generate(cwd: string, args: {
+export declare function generate(args: {
     [k: string]: any;
 }): Promise<number>;

package/src/command-line/generate/generate.js

@@ -19,6 +19,7 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const generator_utils_1 = require("./generator-utils");
+const path_2 = require("../../utils/path");
 function printChanges(fileChanges) {
     fileChanges.forEach((f) => {
         if (f.type === 'CREATE') {
@@ -206,7 +207,7 @@ function printGenHelp(opts, schema, normalizedGeneratorName, aliases) {
         aliases,
     });
 }
-async function generate(cwd, args) {
+async function generate(args) {
     return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
         const nxJsonConfiguration = (0, configuration_1.readNxJson)();
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
@@ -226,6 +227,7 @@ async function generate(cwd, args) {
             printGenHelp(opts, schema, normalizedGeneratorName, aliases);
             return 0;
         }
+        const cwd = (0, path_2.getCwd)();
         const combinedOpts = await (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), (0, path_1.relative)(workspace_root_1.workspaceRoot, cwd), args.verbose);
         if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot, projectsConfigurations.projects).isNxGenerator) {
             const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);

package/src/command-line/init/command-object.js

@@ -2,14 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsInitCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
-const nx_json_1 = require("../../config/nx-json");
-const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false' &&
-    (0, nx_json_1.readNxJson)().useInferencePlugins !== false;
 exports.yargsInitCommand = {
     command: 'init',
     describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
     builder: (yargs) => withInitOptions(yargs),
     handler: async (args) => {
+        const useV2 = await isInitV2();
         if (useV2) {
             await require('./init-v2').initHandler(args);
         }
@@ -19,7 +17,13 @@ exports.yargsInitCommand = {
         process.exit(0);
     },
 };
-function withInitOptions(yargs) {
+async function isInitV2() {
+    return (process.env['NX_ADD_PLUGINS'] !== 'false' &&
+        (await Promise.resolve().then(() => require('../../config/nx-json'))).readNxJson().useInferencePlugins !==
+            false);
+}
+async function withInitOptions(yargs) {
+    const useV2 = await isInitV2();
     if (useV2) {
         return yargs
             .option('nxCloud', {

package/src/command-line/init/implementation/utils.js

@@ -21,6 +21,7 @@ const fs_1 = require("fs");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const connect_to_nx_cloud_2 = require("../../connect/connect-to-nx-cloud");
+const default_base_1 = require("../../../utils/default-base");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -88,7 +89,16 @@ function deduceDefaultBase() {
                     return 'next';
                 }
                 catch {
-                    return 'master';
+                    try {
+                        (0, child_process_1.execSync)(`git rev-parse --verify master`, {
+                            stdio: ['ignore', 'ignore', 'ignore'],
+                            windowsHide: false,
+                        });
+                        return 'master';
+                    }
+                    catch {
+                        return (0, default_base_1.deduceDefaultBase)();
+                    }
                 }
             }
         }

package/src/command-line/migrate/command-object.js

@@ -1,13 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsInternalMigrateCommand = exports.yargsMigrateCommand = void 0;
-const path = require("path");
-const child_process_1 = require("../../utils/child-process");
 const documentation_1 = require("../yargs-utils/documentation");
-const child_process_2 = require("child_process");
-const package_manager_1 = require("../../utils/package-manager");
-const fileutils_1 = require("../../utils/fileutils");
-const workspace_root_1 = require("../../utils/workspace-root");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsMigrateCommand = {
     command: 'migrate [packageAndVersion]',
@@ -15,8 +9,8 @@ exports.yargsMigrateCommand = {
   - Migrate packages and create migrations.json (e.g., nx migrate @nx/workspace@latest)
   - Run migrations (e.g., nx migrate --run-migrations=migrations.json). Use flag --if-exists to run migrations only if the migrations file exists.`,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(withMigrationOptions(yargs), 'migrate'),
-    handler: () => {
-        runMigration();
+    handler: async () => {
+        (await Promise.resolve().then(() => require('./migrate'))).runMigration();
         process.exit(0);
     },
 };
@@ -81,91 +75,3 @@ function withMigrationOptions(yargs) {
         return true;
     });
 }
-function runMigration() {
-    const runLocalMigrate = () => {
-        (0, child_process_1.runNxSync)(`_migrate ${process.argv.slice(3).join(' ')}`, {
-            stdio: ['inherit', 'inherit', 'inherit'],
-        });
-    };
-    if (process.env.NX_MIGRATE_USE_LOCAL === undefined) {
-        const p = nxCliPath();
-        if (p === null) {
-            runLocalMigrate();
-        }
-        else {
-            // ensure local registry from process is not interfering with the install
-            // when we start the process from temp folder the local registry would override the custom registry
-            if (process.env.npm_config_registry &&
-                process.env.npm_config_registry.match(/^https:\/\/registry\.(npmjs\.org|yarnpkg\.com)/)) {
-                delete process.env.npm_config_registry;
-            }
-            (0, child_process_2.execSync)(`${p} _migrate ${process.argv.slice(3).join(' ')}`, {
-                stdio: ['inherit', 'inherit', 'inherit'],
-                windowsHide: false,
-            });
-        }
-    }
-    else {
-        runLocalMigrate();
-    }
-}
-function nxCliPath() {
-    const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
-    try {
-        const packageManager = (0, package_manager_1.detectPackageManager)();
-        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
-        const { dirSync } = require('tmp');
-        const tmpDir = dirSync().name;
-        (0, fileutils_1.writeJsonFile)(path.join(tmpDir, 'package.json'), {
-            dependencies: {
-                nx: version,
-            },
-            license: 'MIT',
-        });
-        (0, package_manager_1.copyPackageManagerConfigurationFiles)(workspace_root_1.workspaceRoot, tmpDir);
-        if (pmc.preInstall) {
-            // ensure package.json and repo in tmp folder is set to a proper package manager state
-            (0, child_process_2.execSync)(pmc.preInstall, {
-                cwd: tmpDir,
-                stdio: ['ignore', 'ignore', 'ignore'],
-                windowsHide: false,
-            });
-            // if it's berry ensure we set the node_linker to node-modules
-            if (packageManager === 'yarn' && pmc.ciInstall.includes('immutable')) {
-                (0, child_process_2.execSync)('yarn config set nodeLinker node-modules', {
-                    cwd: tmpDir,
-                    stdio: ['ignore', 'ignore', 'ignore'],
-                    windowsHide: false,
-                });
-            }
-        }
-        (0, child_process_2.execSync)(pmc.install, {
-            cwd: tmpDir,
-            stdio: ['ignore', 'ignore', 'ignore'],
-            windowsHide: false,
-        });
-        // Set NODE_PATH so that these modules can be used for module resolution
-        addToNodePath(path.join(tmpDir, 'node_modules'));
-        addToNodePath(path.join(workspace_root_1.workspaceRoot, 'node_modules'));
-        return path.join(tmpDir, `node_modules`, '.bin', 'nx');
-    }
-    catch (e) {
-        console.error(`Failed to install the ${version} version of the migration script. Using the current version.`);
-        if (process.env.NX_VERBOSE_LOGGING === 'true') {
-            console.error(e);
-        }
-        return null;
-    }
-}
-function addToNodePath(dir) {
-    // NODE_PATH is a delimited list of paths.
-    // The delimiter is different for windows.
-    const delimiter = require('os').platform() === 'win32' ? ';' : ':';
-    const paths = process.env.NODE_PATH
-        ? process.env.NODE_PATH.split(delimiter)
-        : [];
-    // Add the tmp path
-    paths.push(dir);
-    // Update the env variable.
-    process.env.NODE_PATH = paths.join(delimiter);
-}

package/src/command-line/migrate/migrate.d.ts

@@ -111,4 +111,5 @@ export declare function executeMigrations(root: string, migrations: {
 export declare function migrate(root: string, args: {
     [k: string]: any;
 }, rawArgs: string[]): Promise<number>;
+export declare function runMigration(): void;
 export {};

package/src/command-line/migrate/migrate.js

@@ -5,6 +5,7 @@ exports.normalizeVersion = normalizeVersion;
 exports.parseMigrationsOptions = parseMigrationsOptions;
 exports.executeMigrations = executeMigrations;
 exports.migrate = migrate;
+exports.runMigration = runMigration;
 const chalk = require("chalk");
 const child_process_1 = require("child_process");
 const enquirer_1 = require("enquirer");
@@ -1051,6 +1052,34 @@ async function migrate(root, args, rawArgs) {
         }
     });
 }
+function runMigration() {
+    const runLocalMigrate = () => {
+        (0, child_process_2.runNxSync)(`_migrate ${process.argv.slice(3).join(' ')}`, {
+            stdio: ['inherit', 'inherit', 'inherit'],
+        });
+    };
+    if (process.env.NX_MIGRATE_USE_LOCAL === undefined) {
+        const p = nxCliPath();
+        if (p === null) {
+            runLocalMigrate();
+        }
+        else {
+            // ensure local registry from process is not interfering with the install
+            // when we start the process from temp folder the local registry would override the custom registry
+            if (process.env.npm_config_registry &&
+                process.env.npm_config_registry.match(/^https:\/\/registry\.(npmjs\.org|yarnpkg\.com)/)) {
+                delete process.env.npm_config_registry;
+            }
+            (0, child_process_1.execSync)(`${p} _migrate ${process.argv.slice(3).join(' ')}`, {
+                stdio: ['inherit', 'inherit', 'inherit'],
+                windowsHide: false,
+            });
+        }
+    }
+    else {
+        runLocalMigrate();
+    }
+}
 function readMigrationCollection(packageName, root) {
     const collectionPath = readPackageMigrationConfig(packageName, root).migrations;
     const collection = (0, fileutils_1.readJsonFile)(collectionPath);
@@ -1079,6 +1108,66 @@ function getImplementationPath(collection, collectionPath, name) {
     }
     return { path: implPath, fnSymbol };
 }
+function nxCliPath() {
+    const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
+    try {
+        const packageManager = (0, package_manager_1.detectPackageManager)();
+        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
+        const { dirSync } = require('tmp');
+        const tmpDir = dirSync().name;
+        (0, fileutils_1.writeJsonFile)((0, path_1.join)(tmpDir, 'package.json'), {
+            dependencies: {
+                nx: version,
+            },
+            license: 'MIT',
+        });
+        (0, package_manager_1.copyPackageManagerConfigurationFiles)(workspace_root_1.workspaceRoot, tmpDir);
+        if (pmc.preInstall) {
+            // ensure package.json and repo in tmp folder is set to a proper package manager state
+            (0, child_process_1.execSync)(pmc.preInstall, {
+                cwd: tmpDir,
+                stdio: ['ignore', 'ignore', 'ignore'],
+                windowsHide: false,
+            });
+            // if it's berry ensure we set the node_linker to node-modules
+            if (packageManager === 'yarn' && pmc.ciInstall.includes('immutable')) {
+                (0, child_process_1.execSync)('yarn config set nodeLinker node-modules', {
+                    cwd: tmpDir,
+                    stdio: ['ignore', 'ignore', 'ignore'],
+                    windowsHide: false,
+                });
+            }
+        }
+        (0, child_process_1.execSync)(pmc.install, {
+            cwd: tmpDir,
+            stdio: ['ignore', 'ignore', 'ignore'],
+            windowsHide: false,
+        });
+        // Set NODE_PATH so that these modules can be used for module resolution
+        addToNodePath((0, path_1.join)(tmpDir, 'node_modules'));
+        addToNodePath((0, path_1.join)(workspace_root_1.workspaceRoot, 'node_modules'));
+        return (0, path_1.join)(tmpDir, `node_modules`, '.bin', 'nx');
+    }
+    catch (e) {
+        console.error(`Failed to install the ${version} version of the migration script. Using the current version.`);
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
+            console.error(e);
+        }
+        return null;
+    }
+}
+function addToNodePath(dir) {
+    // NODE_PATH is a delimited list of paths.
+    // The delimiter is different for windows.
+    const delimiter = require('os').platform() === 'win32' ? ';' : ':';
+    const paths = process.env.NODE_PATH
+        ? process.env.NODE_PATH.split(delimiter)
+        : [];
+    // Add the tmp path
+    paths.push(dir);
+    // Update the env variable.
+    process.env.NODE_PATH = paths.join(delimiter);
+}
 // TODO (v21): Remove CLI determination of Angular Migration
 function isAngularMigration(collection, collectionPath, name) {
     const entry = collection.generators?.[name] || collection.schematics?.[name];

package/src/command-line/release/command-object.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsReleaseCommand = void 0;
 const yargs_1 = require("yargs");
-const nx_json_1 = require("../../config/nx-json");
-const command_line_utils_1 = require("../../utils/command-line-utils");
 const logger_1 = require("../../utils/logger");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsReleaseCommand = {
@@ -51,11 +49,11 @@ exports.yargsReleaseCommand = {
             return val;
         },
     })
-        .check((argv) => {
+        .check(async (argv) => {
         if (argv.groups && argv.projects) {
             throw new Error('The --projects and --groups options are mutually exclusive, please use one or the other.');
         }
-        const nxJson = (0, nx_json_1.readNxJson)();
+        const nxJson = (await Promise.resolve().then(() => require('../../config/nx-json'))).readNxJson();
         if (argv.groups?.length) {
             for (const group of argv.groups) {
                 if (!nxJson.release?.groups?.[group]) {
@@ -255,7 +253,7 @@ const planCheckCommand = {
 function coerceParallelOption(args) {
     return {
         ...args,
-        parallel: (0, command_line_utils_1.readParallelFromArgsAndEnv)(args),
+        parallel: (0, shared_options_1.readParallelFromArgsAndEnv)(args),
     };
 }
 function withGitCommitAndGitTagOptions(yargs) {

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

@@ -15,6 +15,7 @@ exports.getFirstGitCommit = getFirstGitCommit;
  * Special thanks to changelogen for the original inspiration for many of these utilities:
  * https://github.com/unjs/changelogen
  */
+const node_path_1 = require("node:path");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
@@ -86,13 +87,19 @@ async function getGitDiff(from, to = 'HEAD') {
     // Use a unique enough separator that we can be relatively certain will not occur within the commit message itself
     const separator = '§§§';
     // https://git-scm.com/docs/pretty-formats
-    const r = await (0, exec_command_1.execCommand)('git', [
+    const args = [
         '--no-pager',
         'log',
         range,
         `--pretty="----%n%s${separator}%h${separator}%an${separator}%ae%n%b"`,
         '--name-status',
-    ]);
+    ];
+    // Support cases where the nx workspace root is located at a nested path within the git repo
+    const relativePath = await getGitRootRelativePath();
+    if (relativePath) {
+        args.push(`--relative=${relativePath}`);
+    }
+    const r = await (0, exec_command_1.execCommand)('git', args);
     return r
         .split('----\n')
         .splice(1)
@@ -405,3 +412,19 @@ async function getFirstGitCommit() {
         throw new Error(`Unable to find first commit in git history`);
     }
 }
+async function getGitRoot() {
+    try {
+        return (await (0, exec_command_1.execCommand)('git', ['rev-parse', '--show-toplevel'])).trim();
+    }
+    catch (e) {
+        throw new Error('Unable to find git root');
+    }
+}
+let gitRootRelativePath;
+async function getGitRootRelativePath() {
+    if (!gitRootRelativePath) {
+        const gitRoot = await getGitRoot();
+        gitRootRelativePath = (0, node_path_1.relative)(gitRoot, workspace_root_1.workspaceRoot);
+    }
+    return gitRootRelativePath;
+}

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -72,4 +72,7 @@ export declare function withRunOneOptions(yargs: Argv): Argv<{
     help: boolean;
 }>;
 export declare function parseCSV(args: string[] | string): string[];
+export declare function readParallelFromArgsAndEnv(args: {
+    [k: string]: any;
+}): number;
 export {};

package/src/command-line/yargs-utils/shared-options.js

@@ -13,6 +13,7 @@ exports.withOverrides = withOverrides;
 exports.withOutputStyleOption = withOutputStyleOption;
 exports.withRunOneOptions = withRunOneOptions;
 exports.parseCSV = parseCSV;
+exports.readParallelFromArgsAndEnv = readParallelFromArgsAndEnv;
 exports.defaultYargsParserConfiguration = {
     'strip-dashed': true,
     'unknown-options-as-args': true,
@@ -251,3 +252,21 @@ function parseCSV(args) {
     const items = args.split(',');
     return items.map((i) => i.startsWith('"') && i.endsWith('"') ? i.slice(1, -1) : i);
 }
+function readParallelFromArgsAndEnv(args) {
+    if (args['parallel'] === 'false' || args['parallel'] === false) {
+        return 1;
+    }
+    else if (args['parallel'] === 'true' ||
+        args['parallel'] === true ||
+        args['parallel'] === '' ||
+        // dont require passing --parallel if NX_PARALLEL is set, but allow overriding it
+        (process.env.NX_PARALLEL && args['parallel'] === undefined)) {
+        return Number(args['maxParallel'] ||
+            args['max-parallel'] ||
+            process.env.NX_PARALLEL ||
+            3);
+    }
+    else if (args['parallel'] !== undefined) {
+        return Number(args['parallel']);
+    }
+}