create-nx-workspace 17.1.0-beta.2 → 17.1.0-beta.3

package/bin/create-nx-workspace.d.ts

@@ -28,6 +28,8 @@ interface AngularArguments extends BaseArguments {
     routing: boolean;
     standaloneApi: boolean;
     e2eTestRunner: 'none' | 'cypress' | 'playwright';
+    bundler: 'webpack' | 'esbuild';
+    ssr: boolean;
 }
 interface VueArguments extends BaseArguments {
     stack: 'vue';
@@ -36,6 +38,13 @@ interface VueArguments extends BaseArguments {
     style: string;
     e2eTestRunner: 'none' | 'cypress' | 'playwright';
 }
+interface NuxtArguments extends BaseArguments {
+    stack: 'nuxt';
+    workspaceType: 'standalone' | 'integrated';
+    appName: string;
+    style: string;
+    e2eTestRunner: 'none' | 'cypress' | 'playwright';
+}
 interface NodeArguments extends BaseArguments {
     stack: 'node';
     workspaceType: 'standalone' | 'integrated';
@@ -46,6 +55,6 @@ interface NodeArguments extends BaseArguments {
 interface UnknownStackArguments extends BaseArguments {
     stack: 'unknown';
 }
-type Arguments = NoneArguments | ReactArguments | AngularArguments | VueArguments | NodeArguments | UnknownStackArguments;
+type Arguments = NoneArguments | ReactArguments | AngularArguments | VueArguments | NuxtArguments | NodeArguments | UnknownStackArguments;
 export declare const commandsObject: yargs.Argv<Arguments>;
 export {};

package/bin/create-nx-workspace.js

@@ -32,6 +32,8 @@ exports.commandsObject = yargs
 })
     .option('preset', {
     describe: chalk.dim `Customizes the initial content of your workspace. Default presets include: [${Object.values(preset_1.Preset)
+        // TODO(katerina): Remove this option when @nx/nuxt is released.
+        .filter((p) => p !== preset_1.Preset.NuxtStandalone && p !== preset_1.Preset.Nuxt)
         .map((p) => `"${p}"`)
         .join(', ')}]. To build your own see https://nx.dev/extending-nx/recipes/create-preset`,
     type: 'string',
@@ -57,10 +59,12 @@ exports.commandsObject = yargs
     .option('standaloneApi', {
     describe: chalk.dim `Use Standalone Components if generating an Angular app`,
     type: 'boolean',
+    default: true,
 })
     .option('routing', {
     describe: chalk.dim `Add a routing setup for an Angular app`,
     type: 'boolean',
+    default: true,
 })
     .option('bundler', {
     describe: chalk.dim `Bundler to be used to build the app`,
@@ -82,6 +86,10 @@ exports.commandsObject = yargs
     describe: chalk.dim `Test runner to use for end to end (E2E) tests.`,
     choices: ['cypress', 'playwright', 'none'],
     type: 'string',
+})
+    .option('ssr', {
+    describe: chalk.dim `Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application`,
+    type: 'boolean',
 }), yargs_options_1.withNxCloud, yargs_options_1.withCI, yargs_options_1.withAllPrompts, yargs_options_1.withPackageManager, yargs_options_1.withGitOptions), async function handler(argv) {
     await main(argv).catch((error) => {
         const { version } = require('../package.json');
@@ -242,6 +250,9 @@ async function determineStack(parsedArgs) {
             case preset_1.Preset.VueStandalone:
             case preset_1.Preset.VueMonorepo:
                 return 'vue';
+            case preset_1.Preset.NuxtStandalone:
+            case preset_1.Preset.Nuxt:
+                return 'nuxt';
             case preset_1.Preset.Nest:
             case preset_1.Preset.NodeStandalone:
             case preset_1.Preset.Express:
@@ -299,6 +310,8 @@ async function determinePresetOptions(parsedArgs) {
             return determineAngularOptions(parsedArgs);
         case 'vue':
             return determineVueOptions(parsedArgs);
+        case 'nuxt':
+            return determineNuxtOptions(parsedArgs);
         case 'node':
             return determineNodeOptions(parsedArgs);
         default:
@@ -515,33 +528,30 @@ async function determineVueOptions(parsedArgs) {
     }
     return { preset, style, appName, e2eTestRunner };
 }
-async function determineAngularOptions(parsedArgs) {
+async function determineNuxtOptions(parsedArgs) {
     let preset;
-    let style;
+    let style = undefined;
     let appName;
-    let standaloneApi;
     let e2eTestRunner = undefined;
-    let routing;
-    if (parsedArgs.preset && parsedArgs.preset !== preset_1.Preset.Angular) {
+    if (parsedArgs.preset) {
         preset = parsedArgs.preset;
-        if (preset === preset_1.Preset.AngularStandalone) {
-            appName = parsedArgs.name;
-        }
-        else {
-            appName = await determineAppName(parsedArgs);
-        }
     }
     else {
         const workspaceType = await determineStandaloneOrMonorepo();
         if (workspaceType === 'standalone') {
-            preset = preset_1.Preset.AngularStandalone;
-            appName = parsedArgs.name;
+            preset = preset_1.Preset.NuxtStandalone;
         }
         else {
-            preset = preset_1.Preset.AngularMonorepo;
-            appName = await determineAppName(parsedArgs);
+            preset = preset_1.Preset.Nuxt;
         }
     }
+    if (preset === preset_1.Preset.NuxtStandalone) {
+        appName = parsedArgs.appName ?? parsedArgs.name;
+    }
+    else {
+        appName = await determineAppName(parsedArgs);
+    }
+    e2eTestRunner = await determineE2eTestRunner(parsedArgs);
     if (parsedArgs.style) {
         style = parsedArgs.style;
     }
@@ -565,57 +575,124 @@ async function determineAngularOptions(parsedArgs) {
                         name: 'less',
                         message: 'LESS              [ http://lesscss.org     ]',
                     },
+                    {
+                        name: 'none',
+                        message: 'None',
+                    },
                 ],
             },
         ]);
         style = reply.style;
     }
-    e2eTestRunner = await determineE2eTestRunner(parsedArgs);
-    if (parsedArgs.standaloneApi !== undefined) {
-        standaloneApi = parsedArgs.standaloneApi;
+    return { preset, style, appName, e2eTestRunner };
+}
+async function determineAngularOptions(parsedArgs) {
+    let preset;
+    let style;
+    let appName;
+    let e2eTestRunner = undefined;
+    let bundler = undefined;
+    let ssr = undefined;
+    const standaloneApi = parsedArgs.standaloneApi;
+    const routing = parsedArgs.routing;
+    if (parsedArgs.preset && parsedArgs.preset !== preset_1.Preset.Angular) {
+        preset = parsedArgs.preset;
+        if (preset === preset_1.Preset.AngularStandalone) {
+            appName = parsedArgs.name;
+        }
+        else {
+            appName = await determineAppName(parsedArgs);
+        }
+    }
+    else {
+        const workspaceType = await determineStandaloneOrMonorepo();
+        if (workspaceType === 'standalone') {
+            preset = preset_1.Preset.AngularStandalone;
+            appName = parsedArgs.name;
+        }
+        else {
+            preset = preset_1.Preset.AngularMonorepo;
+            appName = await determineAppName(parsedArgs);
+        }
+    }
+    if (parsedArgs.bundler) {
+        bundler = parsedArgs.bundler;
     }
     else {
         const reply = await enquirer.prompt([
             {
-                name: 'standaloneApi',
-                message: 'Would you like to use Standalone Components in your application?',
+                name: 'bundler',
+                message: `Which bundler would you like to use?`,
                 type: 'autocomplete',
                 choices: [
                     {
-                        name: 'No',
+                        name: 'esbuild',
+                        message: 'esbuild [ https://esbuild.github.io/ ]',
                     },
                     {
-                        name: 'Yes',
+                        name: 'webpack',
+                        message: 'Webpack [ https://webpack.js.org/ ]',
                     },
                 ],
-                initial: 'No',
+                initial: 'esbuild',
             },
         ]);
-        standaloneApi = reply.standaloneApi === 'Yes';
+        bundler = reply.bundler;
     }
-    if (parsedArgs.routing !== undefined) {
-        routing = parsedArgs.routing;
+    if (parsedArgs.style) {
+        style = parsedArgs.style;
     }
     else {
         const reply = await enquirer.prompt([
             {
-                name: 'routing',
-                message: 'Would you like to add routing?',
+                name: 'style',
+                message: `Default stylesheet format`,
+                initial: 'css',
                 type: 'autocomplete',
                 choices: [
                     {
-                        name: 'Yes',
+                        name: 'css',
+                        message: 'CSS',
                     },
                     {
-                        name: 'No',
+                        name: 'scss',
+                        message: 'SASS(.scss)       [ http://sass-lang.com   ]',
+                    },
+                    {
+                        name: 'less',
+                        message: 'LESS              [ http://lesscss.org     ]',
                     },
                 ],
-                initial: 'Yes',
             },
         ]);
-        routing = reply.routing === 'Yes';
+        style = reply.style;
     }
-    return { preset, style, appName, standaloneApi, routing, e2eTestRunner };
+    if (parsedArgs.ssr !== undefined) {
+        ssr = parsedArgs.ssr;
+    }
+    else {
+        const reply = await enquirer.prompt([
+            {
+                name: 'ssr',
+                message: 'Do you want to enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering)?',
+                type: 'autocomplete',
+                choices: [{ name: 'Yes' }, { name: 'No' }],
+                initial: 'No',
+            },
+        ]);
+        ssr = reply.ssr === 'Yes';
+    }
+    e2eTestRunner = await determineE2eTestRunner(parsedArgs);
+    return {
+        preset,
+        style,
+        appName,
+        standaloneApi,
+        routing,
+        e2eTestRunner,
+        bundler,
+        ssr,
+    };
 }
 async function determineNodeOptions(parsedArgs) {
     let preset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "17.1.0-beta.2",
+  "version": "17.1.0-beta.3",
   "private": false,
   "description": "Smart, Fast and Extensible Build System",
   "repository": {

package/src/utils/preset/preset-options.js

@@ -23,6 +23,10 @@ exports.presetOptions = [
         name: preset_1.Preset.VueMonorepo,
         message: 'vue               [a monorepo with a single Vue application]',
     },
+    {
+        name: preset_1.Preset.Nuxt,
+        message: 'nuxt              [a monorepo with a single Nuxt application]',
+    },
     {
         name: preset_1.Preset.NextJs,
         message: 'next.js           [a monorepo with a single Next.js application]',

package/src/utils/preset/preset.d.ts

@@ -11,6 +11,8 @@ export declare enum Preset {
     ReactStandalone = "react-standalone",
     VueMonorepo = "vue-monorepo",
     VueStandalone = "vue-standalone",
+    Nuxt = "nuxt",
+    NuxtStandalone = "nuxt-standalone",
     NextJs = "next",
     NextJsStandalone = "nextjs-standalone",
     ReactNative = "react-native",

package/src/utils/preset/preset.js

@@ -15,6 +15,8 @@ var Preset;
     Preset["ReactStandalone"] = "react-standalone";
     Preset["VueMonorepo"] = "vue-monorepo";
     Preset["VueStandalone"] = "vue-standalone";
+    Preset["Nuxt"] = "nuxt";
+    Preset["NuxtStandalone"] = "nuxt-standalone";
     Preset["NextJs"] = "next";
     Preset["NextJsStandalone"] = "nextjs-standalone";
     Preset["ReactNative"] = "react-native";