@nestjs/cli 9.4.1 → 9.5.0

package/.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.9
+      - image: cimg/node:20.2
     steps:
       - checkout
       - run:
@@ -43,7 +43,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:19.9
+      - image: cimg/node:20.2
     steps:
       - checkout
       - *restore-cache

package/actions/build.action.js

@@ -76,7 +76,7 @@ class BuildAction extends abstract_action_1.AbstractAction {
             if (isWebpackEnabled) {
                 const webpackPath = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.webpackConfigPath', appName, 'webpackPath', options);
                 const webpackConfigFactoryOrConfig = this.getWebpackConfigFactoryByPath(webpackPath, configuration.compilerOptions.webpackConfigPath);
-                return this.webpackCompiler.run(configuration, webpackConfigFactoryOrConfig, pathToTsconfig, appName, isDebugEnabled, watchMode, this.assetsManager, onSuccess);
+                return this.webpackCompiler.run(configuration, options, webpackConfigFactoryOrConfig, pathToTsconfig, appName, isDebugEnabled, watchMode, this.assetsManager, onSuccess);
             }
             if (watchMode) {
                 const tsCompilerOptions = {};

package/actions/new.action.js

@@ -15,7 +15,6 @@ const child_process_1 = require("child_process");
 const fs = require("fs");
 const inquirer = require("inquirer");
 const path_1 = require("path");
-const util_1 = require("util");
 const defaults_1 = require("../lib/configuration/defaults");
 const package_managers_1 = require("../lib/package-managers");
 const questions_1 = require("../lib/questions/questions");
@@ -144,7 +143,7 @@ const createGitIgnoreFile = (dir, content) => {
     if (fileExists(filePath)) {
         return;
     }
-    return (0, util_1.promisify)(fs.writeFile)(filePath, fileContent);
+    return fs.promises.writeFile(filePath, fileContent);
 };
 const printCollective = () => {
     const dim = print('dim');

package/lib/compiler/watch-compiler.js

@@ -22,13 +22,16 @@ class WatchCompiler {
         const origDiagnosticReporter = tsBin.createDiagnosticReporter(tsBin.sys, true);
         const origWatchStatusReporter = tsBin.createWatchStatusReporter(tsBin.sys, true);
         const host = tsBin.createWatchCompilerHost(configPath, Object.assign(Object.assign({}, options), tsCompilerOptions), tsBin.sys, createProgram, this.createDiagnosticReporter(origDiagnosticReporter), this.createWatchStatusChanged(origWatchStatusReporter, onSuccess));
+        const manualRestart = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.manualRestart', appName);
         const pluginsConfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.plugins', appName);
         const plugins = this.pluginsLoader.load(pluginsConfig);
         const origCreateProgram = host.createProgram;
         host.createProgram = (rootNames, options, 
         // tslint:disable-next-line:no-shadowed-variable
         host, oldProgram) => {
-            (0, manual_restart_1.displayManualRestartTip)();
+            if (manualRestart) {
+                (0, manual_restart_1.displayManualRestartTip)();
+            }
             const tsconfigPathsPlugin = options
                 ? (0, tsconfig_paths_hook_1.tsconfigPathsBeforeHookFactory)(options)
                 : null;
@@ -51,10 +54,12 @@ class WatchCompiler {
             return program;
         };
         const watchProgram = tsBin.createWatchProgram(host);
-        (0, manual_restart_1.listenForManualRestart)(() => {
-            watchProgram.close();
-            this.run(configuration, configFilename, appName, tsCompilerOptions, onSuccess);
-        });
+        if (manualRestart) {
+            (0, manual_restart_1.listenForManualRestart)(() => {
+                watchProgram.close();
+                this.run(configuration, configFilename, appName, tsCompilerOptions, onSuccess);
+            });
+        }
     }
     createDiagnosticReporter(diagnosticReporter) {
         return function (diagnostic, ...args) {

package/lib/compiler/webpack-compiler.d.ts

@@ -1,12 +1,13 @@
 import { Configuration } from '../configuration';
 import { AssetsManager } from './assets-manager';
 import { PluginsLoader } from './plugins-loader';
+import { Input } from '../../commands';
 import webpack = require('webpack');
 type WebpackConfigFactory = (config: webpack.Configuration, webpackRef: typeof webpack) => webpack.Configuration;
 type WebpackConfigFactoryOrConfig = WebpackConfigFactory | webpack.Configuration;
 export declare class WebpackCompiler {
     private readonly pluginsLoader;
     constructor(pluginsLoader: PluginsLoader);
-    run(configuration: Required<Configuration>, webpackConfigFactoryOrConfig: WebpackConfigFactoryOrConfig | WebpackConfigFactoryOrConfig[], tsConfigPath: string, appName: string, isDebugEnabled: boolean | undefined, watchMode: boolean | undefined, assetsManager: AssetsManager, onSuccess?: () => void): void;
+    run(configuration: Required<Configuration>, options: Input[], webpackConfigFactoryOrConfig: WebpackConfigFactoryOrConfig | WebpackConfigFactoryOrConfig[], tsConfigPath: string, appName: string, isDebugEnabled: boolean | undefined, watchMode: boolean | undefined, assetsManager: AssetsManager, onSuccess?: () => void): void;
 }
 export {};

package/lib/compiler/webpack-compiler.js

@@ -11,7 +11,7 @@ class WebpackCompiler {
     constructor(pluginsLoader) {
         this.pluginsLoader = pluginsLoader;
     }
-    run(configuration, webpackConfigFactoryOrConfig, tsConfigPath, appName, isDebugEnabled = false, watchMode = false, assetsManager, onSuccess) {
+    run(configuration, options, webpackConfigFactoryOrConfig, tsConfigPath, appName, isDebugEnabled = false, watchMode = false, assetsManager, onSuccess) {
         const cwd = process.cwd();
         const configPath = (0, path_1.join)(cwd, tsConfigPath);
         if (!(0, fs_1.existsSync)(configPath)) {
@@ -20,11 +20,11 @@ class WebpackCompiler {
         const pluginsConfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.plugins', appName);
         const plugins = this.pluginsLoader.load(pluginsConfig);
         const relativeRootPath = (0, path_1.dirname)((0, path_1.relative)(cwd, configPath));
-        const sourceRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName);
+        const sourceRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName, 'sourceRoot', options);
         const pathToSource = (0, path_1.normalize)(sourceRoot).indexOf((0, path_1.normalize)(relativeRootPath)) >= 0
             ? (0, path_1.join)(cwd, sourceRoot)
             : (0, path_1.join)(cwd, relativeRootPath, sourceRoot);
-        const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName);
+        const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName, 'entryFile', options);
         const entryFileRoot = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'root', appName) || '';
         const defaultOptions = (0, webpack_defaults_1.webpackDefaultsFactory)(pathToSource, entryFileRoot, entryFile, isDebugEnabled, tsConfigPath, plugins);
         let compiler;

package/lib/configuration/configuration.d.ts

@@ -21,6 +21,7 @@ interface CompilerOptions {
     plugins?: string[] | PluginOptions[];
     assets?: string[];
     deleteOutDir?: boolean;
+    manualRestart?: boolean;
 }
 interface PluginOptions {
     name: string;

package/lib/configuration/defaults.js

@@ -16,6 +16,7 @@ exports.defaultConfiguration = {
         webpackConfigPath: 'webpack.config.js',
         plugins: [],
         assets: [],
+        manualRestart: false,
     },
     generateOptions: {},
 };

package/lib/configuration/nest-configuration.loader.js

@@ -20,9 +20,9 @@ class NestConfigurationLoader {
             const content = name
                 ? yield this.reader.read(name)
                 : yield this.reader.readAnyOf([
+                    'nest-cli.json',
                     '.nestcli.json',
                     '.nest-cli.json',
-                    'nest-cli.json',
                     'nest.json',
                 ]);
             if (!content) {

package/lib/package-managers/package-manager.factory.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageManagerFactory = void 0;
-const fs_1 = require("fs");
+const fs = require("fs");
 const npm_package_manager_1 = require("./npm.package-manager");
 const package_manager_1 = require("./package-manager");
 const yarn_package_manager_1 = require("./yarn.package-manager");
@@ -30,24 +30,22 @@ class PackageManagerFactory {
     }
     static find() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
-                (0, fs_1.readdir)(process.cwd(), (error, files) => {
-                    if (error) {
-                        resolve(this.create(package_manager_1.PackageManager.NPM));
-                    }
-                    else {
-                        if (files.findIndex((filename) => filename === 'yarn.lock') > -1) {
-                            resolve(this.create(package_manager_1.PackageManager.YARN));
-                        }
-                        else if (files.findIndex((filename) => filename === 'pnpm-lock.yaml') > -1) {
-                            resolve(this.create(package_manager_1.PackageManager.PNPM));
-                        }
-                        else {
-                            resolve(this.create(package_manager_1.PackageManager.NPM));
-                        }
-                    }
-                });
-            });
+            const DEFAULT_PACKAGE_MANAGER = package_manager_1.PackageManager.NPM;
+            try {
+                const files = yield fs.promises.readdir(process.cwd());
+                const hasYarnLockFile = files.includes('yarn.lock');
+                if (hasYarnLockFile) {
+                    return this.create(package_manager_1.PackageManager.YARN);
+                }
+                const hasPnpmLockFile = files.includes('pnpm-lock.yaml');
+                if (hasPnpmLockFile) {
+                    return this.create(package_manager_1.PackageManager.PNPM);
+                }
+                return this.create(DEFAULT_PACKAGE_MANAGER);
+            }
+            catch (error) {
+                return this.create(DEFAULT_PACKAGE_MANAGER);
+            }
         });
     }
 }

package/lib/readers/file-system.reader.js

@@ -11,37 +11,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSystemReader = void 0;
 const fs = require("fs");
+const path = require("path");
 class FileSystemReader {
     constructor(directory) {
         this.directory = directory;
     }
     list() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                fs.readdir(this.directory, (error, filenames) => {
-                    if (error) {
-                        reject(error);
-                    }
-                    else {
-                        resolve(filenames);
-                    }
-                });
-            });
-        });
+        return fs.promises.readdir(this.directory);
     }
     read(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                fs.readFile(`${this.directory}/${name}`, (error, data) => {
-                    if (error) {
-                        reject(error);
-                    }
-                    else {
-                        resolve(data.toString());
-                    }
-                });
-            });
-        });
+        return fs.promises.readFile(path.join(this.directory, name), 'utf8');
     }
     readAnyOf(filenames) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -38,9 +38,9 @@
   },
   "homepage": "https://github.com/nestjs/nest-cli#readme",
   "dependencies": {
-    "@angular-devkit/core": "15.2.6",
-    "@angular-devkit/schematics": "15.2.6",
-    "@angular-devkit/schematics-cli": "15.2.6",
+    "@angular-devkit/core": "16.0.1",
+    "@angular-devkit/schematics": "16.0.1",
+    "@angular-devkit/schematics-cli": "16.0.1",
     "@nestjs/schematics": "^9.0.4",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
@@ -58,30 +58,30 @@
     "tsconfig-paths": "4.2.0",
     "tsconfig-paths-webpack-plugin": "4.0.1",
     "typescript": "4.9.5",
-    "webpack": "5.79.0",
+    "webpack": "5.82.1",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.6.1",
-    "@commitlint/config-angular": "17.6.1",
+    "@commitlint/cli": "17.6.3",
+    "@commitlint/config-angular": "17.6.3",
     "@types/inquirer": "8.2.6",
     "@types/jest": "29.5.1",
-    "@types/node": "18.15.12",
+    "@types/node": "18.16.12",
     "@types/node-emoji": "1.8.2",
     "@types/shelljs": "0.8.12",
     "@types/webpack-node-externals": "3.0.0",
-    "@typescript-eslint/eslint-plugin": "5.59.0",
-    "@typescript-eslint/parser": "5.59.0",
+    "@typescript-eslint/eslint-plugin": "5.59.6",
+    "@typescript-eslint/parser": "5.59.6",
     "delete-empty": "3.0.0",
-    "eslint": "8.38.0",
+    "eslint": "8.40.0",
     "eslint-config-prettier": "8.8.0",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
     "husky": "8.0.3",
     "jest": "29.5.0",
-    "lint-staged": "13.2.1",
-    "prettier": "2.8.7",
-    "release-it": "15.10.1",
+    "lint-staged": "13.2.2",
+    "prettier": "2.8.8",
+    "release-it": "15.10.3",
     "ts-jest": "29.1.0",
     "ts-loader": "9.4.2"
   },