@nestjs/cli 9.4.2 → 10.0.0-next.1

package/lib/compiler/webpack-compiler.js

@@ -4,53 +4,63 @@ exports.WebpackCompiler = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ui_1 = require("../ui");
+const base_compiler_1 = require("./base-compiler");
 const webpack_defaults_1 = require("./defaults/webpack-defaults");
 const get_value_or_default_1 = require("./helpers/get-value-or-default");
 const webpack = require("webpack");
-class WebpackCompiler {
+class WebpackCompiler extends base_compiler_1.BaseCompiler {
     constructor(pluginsLoader) {
-        this.pluginsLoader = pluginsLoader;
+        super(pluginsLoader);
     }
-    run(configuration, options, webpackConfigFactoryOrConfig, tsConfigPath, appName, isDebugEnabled = false, watchMode = false, assetsManager, onSuccess) {
+    run(configuration, tsConfigPath, appName, extras, onSuccess) {
+        var _a, _b;
         const cwd = process.cwd();
         const configPath = (0, path_1.join)(cwd, tsConfigPath);
         if (!(0, fs_1.existsSync)(configPath)) {
             throw new Error(`Could not find TypeScript configuration file "${tsConfigPath}".`);
         }
-        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, '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, 'entryFile', options);
+        const plugins = this.loadPlugins(configuration, tsConfigPath, appName);
+        const pathToSource = this.getPathToSource(configuration, tsConfigPath, appName);
+        const entryFile = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'entryFile', appName, 'entryFile', extras.inputs);
         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 defaultOptions = (0, webpack_defaults_1.webpackDefaultsFactory)(pathToSource, entryFileRoot, entryFile, (_a = extras.debug) !== null && _a !== void 0 ? _a : false, tsConfigPath, plugins);
         let compiler;
         let watchOptions;
         let watch;
-        if (Array.isArray(webpackConfigFactoryOrConfig)) {
-            const webpackConfigurations = webpackConfigFactoryOrConfig.map((configOrFactory) => {
+        if (Array.isArray(extras.webpackConfigFactoryOrConfig)) {
+            const webpackConfigurations = extras.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);
+                return Object.assign(Object.assign(Object.assign({}, defaultOptions), { mode: extras.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);
+            const projectWebpackOptions = typeof extras.webpackConfigFactoryOrConfig !== 'function'
+                ? extras.webpackConfigFactoryOrConfig
+                : extras.webpackConfigFactoryOrConfig(defaultOptions, webpack);
+            const webpackConfiguration = Object.assign(Object.assign(Object.assign({}, defaultOptions), { mode: extras.watchMode ? 'development' : defaultOptions.mode }), projectWebpackOptions);
             compiler = webpack(webpackConfiguration);
             watchOptions = webpackConfiguration.watchOptions;
             watch = webpackConfiguration.watch;
         }
-        const afterCallback = (err, stats) => {
+        const afterCallback = this.createAfterCallback(onSuccess, extras.assetsManager, (_b = extras.watchMode) !== null && _b !== void 0 ? _b : false, watch);
+        if (extras.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(watchOptions || {}, afterCallback);
+        }
+        else {
+            compiler.run(afterCallback);
+        }
+    }
+    createAfterCallback(onSuccess, assetsManager, watchMode, watch) {
+        return (err, stats) => {
             if (err && stats === undefined) {
                 // Could not complete the compilation
                 // The error caught is most likely thrown by underlying tasks
@@ -77,16 +87,6 @@ class WebpackCompiler {
             }
             console.log(statsOutput);
         };
-        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(watchOptions || {}, afterCallback);
-        }
-        else {
-            compiler.run(afterCallback);
-        }
     }
 }
 exports.WebpackCompiler = WebpackCompiler;

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/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.2",
+  "version": "10.0.0-next.1",
   "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,34 +58,43 @@
     "tsconfig-paths": "4.2.0",
     "tsconfig-paths-webpack-plugin": "4.0.1",
     "typescript": "4.9.5",
-    "webpack": "5.80.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",
+    "@swc/cli": "0.1.62",
     "@types/inquirer": "8.2.6",
     "@types/jest": "29.5.1",
-    "@types/node": "18.16.0",
+    "@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.39.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",
+    "lint-staged": "13.2.2",
     "prettier": "2.8.8",
-    "release-it": "15.10.1",
+    "release-it": "15.10.3",
     "ts-jest": "29.1.0",
     "ts-loader": "9.4.2"
   },
   "lint-staged": {
     "**/*.{ts,json}": []
+  },
+  "peerDependencies": {
+    "@swc/cli": "^0.1.62"
+  },
+  "peerDependenciesMeta": {
+    "@swc/cli": {
+      "optional": true
+    }
   }
 }

package/lib/compiler/plugins-loader.d.ts

@@ -1,21 +0,0 @@
-import * as ts from 'typescript';
-type Transformer = ts.TransformerFactory<any> | ts.CustomTransformerFactory;
-type PluginEntry = string | PluginAndOptions;
-interface PluginAndOptions {
-    name: 'string';
-    options: Record<string, any>;
-}
-export interface NestCompilerPlugin {
-    before?: (options?: Record<string, any>, program?: ts.Program) => Transformer;
-    after?: (options?: Record<string, any>, program?: ts.Program) => Transformer;
-    afterDeclarations?: (options?: Record<string, any>, program?: ts.Program) => Transformer;
-}
-export interface MultiNestCompilerPlugins {
-    beforeHooks: Array<(program?: ts.Program) => Transformer>;
-    afterHooks: Array<(program?: ts.Program) => Transformer>;
-    afterDeclarationsHooks: Array<(program?: ts.Program) => Transformer>;
-}
-export declare class PluginsLoader {
-    load(plugins?: PluginEntry[]): MultiNestCompilerPlugins;
-}
-export {};

package/lib/compiler/plugins-loader.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginsLoader = void 0;
-const path_1 = require("path");
-const util_1 = require("util");
-const ui_1 = require("../ui");
-const PLUGIN_ENTRY_FILENAME = 'plugin';
-class PluginsLoader {
-    load(plugins = []) {
-        const pluginNames = plugins.map((entry) => (0, util_1.isObject)(entry) ? entry.name : entry);
-        const nodeModulePaths = [
-            (0, path_1.join)(process.cwd(), 'node_modules'),
-            ...module.paths,
-        ];
-        const pluginRefs = pluginNames.map((item) => {
-            try {
-                try {
-                    const binaryPath = require.resolve((0, path_1.join)(item, PLUGIN_ENTRY_FILENAME), {
-                        paths: nodeModulePaths,
-                    });
-                    return require(binaryPath);
-                }
-                catch (_a) { }
-                const binaryPath = require.resolve(item, { paths: nodeModulePaths });
-                return require(binaryPath);
-            }
-            catch (e) {
-                throw new Error(`"${item}" plugin could not be found!`);
-            }
-        });
-        const beforeHooks = [];
-        const afterHooks = [];
-        const afterDeclarationsHooks = [];
-        pluginRefs.forEach((plugin, index) => {
-            if (!plugin.before && !plugin.after && !plugin.afterDeclarations) {
-                throw new Error(ui_1.CLI_ERRORS.WRONG_PLUGIN(pluginNames[index]));
-            }
-            const options = (0, util_1.isObject)(plugins[index])
-                ? plugins[index].options || {}
-                : {};
-            plugin.before &&
-                beforeHooks.push(plugin.before.bind(plugin.before, options));
-            plugin.after && afterHooks.push(plugin.after.bind(plugin.after, options));
-            plugin.afterDeclarations &&
-                afterDeclarationsHooks.push(plugin.afterDeclarations.bind(plugin.afterDeclarations, options));
-        });
-        return {
-            beforeHooks,
-            afterHooks,
-            afterDeclarationsHooks,
-        };
-    }
-}
-exports.PluginsLoader = PluginsLoader;