nx 19.8.2 → 19.8.4

package/.eslintrc.json

@@ -9,8 +9,18 @@
         "no-restricted-imports": [
           "error",
           {
-            "name": "fs-extra",
-            "message": "Please use equivalent utilities from `node:fs` instead."
+            "paths": [
+              {
+                "name": "fs-extra",
+                "message": "Please use equivalent utilities from `node:fs` instead."
+              }
+            ],
+            "patterns": [
+              {
+                "group": ["**/devkit-exports"],
+                "message": "Do not import from devkit-exports from the nx package"
+              }
+            ]
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.2",
+  "version": "19.8.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -67,7 +67,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.8.2"
+    "@nrwl/tao": "19.8.4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.2",
-    "@nx/nx-darwin-arm64": "19.8.2",
-    "@nx/nx-linux-x64-gnu": "19.8.2",
-    "@nx/nx-linux-x64-musl": "19.8.2",
-    "@nx/nx-win32-x64-msvc": "19.8.2",
-    "@nx/nx-linux-arm64-gnu": "19.8.2",
-    "@nx/nx-linux-arm64-musl": "19.8.2",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.2",
-    "@nx/nx-win32-arm64-msvc": "19.8.2",
-    "@nx/nx-freebsd-x64": "19.8.2"
+    "@nx/nx-darwin-x64": "19.8.4",
+    "@nx/nx-darwin-arm64": "19.8.4",
+    "@nx/nx-linux-x64-gnu": "19.8.4",
+    "@nx/nx-linux-x64-musl": "19.8.4",
+    "@nx/nx-win32-x64-msvc": "19.8.4",
+    "@nx/nx-linux-arm64-gnu": "19.8.4",
+    "@nx/nx-linux-arm64-musl": "19.8.4",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.4",
+    "@nx/nx-win32-arm64-msvc": "19.8.4",
+    "@nx/nx-freebsd-x64": "19.8.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -103,8 +103,8 @@ async function initializePlugin(pkgName, options, nxJson) {
         if (options.__overrides_unparsed__.length) {
             args.push(...options.__overrides_unparsed__);
         }
-        await (0, child_process_2.runNxAsync)(`g ${pkgName}:${initGenerator} ${args.join(' ')}`, {
-            silent: !options.verbose,
+        (0, child_process_2.runNxSync)(`g ${pkgName}:${initGenerator} ${args.join(' ')}`, {
+            stdio: [0, 1, 2],
         });
     }
     catch (e) {

package/src/command-line/import/utils/prepare-source-repo.js

@@ -6,15 +6,20 @@ const path_1 = require("path");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
+    const message = relativeSourceDir.trim()
+        ? `Filtering git history to only include files in ${relativeSourceDir}`
+        : `Filtering git history`;
     if (await gitClient.hasFilterRepoInstalled()) {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        spinner.start(message);
         await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
     else {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        spinner.start(`${message} (this might take a few minutes -- install git-filter-repo for faster performance)`);
         await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    spinner.succeed(relativeSourceDir.trim()
+        ? `Filtered git history to only include files in ${relativeSourceDir}`
+        : `Filtered git history`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

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

@@ -29,6 +29,7 @@ const command_object_23 = require("./login/command-object");
 const command_object_24 = require("./logout/command-object");
 const command_objects_1 = require("./deprecated/command-objects");
 const command_object_25 = require("./sync/command-object");
+const output_1 = require("../utils/output");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -82,26 +83,46 @@ exports.commandsObject = yargs
     .command(command_object_23.yargsLoginCommand)
     .command(command_object_24.yargsLogoutCommand)
     .command(resolveConformanceCommandObject())
+    .command(resolveConformanceCheckCommandObject())
     .scriptName('nx')
     .help()
     // NOTE: we handle --version in nx.ts, this just tells yargs that the option exists
     // so that it shows up in help. The default yargs implementation of --version is not
     // hit, as the implementation in nx.ts is hit first and calls process.exit(0).
     .version();
+function createMissingConformanceCommand(command) {
+    return {
+        command,
+        // Hide from --help output in the common case of not having the plugin installed
+        describe: false,
+        handler: () => {
+            output_1.output.error({
+                title: `${command} is not available`,
+                bodyLines: [
+                    `In order to use the \`nx ${command}\` command you must have an active Powerpack license and the \`@nx/powerpack-conformance\` plugin installed.`,
+                    '',
+                    'To learn more, visit https://nx.dev/features/powerpack/conformance',
+                ],
+            });
+            process.exit(1);
+        },
+    };
+}
 function resolveConformanceCommandObject() {
     try {
         const { yargsConformanceCommand } = require('@nx/powerpack-conformance');
         return yargsConformanceCommand;
     }
-    catch (e) {
-        return {
-            command: 'conformance',
-            // Hide from --help output in the common case of not having the plugin installed
-            describe: false,
-            handler: () => {
-                // TODO: Add messaging to help with learning more about powerpack and conformance
-                process.exit(1);
-            },
-        };
+    catch {
+        return createMissingConformanceCommand('conformance');
+    }
+}
+function resolveConformanceCheckCommandObject() {
+    try {
+        const { yargsConformanceCheckCommand, } = require('@nx/powerpack-conformance');
+        return yargsConformanceCheckCommand;
+    }
+    catch {
+        return createMissingConformanceCommand('conformance:check');
     }
 }

package/src/command-line/release/utils/print-changes.js

@@ -5,8 +5,10 @@ exports.printAndFlushChanges = printAndFlushChanges;
 const chalk = require("chalk");
 const jest_diff_1 = require("jest-diff");
 const node_fs_1 = require("node:fs");
-const devkit_exports_1 = require("../../../devkit-exports");
 const tree_1 = require("../../../generators/tree");
+const workspace_root_1 = require("../../../utils/workspace-root");
+const path_1 = require("../../../utils/path");
+const logger_1 = require("../../../utils/logger");
 // jest-diff does not export this constant
 const NO_DIFF_MESSAGE = 'Compared values have no visual difference.';
 function printDiff(before, after, contextLines = 1, noDiffMessage = NO_DIFF_MESSAGE) {
@@ -43,7 +45,7 @@ function printAndFlushChanges(tree, isDryRun, diffContextLines = 1, shouldPrintD
         }
         else if (f.type === 'UPDATE') {
             console.error(`${chalk.white('UPDATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
-            const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, devkit_exports_1.joinPathFragments)(tree.root, f.path)).toString();
+            const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(tree.root, f.path)).toString();
             printDiff(currentContentsOnDisk, f.content?.toString() || '', diffContextLines, noDiffMessage);
         }
         else if (f.type === 'DELETE') {
@@ -51,9 +53,9 @@ function printAndFlushChanges(tree, isDryRun, diffContextLines = 1, shouldPrintD
         }
     });
     if (!isDryRun) {
-        (0, tree_1.flushChanges)(devkit_exports_1.workspaceRoot, changes);
+        (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
     }
     if (isDryRun && shouldPrintDryRunMessage) {
-        devkit_exports_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+        logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
     }
 }

package/src/command-line/release/utils/resolve-nx-json-error-message.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveNxJsonConfigErrorMessage = resolveNxJsonConfigErrorMessage;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const devkit_exports_1 = require("../../../devkit-exports");
+const path_1 = require("../../../utils/path");
+const workspace_root_1 = require("../../../utils/workspace-root");
 async function resolveNxJsonConfigErrorMessage(propPath) {
-    const errorLines = await getJsonConfigLinesForErrorMessage((0, node_fs_1.readFileSync)((0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, 'nx.json'), 'utf-8'), propPath);
-    let nxJsonMessage = `The relevant config is defined here: ${(0, node_path_1.relative)(process.cwd(), (0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, 'nx.json'))}`;
+    const errorLines = await getJsonConfigLinesForErrorMessage((0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(workspace_root_1.workspaceRoot, 'nx.json'), 'utf-8'), propPath);
+    let nxJsonMessage = `The relevant config is defined here: ${(0, node_path_1.relative)(process.cwd(), (0, path_1.joinPathFragments)(workspace_root_1.workspaceRoot, 'nx.json'))}`;
     if (errorLines) {
         nxJsonMessage +=
             errorLines.startLine === errorLines.endLine

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

@@ -37,16 +37,16 @@ async function resetHandler(args) {
         try {
             await killDaemon();
         }
-        catch {
-            errors.push('Failed to stop the Nx Daemon.');
+        catch (e) {
+            errors.push('Failed to stop the Nx Daemon.', e.toString());
         }
     }
     if (all || args.onlyCache) {
         try {
             await cleanupCacheEntries();
         }
-        catch {
-            errors.push('Failed to clean up the cache directory.');
+        catch (e) {
+            errors.push('Failed to clean up the cache directory.', e.toString());
         }
     }
     if (all || args.onlyWorkspaceData) {
@@ -59,12 +59,17 @@ async function resetHandler(args) {
         try {
             await cleanupWorkspaceData();
         }
-        catch {
-            errors.push('Failed to clean up the workspace data directory.');
+        catch (e) {
+            errors.push('Failed to clean up the workspace data directory.', e.toString());
         }
     }
     if (all || args.onlyCloud) {
-        await resetCloudClient();
+        try {
+            await resetCloudClient();
+        }
+        catch (e) {
+            errors.push('Failed to reset the Nx Cloud client.', e.toString());
+        }
     }
     if (errors.length > 0) {
         output_1.output.error({
@@ -79,8 +84,10 @@ async function resetHandler(args) {
         });
     }
 }
-function killDaemon() {
-    return client_1.daemonClient.stop();
+async function killDaemon() {
+    if (client_1.daemonClient.enabled()) {
+        return client_1.daemonClient.stop();
+    }
 }
 async function resetCloudClient() {
     // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or

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

@@ -81,9 +81,9 @@ function withRunOptions(yargs) {
         default: false,
     })
         .option('skipSync', {
+        describe: 'Skips running the sync generators associated with the tasks.',
         type: 'boolean',
-        // TODO(leo): add description and make it visible once it is stable
-        hidden: true,
+        default: false,
     })
         .options('cloud', {
         type: 'boolean',