feat(core): add standalone api prompt to CNW

nrwl · Feb 9, 2023 · d30658a · d30658a
1 parent 4d21915
commit d30658a
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 1 deletion.
diff --git a/docs/generated/cli/create-nx-workspace.md b/docs/generated/cli/create-nx-workspace.md
@@ -141,6 +141,12 @@ Default: `false`
 
 Skip initializing a git repository.
 
+### standaloneApi
+
+Type: `boolean`
+
+Use Standalone APIs if generating an Angular app
+
 ### style
 
 Type: `string`

diff --git a/docs/generated/packages/nx/documents/create-nx-workspace.md b/docs/generated/packages/nx/documents/create-nx-workspace.md
@@ -141,6 +141,12 @@ Default: `false`
 
 Skip initializing a git repository.
 
+### standaloneApi
+
+Type: `boolean`
+
+Use Standalone APIs if generating an Angular app
+
 ### style
 
 Type: `string`

diff --git a/docs/generated/packages/workspace/generators/preset.json b/docs/generated/packages/workspace/generators/preset.json
@@ -49,6 +49,11 @@
           ]
         }
       },
+      "standaloneApi": {
+        "description": "Use the Standalone APIs if generating an Angular application.",
+        "type": "boolean",
+        "default": "false"
+      },
       "standaloneConfig": {
         "description": "Split the project configurations into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
         "type": "boolean",

diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -143,6 +143,7 @@ export function runCreateWorkspace(
     useDetectedPm = false,
     cwd = e2eCwd,
     bundler,
+    standaloneApi,
   }: {
     preset: string;
     appName?: string;
@@ -155,6 +156,7 @@ export function runCreateWorkspace(
     useDetectedPm?: boolean;
     cwd?: string;
     bundler?: 'webpack' | 'vite';
+    standaloneApi?: boolean;
   }
 ) {
   projName = name;
@@ -178,6 +180,10 @@ export function runCreateWorkspace(
     command += ` --bundler=${bundler}`;
   }
 
+  if (standaloneApi !== undefined) {
+    command += ` --standaloneApi=${standaloneApi}`;
+  }
+
   if (base) {
     command += ` --defaultBase="${base}"`;
   }

diff --git a/e2e/workspace-create/src/create-nx-workspace.test.ts b/e2e/workspace-create/src/create-nx-workspace.test.ts
@@ -26,6 +26,7 @@ describe('create-nx-workspace', () => {
       appName: wsName,
       style: 'css',
       packageManager,
+      standaloneApi: false,
     });
 
     checkFilesExist('package.json');
@@ -112,6 +113,7 @@ describe('create-nx-workspace', () => {
       style: 'css',
       appName,
       packageManager,
+      standaloneApi: false,
     });
   });
 
@@ -127,6 +129,7 @@ describe('create-nx-workspace', () => {
         style: 'css',
         appName,
         packageManager,
+        standaloneApi: false,
       });
     } catch (e) {
       expect(e).toBeTruthy();
@@ -294,6 +297,7 @@ describe('create-nx-workspace', () => {
       style: 'css',
       packageManager: 'npm',
       cli: 'angular',
+      standaloneApi: false,
     });
 
     checkFilesDoNotExist('yarn.lock');

diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -32,6 +32,7 @@ type Arguments = {
   cli: string;
   style: string;
   framework: string;
+  standaloneApi: boolean;
   docker: boolean;
   nxCloud: boolean;
   allPrompts: boolean;
@@ -149,6 +150,10 @@ export const commandsObject: yargs.Argv<Arguments> = yargs
           describe: chalk.dim`Style option to be used when a preset with pregenerated app is selected`,
           type: 'string',
         })
