create-nx-workspace 20.2.0-beta.2 → 20.2.0-beta.4

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

@@ -21,6 +21,9 @@ interface ReactArguments extends BaseArguments {
     nextAppDir: boolean;
     nextSrcDir: boolean;
     e2eTestRunner: 'none' | 'cypress' | 'playwright';
+    linter?: 'none' | 'eslint';
+    formatter?: 'none' | 'prettier';
+    workspaces?: boolean;
 }
 interface AngularArguments extends BaseArguments {
     stack: 'angular';

package/bin/create-nx-workspace.js

@@ -8,7 +8,6 @@ const create_workspace_1 = require("../src/create-workspace");
 const preset_1 = require("../src/utils/preset/preset");
 const output_1 = require("../src/utils/output");
 const nx_version_1 = require("../src/utils/nx/nx-version");
-const point_to_tutorial_and_course_1 = require("../src/utils/preset/point-to-tutorial-and-course");
 const decorator_1 = require("./decorator");
 const get_third_party_preset_1 = require("../src/utils/preset/get-third-party-preset");
 const prompts_1 = require("../src/internal-utils/prompts");
@@ -17,6 +16,7 @@ const ab_testing_1 = require("../src/utils/nx/ab-testing");
 const error_utils_1 = require("../src/utils/error-utils");
 const fs_1 = require("fs");
 const is_ci_1 = require("../src/utils/ci/is-ci");
+const social_information_1 = require("../src/utils/social-information");
 exports.commandsObject = yargs
     .wrap(yargs.terminalWidth())
     .parserConfiguration({
@@ -69,6 +69,15 @@ exports.commandsObject = yargs
     .option('bundler', {
     describe: chalk.dim `Bundler to be used to build the app.`,
     type: 'string',
+})
+    .option('workspaces', {
+    describe: chalk.dim `Use package manager workspaces.`,
+    type: 'boolean',
+    default: false,
+})
+    .option('formatter', {
+    describe: chalk.dim `Code formatter to use.`,
+    type: 'string',
 })
     .option('framework', {
     describe: chalk.dim `Framework option to be used with certain stacks.`,
@@ -126,10 +135,10 @@ async function main(parsedArgs) {
         ],
     });
     if (parsedArgs.nxCloud && workspaceInfo.nxCloudInfo) {
-        console.log(workspaceInfo.nxCloudInfo);
+        process.stdout.write(workspaceInfo.nxCloudInfo);
     }
     if ((0, preset_1.isKnownPreset)(parsedArgs.preset)) {
-        (0, point_to_tutorial_and_course_1.pointToTutorialAndCourse)(parsedArgs.preset);
+        (0, social_information_1.printSocialInformation)();
     }
     else {
         output_1.output.log({
@@ -307,30 +316,55 @@ async function determinePresetOptions(parsedArgs) {
             return parsedArgs;
     }
 }
+async function determineFormatterOptions(args) {
+    if (args.formatter)
+        return args.formatter;
+    const reply = await enquirer.prompt([
+        {
+            name: 'prettier',
+            message: `Would you like to use Prettier for code formatting?`,
+            type: 'autocomplete',
+            choices: [
+                {
+                    name: 'Yes',
+                },
+                {
+                    name: 'No',
+                },
+            ],
+            initial: 1,
+            skip: !args.interactive || (0, is_ci_1.isCI)(),
+        },
+    ]);
+    return reply.prettier === 'Yes' ? 'prettier' : 'none';
+}
+async function determineLinterOptions(args) {
+    const reply = await enquirer.prompt([
+        {
+            name: 'eslint',
+            message: `Would you like to use ESLint?`,
+            type: 'autocomplete',
+            choices: [
+                {
+                    name: 'Yes',
+                },
+                {
+                    name: 'No',
+                },
+            ],
+            initial: 1,
+            skip: !args.interactive || (0, is_ci_1.isCI)(),
+        },
+    ]);
+    return reply.eslint === 'Yes' ? 'eslint' : 'none';
+}
 async function determineNoneOptions(parsedArgs) {
     if ((!parsedArgs.preset || parsedArgs.preset === preset_1.Preset.TS) &&
         process.env.NX_ADD_PLUGINS !== 'false' &&
         process.env.NX_ADD_TS_PLUGIN !== 'false') {
-        const reply = await enquirer.prompt([
-            {
-                name: 'prettier',
-                message: `Would you like to use Prettier for code formatting?`,
-                type: 'autocomplete',
-                choices: [
-                    {
-                        name: 'Yes',
-                    },
-                    {
-                        name: 'No',
-                    },
-                ],
-                initial: 1,
-                skip: !parsedArgs.interactive || (0, is_ci_1.isCI)(),
-            },
-        ]);
         return {
             preset: preset_1.Preset.TS,
-            formatter: reply.prettier === 'Yes' ? 'prettier' : 'none',
+            formatter: await determineFormatterOptions(parsedArgs),
         };
     }
     else {
@@ -392,6 +426,9 @@ async function determineReactOptions(parsedArgs) {
     let e2eTestRunner = undefined;
     let nextAppDir = false;
     let nextSrcDir = false;
+    let linter;
+    let formatter;
+    const workspaces = parsedArgs.workspaces ?? false;
     if (parsedArgs.preset && parsedArgs.preset !== preset_1.Preset.React) {
         preset = parsedArgs.preset;
         if (preset === preset_1.Preset.ReactStandalone ||
@@ -405,19 +442,17 @@ async function determineReactOptions(parsedArgs) {
     }
     else {
         const framework = await determineReactFramework(parsedArgs);
-        // React Native and Expo only support integrated monorepos for now.
-        // TODO(jack): Add standalone support for React Native and Expo.
-        const workspaceType = framework === 'react-native' || framework === 'expo'
-            ? 'integrated'
-            : await determineStandaloneOrMonorepo();
-        if (workspaceType === 'standalone') {
+        const isStandalone = workspaces || framework === 'react-native' || framework === 'expo'
+            ? false
+            : (await determineStandaloneOrMonorepo()) === 'standalone';
+        if (isStandalone) {
             appName = parsedArgs.name;
         }
         else {
             appName = await determineAppName(parsedArgs);
         }
         if (framework === 'nextjs') {
-            if (workspaceType === 'standalone') {
+            if (isStandalone) {
                 preset = preset_1.Preset.NextJsStandalone;
             }
             else {
@@ -425,7 +460,7 @@ async function determineReactOptions(parsedArgs) {
             }
         }
         else if (framework === 'remix') {
-            if (workspaceType === 'standalone') {
+            if (isStandalone) {
                 preset = preset_1.Preset.RemixStandalone;
             }
             else {
@@ -439,7 +474,7 @@ async function determineReactOptions(parsedArgs) {
             preset = preset_1.Preset.Expo;
         }
         else {
-            if (workspaceType === 'standalone') {
+            if (isStandalone) {
                 preset = preset_1.Preset.ReactStandalone;
             }
             else {
@@ -510,6 +545,14 @@ async function determineReactOptions(parsedArgs) {
         ]);
         style = reply.style;
     }
+    if (workspaces) {
+        linter = await determineLinterOptions(parsedArgs);
+        formatter = await determineFormatterOptions(parsedArgs);
+    }
+    else {
+        linter = 'eslint';
+        formatter = 'prettier';
+    }
     return {
         preset,
         style,
@@ -518,6 +561,9 @@ async function determineReactOptions(parsedArgs) {
         nextAppDir,
         nextSrcDir,
         e2eTestRunner,
+        linter,
+        formatter,
+        workspaces,
     };
 }
 async function determineVueOptions(parsedArgs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "20.2.0-beta.2",
+  "version": "20.2.0-beta.4",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {

package/src/create-workspace.js

@@ -11,14 +11,16 @@ const setup_ci_1 = require("./utils/ci/setup-ci");
 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) {
     const { packageManager, name, nxCloud, skipGit = false, defaultBase = 'main', commit, cliName, useGitHub, } = options;
     if (cliName) {
         output_1.output.setCliName(cliName ?? 'NX');
     }
     const tmpDir = await (0, create_sandbox_1.createSandbox)(packageManager);
+    const workspaceGlobs = getWorkspaceGlobsFromPreset(preset);
     // 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 });
+    const directory = await (0, create_empty_workspace_1.createEmptyWorkspace)(tmpDir, name, packageManager, { ...options, preset, workspaceGlobs });
     // If the preset is a third-party preset, we need to call createPreset to install it
     // For first-party presets, it will be created by createEmptyWorkspace instead.
     // In createEmptyWorkspace, it will call `nx new` -> `@nx/workspace newGenerator` -> `@nx/workspace generatePreset`.
@@ -63,3 +65,23 @@ function extractConnectUrl(text) {
     const match = text.match(urlPattern);
     return match ? match[0] : null;
 }
+function getWorkspaceGlobsFromPreset(preset) {
+    // Should match how apps are created in `packages/workspace/src/generators/preset/preset.ts`.
+    switch (preset) {
+        case preset_1.Preset.AngularMonorepo:
+        case preset_1.Preset.Expo:
+        case preset_1.Preset.Express:
+        case preset_1.Preset.Nest:
+        case preset_1.Preset.NextJs:
+        case preset_1.Preset.NodeMonorepo:
+        case preset_1.Preset.Nuxt:
+        case preset_1.Preset.ReactNative:
+        case preset_1.Preset.ReactMonorepo:
+        case preset_1.Preset.RemixMonorepo:
+        case preset_1.Preset.VueMonorepo:
+        case preset_1.Preset.WebComponents:
+            return ['apps/**', 'packages/**'];
+        default:
+            return ['packages/**'];
+    }
+}

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

@@ -1,4 +1,4 @@
-export type NxCloud = 'yes' | 'github' | 'circleci' | 'skip';
+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<{
     output: string;

package/src/utils/output.js

@@ -117,7 +117,6 @@ class CLIOutput {
             title: chalk.green(title),
         });
         this.writeOptionalOutputBody(bodyLines);
-        this.addNewline();
     }
     logSingleLine(message) {
         this.addNewline();

package/src/utils/social-information.d.ts

@@ -0,0 +1 @@
+export declare function printSocialInformation(): void;

package/src/utils/social-information.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printSocialInformation = printSocialInformation;
+const output_1 = require("./output");
+function printSocialInformation() {
+    output_1.output.success({
+        title: 'Welcome to the Nx community! 👋',
+        bodyLines: [
+            '🌟 Star Nx on GitHub: https://github.com/nrwl/nx',
+            '📢 Stay up to date on X: https://x.com/nxdevtools',
+            '💬 Discuss Nx on Discord: https://go.nx.dev/community',
+        ],
+    });
+}

package/src/utils/preset/point-to-tutorial-and-course.d.ts

@@ -1,2 +0,0 @@
-import { Preset } from './preset';
-export declare function pointToTutorialAndCourse(preset: Preset): void;

package/src/utils/preset/point-to-tutorial-and-course.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pointToTutorialAndCourse = pointToTutorialAndCourse;
-const output_1 = require("../output");
-const preset_1 = require("./preset");
-function pointToTutorialAndCourse(preset) {
-    const title = `First time using Nx? Check out this interactive Nx tutorial.`;
-    switch (preset) {
-        case preset_1.Preset.NPM:
-        case preset_1.Preset.Apps:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [
-                    `https://nx.dev/getting-started/tutorials/npm-workspaces-tutorial`,
-                ],
-            });
-            break;
-        case preset_1.Preset.TS:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [
-                    `https://nx.dev/getting-started/tutorials/integrated-repo-tutorial`,
-                ],
-            });
-            break;
-        case preset_1.Preset.ReactStandalone:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [
-                    `https://nx.dev/getting-started/tutorials/react-standalone-tutorial`,
-                ],
-            });
-            break;
-        case preset_1.Preset.ReactMonorepo:
-        case preset_1.Preset.NextJs:
-        case preset_1.Preset.NextJsStandalone:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [`https://nx.dev/react-tutorial/1-code-generation`],
-            });
-            break;
-        case preset_1.Preset.AngularStandalone:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [
-                    `https://nx.dev/getting-started/tutorials/angular-standalone-tutorial`,
-                ],
-            });
-            break;
-        case preset_1.Preset.AngularMonorepo:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [`https://nx.dev/angular-tutorial/1-code-generation`],
-            });
-            break;
-        case preset_1.Preset.Express:
-        case preset_1.Preset.NodeStandalone:
-            output_1.output.addVerticalSeparator();
-            output_1.output.note({
-                title,
-                bodyLines: [
-                    `https://nx.dev/getting-started/tutorials/node-server-tutorial`,
-                ],
-            });
-            break;
-    }
-}

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

@@ -1,5 +0,0 @@
-import { Preset } from './preset';
-export declare const presetOptions: {
-    name: Preset;
-    message: string;
-}[];

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

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.presetOptions = void 0;
-const preset_1 = require("./preset");
-exports.presetOptions = [
-    {
-        name: preset_1.Preset.Apps,
-        message: 'apps              [an empty monorepo with no plugins with a layout that works best for building apps]',
-    },
-    {
-        name: preset_1.Preset.TS,
-        message: 'ts                [an empty monorepo with the JS/TS plugin preinstalled]',
-    },
-    {
-        name: preset_1.Preset.ReactMonorepo,
-        message: 'react             [a monorepo with a single React application]',
-    },
-    {
-        name: preset_1.Preset.AngularMonorepo,
-        message: 'angular           [a monorepo with a single Angular application]',
-    },
-    {
-        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]',
-    },
-    {
-        name: preset_1.Preset.Nest,
-        message: 'nest              [a monorepo with a single Nest application]',
-    },
-    {
-        name: preset_1.Preset.ReactNative,
-        message: 'react-native      [a monorepo with a single React Native application]',
-    },
-];