@nx/express 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/express",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Express contains executors and generators for allowing your workspace to create powerful Express Node applications and APIs.",
   "repository": {
@@ -30,10 +30,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/node": "17.3.0-beta.3",
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/node": "17.3.0-beta.4",
     "tslib": "^2.3.0",
-    "@nrwl/express": "17.3.0-beta.3"
+    "@nrwl/express": "17.3.0-beta.4"
   },
   "peerDependencies": {
     "express": "^4.18.1"

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

@@ -1,5 +1,5 @@
-import type { Tree } from '@nx/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<() => Promise<void>>;
-export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<() => Promise<void>>;
+export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -4,7 +4,9 @@ exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const node_1 = require("@nx/node");
+const versions_1 = require("@nx/node/src/utils/versions");
 const path_1 = require("path");
+const versions_2 = require("../../utils/versions");
 const init_1 = require("../init/init");
 function addTypes(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.appProjectRoot, 'tsconfig.app.json'), (json) => {
@@ -48,21 +50,24 @@ async function applicationGenerator(tree, schema) {
 exports.applicationGenerator = applicationGenerator;
 async function applicationGeneratorInternal(tree, schema) {
     const options = await normalizeOptions(tree, schema);
+    const tasks = [];
     const initTask = await (0, init_1.initGenerator)(tree, { ...options, skipFormat: true });
+    tasks.push(initTask);
     const applicationTask = await (0, node_1.applicationGenerator)(tree, {
         ...schema,
         bundler: 'webpack',
         skipFormat: true,
     });
+    tasks.push(applicationTask);
     addMainFile(tree, options);
     addTypes(tree, options);
+    if (!options.skipPackageJson) {
+        tasks.push(ensureDependencies(tree));
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return async () => {
-        await initTask();
-        await applicationTask();
-    };
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;
@@ -81,3 +86,6 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
     };
 }
+function ensureDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, { tslib: versions_1.tslibVersion }, { '@nx/express': versions_2.nxVersion });
+}

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

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

package/src/generators/init/init.js

@@ -2,32 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const node_1 = require("@nx/node");
-const versions_1 = require("@nx/node/src/utils/versions");
-const versions_2 = require("../../utils/versions");
+const versions_1 = require("../../utils/versions");
 function updateDependencies(tree) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/express'], []);
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        express: versions_2.expressVersion,
-        tslib: versions_1.tslibVersion,
-    }, {
-        '@types/express': versions_2.expressTypingsVersion,
-        '@nx/express': versions_2.nxVersion,
-    });
+    const tasks = [];
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/express'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, { express: versions_1.expressVersion }, { '@nx/express': versions_1.nxVersion }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function initGenerator(tree, schema) {
-    const initTask = await (0, node_1.initGenerator)(tree, {
-        ...schema,
-        skipFormat: true,
-    });
-    const installTask = updateDependencies(tree);
+    let installTask = () => { };
+    if (!schema.skipPackageJson) {
+        installTask = updateDependencies(tree);
+    }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return async () => {
-        await initTask();
-        await installTask();
-    };
+    return installTask;
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;

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

@@ -1,4 +1,4 @@
 export interface Schema {
-  unitTestRunner?: 'jest' | 'none';
   skipFormat?: boolean;
+  skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,16 +6,15 @@
   "description": "Init Express Plugin.",
   "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",
       "default": false
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not add dependencies to `package.json`."
     }
   },
   "required": []