+        .option('standaloneApi', {
+          describe: chalk.dim`Use Standalone APIs if generating an Angular app`,
+          type: 'boolean',
+        })
         .option('bundler', {
           describe: chalk.dim`Bundler to be used to build the application`,
           type: 'string',
@@ -234,6 +239,7 @@ async function main(parsedArgs: yargs.Arguments<Arguments>) {
     preset,
     appName,
     style,
+    standaloneApi,
     nxCloud,
     packageManager,
     defaultBase,
@@ -265,6 +271,7 @@ async function main(parsedArgs: yargs.Arguments<Arguments>) {
       preset,
       appName,
       style,
+      standaloneApi,
       nxCloud,
       defaultBase,
       framework,
@@ -322,7 +329,7 @@ async function getConfiguration(
   argv: yargs.Arguments<Arguments>
 ): Promise<void> {
   try {
-    let name, appName, style, preset, framework, bundler, docker;
+    let name, appName, style, preset, framework, bundler, docker, standaloneApi;
 
     output.log({
       title:
@@ -374,12 +381,20 @@ async function getConfiguration(
         if (preset === Preset.ReactStandalone) {
           bundler = await determineBundler(argv);
         }
+
+        if (preset === Preset.AngularStandalone) {
+          standaloneApi = await determineStandaloneApi(argv);
+        }
       } else {
         name = await determineRepoName(argv);
         appName = await determineAppName(preset, argv);
         if (preset === Preset.ReactMonorepo) {
           bundler = await determineBundler(argv);
         }
+
+        if (preset === Preset.AngularMonorepo) {
+          standaloneApi = await determineStandaloneApi(argv);
+        }
       }
       style = await determineStyle(preset, argv);
     }
@@ -395,6 +410,7 @@ async function getConfiguration(
       preset,
       appName,
       style,
+      standaloneApi,
       framework,
       cli,
       nxCloud,
@@ -739,6 +755,34 @@ async function determineFramework(
   return Promise.resolve(parsedArgs.framework);
 }
 
+async function determineStandaloneApi(
+  parsedArgs: yargs.Arguments<Arguments>
+): Promise<boolean> {
+  if (parsedArgs.standaloneApi === undefined) {
+    return enquirer
+      .prompt([
+        {
+          name: 'standaloneApi',
+          message: 'Would you like to use Standalone APIs in your application?',
+          type: 'autocomplete',
+          choices: [
+            {
+              name: 'Yes',
+            },
+
+            {
+              name: 'No',
+            },
+          ],
+          initial: 'No' as any,
+        },
+      ])
+      .then((a: { standaloneApi: 'Yes' | 'No' }) => a.standaloneApi === 'Yes');
+  }
+
+  return parsedArgs.standaloneApi;
+}
+
 async function determineDockerfile(
   parsedArgs: yargs.Arguments<Arguments>
 ): Promise<boolean> {

diff --git a/packages/workspace/src/generators/preset/preset.ts b/packages/workspace/src/generators/preset/preset.ts
@@ -32,6 +32,7 @@ async function createPreset(tree: Tree, options: Schema) {
       name: options.name,
       style: options.style,
       linter: options.linter,
+      standalone: options.standaloneApi,
     });
   } else if (options.preset === Preset.AngularStandalone) {
     const {
@@ -43,6 +44,7 @@ async function createPreset(tree: Tree, options: Schema) {
       style: options.style,
       linter: options.linter,
       rootProject: true,
+      standalone: options.standaloneApi,
     });
   } else if (options.preset === Preset.ReactMonorepo) {
     const {

diff --git a/packages/workspace/src/generators/preset/schema.d.ts b/packages/workspace/src/generators/preset/schema.d.ts
@@ -13,4 +13,5 @@ export interface Schema {
   packageManager?: PackageManager;
   bundler?: 'vite' | 'webpack';
   docker?: boolean;
+  standaloneApi?: boolean;
 }
diff --git a/packages/workspace/src/generators/preset/schema.json b/packages/workspace/src/generators/preset/schema.json
@@ -55,6 +55,11 @@
         ]
       }
     },
+    "standaloneApi": {
+      "description": "Use the Standalone APIs if generating an Angular application.",
+      "type": "boolean",
+      "default": "false"
+    },
     "standaloneConfig": {
       "description": "Split the project configurations into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
       "type": "boolean",