nx 21.3.6 → 21.3.8

package/bin/nx.js

@@ -68,7 +68,12 @@ async function main() {
             handleMissingLocalInstallation(workspace ? workspace.dir : null);
         }
         // this file is already in the local workspace
-        if (isLocalInstall) {
+        if (isNxCloudCommand(process.argv[2])) {
+            // nx-cloud commands can run without local Nx installation
+            process.env.NX_DAEMON = 'false';
+            require('nx/src/command-line/nx-commands').commandsObject.argv;
+        }
+        else if (isLocalInstall) {
             await (0, init_local_1.initLocal)(workspace);
         }
         else if (localNx) {
@@ -82,11 +87,6 @@ async function main() {
                 require(localNx);
             }
         }
-        else if (isNxCloudCommand(process.argv[2])) {
-            // nx-cloud commands can run without local Nx installation
-            process.env.NX_DAEMON = 'false';
-            require('nx/src/command-line/nx-commands').commandsObject.argv;
-        }
     }
 }
 function handleNoWorkspace(globalNxVersion) {

package/bin/post-install.js

@@ -1,43 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const project_graph_1 = require("../src/project-graph/project-graph");
 const workspace_root_1 = require("../src/utils/workspace-root");
 const fileutils_1 = require("../src/utils/fileutils");
 const path_1 = require("path");
-const client_1 = require("../src/daemon/client/client");
 const assert_supported_platform_1 = require("../src/native/assert-supported-platform");
 const update_manager_1 = require("../src/nx-cloud/update-manager");
 const get_cloud_options_1 = require("../src/nx-cloud/utilities/get-cloud-options");
 const nx_cloud_utils_1 = require("../src/utils/nx-cloud-utils");
 const nx_json_1 = require("../src/config/nx-json");
 const logger_1 = require("../src/utils/logger");
-const workspace_context_1 = require("../src/utils/workspace-context");
+// The post install is not critical, to avoid any chance that it may hang
+// we will kill this process after 30 seconds.
+const postinstallTimeout = setTimeout(() => {
+    logger_1.logger.verbose('Nx post-install timed out.');
+    process.exit(0);
+}, 30_000);
 (async () => {
     const start = new Date();
     try {
         if (isMainNxPackage() && (0, fileutils_1.fileExists)((0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json'))) {
             (0, assert_supported_platform_1.assertSupportedPlatform)();
-            (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
-            if (client_1.daemonClient.enabled()) {
-                try {
-                    await client_1.daemonClient.stop();
-                }
-                catch (e) { }
-            }
-            const tasks = [
-                (0, project_graph_1.buildProjectGraphAndSourceMapsWithoutDaemon)(),
-            ];
             if ((0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
-                tasks.push((0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()));
+                await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)());
             }
-            process.env.NX_DAEMON = 'false';
-            await Promise.all(tasks.map((promise) => {
-                return promise.catch((e) => {
-                    if (process.env.NX_VERBOSE_LOGGING === 'true') {
-                        console.warn(e);
-                    }
-                });
-            }));
         }
     }
     catch (e) {
@@ -46,6 +31,7 @@ const workspace_context_1 = require("../src/utils/workspace-context");
     finally {
         const end = new Date();
         logger_1.logger.verbose(`Nx postinstall steps took ${end.getTime() - start.getTime()}ms`);
+        clearTimeout(postinstallTimeout);
         process.exit(0);
     }
 })();

package/package.json

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

package/src/command-line/nx-cloud/connect/command-object.js

@@ -10,7 +10,8 @@ exports.yargsConnectCommand = {
     describe: `Connect workspace to Nx Cloud.`,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(withConnectOptions(yargs), 'connect-to-nx-cloud'),
     handler: async (args) => {
-        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand(args);
+        const checkRemote = process.env.NX_SKIP_CHECK_REMOTE !== 'true';
+        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand({ ...args, checkRemote });
         await (await Promise.resolve().then(() => require('../../../utils/ab-testing'))).recordStat({
             command: 'connect',
             nxVersion: versions_1.nxVersion,

package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts

@@ -7,6 +7,7 @@ export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise
 export declare function connectWorkspaceToCloud(options: ConnectToNxCloudOptions, directory?: string): Promise<string>;
 export declare function connectToNxCloudCommand(options: {
     generateToken?: boolean;
+    checkRemote?: boolean;
 }, command?: string): Promise<boolean>;
 export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<boolean>;
 export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;

package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -17,8 +17,9 @@ const ab_testing_1 = require("../../../utils/ab-testing");
 const versions_1 = require("../../../utils/versions");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const chalk = require("chalk");
-const ora = require("ora");
-const open = require("open");
+const git_utils_1 = require("../../../utils/git-utils");
+const ora = require('ora');
+const open = require('open');
 function onlyDefaultRunnerIsUsed(nxJson) {
     const defaultRunner = nxJson.tasksRunnerOptions?.default?.runner;
     if (!defaultRunner) {
@@ -59,6 +60,17 @@ async function connectToNxCloudCommand(options, command) {
     const installationSource = process.env.NX_CONSOLE
         ? 'nx-console'
         : 'nx-connect';
+    const hasRemote = !!(0, git_utils_1.getGitRemote)();
+    if (!hasRemote && options.checkRemote) {
+        output_1.output.error({
+            title: 'Missing VCS provider',
+            bodyLines: [
+                'Push this repository to a VCS provider (e.g., GitHub) and try again.',
+                'Go to https://github.com/new to create a repository on GitHub.',
+            ],
+        });
+        return false;
+    }
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
         const token = process.env.NX_CLOUD_ACCESS_TOKEN ||
             nxJson.nxCloudAccessToken ||

package/src/utils/git-utils.d.ts

@@ -32,6 +32,7 @@ export declare class GitRepository {
     private quotePath;
     private quoteArg;
 }
+export declare function getGitRemote(): string;
 /**
  * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
  */

package/src/utils/git-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitRepository = void 0;
 exports.cloneFromUpstream = cloneFromUpstream;
+exports.getGitRemote = getGitRemote;
 exports.getGithubSlugOrNull = getGithubSlugOrNull;
 exports.extractUserAndRepoFromGitHubUrl = extractUserAndRepoFromGitHubUrl;
 exports.commitChanges = commitChanges;
@@ -170,15 +171,21 @@ class GitRepository {
     }
 }
 exports.GitRepository = GitRepository;
+function getGitRemote() {
+    const res = (0, child_process_1.execSync)('git remote -v', {
+        stdio: 'pipe',
+        windowsHide: false,
+    })
+        .toString()
+        .trim();
+    return res;
+}
 /**
  * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
  */
 function getGithubSlugOrNull() {
     try {
-        const gitRemote = (0, child_process_1.execSync)('git remote -v', {
-            stdio: 'pipe',
-            windowsHide: false,
-        }).toString();
+        const gitRemote = getGitRemote();
         // If there are no remotes, we default to github
         if (!gitRemote || gitRemote.length === 0) {
             return 'github';