@nestjs/cli 9.1.2 → 9.1.4

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/compiler/hooks/tsconfig-paths.hook.js

@@ -30,14 +30,18 @@ function tsconfigPathsBeforeHookFactory(compilerOptions) {
                         const moduleSpecifier = tsBinary.factory.createStringLiteral(result);
                         moduleSpecifier.parent = node.moduleSpecifier.parent;
                         if (tsBinary.isImportDeclaration(node)) {
-                            return isInUpdatedAstContext
+                            const updatedNode = isInUpdatedAstContext
                                 ? tsBinary.factory.updateImportDeclaration(node, node.modifiers, node.importClause, moduleSpecifier, node.assertClause)
                                 : tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
+                            updatedNode.flags = node.flags;
+                            return updatedNode;
                         }
                         else {
-                            return isInUpdatedAstContext
+                            const updatedNode = isInUpdatedAstContext
                                 ? tsBinary.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause)
                                 : tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+                            updatedNode.flags = node.flags;
+                            return updatedNode;
                         }
                     }
                     catch (_a) {

package/lib/configuration/defaults.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultGitIgnore = exports.defaultOutDir = exports.defaultConfiguration = void 0;
+const get_default_tsconfig_path_1 = require("../utils/get-default-tsconfig-path");
 exports.defaultConfiguration = {
     language: 'ts',
     sourceRoot: 'src',
@@ -9,7 +10,7 @@ exports.defaultConfiguration = {
     projects: {},
     monorepo: false,
     compilerOptions: {
-        tsConfigPath: 'tsconfig.build.json',
+        tsConfigPath: (0, get_default_tsconfig_path_1.getDefaultTsconfigPath)(),
         webpack: false,
         webpackConfigPath: 'webpack.config.js',
         plugins: [],

package/lib/utils/get-default-tsconfig-path.d.ts

@@ -0,0 +1 @@
+export declare function getDefaultTsconfigPath(): "tsconfig.build.json" | "tsconfig.json";

package/lib/utils/get-default-tsconfig-path.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultTsconfigPath = void 0;
+const fs = require("fs");
+const path_1 = require("path");
+const TSCONFIG_BUILD_JSON = 'tsconfig.build.json';
+const TSCONFIG_JSON = 'tsconfig.json';
+function getDefaultTsconfigPath() {
+    return fs.existsSync((0, path_1.join)(process.cwd(), TSCONFIG_BUILD_JSON))
+        ? TSCONFIG_BUILD_JSON
+        : TSCONFIG_JSON;
+}
+exports.getDefaultTsconfigPath = getDefaultTsconfigPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "9.1.2",
+  "version": "9.1.4",
   "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": "14.2.1",
-    "@angular-devkit/schematics": "14.2.1",
-    "@angular-devkit/schematics-cli": "14.2.1",
+    "@angular-devkit/core": "14.2.2",
+    "@angular-devkit/schematics": "14.2.2",
+    "@angular-devkit/schematics-cli": "14.2.2",
     "@nestjs/schematics": "^9.0.0",
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
@@ -57,7 +57,7 @@
     "tree-kill": "1.2.2",
     "tsconfig-paths": "4.1.0",
     "tsconfig-paths-webpack-plugin": "4.0.0",
-    "typescript": "4.7.4",
+    "typescript": "4.8.3",
     "webpack": "5.74.0",
     "webpack-node-externals": "3.0.0"
   },
@@ -67,17 +67,17 @@
     "@types/copyfiles": "2.4.1",
     "@types/inquirer": "8.2.3",
     "@types/jest": "28.1.8",
-    "@types/node": "16.11.56",
-    "@types/node-emoji": "1.8.1",
+    "@types/node": "16.11.62",
+    "@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.1",
-    "@typescript-eslint/parser": "5.36.1",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
+    "@typescript-eslint/parser": "5.38.1",
     "delete-empty": "3.0.0",
-    "eslint": "8.23.0",
+    "eslint": "8.24.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.4.2",
     "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
+    "ts-loader": "9.4.1",
     "ts-node": "10.9.1"
   },
   "lint-staged": {