nx 20.7.0-canary.20250327-1a235d7 → 20.7.0-canary.20250328-4a3a824

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.7.0-canary.20250327-1a235d7",
+  "version": "20.7.0-canary.20250328-4a3a824",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-darwin-x64": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-freebsd-x64": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-linux-arm-gnueabihf": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-linux-arm64-gnu": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-linux-arm64-musl": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-linux-x64-gnu": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-linux-x64-musl": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-win32-arm64-msvc": "20.7.0-canary.20250327-1a235d7",
-    "@nx/nx-win32-x64-msvc": "20.7.0-canary.20250327-1a235d7"
+    "@nx/nx-darwin-arm64": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-darwin-x64": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-freebsd-x64": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-linux-arm-gnueabihf": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-linux-arm64-gnu": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-linux-arm64-musl": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-linux-x64-gnu": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-linux-x64-musl": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-win32-arm64-msvc": "20.7.0-canary.20250328-4a3a824",
+    "@nx/nx-win32-x64-msvc": "20.7.0-canary.20250328-4a3a824"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -89,7 +89,7 @@ async function initializePlugin(pkgName, options, nxJson) {
     const spinner = ora(`Initializing ${pkgName}...`);
     spinner.start();
     try {
-        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
+        await (0, configure_plugins_1.runPluginInitGenerator)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
     }
     catch (e) {
         spinner.fail();

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

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
 const plugins_1 = require("../../project-graph/plugins");
+const installation_directory_1 = require("../../utils/installation-directory");
 function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
         const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
@@ -37,18 +38,22 @@ function getGeneratorInformation(collectionName, generatorName, root, projects)
         };
     }
     catch (e) {
-        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${e.message}`);
+        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${process.env.NX_VERBOSE_LOGGING === 'true' ? e.stack : e.message}`);
     }
 }
 function readGeneratorsJson(collectionName, generator, root, projects) {
     let generatorsFilePath;
     if (collectionName.endsWith('.json')) {
         generatorsFilePath = require.resolve(collectionName, {
-            paths: root ? [root, __dirname] : [__dirname],
+            paths: root
+                ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+                : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname],
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root
+            ? [...(0, installation_directory_1.getNxRequirePaths)(root), __dirname]
+            : [...(0, installation_directory_1.getNxRequirePaths)(), __dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);

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

@@ -287,7 +287,7 @@ async function runPluginsInstall(plugins, pmc, destinationGitClient) {
     let installed = true;
     output_1.output.log({ title: 'Installing Plugins' });
     try {
-        (0, configure_plugins_1.runPackageManagerInstallPlugins)(workspace_root_1.workspaceRoot, pmc, plugins);
+        (0, configure_plugins_1.installPluginPackages)(workspace_root_1.workspaceRoot, pmc, plugins);
         await destinationGitClient.amendCommit();
     }
     catch (e) {

package/src/command-line/init/configure-plugins.d.ts

@@ -1,5 +1,5 @@
 import { PackageManagerCommands } from '../../utils/package-manager';
-export declare function runPackageManagerInstallPlugins(repoRoot: string, pmc: PackageManagerCommands, plugins: string[]): void;
+export declare function installPluginPackages(repoRoot: string, pmc: PackageManagerCommands, plugins: string[]): void;
 /**
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
@@ -9,13 +9,13 @@ export declare function runPackageManagerInstallPlugins(repoRoot: string, pmc: P
  * @param verbose whether to run in verbose mode
  * @returns void
  */
-export declare function installPlugin(plugin: string, repoRoot?: string, updatePackageScripts?: boolean, verbose?: boolean, pmc?: PackageManagerCommands): Promise<void>;
+export declare function runPluginInitGenerator(plugin: string, repoRoot?: string, updatePackageScripts?: boolean, verbose?: boolean, pmc?: PackageManagerCommands): Promise<void>;
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, pmc: PackageManagerCommands, repoRoot?: string, verbose?: boolean): Promise<{
+export declare function runPluginInitGenerators(plugins: string[], updatePackageScripts: boolean, pmc: PackageManagerCommands, repoRoot?: string, verbose?: boolean): Promise<{
     succeededPlugins: string[];
     failedPlugins: {
         [plugin: string]: Error;

package/src/command-line/init/configure-plugins.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runPackageManagerInstallPlugins = runPackageManagerInstallPlugins;
-exports.installPlugin = installPlugin;
-exports.installPlugins = installPlugins;
+exports.installPluginPackages = installPluginPackages;
+exports.runPluginInitGenerator = runPluginInitGenerator;
+exports.runPluginInitGenerators = runPluginInitGenerators;
 exports.configurePlugins = configurePlugins;
 exports.getFailedToInstallPluginErrorMessages = getFailedToInstallPluginErrorMessages;
 const createSpinner = require("ora");
 const chalk_1 = require("chalk");
-const child_process_1 = require("child_process");
 const package_manager_1 = require("../../utils/package-manager");
 const output_1 = require("../../utils/output");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -15,12 +14,28 @@ const utils_1 = require("./implementation/utils");
 const angular_json_1 = require("../../adapter/angular-json");
 const error_types_1 = require("../../project-graph/error-types");
 const generator_utils_1 = require("../generate/generator-utils");
-function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
+const path_1 = require("path");
+const fs_1 = require("fs");
+const configuration_1 = require("../../config/configuration");
+const versions_1 = require("../../utils/versions");
+const child_process_1 = require("../../utils/child-process");
+function installPluginPackages(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)(), plugins) {
     if (plugins.length === 0) {
         return;
     }
-    (0, utils_1.addDepsToPackageJson)(repoRoot, plugins);
-    (0, utils_1.runInstall)(repoRoot, pmc);
+    if ((0, fs_1.existsSync)((0, path_1.join)(repoRoot, 'package.json'))) {
+        (0, utils_1.addDepsToPackageJson)(repoRoot, plugins);
+        (0, utils_1.runInstall)(repoRoot, pmc);
+    }
+    else {
+        const nxJson = (0, configuration_1.readNxJson)(repoRoot);
+        nxJson.installation.plugins ??= {};
+        for (const plugin of plugins) {
+            nxJson.installation.plugins[plugin] = versions_1.nxVersion;
+        }
+        // Invoking nx wrapper to install plugins.
+        (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
+    }
 }
 /**
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
@@ -31,20 +46,21 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  * @param verbose whether to run in verbose mode
  * @returns void
  */
-async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
+async function runPluginInitGenerator(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     try {
         const { schema } = (0, generator_utils_1.getGeneratorInformation)(plugin, 'init', workspace_root_1.workspaceRoot, {});
-        let command = `${pmc.exec} nx g ${plugin}:init ${verbose ? '--verbose' : ''}`;
+        let command = `g ${plugin}:init ${verbose ? '--verbose' : ''}`;
         if (!!schema.properties['keepExistingVersions']) {
             command += ` --keepExistingVersions`;
         }
         if (updatePackageScripts && !!schema.properties['updatePackageScripts']) {
             command += ` --updatePackageScripts`;
         }
-        (0, child_process_1.execSync)(command, {
+        (0, child_process_1.runNxSync)(command, {
             stdio: [0, 1, 2],
             cwd: repoRoot,
             windowsHide: false,
+            packageManagerCommand: pmc,
         });
     }
     catch {
@@ -60,7 +76,7 @@ async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot,
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-async function installPlugins(plugins, updatePackageScripts, pmc, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
+async function runPluginInitGenerators(plugins, updatePackageScripts, pmc, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
     if (plugins.length === 0) {
         return {
             succeededPlugins: [],
@@ -73,7 +89,7 @@ async function installPlugins(plugins, updatePackageScripts, pmc, repoRoot = wor
     for (const plugin of plugins) {
         try {
             spinner.start('Installing plugin ' + plugin);
-            await installPlugin(plugin, repoRoot, updatePackageScripts, verbose, pmc);
+            await runPluginInitGenerator(plugin, repoRoot, updatePackageScripts, verbose, pmc);
             succeededPlugins.push(plugin);
             spinner.succeed('Installed plugin ' + plugin);
         }
@@ -99,7 +115,7 @@ async function configurePlugins(plugins, updatePackageScripts, pmc, repoRoot = w
         };
     }
     output_1.output.log({ title: '🔨 Configuring plugins' });
-    let { succeededPlugins, failedPlugins } = await installPlugins(plugins, updatePackageScripts, pmc, repoRoot, verbose);
+    let { succeededPlugins, failedPlugins } = await runPluginInitGenerators(plugins, updatePackageScripts, pmc, repoRoot, verbose);
     if (succeededPlugins.length > 0) {
         output_1.output.success({
             title: 'Installed Plugins',

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

@@ -24,6 +24,7 @@ const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-n
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const connect_to_nx_cloud_2 = require("../../connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
+const child_process_2 = require("../../../utils/child-process");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -252,8 +253,8 @@ function printFinalMessage({ learnMoreLink, }) {
     output_1.output.success({
         title: '🎉 Done!',
         bodyLines: [
-            `- Run "${pmc.exec} nx run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
-            `- Run "${pmc.exec} nx graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
+            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
+            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
             learnMoreLink ? `- Learn more at ${learnMoreLink}.` : undefined,
         ].filter(Boolean),
     });

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

@@ -6,7 +6,6 @@ const fs_1 = require("fs");
 const enquirer_1 = require("enquirer");
 const semver_1 = require("semver");
 const nx_json_1 = require("../../config/nx-json");
-const child_process_1 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
 const get_package_name_from_import_path_1 = require("../../utils/get-package-name-from-import-path");
 const output_1 = require("../../utils/output");
@@ -28,25 +27,6 @@ async function initHandler(options) {
     if (process.env.NX_VERSION) {
         output_1.output.log({ title: `Using version ${process.env.NX_VERSION}` });
     }
-    if (!(0, fs_1.existsSync)('package.json') || options.useDotNxInstallation) {
-        if (process.platform !== 'win32') {
-            console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx --help`');
-        }
-        else {
-            console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx.bat --help`');
-        }
-        (0, add_nx_scripts_1.generateDotNxSetup)(version);
-        const nxJson = (0, nx_json_1.readNxJson)(process.cwd());
-        const { plugins } = await detectPlugins(nxJson, options.interactive);
-        plugins.forEach((plugin) => {
-            (0, child_process_1.runNxSync)(`add ${plugin}`, {
-                stdio: 'inherit',
-            });
-        });
-        // invokes the wrapper, thus invoking the initial installation process
-        (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
-        return;
-    }
     // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.
     if ((0, fs_1.existsSync)('angular.json')) {
         await (0, angular_1.addNxToAngularCliRepo)({
@@ -58,10 +38,13 @@ async function initHandler(options) {
         });
         return;
     }
-    const packageJson = (0, fileutils_1.readJsonFile)('package.json');
+    const _isNonJs = !(0, fs_1.existsSync)('package.json') || options.useDotNxInstallation;
+    const packageJson = _isNonJs
+        ? null
+        : (0, fileutils_1.readJsonFile)('package.json');
     const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
-    const _isMonorepo = (0, utils_1.isMonorepo)(packageJson);
-    const _isCRA = (0, utils_1.isCRA)(packageJson);
+    const _isMonorepo = _isNonJs ? false : (0, utils_1.isMonorepo)(packageJson);
+    const _isCRA = _isNonJs ? false : (0, utils_1.isCRA)(packageJson);
     const learnMoreLink = _isTurborepo
         ? 'https://nx.dev/recipes/adopting-nx/from-turborepo'
         : _isMonorepo
@@ -99,6 +82,10 @@ async function initHandler(options) {
             nxCloud: false,
         });
     }
+    else if (_isNonJs) {
+        (0, add_nx_scripts_1.generateDotNxSetup)(version);
+        console.log('');
+    }
     else {
         await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
             interactive: options.interactive,
@@ -124,7 +111,7 @@ async function initHandler(options) {
         updatePackageScripts = _updatePackageScripts;
     }
     output_1.output.log({ title: '📦 Installing Nx' });
-    (0, configure_plugins_1.runPackageManagerInstallPlugins)(repoRoot, pmc, plugins);
+    (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
     await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });

package/src/utils/child-process.d.ts

@@ -1,11 +1,15 @@
 import { type ExecOptions, type ExecSyncOptions } from 'child_process';
+import { PackageManagerCommands } from './package-manager';
 import { ChildProcess } from '../native';
+export declare function getRunNxBaseCommand(packageManagerCommand?: PackageManagerCommands, cwd?: string): string;
 export declare function runNxSync(cmd: string, options?: ExecSyncOptions & {
     cwd?: string;
+    packageManagerCommand?: PackageManagerCommands;
 }): void;
 export declare function runNxAsync(cmd: string, options?: ExecOptions & {
     cwd?: string;
     silent?: boolean;
+    packageManagerCommand?: PackageManagerCommands;
 }): Promise<void>;
 export declare class PseudoTtyProcess {
     private childProcess;

package/src/utils/child-process.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PseudoTtyProcess = void 0;
+exports.getRunNxBaseCommand = getRunNxBaseCommand;
 exports.runNxSync = runNxSync;
 exports.runNxAsync = runNxAsync;
 const child_process_1 = require("child_process");
@@ -8,46 +9,38 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const package_manager_1 = require("./package-manager");
 const workspace_root_1 = require("./workspace-root");
-function runNxSync(cmd, options) {
-    let baseCmd;
+function getRunNxBaseCommand(packageManagerCommand, cwd = process.cwd()) {
     if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))) {
-        baseCmd = `${(0, package_manager_1.getPackageManagerCommand)().exec} nx`;
+        if (!packageManagerCommand) {
+            const pm = (0, package_manager_1.detectPackageManager)();
+            packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)(pm);
+        }
+        return `${packageManagerCommand.exec} nx`;
     }
     else {
-        options ??= {};
-        options.cwd ??= process.cwd();
-        options.windowsHide ??= true;
-        const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
+        const offsetFromRoot = (0, path_1.relative)(cwd, (0, workspace_root_1.workspaceRootInner)(cwd, null));
         if (process.platform === 'win32') {
-            baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
+            return '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
         }
         else {
-            baseCmd = './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
+            return './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
         }
     }
-    (0, child_process_1.execSync)(`${baseCmd} ${cmd}`, options);
+}
+function runNxSync(cmd, options) {
+    let { packageManagerCommand, ...execSyncOptions } = options ?? {};
+    execSyncOptions.cwd ??= process.cwd();
+    execSyncOptions.windowsHide ??= true;
+    const baseCmd = getRunNxBaseCommand(packageManagerCommand, execSyncOptions.cwd);
+    (0, child_process_1.execSync)(`${baseCmd} ${cmd}`, execSyncOptions);
 }
 async function runNxAsync(cmd, options) {
-    let baseCmd;
-    if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'))) {
-        baseCmd = `${(0, package_manager_1.getPackageManagerCommand)().exec} nx`;
-    }
-    else {
-        options ??= {};
-        options.cwd ??= process.cwd();
-        options.windowsHide ??= true;
-        const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
-        if (process.platform === 'win32') {
-            baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
-        }
-        else {
-            baseCmd = './' + (0, path_1.join)(`${offsetFromRoot}`, 'nx');
-        }
-    }
-    const silent = options?.silent ?? true;
-    if (options?.silent) {
-        delete options.silent;
-    }
+    options ??= {};
+    options.cwd ??= process.cwd();
+    options.windowsHide ??= true;
+    let { silent, packageManagerCommand, ...execSyncOptions } = options;
+    silent ??= true;
+    const baseCmd = getRunNxBaseCommand(packageManagerCommand, execSyncOptions.cwd);
     return new Promise((resolve, reject) => {
         const child = (0, child_process_1.exec)(`${baseCmd} ${cmd}`, options, (error, stdout, stderr) => {
             if (error) {