nx 17.0.3 → 17.0.5

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

@@ -16,15 +16,16 @@ const nx_json_1 = require("../../config/nx-json");
  *
  */
 async function listHandler(args) {
+    const nxJson = (0, nx_json_1.readNxJson)();
+    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
+    const projects = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     if (args.plugin) {
-        await (0, plugins_1.listPluginCapabilities)(args.plugin);
+        await (0, plugins_1.listPluginCapabilities)(args.plugin, projects.projects);
     }
     else {
-        const nxJson = (0, nx_json_1.readNxJson)();
         const corePlugins = (0, plugins_1.fetchCorePlugins)();
-        const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-        const localPlugins = await (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson);
-        const installedPlugins = await (0, plugins_1.getInstalledPluginsAndCapabilities)(workspace_root_1.workspaceRoot);
+        const localPlugins = await (0, local_plugins_1.getLocalWorkspacePlugins)(projects, nxJson);
+        const installedPlugins = await (0, plugins_1.getInstalledPluginsAndCapabilities)(workspace_root_1.workspaceRoot, projects.projects);
         if (localPlugins.size) {
             (0, local_plugins_1.listLocalWorkspacePlugins)(localPlugins);
         }

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

@@ -108,18 +108,33 @@ function runMigration() {
     }
 }
 function nxCliPath() {
+    const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
     try {
-        const packageManager = (0, package_manager_1.getPackageManagerCommand)();
+        const packageManager = (0, package_manager_1.detectPackageManager)();
+        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
         const { dirSync } = require('tmp');
         const tmpDir = dirSync().name;
-        const version = process.env.NX_MIGRATE_USE_NEXT === 'true' ? 'next' : 'latest';
         (0, fileutils_1.writeJsonFile)(path.join(tmpDir, 'package.json'), {
             dependencies: {
                 nx: version,
             },
             license: 'MIT',
         });
-        (0, child_process_2.execSync)(packageManager.install, {
+        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'],
+            });
+            // 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)(pmc.preInstall, {
+                    cwd: 'yarn config set nodeLinker node-modules',
+                    stdio: ['ignore', 'ignore', 'ignore'],
+                });
+            }
+        }
+        (0, child_process_2.execSync)(pmc.install, {
             cwd: tmpDir,
             stdio: ['ignore', 'ignore', 'ignore'],
         });
