@nx/nest 17.3.0-beta.3 → 17.3.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.5",
   "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,13 +31,13 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/node": "17.3.0-beta.3",
+    "@nx/devkit": "17.3.0-beta.5",
+    "@nx/js": "17.3.0-beta.5",
+    "@nx/eslint": "17.3.0-beta.5",
+    "@nx/node": "17.3.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "tslib": "^2.3.0",
-    "@nrwl/nest": "17.3.0-beta.3"
+    "@nrwl/nest": "17.3.0-beta.5"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -14,18 +14,23 @@ async function applicationGenerator(tree, rawOptions) {
 exports.applicationGenerator = applicationGenerator;
 async function applicationGeneratorInternal(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const tasks = [];
     const initTask = await (0, init_1.initGenerator)(tree, {
         skipPackageJson: options.skipPackageJson,
-        unitTestRunner: options.unitTestRunner,
         skipFormat: true,
     });
+    tasks.push(initTask);
     const nodeApplicationTask = await (0, node_1.applicationGenerator)(tree, (0, lib_1.toNodeApplicationGeneratorOptions)(options));
+    tasks.push(nodeApplicationTask);
     (0, lib_1.createFiles)(tree, options);
     (0, lib_1.updateTsConfig)(tree, options);
+    if (!options.skipPackageJson) {
+        tasks.push((0, lib_1.ensureDependencies)(tree));
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(initTask, nodeApplicationTask);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

package/src/generators/application/lib/ensure-dependencies.d.ts

@@ -0,0 +1,2 @@
+import type { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function ensureDependencies(tree: Tree): GeneratorCallback;

package/src/generators/application/lib/ensure-dependencies.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
+function ensureDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@nestjs/common': versions_1.nestJsVersion,
+        '@nestjs/core': versions_1.nestJsVersion,
+        '@nestjs/platform-express': versions_1.nestJsVersion,
+        'reflect-metadata': versions_1.reflectMetadataVersion,
+        rxjs: versions_1.rxjsVersion,
+        tslib: versions_1.tsLibVersion,
+    }, {
+        '@nestjs/testing': versions_1.nestJsVersion,
+    });
+}
+exports.ensureDependencies = ensureDependencies;

package/src/generators/application/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './create-files';
+export * from './ensure-dependencies';
 export * from './normalize-options';
 export * from './update-tsconfig';

package/src/generators/application/lib/index.js

@@ -2,5 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./create-files"), exports);
+tslib_1.__exportStar(require("./ensure-dependencies"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-tsconfig"), exports);

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { InitGeneratorOptions } from './schema';
-export declare function initGenerator(tree: Tree, rawOptions: InitGeneratorOptions): Promise<GeneratorCallback>;
+export declare function initGenerator(tree: Tree, options: InitGeneratorOptions): Promise<GeneratorCallback>;
 export default initGenerator;

package/src/generators/init/init.js

@@ -2,24 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const node_1 = require("@nx/node");
 const lib_1 = require("./lib");
-async function initGenerator(tree, rawOptions) {
-    const options = (0, lib_1.normalizeOptions)(rawOptions);
-    const tasks = [];
-    const nodeInitTask = await (0, node_1.initGenerator)(tree, {
-        ...options,
-        skipFormat: true,
-    });
-    tasks.push(nodeInitTask);
+async function initGenerator(tree, options) {
+    let installPackagesTask = () => { };
     if (!options.skipPackageJson) {
-        const installPackagesTask = (0, lib_1.addDependencies)(tree);
-        tasks.push(installPackagesTask);
+        installPackagesTask = (0, lib_1.addDependencies)(tree);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installPackagesTask;
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;

package/src/generators/init/lib/add-dependencies.js

@@ -4,16 +4,8 @@ exports.addDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 function addDependencies(tree) {
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        '@nestjs/common': versions_1.nestJsVersion,
-        '@nestjs/core': versions_1.nestJsVersion,
-        '@nestjs/platform-express': versions_1.nestJsVersion,
-        'reflect-metadata': versions_1.reflectMetadataVersion,
-        rxjs: versions_1.rxjsVersion,
-        tslib: versions_1.tsLibVersion,
-    }, {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@nestjs/schematics': versions_1.nestJsSchematicsVersion,
-        '@nestjs/testing': versions_1.nestJsVersion,
         '@nx/nest': versions_1.nxVersion,
     });
 }

package/src/generators/init/lib/index.d.ts

@@ -1,2 +1 @@
 export * from './add-dependencies';
-export * from './normalize-options';

package/src/generators/init/lib/index.js

@@ -2,4 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./add-dependencies"), exports);
-tslib_1.__exportStar(require("./normalize-options"), exports);

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

@@ -2,6 +2,5 @@ import { UnitTestRunner } from '../utils';
 
 export interface InitGeneratorOptions {
   skipFormat?: boolean;
-  unitTestRunner?: UnitTestRunner;
   skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,12 +6,6 @@
   "cli": "nx",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner.",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/init/lib/normalize-options.d.ts

@@ -1,2 +0,0 @@
-import type { InitGeneratorOptions } from '../schema';
-export declare function normalizeOptions(options: InitGeneratorOptions): InitGeneratorOptions;

package/src/generators/init/lib/normalize-options.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
-function normalizeOptions(options) {
-    return {
-        ...options,
-        unitTestRunner: options.unitTestRunner ?? 'jest',
-    };
-}
-exports.normalizeOptions = normalizeOptions;