create-nx-workspace 18.0.0-beta.0 → 18.0.0-beta.2

package/bin/create-nx-workspace.js

@@ -103,7 +103,7 @@ exports.commandsObject = yargs
 }, [
     normalizeArgsMiddleware,
     normalizeAndWarnOnDeprecatedPreset({
-        // TODO(v18): Remove Empty and Core presets
+        // TODO(v19): Remove Empty and Core presets
         [preset_1.Preset.Core]: preset_1.Preset.NPM,
         [preset_1.Preset.Empty]: preset_1.Preset.Apps,
     }),
@@ -114,10 +114,6 @@ exports.commandsObject = yargs
 async function main(parsedArgs) {
     output_1.output.log({
         title: `Creating your v${nx_version_1.nxVersion} workspace.`,
-        bodyLines: [
-            'To make sure the command works reliably in all environments, and that the preset is applied correctly,',
-            `Nx will run "${parsedArgs.packageManager} install" several times. Please wait.`,
-        ],
     });
     const workspaceInfo = await (0, create_workspace_1.createWorkspace)(parsedArgs.preset, parsedArgs);
     (0, show_nx_warning_1.showNxWarning)(parsedArgs.name);
@@ -170,8 +166,6 @@ async function normalizeArgsMiddleware(argv) {
     });
     try {
         let thirdPartyPreset;
-        // Node options
-        let docker;
         try {
             thirdPartyPreset = await (0, get_third_party_preset_1.getThirdPartyPreset)(argv.preset);
         }
@@ -448,11 +442,11 @@ async function determineReactOptions(parsedArgs) {
                     },
                     {
                         name: 'scss',
-                        message: 'SASS(.scss)       [ http://sass-lang.com   ]',
+                        message: 'SASS(.scss)       [ https://sass-lang.com   ]',
                     },
                     {
                         name: 'less',
-                        message: 'LESS              [ http://lesscss.org     ]',
+                        message: 'LESS              [ https://lesscss.org     ]',
                     },
                     {
                         name: 'styled-components',
@@ -539,11 +533,11 @@ async function determineVueOptions(parsedArgs) {
                     },
                     {
                         name: 'scss',
-                        message: 'SASS(.scss)       [ http://sass-lang.com   ]',
+                        message: 'SASS(.scss)       [ https://sass-lang.com   ]',
                     },
                     {
                         name: 'less',
-                        message: 'LESS              [ http://lesscss.org     ]',
+                        message: 'LESS              [ https://lesscss.org     ]',
                     },
                     {
                         name: 'none',
@@ -626,11 +620,11 @@ async function determineAngularOptions(parsedArgs) {
                     },
                     {
                         name: 'scss',
-                        message: 'SASS(.scss)       [ http://sass-lang.com   ]',
+                        message: 'SASS(.scss)       [ https://sass-lang.com   ]',
                     },
                     {
                         name: 'less',
-                        message: 'LESS              [ http://lesscss.org     ]',
+                        message: 'LESS              [ https://lesscss.org     ]',
                     },
                 ],
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.0-beta.2",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {
@@ -36,7 +36,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "yargs": "^17.6.2",
-    "axios": "^1.5.1"
+    "axios": "^1.6.0"
   },
   "publishConfig": {
     "access": "public"

package/src/create-workspace.js

@@ -16,10 +16,10 @@ async function createWorkspace(preset, options) {
         output_1.output.setCliName(cliName ?? 'NX');
     }
     const tmpDir = await (0, create_sandbox_1.createSandbox)(packageManager);
-    // nx new requires preset currently. We should probably make it optional.
+    // nx new requires a preset currently. We should probably make it optional.
     const directory = await (0, create_empty_workspace_1.createEmptyWorkspace)(tmpDir, name, packageManager, { ...options, preset });
     // If the preset is a third-party preset, we need to call createPreset to install it
-    // For first-party presets, it will created by createEmptyWorkspace instead.
+    // For first-party presets, it will be created by createEmptyWorkspace instead.
     // In createEmptyWorkspace, it will call `nx new` -> `@nx/workspace newGenerator` -> `@nx/workspace generatePreset`.
     const thirdPartyPreset = await (0, get_third_party_preset_1.getThirdPartyPreset)(preset);
     if (thirdPartyPreset) {
@@ -27,7 +27,7 @@ async function createWorkspace(preset, options) {
     }
     let nxCloudInstallRes;
     if (nxCloud !== 'skip') {
-        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager);
+        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager, nxCloud);
         if (nxCloud !== 'yes') {
             await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager, nxCloudInstallRes?.code === 0);
         }

package/src/utils/nx/nx-cloud.d.ts

@@ -1,6 +1,6 @@
 import { PackageManager } from '../package-manager';
 export type NxCloud = 'yes' | 'github' | 'circleci' | 'skip';
-export declare function setupNxCloud(directory: string, packageManager: PackageManager): Promise<{
+export declare function setupNxCloud(directory: string, packageManager: PackageManager, nxCloud: NxCloud): Promise<{
     code: number;
     stdout: string;
 }>;

package/src/utils/nx/nx-cloud.js

@@ -6,12 +6,17 @@ const child_process_utils_1 = require("../child-process-utils");
 const output_1 = require("../output");
 const package_manager_1 = require("../package-manager");
 const error_utils_1 = require("../error-utils");
-async function setupNxCloud(directory, packageManager) {
+async function setupNxCloud(directory, packageManager, nxCloud) {
     const nxCloudSpinner = ora(`Setting up Nx Cloud`).start();
     try {
         const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
         const res = await (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx:connect-to-nx-cloud --no-interactive --quiet`, directory);
-        nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
+        if (nxCloud !== 'yes') {
+            nxCloudSpinner.succeed('CI workflow with Nx Cloud has been generated successfully');
+        }
+        else {
+            nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
+        }
         return res;
     }
     catch (e) {
@@ -33,12 +38,19 @@ async function setupNxCloud(directory, packageManager) {
 }
 exports.setupNxCloud = setupNxCloud;
 function printNxCloudSuccessMessage(nxCloudOut) {
-    const bodyLines = nxCloudOut
-        .split('Remote caching via Nx Cloud has been enabled')[1]
-        .trim();
-    output_1.output.note({
-        title: `Remote caching via Nx Cloud has been enabled`,
-        bodyLines: bodyLines.split('\n').map((r) => r.trim()),
+    // remove leading Nx carret and any new lines
+    const logContent = nxCloudOut.split('>  NX   ')[1];
+    const indexOfTitleEnd = logContent.indexOf('\n');
+    const title = logContent.slice(0, logContent.indexOf('\n')).trim();
+    const bodyLines = logContent
+        .slice(indexOfTitleEnd)
+        .replace(/^\n*/, '') // remove leading new lines
+        .replace(/\n*$/, '') // remove trailing new lines
+        .split('\n')
+        .map((r) => r.trim());
+    output_1.output.warn({
+        title,
+        bodyLines,
     });
 }
 exports.printNxCloudSuccessMessage = printNxCloudSuccessMessage;

package/src/utils/nx/show-nx-warning.js

@@ -4,6 +4,7 @@ exports.showNxWarning = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const output_1 = require("../output");
+const package_manager_1 = require("../package-manager");
 function showNxWarning(workspaceName) {
     try {
         const pathToRunNxCommand = (0, path_1.resolve)(process.cwd(), workspaceName);
@@ -14,12 +15,13 @@ function showNxWarning(workspaceName) {
     }
     catch (e) {
         // no nx found
+        const { exec, globalAdd } = (0, package_manager_1.getPackageManagerCommand)();
         output_1.output.addVerticalSeparator();
         output_1.output.note({
             title: `Nx CLI is not installed globally.`,
             bodyLines: [
-                `This means that you might have to use "yarn nx" or "npx nx" to execute commands in the workspace.`,
-                `Run "yarn global add nx" or "npm install -g nx" to be able to execute command directly.`,
+                `This means that you will have to use "${exec} nx" to execute commands in the workspace.`,
+                `Run "${globalAdd} nx" to be able to execute command directly.`,
             ],
         });
     }

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

@@ -17,6 +17,7 @@ export declare function getPackageManagerCommand(packageManager?: PackageManager
     install: string;
     exec: string;
     preInstall?: string;
+    globalAdd: string;
 };
 export declare function generatePackageManagerFiles(root: string, packageManager?: PackageManager): void;
 export declare function getPackageManagerVersion(packageManager: PackageManager, cwd?: string): string;

package/src/utils/package-manager.js

@@ -43,6 +43,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
                     : `${installCommand} --ignore-scripts`,
                 // using npx is necessary to avoid yarn classic manipulating the version detection when using berry
                 exec: useBerry ? 'npx' : 'yarn',
+                globalAdd: 'yarn global add',
             };
         case 'pnpm':
             let useExec = false;
@@ -52,11 +53,13 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
             return {
                 install: 'pnpm install --no-frozen-lockfile --silent --ignore-scripts',
                 exec: useExec ? 'pnpm exec' : 'pnpx',
+                globalAdd: 'pnpm add -g',
             };
         case 'npm':
             return {
                 install: 'npm install --silent --ignore-scripts',
                 exec: 'npx',
+                globalAdd: 'npm i -g',
             };
     }
 }