@@ -129,7 +144,7 @@ function nxCliPath() {
         return path.join(tmpDir, `node_modules`, '.bin', 'nx');
     }
     catch (e) {
-        console.error('Failed to install the latest version of the migration script. Using the current version.');
+        console.error(`Failed to install the ${version} version of the migration script. Using the current version.`);
         if (process.env.NX_VERBOSE_LOGGING) {
             console.error(e);
         }

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

@@ -16,8 +16,6 @@ const package_manager_1 = require("../../utils/package-manager");
 const params_1 = require("../../utils/params");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
 const output_1 = require("../../utils/output");
-const ab_testing_1 = require("../../utils/ab-testing");
-const versions_1 = require("../../utils/versions");
 const fs_1 = require("fs");
 const workspace_root_1 = require("../../utils/workspace-root");
 const is_ci_1 = require("../../utils/is-ci");
@@ -26,6 +24,7 @@ const configuration_1 = require("../../config/configuration");
 const child_process_2 = require("../../utils/child-process");
 const client_1 = require("../../daemon/client/client");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const project_graph_1 = require("../../project-graph/project-graph");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 function normalizeVersion(version) {
     const [semver, ...prereleaseTagParts] = version.split('-');
@@ -431,13 +430,15 @@ async function parseTargetPackageAndVersion(args) {
     else {
         if (args === 'latest' ||
             args === 'next' ||
+            args === 'canary' ||
             (0, semver_1.valid)(args) ||
             args.match(/^\d+(?:\.\d+)?(?:\.\d+)?$/)) {
             // Passing `nx` here may seem wrong, but nx and @nrwl/workspace are synced in version.
             // We could duplicate the ternary below, but its not necessary since they are equivalent
             // on the registry
             const targetVersion = await normalizeVersionWithTagCheck('nx', args);
-            const targetPackage = !['latest', 'next'].includes(args) && (0, semver_1.lt)(targetVersion, '14.0.0-beta.0')
+            const targetPackage = !['latest', 'next', 'canary'].includes(args) &&
+                (0, semver_1.lt)(targetVersion, '14.0.0-beta.0')
                 ? '@nrwl/workspace'
                 : 'nx';
             return {
@@ -718,7 +719,7 @@ async function updateInstallationDetails(root, updatedPackages) {
 }
 async function isMigratingToNewMajor(from, to) {
     from = normalizeVersion(from);
-    to = ['latest', 'next'].includes(to) ? to : normalizeVersion(to);
+    to = ['latest', 'next', 'canary'].includes(to) ? to : normalizeVersion(to);
     if (!(0, semver_1.valid)(from)) {
         from = await (0, package_manager_1.resolvePackageVersionUsingRegistry)('nx', from);
     }
@@ -750,16 +751,7 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                 (await isMigratingToNewMajor(from, opts.targetVersion)) &&
                 !(0, is_ci_1.isCI)() &&
                 !(0, nx_cloud_utils_1.isNxCloudUsed)(originalNxJson)) {
-                const useCloud = await (0, connect_to_nx_cloud_1.connectToNxCloudCommand)({
-                    promptOverride: ab_testing_1.messages.getPromptMessage('nxCloudMigration'),
-                    interactive: true,
-                });
-                await (0, ab_testing_1.recordStat)({
-                    command: 'migrate',
-                    nxVersion: versions_1.nxVersion,
-                    useCloud,
-                    meta: ab_testing_1.messages.codeOfSelectedPromptMessage('nxCloudMigration'),
-                });
+                await (0, connect_to_nx_cloud_1.connectToNxCloudWithPrompt)('migrate');
                 originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
             }
         }
@@ -811,7 +803,7 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                         `- To learn more go to https://nx.dev/recipes/tips-n-tricks/advanced-update`,
                     ]
                     : [
-                        `- To learn more go to https://nx.dev/core-features/automate-updating-dependencies`,
+                        `- To learn more go to https://nx.dev/features/automate-updating-dependencies`,
                     ]),
                 ...(showConnectToCloudMessage()
                     ? [
@@ -872,7 +864,19 @@ function runInstall() {
 async function executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix) {
     const depsBeforeMigrations = getStringifiedPackageJsonDeps(root);
     const migrationsWithNoChanges = [];
-    for (const m of migrations) {
+    const sortedMigrations = migrations.sort((a, b) => {
+        // special case for the split configuration migration to run first
+        if (a.name === '15-7-0-split-configuration-into-project-json-files') {
+            return -1;
+        }
+        if (b.name === '15-7-0-split-configuration-into-project-json-files') {
+            return 1;
+        }
+        return (0, semver_1.lt)(normalizeVersion(a.version), normalizeVersion(b.version))
+            ? -1
+            : 1;
+    });
+    for (const m of sortedMigrations) {
         try {
             const { collection, collectionPath } = readMigrationCollection(m.package, root);
             if (!isAngularMigration(collection, collectionPath, m.name)) {
@@ -888,7 +892,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
             }
             else {
                 const ngCliAdapter = await getNgCompatLayer();
-                const { madeChanges, loggingQueue } = await ngCliAdapter.runMigration(root, m.package, m.name, isVerbose);
+                const { madeChanges, loggingQueue } = await ngCliAdapter.runMigration(root, m.package, m.name, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(await (0, project_graph_1.createProjectGraphAsync)()).projects, isVerbose);
                 if (!madeChanges) {
                     migrationsWithNoChanges.push(m);
                     // If no changes are made, continue on without printing anything

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

@@ -14,7 +14,7 @@ function removeSpecialFlags(generatorOptions) {
 async function newWorkspace(cwd, args) {
     return (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true' || args.verbose, async () => {
         const isInteractive = args.interactive;
-        const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)('@nx/workspace/generators.json', 'new', null);
+        const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)('@nx/workspace/generators.json', 'new', null, {});
         removeSpecialFlags(args);
         const combinedOpts = await (0, params_1.combineOptionsForGenerator)(args, '@nx/workspace/generators.json', normalizedGeneratorName, null, null, schema, isInteractive, null, null, false);
         const host = new tree_1.FsTree(cwd, false, 'nx new');

package/src/command-line/nx-commands.js

@@ -22,6 +22,7 @@ const command_object_16 = require("./show/command-object");
 const command_object_17 = require("./watch/command-object");
 const command_object_18 = require("./reset/command-object");
 const command_object_19 = require("./release/command-object");
+const command_object_20 = require("./add/command-object");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -36,8 +37,9 @@ exports.parserConfiguration = {
  */
 exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
-    .usage(chalk.bold('Smart, Fast and Extensible Build System'))
+    .usage(chalk.bold('Smart Monorepos · Fast CI'))
     .demandCommand(1, '')
+    .command(command_object_20.yargsAddCommand)
     .command(command_object_1.yargsAffectedBuildCommand)
     .command(command_object_1.yargsAffectedCommand)
     .command(command_object_1.yargsAffectedE2ECommand)
@@ -66,6 +68,7 @@ exports.commandsObject = yargs
     .command(command_object_16.yargsShowCommand)
     .command(command_object_2.yargsViewLogsCommand)
     .command(command_object_17.yargsWatchCommand)
+    .command(command_object_14.yargsNxInfixCommand)
     .scriptName('nx')
     .help()
     // NOTE: we handle --version in nx.ts, this just tells yargs that the option exists

package/src/command-line/release/changelog.d.ts

@@ -1,2 +1,23 @@
+import { NxReleaseChangelogConfiguration } from '../../config/nx-json';
 import { ChangelogOptions } from './command-object';
-export declare function changelogHandler(args: ChangelogOptions): Promise<void>;
+import { ReleaseVersion } from './utils/shared';
+export interface NxReleaseChangelogResult {
+    workspaceChangelog?: {
+        releaseVersion: ReleaseVersion;
+        contents: string;
+    };
+    projectChangelogs?: {
+        [projectName: string]: {
+            releaseVersion: ReleaseVersion;
+            contents: string;
+        };
+    };
+}
+export declare const releaseChangelogCLIHandler: (args: ChangelogOptions) => Promise<any>;
+/**
+ * NOTE: This function is also exported for programmatic usage and forms part of the public API
+ * of Nx. We intentionally do not wrap the implementation with handleErrors because users need
+ * to have control over their own error handling when using the API.
+ */
+export declare function releaseChangelog(args: ChangelogOptions): Promise<NxReleaseChangelogResult>;
+export declare function shouldCreateGitHubRelease(changelogConfig: NxReleaseChangelogConfiguration | false | undefined, createReleaseArg?: ChangelogOptions['createRelease'] | undefined): boolean;