@nestjs/cli 9.1.5 → 9.1.7

package/.circleci/config.yml

@@ -21,12 +21,12 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:17.9
+      - image: cimg/node:19.3
     steps:
       - checkout
       - run:
           name: Update NPM version
-          command: npm install -g npm@latest
+          command: sudo npm install -g npm@latest
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:
@@ -43,7 +43,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:17.9
+      - image: cimg/node:19.3
     steps:
       - checkout
       - *restore-cache

package/actions/build.action.js

@@ -88,7 +88,6 @@ class BuildAction extends abstract_action_1.AbstractAction {
             }
             else {
                 this.compiler.run(configuration, pathToTsconfig, appName, onSuccess);
-                this.assetsManager.closeWatchers();
             }
         });
     }

package/actions/new.action.js

@@ -30,7 +30,7 @@ class NewAction extends abstract_action_1.AbstractAction {
             const directoryOption = options.find((option) => option.name === 'directory');
             const dryRunOption = options.find((option) => option.name === 'dry-run');
             const isDryRunEnabled = dryRunOption && dryRunOption.value;
-            yield askForMissingInformation(inputs);
+            yield askForMissingInformation(inputs, options);
             yield generateApplicationFiles(inputs, options).catch(exports.exit);
             const shouldSkipInstall = options.some((option) => option.name === 'skip-install' && option.value === true);
             const shouldSkipGit = options.some((option) => option.name === 'skip-git' && option.value === true);
@@ -51,11 +51,12 @@ class NewAction extends abstract_action_1.AbstractAction {
 }
 exports.NewAction = NewAction;
 const getApplicationNameInput = (inputs) => inputs.find((input) => input.name === 'name');
+const getPackageManagerInput = (inputs) => inputs.find((options) => options.name === 'packageManager');
 const getProjectDirectory = (applicationName, directoryOption) => {
     return ((directoryOption && directoryOption.value) ||
         (0, formatting_1.normalizeToKebabOrSnakeCase)(applicationName.value));
 };
-const askForMissingInformation = (inputs) => __awaiter(void 0, void 0, void 0, function* () {
+const askForMissingInformation = (inputs, options) => __awaiter(void 0, void 0, void 0, function* () {
     console.info(ui_1.MESSAGES.PROJECT_INFORMATION_START);
     console.info();
     const prompt = inquirer.createPromptModule();
@@ -66,6 +67,11 @@ const askForMissingInformation = (inputs) => __awaiter(void 0, void 0, void 0, f
         const answers = yield prompt(questions);
         replaceInputMissingInformation(inputs, answers);
     }
+    const packageManagerInput = getPackageManagerInput(options);
+    if (!packageManagerInput.value) {
+        const answers = yield askForPackageManager();
+        replaceInputMissingInformation(options, answers);
+    }
 });
 const replaceInputMissingInformation = (inputs, answers) => {
     return inputs.map((input) => (input.value =
@@ -80,15 +86,14 @@ const generateApplicationFiles = (args, options) => __awaiter(void 0, void 0, vo
 });
 const mapSchematicOptions = (options) => {
     return options.reduce((schematicOptions, option) => {
-        if (option.name !== 'skip-install' &&
-            option.value !== 'package-manager') {
+        if (option.name !== 'skip-install') {
             schematicOptions.push(new schematics_1.SchematicOption(option.name, option.value));
         }
         return schematicOptions;
     }, []);
 };
 const installPackages = (options, dryRunMode, installDirectory) => __awaiter(void 0, void 0, void 0, function* () {
-    const inputPackageManager = options.find((option) => option.name === 'package-manager').value;
+    const inputPackageManager = getPackageManagerInput(options).value;
     let packageManager;
     if (dryRunMode) {
         console.info();
@@ -96,29 +101,19 @@ const installPackages = (options, dryRunMode, installDirectory) => __awaiter(voi
         console.info();
         return;
     }
-    if (inputPackageManager !== undefined) {
-        try {
-            packageManager = package_managers_1.PackageManagerFactory.create(inputPackageManager);
-            yield packageManager.install(installDirectory, inputPackageManager);
-        }
-        catch (error) {
-            if (error && error.message) {
-                console.error(chalk.red(error.message));
-            }
-        }
+    try {
+        packageManager = package_managers_1.PackageManagerFactory.create(inputPackageManager);
+        yield packageManager.install(installDirectory, inputPackageManager);
     }
-    else {
-        packageManager = yield selectPackageManager();
-        yield packageManager.install(installDirectory, packageManager.name.toLowerCase());
+    catch (error) {
+        if (error && error.message) {
+            console.error(chalk.red(error.message));
+        }
     }
 });
-const selectPackageManager = () => __awaiter(void 0, void 0, void 0, function* () {
-    const answers = yield askForPackageManager();
-    return package_managers_1.PackageManagerFactory.create(answers['package-manager']);
-});
 const askForPackageManager = () => __awaiter(void 0, void 0, void 0, function* () {
     const questions = [
-        (0, questions_1.generateSelect)('package-manager')(ui_1.MESSAGES.PACKAGE_MANAGER_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,

package/commands/new.command.js

@@ -22,7 +22,7 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             .option('-d, --dry-run', 'Report actions that would be performed without writing out results.', false)
             .option('-g, --skip-git', 'Skip git repository initialization.', false)
             .option('-s, --skip-install', 'Skip package installation.', false)
-            .option('-p, --package-manager [package-manager]', 'Specify package manager.')
+            .option('-p, --package-manager [packageManager]', 'Specify package manager.')
             .option('-l, --language [language]', 'Programming language to be used (TypeScript or JavaScript)', 'TypeScript')
             .option('-c, --collection [collectionName]', 'Schematics collection to use', schematics_1.Collection.NESTJS)
             .option('--strict', 'Enables strict mode in TypeScript.', false)
@@ -35,7 +35,7 @@ class NewCommand extends abstract_command_1.AbstractCommand {
             options.push({ name: 'skip-install', value: command.skipInstall });
             options.push({ name: 'strict', value: command.strict });
             options.push({
-                name: 'package-manager',
+                name: 'packageManager',
                 value: command.packageManager,
             });
             options.push({ name: 'collection', value: command.collection });

package/commands/start.command.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartCommand = void 0;
+const remaining_flags_1 = require("../lib/utils/remaining-flags");
 const abstract_command_1 = require("./abstract.command");
 class StartCommand extends abstract_command_1.AbstractCommand {
     load(program) {
@@ -67,7 +68,13 @@ class StartCommand extends abstract_command_1.AbstractCommand {
             });
             const inputs = [];
             inputs.push({ name: 'app', value: app });
-            yield this.action.handle(inputs, options);
+            const flags = (0, remaining_flags_1.getRemainingFlags)(program);
+            try {
+                yield this.action.handle(inputs, options, flags);
+            }
+            catch (err) {
+                process.exit(1);
+            }
         }));
     }
 }

package/lib/compiler/assets-manager.d.ts

@@ -2,13 +2,6 @@ import { Configuration } from '../configuration';
 export declare class AssetsManager {
     private watchAssetsKeyValue;
     private watchers;
-    private actionInProgress;
-    /**
-     * Using on `nest build` to close file watch or the build process will not end
-     * Interval like process
-     * If no action has been taken recently close watchers
-     * If action has been taken recently flag and try again
-     */
     closeWatchers(): void;
     copyAssets(configuration: Required<Configuration>, appName: string, outDir: string, watchAssetsMode: boolean): void;
     private actionOnFile;

package/lib/compiler/assets-manager.js

@@ -10,27 +10,9 @@ class AssetsManager {
     constructor() {
         this.watchAssetsKeyValue = {};
         this.watchers = [];
-        this.actionInProgress = false;
     }
-    /**
-     * Using on `nest build` to close file watch or the build process will not end
-     * Interval like process
-     * If no action has been taken recently close watchers
-     * If action has been taken recently flag and try again
-     */
     closeWatchers() {
-        // Consider adjusting this for larger files
-        const timeoutMs = 500;
-        const closeFn = () => {
-            if (this.actionInProgress) {
-                this.actionInProgress = false;
-                setTimeout(closeFn, timeoutMs);
-            }
-            else {
-                this.watchers.forEach((watcher) => watcher.close());
-            }
-        };
-        setTimeout(closeFn, timeoutMs);
+        this.watchers.forEach((watcher) => watcher.close());
     }
     copyAssets(configuration, appName, outDir, watchAssetsMode) {
         const assets = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.assets', appName) || [];
@@ -70,6 +52,9 @@ class AssetsManager {
                     .on('add', (path) => this.actionOnFile(Object.assign(Object.assign({}, option), { path, action: 'change' })))
                     .on('change', (path) => this.actionOnFile(Object.assign(Object.assign({}, option), { path, action: 'change' })))
                     .on('unlink', (path) => this.actionOnFile(Object.assign(Object.assign({}, option), { path, action: 'unlink' })));
+                if (!isWatchEnabled) {
+                    watcher.on('ready', () => watcher.close());
+                }
                 this.watchers.push(watcher);
             }
         }
@@ -86,8 +71,6 @@ class AssetsManager {
         }
         // Set path value to true for watching the first time
         this.watchAssetsKeyValue[path] = true;
-        // Set action to true to avoid watches getting cutoff
-        this.actionInProgress = true;
         const dest = (0, copy_path_resolve_1.copyPathResolve)(path, item.outDir, sourceRoot.split(path_1.sep).length);
         // Copy to output dir if file is changed or added
         if (action === 'change') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.1.5",
+  "version": "9.1.7",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -38,15 +38,15 @@
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "14.2.2",
-    "@angular-devkit/schematics": "14.2.2",
-    "@angular-devkit/schematics-cli": "14.2.2",
+    "@angular-devkit/core": "15.0.4",
+    "@angular-devkit/schematics": "15.0.4",
+    "@angular-devkit/schematics-cli": "15.0.4",
     "@nestjs/schematics": "^9.0.0",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
-    "cli-table3": "0.6.2",
+    "cli-table3": "0.6.3",
     "commander": "4.1.1",
-    "fork-ts-checker-webpack-plugin": "7.2.13",
+    "fork-ts-checker-webpack-plugin": "7.2.14",
     "inquirer": "7.3.3",
     "node-emoji": "1.11.0",
     "ora": "5.4.1",
@@ -55,40 +55,40 @@
     "shelljs": "0.8.5",
     "source-map-support": "0.5.21",
     "tree-kill": "1.2.2",
-    "tsconfig-paths": "4.1.0",
+    "tsconfig-paths": "4.1.1",
     "tsconfig-paths-webpack-plugin": "4.0.0",
-    "typescript": "4.8.4",
-    "webpack": "5.74.0",
+    "typescript": "4.9.4",
+    "webpack": "5.75.0",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.1.2",
-    "@commitlint/config-angular": "17.1.0",
+    "@commitlint/cli": "17.3.0",
+    "@commitlint/config-angular": "17.3.0",
     "@types/copyfiles": "2.4.1",
-    "@types/inquirer": "8.2.4",
-    "@types/jest": "28.1.8",
-    "@types/node": "18.11.7",
+    "@types/inquirer": "8.2.5",
+    "@types/jest": "29.2.4",
+    "@types/node": "18.11.18",
     "@types/node-emoji": "1.8.2",
     "@types/ora": "3.2.0",
     "@types/os-name": "3.1.0",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.11",
     "@types/webpack-node-externals": "2.5.3",
-    "@typescript-eslint/eslint-plugin": "5.41.0",
-    "@typescript-eslint/parser": "5.41.0",
+    "@typescript-eslint/eslint-plugin": "5.47.1",
+    "@typescript-eslint/parser": "5.47.1",
     "delete-empty": "3.0.0",
-    "eslint": "8.26.0",
+    "eslint": "8.30.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
-    "husky": "8.0.1",
-    "jest": "28.1.3",
-    "lint-staged": "13.0.3",
-    "prettier": "2.7.1",
-    "release-it": "15.5.0",
-    "ts-jest": "28.0.8",
-    "ts-loader": "9.4.1",
+    "husky": "8.0.2",
+    "jest": "29.3.1",
+    "lint-staged": "13.1.0",
+    "prettier": "2.8.1",
+    "release-it": "15.5.1",
+    "ts-jest": "29.0.3",
+    "ts-loader": "9.4.2",
     "ts-node": "10.9.1"
   },
   "lint-staged": {

package/test/lib/compiler/hooks/__snapshots__/tsconfig-paths.hook.spec.ts.snap

@@ -2,62 +2,62 @@
 
 exports[`tsconfig paths hooks should remove unused imports 1`] = `
 Map {
-  "dist/foo.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/foo.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Foo = void 0;
 class Foo {
 }
 exports.Foo = Foo;
 ",
-  "dist/bar.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/bar.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bar = void 0;
 class Bar {
 }
 exports.Bar = Bar;
 ",
-  "dist/main.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/main.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 ",
 }
 `;
 
 exports[`tsconfig paths hooks should replace path of every import using a path alias by its relative path 1`] = `
 Map {
-  "dist/foo.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/foo.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Foo = void 0;
 class Foo {
 }
 exports.Foo = Foo;
 ",
-  "dist/bar.jsx" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/bar.jsx" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bar = void 0;
 class Bar {
 }
 exports.Bar = Bar;
 ",
-  "dist/baz.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/baz.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Baz = void 0;
 class Baz {
 }
 exports.Baz = Baz;
 ",
-  "dist/qux.jsx" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
+  "dist/qux.jsx" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Qux = void 0;
 class Qux {
 }
 exports.Qux = Qux;
 ",
-  "dist/main.js" => "\\"use strict\\";
-Object.defineProperty(exports, \\"__esModule\\", { value: true });
-const foo_1 = require(\\"./foo\\");
-const bar_1 = require(\\"./bar\\");
-const baz_1 = require(\\"./baz\\");
-const qux_1 = require(\\"./qux\\");
+  "dist/main.js" => ""use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const foo_1 = require("./foo");
+const bar_1 = require("./bar");
+const baz_1 = require("./baz");
+const qux_1 = require("./qux");
 // use the imports so they do not get eliminated
 console.log(foo_1.Foo);
 console.log(bar_1.Bar);