@nestjs/cli 11.0.0-next.1 → 11.0.0-next.3

package/actions/build.action.js

@@ -49,8 +49,7 @@ class BuildAction extends abstract_action_1.AbstractAction {
     async runBuild(commandInputs, commandOptions, watchMode, watchAssetsMode, isDebugEnabled = false, onSuccess) {
         const configFileName = commandOptions.find((option) => option.name === 'config').value;
         const configuration = await this.loader.load(configFileName);
-        const buildAll = commandOptions.find((opt) => opt.name === 'all')
-            .value;
+        const buildAll = commandOptions.find((opt) => opt.name === 'all')?.value;
         let appNames;
         if (buildAll) {
             // If the "all" flag is set, we need to build all projects in a monorepo.
@@ -85,82 +84,53 @@ class BuildAction extends abstract_action_1.AbstractAction {
             }
             switch (builder.type) {
                 case 'tsc':
-                    await this.runTsc(watchMode, commandOptions, configuration, pathToTsconfig, appName);
+                    await this.runTsc(watchMode, commandOptions, configuration, pathToTsconfig, appName, onSuccess);
                     break;
                 case 'webpack':
-                    await this.runWebpack(configuration, appName, commandOptions, pathToTsconfig, isDebugEnabled, watchMode);
+                    await this.runWebpack(configuration, appName, commandOptions, pathToTsconfig, isDebugEnabled, watchMode, onSuccess);
                     break;
                 case 'swc':
-                    await this.runSwc(configuration, appName, pathToTsconfig, watchMode, commandOptions, tsOptions);
+                    await this.runSwc(configuration, appName, pathToTsconfig, watchMode, commandOptions, tsOptions, onSuccess);
                     break;
             }
         }
-        onSuccess?.();
     }
-    async runSwc(configuration, appName, pathToTsconfig, watchMode, options, tsOptions) {
+    async runSwc(configuration, appName, pathToTsconfig, watchMode, options, tsOptions, onSuccess) {
         const { SwcCompiler } = await Promise.resolve().then(() => require('../lib/compiler/swc/swc-compiler'));
         const swc = new SwcCompiler(this.pluginsLoader);
-        return new Promise((onSuccess, onError) => {
-            try {
-                swc.run(configuration, pathToTsconfig, appName, {
-                    watch: watchMode,
-                    typeCheck: (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.typeCheck', appName, 'typeCheck', options),
-                    tsOptions,
-                    assetsManager: this.assetsManager,
-                }, onSuccess);
-            }
-            catch (error) {
-                onError(error);
-            }
-        });
+        await swc.run(configuration, pathToTsconfig, appName, {
+            watch: watchMode,
+            typeCheck: (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.typeCheck', appName, 'typeCheck', options),
+            tsOptions,
+            assetsManager: this.assetsManager,
+        }, onSuccess);
     }
-    async runWebpack(configuration, appName, commandOptions, pathToTsconfig, debug, watchMode) {
+    async runWebpack(configuration, appName, commandOptions, pathToTsconfig, debug, watchMode, onSuccess) {
         const { WebpackCompiler } = await Promise.resolve().then(() => require('../lib/compiler/webpack-compiler'));
         const webpackCompiler = new WebpackCompiler(this.pluginsLoader);
         const webpackPath = (0, get_webpack_config_path_1.getWebpackConfigPath)(configuration, commandOptions, appName) ??
             defaults_1.defaultWebpackConfigFilename;
         const webpackConfigFactoryOrConfig = this.getWebpackConfigFactoryByPath(webpackPath, defaults_1.defaultWebpackConfigFilename);
-        return new Promise((onSuccess, onError) => {
-            try {
-                return webpackCompiler.run(configuration, pathToTsconfig, appName, {
-                    inputs: commandOptions,
-                    webpackConfigFactoryOrConfig,
-                    debug,
-                    watchMode,
-                    assetsManager: this.assetsManager,
-                }, onSuccess);
-            }
-            catch (error) {
-                onError(error);
-            }
-        });
+        return webpackCompiler.run(configuration, pathToTsconfig, appName, {
+            inputs: commandOptions,
+            webpackConfigFactoryOrConfig,
+            debug,
+            watchMode,
+            assetsManager: this.assetsManager,
+        }, onSuccess);
     }
-    async runTsc(watchMode, options, configuration, pathToTsconfig, appName) {
+    async runTsc(watchMode, options, configuration, pathToTsconfig, appName, onSuccess) {
         if (watchMode) {
             const { WatchCompiler } = await Promise.resolve().then(() => require('../lib/compiler/watch-compiler'));
             const watchCompiler = new WatchCompiler(this.pluginsLoader, this.tsConfigProvider, this.tsLoader);
             const isPreserveWatchOutputEnabled = options.find((option) => option.name === 'preserveWatchOutput' && option.value === true)?.value;
-            return new Promise((onSuccess, onError) => {
-                try {
-                    watchCompiler.run(configuration, pathToTsconfig, appName, { preserveWatchOutput: isPreserveWatchOutputEnabled }, onSuccess);
-                }
-                catch (error) {
-                    onError(error);
-                }
-            });
+            watchCompiler.run(configuration, pathToTsconfig, appName, { preserveWatchOutput: isPreserveWatchOutputEnabled }, onSuccess);
         }
         else {
             const { Compiler } = await Promise.resolve().then(() => require('../lib/compiler/compiler'));
             const compiler = new Compiler(this.pluginsLoader, this.tsConfigProvider, this.tsLoader);
-            return new Promise((onSuccess, onError) => {
-                try {
-                    compiler.run(configuration, pathToTsconfig, appName, undefined, onSuccess);
-                    this.assetsManager.closeWatchers();
-                }
-                catch (error) {
-                    onError(error);
-                }
-            });
+            compiler.run(configuration, pathToTsconfig, appName, undefined, onSuccess);
+            this.assetsManager.closeWatchers();
         }
     }
     getWebpackConfigFactoryByPath(webpackPath, defaultPath) {

package/actions/new.action.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exit = exports.retrieveCols = exports.NewAction = void 0;
+const prompts_1 = require("@inquirer/prompts");
 const chalk = require("chalk");
 const child_process_1 = require("child_process");
 const fs = require("fs");
@@ -12,8 +13,8 @@ const git_runner_1 = require("../lib/runners/git.runner");
 const schematics_1 = require("../lib/schematics");
 const ui_1 = require("../lib/ui");
 const formatting_1 = require("../lib/utils/formatting");
+const gracefully_exit_on_prompt_error_1 = require("../lib/utils/gracefully-exit-on-prompt-error");
 const abstract_action_1 = require("./abstract.action");
-const prompts_1 = require("@inquirer/prompts");
 class NewAction extends abstract_action_1.AbstractAction {
     async handle(inputs, options) {
         const directoryOption = options.find((option) => option.name === 'directory');
@@ -51,17 +52,20 @@ const askForMissingInformation = async (inputs, options) => {
     if (!nameInput.value) {
         const message = ui_1.MESSAGES.PROJECT_NAME_QUESTION;
         const question = (0, questions_1.generateInput)('name', message)('nest-app');
-        const answer = await (0, prompts_1.input)(question);
+        const answer = await (0, prompts_1.input)(question).catch(gracefully_exit_on_prompt_error_1.gracefullyExitOnPromptError);
         replaceInputMissingInformation(inputs, { name: 'name', value: answer });
     }
     const packageManagerInput = getPackageManagerInput(options);
     if (!packageManagerInput.value) {
         const answer = await askForPackageManager();
-        replaceInputMissingInformation(options, { name: 'packageManager', value: answer });
+        replaceInputMissingInformation(options, {
+            name: 'packageManager',
+            value: answer,
+        });
     }
 };
 const replaceInputMissingInformation = (inputs, answer) => {
-    const input = inputs.find(input => input.name === answer.name);
+    const input = inputs.find((input) => input.name === answer.name);
     if (input) {
         input.value = input.value !== undefined ? input.value : answer.value;
     }
@@ -101,12 +105,8 @@ const installPackages = async (options, dryRunMode, installDirectory) => {
     }
 };
 const askForPackageManager = async () => {
-    const question = (0, questions_1.generateSelect)('packageManager')(ui_1.MESSAGES.PACKAGE_MANAGER_QUESTION)([
-        package_managers_1.PackageManager.NPM,
-        package_managers_1.PackageManager.YARN,
-        package_managers_1.PackageManager.PNPM,
-    ]);
-    return (0, prompts_1.select)(question);
+    const question = (0, questions_1.generateSelect)('packageManager')(ui_1.MESSAGES.PACKAGE_MANAGER_QUESTION)([package_managers_1.PackageManager.NPM, package_managers_1.PackageManager.YARN, package_managers_1.PackageManager.PNPM]);
+    return (0, prompts_1.select)(question).catch(gracefully_exit_on_prompt_error_1.gracefullyExitOnPromptError);
 };
 const initializeGitRepository = async (dir) => {
     const runner = new git_runner_1.GitRunner();

package/commands/start.command.js

@@ -24,6 +24,7 @@ class StartCommand extends abstract_command_1.AbstractCommand {
             .option('-e, --exec [binary]', 'Binary to run (default: "node").')
             .option('--preserveWatchOutput', 'Use "preserveWatchOutput" option when using tsc watch mode.')
             .option('--shell', "Spawn child processes within a shell (see node's child_process.spawn() method docs). Default: true.", true)
+            .option('--no-shell', 'Do not spawn child processes within a shell.')
             .description('Run Nest application.')
             .action(async (app, command) => {
             const options = [];

package/lib/ui/emojis.d.ts

@@ -12,7 +12,7 @@ export declare const EMOJIS: {
     SMIRK: string;
     RAISED_HANDS: string;
     POINT_RIGHT: string;
-    ZAP: string;
+    SPARKLES: string;
     BOOM: string;
     PRAY: string;
     WINE: string;

package/lib/ui/emojis.js

@@ -16,7 +16,7 @@ exports.EMOJIS = {
     SMIRK: (0, node_emoji_1.get)('smirk_cat'),
     RAISED_HANDS: (0, node_emoji_1.get)('raised_hands'),
     POINT_RIGHT: (0, node_emoji_1.get)('point_right'),
-    ZAP: (0, node_emoji_1.get)('zap'),
+    SPARKLES: (0, node_emoji_1.get)('sparkles'),
     BOOM: (0, node_emoji_1.get)('boom'),
     PRAY: (0, node_emoji_1.get)('pray'),
     WINE: (0, node_emoji_1.get)('wine_glass'),

package/lib/ui/messages.js

@@ -8,7 +8,7 @@ exports.MESSAGES = {
     PROJECT_SELECTION_QUESTION: 'Which project would you like to generate to?',
     LIBRARY_PROJECT_SELECTION_QUESTION: 'Which project would you like to add the library to?',
     DRY_RUN_MODE: 'Command has been executed in dry run mode, nothing changed!',
-    PROJECT_INFORMATION_START: `${emojis_1.EMOJIS.ZAP}  We will scaffold your app in a few seconds..`,
+    PROJECT_INFORMATION_START: `${emojis_1.EMOJIS.SPARKLES} We will scaffold your app in a few seconds..`,
     RUNNER_EXECUTION_ERROR: (command) => `\nFailed to execute command: ${command}`,
     PACKAGE_MANAGER_QUESTION: `Which package manager would you ${emojis_1.EMOJIS.HEART} to use?`,
     PACKAGE_MANAGER_INSTALLATION_IN_PROGRESS: `Installation in progress... ${emojis_1.EMOJIS.COFFEE}`,

package/lib/utils/gracefully-exit-on-prompt-error.d.ts

@@ -0,0 +1 @@
+export declare function gracefullyExitOnPromptError(err: Error): void;

package/lib/utils/gracefully-exit-on-prompt-error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gracefullyExitOnPromptError = gracefullyExitOnPromptError;
+function gracefullyExitOnPromptError(err) {
+    if (err.name === 'ExitPromptError') {
+        process.exit(1);
+    }
+    else {
+        throw err;
+    }
+}

package/lib/utils/project-utils.js

@@ -10,6 +10,7 @@ exports.hasValidOptionFlag = hasValidOptionFlag;
 const prompts_1 = require("@inquirer/prompts");
 const get_value_or_default_1 = require("../compiler/helpers/get-value-or-default");
 const questions_1 = require("../questions/questions");
+const gracefully_exit_on_prompt_error_1 = require("./gracefully-exit-on-prompt-error");
 function shouldAskForProject(schematic, configurationProjects, appName) {
     return (['app', 'sub-app', 'library', 'lib'].includes(schematic) === false &&
         configurationProjects &&
@@ -66,10 +67,8 @@ function getSpecFileSuffix(configuration, appName, specFileSuffixValue) {
     return specFileSuffixValue;
 }
 async function askForProjectName(promptQuestion, projects) {
-    const questions = [
-        (0, questions_1.generateSelect)('appName')(promptQuestion)(projects),
-    ];
-    return (0, prompts_1.select)(questions);
+    const questions = [(0, questions_1.generateSelect)('appName')(promptQuestion)(projects)];
+    return (0, prompts_1.select)(questions).catch(gracefully_exit_on_prompt_error_1.gracefullyExitOnPromptError);
 }
 function moveDefaultProjectToStart(configuration, defaultProjectName, defaultLabel) {
     let projects = configuration.projects != null ? Object.keys(configuration.projects) : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "11.0.0-next.1",
+  "version": "11.0.0-next.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"