@nx/nest 16.4.0-beta.9 → 16.4.0

package/migrations.json

@@ -11,6 +11,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/nest with @nx/nest",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-16-4-0-support-nestjs-10": {
+      "cli": "nx",
+      "version": "16.4.0-beta.16",
+      "description": "Update TsConfig target to es2021 and CacheModule if being used. Read more at https://docs.nestjs.com/migration-guide",
+      "implementation": "./src/migrations/update-16-4-0-cache-manager/nestjs-10-updates"
     }
   },
   "packageJsonUpdates": {
@@ -71,6 +77,35 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.4.0": {
+      "version": "16.4.0-beta.11",
+      "packages": {
+        "@nestjs/common": {
+          "version": "^10.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@nestjs/core": {
+          "version": "^10.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@nestjs/platform-express": {
+          "version": "^10.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@nestjs/schematics": {
+          "version": "^10.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@nestjs/swagger": {
+          "version": "^7.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@nestjs/testing": {
+          "version": "^10.0.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "16.4.0-beta.9",
+  "version": "16.4.0",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -31,16 +31,17 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nrwl/nest": "16.4.0-beta.9",
-    "@nx/devkit": "16.4.0-beta.9",
-    "@nx/js": "16.4.0-beta.9",
-    "@nx/linter": "16.4.0-beta.9",
-    "@nx/node": "16.4.0-beta.9",
+    "@nrwl/nest": "16.4.0",
+    "@nx/devkit": "16.4.0",
+    "@nx/js": "16.4.0",
+    "@nx/linter": "16.4.0",
+    "@nx/node": "16.4.0",
+    "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6"
   },
   "publishConfig": {
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "b7fbc25d5be1789d42805e2254cf4a6070889157"
+  "gitHead": "ae698a72748d9f33aa5395aeeaa7b7af436a1dc5"
 }

package/src/generators/application/lib/update-tsconfig.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'), (json) => {
         json.compilerOptions.emitDecoratorMetadata = true;
-        json.compilerOptions.target = 'es2015';
+        json.compilerOptions.target = 'es2021';
         if (options.strict) {
             json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { strictNullChecks: true, noImplicitAny: true, strictBindCallApply: true, forceConsistentCasingInFileNames: true, noFallthroughCasesInSwitch: true });
         }

package/src/generators/library/schema.d.ts

@@ -24,7 +24,8 @@ export interface LibraryGeneratorOptions {
     | 'es2017'
     | 'es2018'
     | 'es2019'
-    | 'es2020';
+    | 'es2020'
+    | 'es2021';
   testEnvironment?: 'jsdom' | 'node';
   unitTestRunner?: UnitTestRunner;
   standaloneConfig?: boolean;

package/src/generators/library/schema.json

@@ -92,9 +92,9 @@
       "default": "node"
     },
     "target": {
-      "description": "The ES target, Nest suggest using es6 or higher.",
+      "description": "The ES target, Nest suggest using es2021 or higher.",
       "type": "string",
-      "default": "es6",
+      "default": "es2021",
       "enum": [
         "es5",
         "es6",
@@ -104,7 +104,8 @@
         "es2017",
         "es2018",
         "es2019",
-        "es2020"
+        "es2020",
+        "es2021"
       ]
     },
     "strict": {

package/src/migrations/update-16-4-0-cache-manager/nestjs-10-updates.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '@nx/devkit';
+export declare function updateNestJs10(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function updateCacheManagerImport(tree: Tree, filePath: string): boolean;
+export declare function updateTsConfigTarget(tree: Tree, tsConfigPath: string): void;
+export default updateNestJs10;

package/src/migrations/update-16-4-0-cache-manager/nestjs-10-updates.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsConfigTarget = exports.updateCacheManagerImport = exports.updateNestJs10 = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("typescript");
+const JS_TS_FILE_MATCHER = /\.[jt]sx?$/;
+const importMatch = ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="CacheModule"], Identifier[name="CacheModule"]):has(StringLiteral[value="@nestjs/common"])';
+function updateNestJs10(tree) {
+    var _a, _b, _c, _d;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const nestProjects = yield getNestProejcts();
+        if (nestProjects.length === 0) {
+            return;
+        }
+        let installCacheModuleDeps = false;
+        const projects = (0, devkit_1.getProjects)(tree);
+        for (const projectName of nestProjects) {
+            const projectConfig = projects.get(projectName);
+            const tsConfig = (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.tsConfig) !== null && _d !== void 0 ? _d : (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'application'
+                ? 'tsconfig.app.json'
+                : 'tsconfig.lib.json');
+            if (tree.exists(tsConfig)) {
+                updateTsConfigTarget(tree, tsConfig);
+            }
+            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+                if (!JS_TS_FILE_MATCHER.test(filePath)) {
+                    return;
+                }
+                installCacheModuleDeps =
+                    updateCacheManagerImport(tree, filePath) || installCacheModuleDeps;
+            });
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+        return installCacheModuleDeps
+            ? (0, devkit_1.addDependenciesToPackageJson)(tree, {
+                '@nestjs/cache-manager': '^2.0.0',
+                'cache-manager': '^5.2.3',
+            }, {})
+            : () => { };
+    });
+}
+exports.updateNestJs10 = updateNestJs10;
+function getNestProejcts() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
+        return Object.entries(projectGraph.dependencies)
+            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]) && target === 'npm:@nestjs/common'; }))
+            .map(([projectName]) => projectName);
+    });
+}
+// change import { CacheModule } from '@nestjs/common';
+// to import { CacheModule } from '@nestjs/cache-manager';
+function updateCacheManagerImport(tree, filePath) {
+    const content = tree.read(filePath, 'utf-8');
+    const updated = tsquery_1.tsquery.replace(content, importMatch, (node) => {
+        const text = node.getText();
+        return `${text.replace('CacheModule', '')}\n${(0, typescript_1.isVariableStatement)(node)
+            ? "const { CacheModule } = require('@nestjs/cache-manager')"
+            : "import { CacheModule } from '@nestjs/cache-manager';"}`;
+    });
+    if (updated !== content) {
+        tree.write(filePath, updated);
+        return true;
+    }
+}
+exports.updateCacheManagerImport = updateCacheManagerImport;
+function updateTsConfigTarget(tree, tsConfigPath) {
+    (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+        if (!json.compilerOptions.target) {
+            return;
+        }
+        const normalizedTargetName = json.compilerOptions.target.toUpperCase();
+        // es6 isn't apart of the ScriptTarget enum but is a valid tsconfig target in json file
+        const existingTarget = normalizedTargetName === 'ES6'
+            ? typescript_1.ScriptTarget.ES2015
+            : typescript_1.ScriptTarget[normalizedTargetName];
+        if (existingTarget < typescript_1.ScriptTarget.ES2021) {
+            json.compilerOptions.target = 'es2021';
+        }
+        return json;
+    });
+}
+exports.updateTsConfigTarget = updateTsConfigTarget;
+exports.default = updateNestJs10;

package/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
-export declare const nestJsVersion = "^9.1.1";
-export declare const nestJsSchematicsVersion = "^9.1.0";
+export declare const nestJsVersion = "^10.0.2";
+export declare const nestJsSchematicsVersion = "^10.0.1";
 export declare const rxjsVersion = "^7.8.0";
 export declare const reflectMetadataVersion = "^0.1.13";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.reflectMetadataVersion = exports.rxjsVersion = exports.nestJsSchematicsVersion = exports.nestJsVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.nestJsVersion = '^9.1.1';
-exports.nestJsSchematicsVersion = '^9.1.0';
+exports.nestJsVersion = '^10.0.2';
+exports.nestJsSchematicsVersion = '^10.0.1';
 exports.rxjsVersion = '^7.8.0';
 exports.reflectMetadataVersion = '^0.1.13';
 exports.tsLibVersion = '^2.3.0';