@nestjs/cli 9.1.7 → 9.1.9-next.1

package/actions/build.action.js

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

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

@@ -2,6 +2,13 @@ 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,9 +10,27 @@ 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() {
-        this.watchers.forEach((watcher) => watcher.close());
+        // 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);
     }
     copyAssets(configuration, appName, outDir, watchAssetsMode) {
         const assets = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.assets', appName) || [];
@@ -52,9 +70,6 @@ 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);
             }
         }
@@ -71,6 +86,8 @@ 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/lib/compiler/webpack-compiler.d.ts

@@ -2,8 +2,11 @@ import { Configuration } from '../configuration';
 import { AssetsManager } from './assets-manager';
 import { PluginsLoader } from './plugins-loader';
 import webpack = require('webpack');
+declare type WebpackConfigFactory = (config: webpack.Configuration, webpackRef: typeof webpack) => webpack.Configuration;
+declare type WebpackConfigFactoryOrConfig = WebpackConfigFactory | webpack.Configuration;
 export declare class WebpackCompiler {
     private readonly pluginsLoader;
     constructor(pluginsLoader: PluginsLoader);
-    run(configuration: Required<Configuration>, webpackConfigFactoryOrConfig: (config: webpack.Configuration, webpackRef: typeof webpack) => webpack.Configuration, tsConfigPath: string, appName: string, isDebugEnabled: boolean | undefined, watchMode: boolean | undefined, assetsManager: AssetsManager, onSuccess?: () => void): void;
+    run(configuration: Required<Configuration>, 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

@@ -27,11 +27,29 @@ class WebpackCompiler {
         const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName);
         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);
-        const projectWebpackOptions = typeof webpackConfigFactoryOrConfig !== 'function'
-            ? webpackConfigFactoryOrConfig
-            : webpackConfigFactoryOrConfig(defaultOptions, webpack);
-        const webpackConfiguration = Object.assign(Object.assign(Object.assign({}, defaultOptions), { mode: watchMode ? 'development' : defaultOptions.mode }), projectWebpackOptions);
-        const compiler = webpack(webpackConfiguration);
+        let compiler;
+        let watchOptions;
+        let watch;
+        if (Array.isArray(webpackConfigFactoryOrConfig)) {
+            const webpackConfigurations = webpackConfigFactoryOrConfig.map((configOrFactory) => {
+                const unwrappedConfig = typeof configOrFactory !== 'function'
+                    ? configOrFactory
+                    : configOrFactory(defaultOptions, webpack);
+                return Object.assign(Object.assign(Object.assign({}, defaultOptions), { mode: watchMode ? 'development' : defaultOptions.mode }), unwrappedConfig);
+            });
+            compiler = webpack(webpackConfigurations);
+            watchOptions = webpackConfigurations.map((config) => config.watchOptions || {});
+            watch = webpackConfigurations.some((config) => config.watch);
+        }
+        else {
+            const projectWebpackOptions = typeof webpackConfigFactoryOrConfig !== 'function'
+                ? webpackConfigFactoryOrConfig
+                : webpackConfigFactoryOrConfig(defaultOptions, webpack);
+            const webpackConfiguration = Object.assign(Object.assign(Object.assign({}, defaultOptions), { mode: watchMode ? 'development' : defaultOptions.mode }), projectWebpackOptions);
+            compiler = webpack(webpackConfiguration);
+            watchOptions = webpackConfiguration.watchOptions;
+            watch = webpackConfiguration.watch;
+        }
         const afterCallback = (err, stats) => {
             if (err && stats === undefined) {
                 // Could not complete the compilation
@@ -53,18 +71,18 @@ class WebpackCompiler {
                     onSuccess();
                 }
             }
-            else if (!watchMode && !webpackConfiguration.watch) {
+            else if (!watchMode && !watch) {
                 console.log(statsOutput);
                 return process.exit(1);
             }
             console.log(statsOutput);
         };
-        if (watchMode || webpackConfiguration.watch) {
+        if (watchMode || watch) {
             compiler.hooks.watchRun.tapAsync('Rebuild info', (params, callback) => {
                 console.log(`\n${ui_1.INFO_PREFIX} Webpack is building your sources...\n`);
                 callback();
             });
-            compiler.watch(webpackConfiguration.watchOptions || {}, afterCallback);
+            compiler.watch(watchOptions || {}, afterCallback);
         }
         else {
             compiler.run(afterCallback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.1.7",
+  "version": "9.1.9-next.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -62,11 +62,11 @@
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.3.0",
-    "@commitlint/config-angular": "17.3.0",
+    "@commitlint/cli": "17.4.2",
+    "@commitlint/config-angular": "17.4.2",
     "@types/copyfiles": "2.4.1",
     "@types/inquirer": "8.2.5",
-    "@types/jest": "29.2.4",
+    "@types/jest": "29.2.6",
     "@types/node": "18.11.18",
     "@types/node-emoji": "1.8.2",
     "@types/ora": "3.2.0",
@@ -74,20 +74,20 @@
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.11",
     "@types/webpack-node-externals": "2.5.3",
-    "@typescript-eslint/eslint-plugin": "5.47.1",
-    "@typescript-eslint/parser": "5.47.1",
+    "@typescript-eslint/eslint-plugin": "5.49.0",
+    "@typescript-eslint/parser": "5.49.0",
     "delete-empty": "3.0.0",
-    "eslint": "8.30.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint": "8.32.0",
+    "eslint-config-prettier": "8.6.0",
+    "eslint-plugin-import": "2.27.5",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
-    "husky": "8.0.2",
+    "husky": "8.0.3",
     "jest": "29.3.1",
     "lint-staged": "13.1.0",
-    "prettier": "2.8.1",
-    "release-it": "15.5.1",
-    "ts-jest": "29.0.3",
+    "prettier": "2.8.3",
+    "release-it": "15.6.0",
+    "ts-jest": "29.0.5",
     "ts-loader": "9.4.2",
     "ts-node": "10.9.1"
   },