create-nx-workspace 21.2.3 → 21.2.4

package/bin/create-nx-workspace.js

@@ -132,11 +132,12 @@ exports.commandsObject = yargs
     .help('help', chalk.dim `Show help`)
     .updateLocale(decorator_1.yargsDecorator)
     .version('version', chalk.dim `Show version`, nx_version_1.nxVersion);
+let rawArgs;
 async function main(parsedArgs) {
     output_1.output.log({
         title: `Creating your v${nx_version_1.nxVersion} workspace.`,
     });
-    const workspaceInfo = await (0, create_workspace_1.createWorkspace)(parsedArgs.preset, parsedArgs);
+    const workspaceInfo = await (0, create_workspace_1.createWorkspace)(parsedArgs.preset, parsedArgs, rawArgs);
     await (0, ab_testing_1.recordStat)({
         nxVersion: nx_version_1.nxVersion,
         command: 'create-nx-workspace',
@@ -145,6 +146,7 @@ async function main(parsedArgs) {
             ab_testing_1.messages.codeOfSelectedPromptMessage('setupCI'),
             ab_testing_1.messages.codeOfSelectedPromptMessage('setupNxCloud'),
             parsedArgs.nxCloud,
+            rawArgs.nxCloud,
         ],
     });
     if (parsedArgs.nxCloud && workspaceInfo.nxCloudInfo) {
@@ -166,6 +168,7 @@ async function main(parsedArgs) {
  * @param argv user arguments
  */
 async function normalizeArgsMiddleware(argv) {
+    rawArgs = argv;
     output_1.output.log({
         title: "Let's create a new workspace [https://nx.dev/getting-started/intro]",
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "21.2.3",
+  "version": "21.2.4",
   "private": false,
   "description": "Smart Repos · Fast Builds",
   "repository": {

package/src/create-workspace.d.ts

@@ -1,5 +1,5 @@
 import { CreateWorkspaceOptions } from './create-workspace-options';
-export declare function createWorkspace<T extends CreateWorkspaceOptions>(preset: string, options: T): Promise<{
+export declare function createWorkspace<T extends CreateWorkspaceOptions>(preset: string, options: T, rawArgs?: T): Promise<{
     nxCloudInfo: string | undefined;
     directory: string;
 }>;

package/src/create-workspace.js

@@ -12,7 +12,7 @@ const git_1 = require("./utils/git/git");
 const get_third_party_preset_1 = require("./utils/preset/get-third-party-preset");
 const error_utils_1 = require("./utils/error-utils");
 const preset_1 = require("./utils/preset/preset");
-async function createWorkspace(preset, options) {
+async function createWorkspace(preset, options, rawArgs) {
     const { packageManager, name, nxCloud, skipGit = false, defaultBase = 'main', commit, cliName, useGitHub, } = options;
     if (cliName) {
         output_1.output.setCliName(cliName ?? 'NX');
@@ -35,7 +35,7 @@ async function createWorkspace(preset, options) {
         if (nxCloud !== 'yes') {
             await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager);
         }
-        const { connectCloudUrl, output } = await (0, nx_cloud_1.getOnboardingInfo)(nxCloud, token, directory, useGitHub);
+        const { connectCloudUrl, output } = await (0, nx_cloud_1.getOnboardingInfo)(nxCloud, token, directory, rawArgs?.nxCloud, useGitHub);
         connectUrl = connectCloudUrl;
         nxCloudInfo = output;
     }

package/src/utils/nx/messages.d.ts

@@ -1,7 +1,7 @@
 declare const outputMessages: {
     readonly 'create-nx-workspace-success-ci-setup': readonly [{
         readonly code: "ci-setup-visit";
-        readonly createMessage: (url: string) => {
+        readonly createMessage: (url: string | null) => {
             title: string;
             type: string;
             bodyLines: string[];
@@ -9,7 +9,7 @@ declare const outputMessages: {
     }];
     readonly 'create-nx-workspace-success-cache-setup': readonly [{
         readonly code: "remote-cache-visit";
-        readonly createMessage: (url: string) => {
+        readonly createMessage: (url: string | null) => {
             title: string;
             type: string;
             bodyLines: string[];
@@ -19,14 +19,14 @@ declare const outputMessages: {
 type OutputMessageKey = keyof typeof outputMessages;
 export declare function getMessageFactory(key: OutputMessageKey): {
     readonly code: "ci-setup-visit";
-    readonly createMessage: (url: string) => {
+    readonly createMessage: (url: string | null) => {
         title: string;
         type: string;
         bodyLines: string[];
     };
 } | {
     readonly code: "remote-cache-visit";
-    readonly createMessage: (url: string) => {
+    readonly createMessage: (url: string | null) => {
         title: string;
         type: string;
         bodyLines: string[];

package/src/utils/nx/messages.js

@@ -5,21 +5,29 @@ const outputMessages = {
     'create-nx-workspace-success-ci-setup': [
         {
             code: 'ci-setup-visit',
-            createMessage: (url) => ({
-                title: `Your CI setup is almost complete.`,
-                type: 'success',
-                bodyLines: [`Finish it by visiting: ${url}`],
-            }),
+            createMessage: (url) => {
+                return {
+                    title: `Your CI setup is almost complete.`,
+                    type: 'success',
+                    bodyLines: [
+                        `Push your repository and finish the setup${url ? `: ${url}` : ''}`,
+                    ],
+                };
+            },
         },
     ],
     'create-nx-workspace-success-cache-setup': [
         {
             code: 'remote-cache-visit',
-            createMessage: (url) => ({
-                title: `Your remote cache setup is almost complete.`,
-                type: 'success',
-                bodyLines: [`Finish it by visiting: ${url}`],
-            }),
+            createMessage: (url) => {
+                return {
+                    title: `Your remote cache is almost complete.`,
+                    type: 'success',
+                    bodyLines: [
+                        `Push your repository and finish the setup${url ? `: ${url}` : ''}`,
+                    ],
+                };
+            },
         },
     ],
 };

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

@@ -1,6 +1,6 @@
 export type NxCloud = 'yes' | 'github' | 'gitlab' | 'azure' | 'bitbucket-pipelines' | 'circleci' | 'skip';
 export declare function readNxCloudToken(directory: string): string | undefined;
-export declare function getOnboardingInfo(nxCloud: NxCloud, token: string, directory: string, useGitHub?: boolean): Promise<{
+export declare function getOnboardingInfo(nxCloud: NxCloud, token: string, directory: string, rawNxCloud?: NxCloud, useGitHub?: boolean): Promise<{
     output: string;
     connectCloudUrl: string;
 }>;

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

@@ -17,7 +17,7 @@ function readNxCloudToken(directory) {
     nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
     return accessToken || nxCloudId;
 }
-async function getOnboardingInfo(nxCloud, token, directory, useGitHub) {
+async function getOnboardingInfo(nxCloud, token, directory, rawNxCloud, useGitHub) {
     // nx-ignore-next-line
     const { createNxCloudOnboardingURL } = require(require.resolve('nx/src/nx-cloud/utilities/url-shorten', {
         paths: [directory],
@@ -31,7 +31,7 @@ async function getOnboardingInfo(nxCloud, token, directory, useGitHub) {
     const connectCloudUrl = await createNxCloudOnboardingURL(source, token, useGitHub ??
         (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci'), code);
     const out = new output_1.CLIOutput(false);
-    const message = createMessage(connectCloudUrl);
+    const message = createMessage(typeof rawNxCloud === 'string' ? null : connectCloudUrl);
     if (message.type === 'success') {
         out.success(message);
     }