create-nx-workspace 17.2.8 → 17.3.0-beta.2

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -17,7 +22,7 @@
 
 # `> npx create-nx-workspace`
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 {{getting-started}}
 
@@ -63,5 +68,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

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

@@ -35,13 +35,7 @@ interface VueArguments extends BaseArguments {
     stack: 'vue';
     workspaceType: 'standalone' | 'integrated';
     appName: string;
-    style: string;
-    e2eTestRunner: 'none' | 'cypress' | 'playwright';
-}
-interface NuxtArguments extends BaseArguments {
-    stack: 'nuxt';
-    workspaceType: 'standalone' | 'integrated';
-    appName: string;
+    framework: 'none' | 'nuxt';
     style: string;
     e2eTestRunner: 'none' | 'cypress' | 'playwright';
 }
@@ -55,6 +49,6 @@ interface NodeArguments extends BaseArguments {
 interface UnknownStackArguments extends BaseArguments {
     stack: 'unknown';
 }
-type Arguments = NoneArguments | ReactArguments | AngularArguments | VueArguments | NuxtArguments | NodeArguments | UnknownStackArguments;
+type Arguments = NoneArguments | ReactArguments | AngularArguments | VueArguments | NodeArguments | UnknownStackArguments;
 export declare const commandsObject: yargs.Argv<Arguments>;
 export {};

package/bin/create-nx-workspace.js

@@ -32,8 +32,6 @@ 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',
@@ -249,10 +247,9 @@ async function determineStack(parsedArgs) {
                 return 'react';
             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.NuxtStandalone:
+                return 'vue';
             case preset_1.Preset.Nest:
             case preset_1.Preset.NodeStandalone:
             case preset_1.Preset.Express:
@@ -285,7 +282,7 @@ async function determineStack(parsedArgs) {
                 },
                 {
                     name: `vue`,
-                    message: `Vue:           Configures a Vue application with modern tooling.`,
+                    message: `Vue:           Configures a Vue application with your framework of choice.`,
                 },
                 {
                     name: `angular`,
@@ -310,8 +307,6 @@ async function determinePresetOptions(parsedArgs) {
             return determineAngularOptions(parsedArgs);
         case 'vue':
             return determineVueOptions(parsedArgs);
-        case 'nuxt':
-            return determineNuxtOptions(parsedArgs);
         case 'node':
             return determineNodeOptions(parsedArgs);
         default:
@@ -477,79 +472,38 @@ async function determineVueOptions(parsedArgs) {
     let e2eTestRunner = undefined;
     if (parsedArgs.preset) {
         preset = parsedArgs.preset;
-    }
-    else {
-        const workspaceType = await determineStandaloneOrMonorepo();
-        if (workspaceType === 'standalone') {
-            preset = preset_1.Preset.VueStandalone;
+        if (preset === preset_1.Preset.VueStandalone || preset === preset_1.Preset.NuxtStandalone) {
+            appName = parsedArgs.appName ?? parsedArgs.name;
         }
         else {
-            preset = preset_1.Preset.VueMonorepo;
+            appName = await determineAppName(parsedArgs);
         }
     }
-    if (preset === preset_1.Preset.VueStandalone) {
-        appName = parsedArgs.appName ?? parsedArgs.name;
-    }
-    else {
-        appName = await determineAppName(parsedArgs);
-    }
-    e2eTestRunner = await determineE2eTestRunner(parsedArgs);
-    if (parsedArgs.style) {
-        style = parsedArgs.style;
-    }
-    else {
-        const reply = await enquirer.prompt([
-            {
-                name: 'style',
-                message: `Default stylesheet format`,
-                initial: 'css',
-                type: 'autocomplete',
-                choices: [
-                    {
-                        name: 'css',
-                        message: 'CSS',
-                    },
-                    {
-                        name: 'scss',
-                        message: 'SASS(.scss)       [ http://sass-lang.com   ]',
-                    },
-                    {
-                        name: 'less',
-                        message: 'LESS              [ http://lesscss.org     ]',
-                    },
-                    {
-                        name: 'none',
-                        message: 'None',
-                    },
-                ],
-            },
-        ]);
-        style = reply.style;
-    }
-    return { preset, style, appName, e2eTestRunner };
-}
-async function determineNuxtOptions(parsedArgs) {
-    let preset;
-    let style = undefined;
-    let appName;
-    let e2eTestRunner = undefined;
-    if (parsedArgs.preset) {
-        preset = parsedArgs.preset;
-    }
     else {
         const workspaceType = await determineStandaloneOrMonorepo();
         if (workspaceType === 'standalone') {
-            preset = preset_1.Preset.NuxtStandalone;
+            appName = parsedArgs.appName ?? parsedArgs.name;
         }
         else {
-            preset = preset_1.Preset.Nuxt;
+            appName = await determineAppName(parsedArgs);
+        }
+        const framework = await determineVueFramework(parsedArgs);
+        if (framework === 'nuxt') {
+            if (workspaceType === 'standalone') {
+                preset = preset_1.Preset.NuxtStandalone;
+            }
+            else {
+                preset = preset_1.Preset.Nuxt;
+            }
+        }
+        else {
+            if (workspaceType === 'standalone') {
+                preset = preset_1.Preset.VueStandalone;
+            }
+            else {
+                preset = preset_1.Preset.VueMonorepo;
+            }
         }
-    }
-    if (preset === preset_1.Preset.NuxtStandalone) {
-        appName = parsedArgs.appName ?? parsedArgs.name;
-    }
-    else {
-        appName = await determineAppName(parsedArgs);
     }
     e2eTestRunner = await determineE2eTestRunner(parsedArgs);
     if (parsedArgs.style) {
@@ -910,6 +864,30 @@ async function determineNextAppDir(parsedArgs) {
     ]);
     return reply.nextAppDir === 'Yes';
 }
+async function determineVueFramework(parsedArgs) {
+    if (!!parsedArgs.framework)
+        return parsedArgs.framework;
+    const reply = await enquirer.prompt([
+        {
+            name: 'framework',
+            message: 'What framework would you like to use?',
+            type: 'autocomplete',
+            choices: [
+                {
+                    name: 'none',
+                    message: 'None',
+                    hint: '         I only want vue',
+                },
+                {
+                    name: 'nuxt',
+                    message: 'Nuxt          [ https://nuxt.com/ ]',
+                },
+            ],
+            initial: 'none',
+        },
+    ]);
+    return reply.framework;
+}
 async function determineNodeFramework(parsedArgs) {
     if (parsedArgs.framework)
         return parsedArgs.framework;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "create-nx-workspace",
-  "version": "17.2.8",
+  "version": "17.3.0-beta.2",
   "private": false,
-  "description": "Smart, Fast and Extensible Build System",
+  "description": "Smart Monorepos · Fast CI",
   "repository": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",

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

@@ -7,18 +7,18 @@ const output_1 = require("../output");
 const package_manager_1 = require("../package-manager");
 const error_utils_1 = require("../error-utils");
 async function setupNxCloud(directory, packageManager) {
-    const nxCloudSpinner = ora(`Setting up NxCloud`).start();
+    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('NxCloud has been set up successfully');
+        nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
         return res;
     }
     catch (e) {
         nxCloudSpinner.fail();
         if (e instanceof Error) {
             output_1.output.error({
-                title: `Failed to setup NxCloud`,
+                title: `Failed to setup Nx Cloud`,
                 bodyLines: (0, error_utils_1.mapErrorToBodyLines)(e),
             });
         }