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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.5",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/jest": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nrwl/node": "17.3.0-beta.3"
+    "@nx/devkit": "17.3.0-beta.5",
+    "@nx/jest": "17.3.0-beta.5",
+    "@nx/js": "17.3.0-beta.5",
+    "@nx/eslint": "17.3.0-beta.5",
+    "@nrwl/node": "17.3.0-beta.5"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -224,9 +224,11 @@ function addProjectDependencies(tree, options) {
     };
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         ...frameworkDependencies[options.framework],
+        tslib: versions_2.tslibVersion,
     }, {
         ...frameworkDevDependencies[options.framework],
         ...bundlers[options.bundler],
+        '@types/node': versions_2.typesNodeVersion,
     });
 }
 function updateTsConfigOptions(tree, options) {
@@ -268,6 +270,12 @@ async function applicationGeneratorInternal(tree, schema) {
         const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
         return await applicationGenerator(tree, { ...options, skipFormat: true });
     }
+    const jsInitTask = await (0, js_1.initGenerator)(tree, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const initTask = await (0, init_1.initGenerator)(tree, {
         ...schema,
         skipFormat: true,
@@ -278,10 +286,14 @@ async function applicationGeneratorInternal(tree, schema) {
     if (options.bundler === 'webpack') {
         const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
         const webpackInitTask = await webpackInitGenerator(tree, {
-            uiFramework: 'react',
+            skipPackageJson: options.skipPackageJson,
             skipFormat: true,
         });
         tasks.push(webpackInitTask);
+        if (!options.skipPackageJson) {
+            const { ensureDependencies } = await Promise.resolve().then(() => require('@nx/webpack/src/utils/ensure-dependencies'));
+            tasks.push(ensureDependencies(tree, { uiFramework: 'react' }));
+        }
     }
     addAppFiles(tree, options);
     addProject(tree, options);

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

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

package/src/generators/init/init.js

@@ -2,37 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
-const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree) {
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/node'], []);
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        tslib: versions_1.tslibVersion,
-    }, { '@nx/node': versions_1.nxVersion, '@types/node': versions_1.typesNodeVersion });
-}
-function normalizeOptions(schema) {
-    return {
-        ...schema,
-        unitTestRunner: schema.unitTestRunner ?? 'jest',
-    };
-}
-async function initGenerator(tree, schema) {
-    const options = normalizeOptions(schema);
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(tree, {
-        ...schema,
-        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
-        skipFormat: true,
-    }));
-    if (options.unitTestRunner === 'jest') {
-        tasks.push(await (0, jest_1.jestInitGenerator)(tree, { ...schema, testEnvironment: 'node' }));
+    tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/node'], []));
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/node': versions_1.nxVersion }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
+}
+async function initGenerator(tree, options) {
+    let installTask = () => { };
+    if (!options.skipPackageJson) {
+        installTask = updateDependencies(tree);
     }
-    tasks.push(updateDependencies(tree));
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;

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

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

package/src/generators/init/schema.json

@@ -6,21 +6,15 @@
   "description": "Init Node 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
     },
-    "js": {
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
+      "default": false
     }
   },
   "required": []

package/src/generators/library/library.js

@@ -7,6 +7,7 @@ const js_1 = require("@nx/js");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -41,6 +42,7 @@ async function libraryGeneratorInternal(tree, schema) {
         (0, devkit_1.updateTsConfigsToJs)(tree, options);
     }
     updateProject(tree, options);
+    tasks.push(ensureDependencies(tree));
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -127,3 +129,6 @@ function updateProject(tree, options) {
     }
     (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
 }
+function ensureDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, { tslib: versions_1.tslibVersion }, { '@types/node': versions_1.typesNodeVersion });
+}