@nestjs/cli 9.1.3 → 9.1.5

package/actions/add.action.js

@@ -26,7 +26,8 @@ class AddAction extends abstract_action_1.AbstractAction {
             const packageName = this.getPackageName(libraryName);
             const collectionName = this.getCollectionName(libraryName, packageName);
             const tagName = this.getTagName(packageName);
-            const packageInstallSuccess = yield this.installPackage(collectionName, tagName);
+            const skipInstall = (0, project_utils_1.hasValidOptionFlag)('skip-install', options);
+            const packageInstallSuccess = skipInstall || (yield this.installPackage(collectionName, tagName));
             if (packageInstallSuccess) {
                 const sourceRootOption = yield this.getSourceRoot(inputs.concat(options));
                 options.push(sourceRootOption);

package/actions/generate.action.js

@@ -33,6 +33,7 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
     const appName = inputs.find((option) => option.name === 'project')
         .value;
     const spec = inputs.find((option) => option.name === 'spec');
+    const flat = inputs.find((option) => option.name === 'flat');
     const collection = schematics_1.CollectionFactory.create(collectionOption || configuration.collection || schematics_1.Collection.NESTJS);
     const schematicOptions = mapSchematicOptions(inputs);
     schematicOptions.push(new schematics_1.SchematicOption('language', configuration.language));
@@ -41,8 +42,10 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         ? (0, get_value_or_default_1.getValueOrDefault)(configuration, 'sourceRoot', appName)
         : configuration.sourceRoot;
     const specValue = spec.value;
+    const flatValue = !!flat;
     const specOptions = spec.options;
     let generateSpec = (0, project_utils_1.shouldGenerateSpec)(configuration, schematic, appName, specValue, specOptions.passedAsInput);
+    let generateFlat = (0, project_utils_1.shouldGenerateFlat)(configuration, appName, flatValue);
     // If you only add a `lib` we actually don't have monorepo: true BUT we do have "projects"
     // Ensure we don't run for new app/libs schematics
     if ((0, project_utils_1.shouldAskForProject)(schematic, configurationProjects, appName)) {
@@ -63,10 +66,12 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
         if (answers.appName !== defaultProjectName) {
             // Only overwrite if the appName is not the default- as it has already been loaded above
             generateSpec = (0, project_utils_1.shouldGenerateSpec)(configuration, schematic, answers.appName, specValue, specOptions.passedAsInput);
+            generateFlat = (0, project_utils_1.shouldGenerateFlat)(configuration, answers.appNames, flatValue);
         }
     }
     schematicOptions.push(new schematics_1.SchematicOption('sourceRoot', sourceRoot));
     schematicOptions.push(new schematics_1.SchematicOption('spec', generateSpec));
+    schematicOptions.push(new schematics_1.SchematicOption('flat', generateFlat));
     try {
         const schematicInput = inputs.find((input) => input.name === 'schematic');
         if (!schematicInput) {
@@ -81,7 +86,7 @@ const generateFiles = (inputs) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 const mapSchematicOptions = (inputs) => {
-    const excludedInputNames = ['schematic', 'spec'];
+    const excludedInputNames = ['schematic', 'spec', 'flat'];
     const options = [];
     inputs.forEach((input) => {
         if (!excludedInputNames.includes(input.name) && input.value !== undefined) {

package/commands/add.command.js

@@ -19,11 +19,13 @@ class AddCommand extends abstract_command_1.AbstractCommand {
             .allowUnknownOption()
             .description('Adds support for an external library to your project.')
             .option('-d, --dry-run', 'Report actions that would be performed without writing out results.')
+            .option('-s, --skip-install', 'Skip package installation.', false)
             .option('-p, --project [project]', 'Project in which to generate files.')
             .usage('<library> [options] [library-specific-options]')
             .action((library, command) => __awaiter(this, void 0, void 0, function* () {
             const options = [];
             options.push({ name: 'dry-run', value: !!command.dryRun });
+            options.push({ name: 'skip-install', value: command.skipInstall });
             options.push({
                 name: 'project',
                 value: command.project,

package/lib/compiler/defaults/webpack-defaults.js

@@ -8,84 +8,90 @@ const defaults_1 = require("../../configuration/defaults");
 const append_extension_1 = require("../helpers/append-extension");
 const webpack = require("webpack");
 const nodeExternals = require("webpack-node-externals");
-const webpackDefaultsFactory = (sourceRoot, relativeSourceRoot, entryFilename, isDebugEnabled = false, tsConfigFile = defaults_1.defaultConfiguration.compilerOptions.tsConfigPath, plugins) => ({
-    entry: (0, append_extension_1.appendTsExtension)((0, path_1.join)(sourceRoot, entryFilename)),
-    devtool: isDebugEnabled ? 'inline-source-map' : false,
-    target: 'node',
-    output: {
-        filename: (0, path_1.join)(relativeSourceRoot, `${entryFilename}.js`),
-    },
-    ignoreWarnings: [/^(?!CriticalDependenciesWarning$)/],
-    externals: [nodeExternals()],
-    externalsPresets: { node: true },
-    module: {
-        rules: [
-            {
-                test: /.tsx?$/,
-                use: [
-                    {
-                        loader: 'ts-loader',
-                        options: {
-                            transpileOnly: !isAnyPluginRegistered(plugins),
-                            configFile: tsConfigFile,
-                            getCustomTransformers: (program) => ({
-                                before: plugins.beforeHooks.map((hook) => hook(program)),
-                                after: plugins.afterHooks.map((hook) => hook(program)),
-                                afterDeclarations: plugins.afterDeclarationsHooks.map((hook) => hook(program)),
-                            }),
+const webpackDefaultsFactory = (sourceRoot, relativeSourceRoot, entryFilename, isDebugEnabled = false, tsConfigFile = defaults_1.defaultConfiguration.compilerOptions.tsConfigPath, plugins) => {
+    const isPluginRegistered = isAnyPluginRegistered(plugins);
+    const webpackConfiguration = {
+        entry: (0, append_extension_1.appendTsExtension)((0, path_1.join)(sourceRoot, entryFilename)),
+        devtool: isDebugEnabled ? 'inline-source-map' : false,
+        target: 'node',
+        output: {
+            filename: (0, path_1.join)(relativeSourceRoot, `${entryFilename}.js`),
+        },
+        ignoreWarnings: [/^(?!CriticalDependenciesWarning$)/],
+        externals: [nodeExternals()],
+        externalsPresets: { node: true },
+        module: {
+            rules: [
+                {
+                    test: /.tsx?$/,
+                    use: [
+                        {
+                            loader: 'ts-loader',
+                            options: {
+                                transpileOnly: !isPluginRegistered,
+                                configFile: tsConfigFile,
+                                getCustomTransformers: (program) => ({
+                                    before: plugins.beforeHooks.map((hook) => hook(program)),
+                                    after: plugins.afterHooks.map((hook) => hook(program)),
+                                    afterDeclarations: plugins.afterDeclarationsHooks.map((hook) => hook(program)),
+                                }),
+                            },
                         },
-                    },
-                ],
-                exclude: /node_modules/,
-            },
-        ],
-    },
-    resolve: {
-        extensions: ['.tsx', '.ts', '.js'],
+                    ],
+                    exclude: /node_modules/,
+                },
+            ],
+        },
+        resolve: {
+            extensions: ['.tsx', '.ts', '.js'],
+            plugins: [
+                new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
+                    configFile: tsConfigFile,
+                }),
+            ],
+        },
+        mode: 'none',
+        optimization: {
+            nodeEnv: false,
+        },
+        node: {
+            __filename: false,
+            __dirname: false,
+        },
         plugins: [
-            new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
-                configFile: tsConfigFile,
+            new webpack.IgnorePlugin({
+                checkResource(resource) {
+                    const lazyImports = [
+                        '@nestjs/microservices',
+                        'cache-manager',
+                        'class-validator',
+                        'class-transformer',
+                    ];
+                    if (!lazyImports.includes(resource)) {
+                        return false;
+                    }
+                    try {
+                        require.resolve(resource, {
+                            paths: [process.cwd()],
+                        });
+                    }
+                    catch (err) {
+                        return true;
+                    }
+                    return false;
+                },
             }),
         ],
-    },
-    mode: 'none',
-    optimization: {
-        nodeEnv: false,
-    },
-    node: {
-        __filename: false,
-        __dirname: false,
-    },
-    plugins: [
-        new webpack.IgnorePlugin({
-            checkResource(resource) {
-                const lazyImports = [
-                    '@nestjs/microservices',
-                    'cache-manager',
-                    'class-validator',
-                    'class-transformer',
-                ];
-                if (!lazyImports.includes(resource)) {
-                    return false;
-                }
-                try {
-                    require.resolve(resource, {
-                        paths: [process.cwd()],
-                    });
-                }
-                catch (err) {
-                    return true;
-                }
-                return false;
-            },
-        }),
-        new ForkTsCheckerWebpackPlugin({
+    };
+    if (!isPluginRegistered) {
+        webpackConfiguration.plugins.push(new ForkTsCheckerWebpackPlugin({
             typescript: {
                 configFile: tsConfigFile,
             },
-        }),
-    ],
-});
+        }));
+    }
+    return webpackConfiguration;
+};
 exports.webpackDefaultsFactory = webpackDefaultsFactory;
 function isAnyPluginRegistered(plugins) {
     return ((plugins.afterHooks && plugins.afterHooks.length > 0) ||

package/lib/configuration/configuration.d.ts

@@ -28,6 +28,7 @@ interface PluginOptions {
 }
 interface GenerateOptions {
     spec?: boolean | Record<string, boolean>;
+    flat?: boolean;
 }
 export interface ProjectConfiguration {
     type?: string;

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

@@ -14,8 +14,8 @@ class PnpmPackageManager extends abstract_package_manager_1.AbstractPackageManag
     // As of PNPM v5.3, all commands are shared with NPM v6.14.5. See: https://pnpm.js.org/en/pnpm-vs-npm
     get cli() {
         return {
-            install: 'install',
-            add: 'install',
+            install: 'install --strict-peer-dependencies=false',
+            add: 'install --strict-peer-dependencies=false',
             update: 'update',
             remove: 'uninstall',
             saveFlag: '--save',

package/lib/utils/project-utils.d.ts

@@ -1,8 +1,11 @@
 import { Answers } from 'inquirer';
+import { Input } from '../../commands';
 import { Configuration, ProjectConfiguration } from '../configuration';
 export declare function shouldAskForProject(schematic: string, configurationProjects: {
     [key: string]: ProjectConfiguration;
 }, appName: string): boolean;
 export declare function shouldGenerateSpec(configuration: Required<Configuration>, schematic: string, appName: string, specValue: boolean, specPassedAsInput?: boolean): any;
+export declare function shouldGenerateFlat(configuration: Required<Configuration>, appName: string, flatValue: boolean): boolean;
 export declare function askForProjectName(promptQuestion: string, projects: string[]): Promise<Answers>;
 export declare function moveDefaultProjectToStart(configuration: Configuration, defaultProjectName: string, defaultLabel: string): string[];
+export declare function hasValidOptionFlag(queriedOptionName: string, options: Input[], queriedValue?: string | number | boolean): boolean;

package/lib/utils/project-utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveDefaultProjectToStart = exports.askForProjectName = exports.shouldGenerateSpec = exports.shouldAskForProject = void 0;
+exports.hasValidOptionFlag = exports.moveDefaultProjectToStart = exports.askForProjectName = exports.shouldGenerateFlat = exports.shouldGenerateSpec = exports.shouldAskForProject = void 0;
 const inquirer = require("inquirer");
 const get_value_or_default_1 = require("../compiler/helpers/get-value-or-default");
 const questions_1 = require("../questions/questions");
@@ -48,6 +48,18 @@ function shouldGenerateSpec(configuration, schematic, appName, specValue, specPa
     return specValue;
 }
 exports.shouldGenerateSpec = shouldGenerateSpec;
+function shouldGenerateFlat(configuration, appName, flatValue) {
+    // CLI parameters have the highest priority
+    if (flatValue === true) {
+        return flatValue;
+    }
+    const flatConfiguration = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'generateOptions.flat', appName || '');
+    if (typeof flatConfiguration === 'boolean') {
+        return flatConfiguration;
+    }
+    return flatValue;
+}
+exports.shouldGenerateFlat = shouldGenerateFlat;
 function askForProjectName(promptQuestion, projects) {
     return __awaiter(this, void 0, void 0, function* () {
         const questions = [
@@ -67,3 +79,7 @@ function moveDefaultProjectToStart(configuration, defaultProjectName, defaultLab
     return projects;
 }
 exports.moveDefaultProjectToStart = moveDefaultProjectToStart;
+function hasValidOptionFlag(queriedOptionName, options, queriedValue = true) {
+    return options.some((option) => option.name === queriedOptionName && option.value === queriedValue);
+}
+exports.hasValidOptionFlag = hasValidOptionFlag;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.1.3",
+  "version": "9.1.5",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -57,7 +57,7 @@
     "tree-kill": "1.2.2",
     "tsconfig-paths": "4.1.0",
     "tsconfig-paths-webpack-plugin": "4.0.0",
-    "typescript": "4.8.3",
+    "typescript": "4.8.4",
     "webpack": "5.74.0",
     "webpack-node-externals": "3.0.0"
   },
@@ -65,19 +65,19 @@
     "@commitlint/cli": "17.1.2",
     "@commitlint/config-angular": "17.1.0",
     "@types/copyfiles": "2.4.1",
-    "@types/inquirer": "8.2.3",
+    "@types/inquirer": "8.2.4",
     "@types/jest": "28.1.8",
-    "@types/node": "16.11.58",
-    "@types/node-emoji": "1.8.1",
+    "@types/node": "18.11.7",
+    "@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.36.2",
-    "@typescript-eslint/parser": "5.36.2",
+    "@typescript-eslint/eslint-plugin": "5.41.0",
+    "@typescript-eslint/parser": "5.41.0",
     "delete-empty": "3.0.0",
-    "eslint": "8.23.1",
+    "eslint": "8.26.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
     "gulp": "4.0.2",
@@ -86,9 +86,9 @@
     "jest": "28.1.3",
     "lint-staged": "13.0.3",
     "prettier": "2.7.1",
-    "release-it": "15.4.1",
+    "release-it": "15.5.0",
     "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
+    "ts-loader": "9.4.1",
     "ts-node": "10.9.1"
   },
   "lint-staged": {