nx 19.7.0-beta.4 → 19.7.0-beta.5

package/package.json

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

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

@@ -4,7 +4,7 @@ exports.yargsLoginCommand = void 0;
 const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLoginCommand = {
     command: 'login [nxCloudUrl]',
-    describe: false,
+    describe: 'Login to Nx Cloud. This command is an alias for [`nx-cloud login`](/ci/reference/nx-cloud-cli#npx-nxcloud-login).',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs.positional('nxCloudUrl', {
         describe: 'The Nx Cloud URL of the instance you are trying to connect to. If no positional argument is provided, this command will connect to https://cloud.nx.app.',
         type: 'string',

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

@@ -4,7 +4,7 @@ exports.yargsLogoutCommand = void 0;
 const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLogoutCommand = {
     command: 'logout',
-    describe: false,
+    describe: 'Logout from Nx Cloud. This command is an alias for [`nx-cloud logout`](/ci/reference/nx-cloud-cli#npx-nxcloud-logout).',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs),
     handler: async (args) => {
         process.exit(await (await Promise.resolve().then(() => require('./logout'))).logoutHandler(args));

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -42,18 +42,6 @@ function getNxInitDate() {
         return null;
     }
 }
-async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxInitDate) {
-    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-    const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
-        workspaceName,
-        installationSource,
-        nxInitDate,
-    });
-    if (response.data.message) {
-        throw new Error(response.data.message);
-    }
-    return response.data;
-}
 async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const response = await require('axios').post(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
@@ -81,19 +69,6 @@ async function printSuccessMessage(token, installationSource, usesGithub) {
     });
     return connectCloudUrl;
 }
-function addNxCloudOptionsToNxJson(tree, token, directory = '') {
-    const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
-    if (tree.exists(nxJsonPath)) {
-        (0, json_1.updateJson)(tree, (0, path_1.join)(directory, 'nx.json'), (nxJson) => {
-            const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
-            if (overrideUrl) {
-                nxJson.nxCloudUrl = overrideUrl;
-            }
-            nxJson.nxCloudAccessToken = token;
-            return nxJson;
-        });
-    }
-}
 function addNxCloudIdToNxJson(tree, nxCloudId, directory = '') {
     const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
     if (tree.exists(nxJsonPath)) {
@@ -124,22 +99,12 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         isGitHubDetected &&
         schema.installationSource === 'nx-connect')
         return null;
-    if (process.env.NX_ENABLE_LOGIN === 'true') {
-        responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-        addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
-        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
-            silent: schema.hideFormatLogs,
-        });
-        return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
-    }
-    else {
-        responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-        addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspaceV1?.token, schema.directory);
-        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
-            silent: schema.hideFormatLogs,
-        });
-        return responseFromCreateNxCloudWorkspaceV1.token;
-    }
+    responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+    addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+        silent: schema.hideFormatLogs,
+    });
+    return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
 }
 async function connectToNxCloudGenerator(tree, options) {
     await connectToNxCloud(tree, options);