nx 19.2.0-rc.0 → 19.2.0-rc.1

package/package.json

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

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

@@ -5,6 +5,7 @@ const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const tree_1 = require("../../generators/tree");
 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 nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const child_process_1 = require("../../utils/child-process");
 const ab_testing_1 = require("../../utils/ab-testing");
@@ -43,20 +44,38 @@ exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
 async function connectToNxCloudCommand() {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
-        output_1.output.log({
-            title: '✔ This workspace already has Nx Cloud set up',
-            bodyLines: [
-                'If you have not done so already, connect your workspace to your Nx Cloud account:',
-                `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
-            ],
-        });
+        if (process.env.NX_NEW_CLOUD_ONBOARDING !== 'true') {
+            output_1.output.log({
+                title: '✔ This workspace already has Nx Cloud set up',
+                bodyLines: [
+                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                    `- Login at ${(0, nx_cloud_utils_1.getNxCloudUrl)(nxJson)} to connect your repository`,
+                ],
+            });
+        }
+        else {
+            const token = process.env.NX_CLOUD_ACCESS_TOKEN || nxJson.nxCloudAccessToken;
+            if (!token) {
+                throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable.`);
+            }
+            const connectCloudUrl = await (0, url_shorten_1.shortenedCloudUrl)('nx-connect', token);
+            output_1.output.log({
+                title: '✔ This workspace already has Nx Cloud set up',
+                bodyLines: [
+                    'If you have not done so already, connect your workspace to your Nx Cloud account:',
+                    `- Connect with Nx Cloud at: 
+      
+        ${connectCloudUrl}`,
+                ],
+            });
+        }
         return false;
     }
     const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, 'connect-to-nx-cloud');
     const callback = await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {});
     tree.lock();
     (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, tree.listChanges());
-    callback();
+    await callback();
     return true;
 }
 exports.connectToNxCloudCommand = connectToNxCloudCommand;

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

@@ -11,6 +11,7 @@ const util_1 = require("util");
 const tree_1 = require("../../generators/tree");
 const fileutils_1 = require("../../utils/fileutils");
 const logger_1 = require("../../utils/logger");
+const git_utils_1 = require("../../utils/git-utils");
 const package_json_1 = require("../../utils/package-json");
 const package_manager_1 = require("../../utils/package-manager");
 const params_1 = require("../../utils/params");
@@ -925,7 +926,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 installDepsIfChanged();
                 const commitMessage = `${commitPrefix}${m.name}`;
                 try {
-                    const committedSha = commitChanges(commitMessage);
+                    const committedSha = (0, git_utils_1.commitChanges)(commitMessage);
                     if (committedSha) {
                         logger_1.logger.info(chalk.dim(`- Commit created for changes: ${committedSha}`));
                     }
@@ -1007,31 +1008,6 @@ function getStringifiedPackageJsonDeps(root) {
         return '';
     }
 }
-function commitChanges(commitMessage) {
-    try {
-        (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe' });
-        (0, child_process_1.execSync)('git commit --no-verify -F -', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-            input: commitMessage,
-        });
-    }
-    catch (err) {
-        throw new Error(`Error committing changes:\n${err.stderr}`);
-    }
-    return getLatestCommitSha();
-}
-function getLatestCommitSha() {
-    try {
-        return (0, child_process_1.execSync)('git rev-parse HEAD', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-        }).trim();
-    }
-    catch {
-        return null;
-    }
-}
 async function runNxMigration(root, collectionPath, collection, name) {
     const { path: implPath, fnSymbol } = getImplementationPath(collection, collectionPath, name);
     const fn = require(implPath)[fnSymbol];