@nx/node 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,30 +1,5 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/node with @nx/node",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-0-0-update-executor": {
-      "cli": "nx",
-      "version": "16.0.0-beta.5",
-      "description": "Replace @nrwl/node:webpack with @nx/node:webpack",
-      "implementation": "./src/migrations/update-16-0-0/update-webpack-executor"
-    },
-    "update-16-3-1-update-executor": {
-      "cli": "nx",
-      "version": "16.3.1-beta.0",
-      "description": "Replace @nrwl/node:webpack and @nx/node:webpack with @nx/webpack:webpack for all project targets",
-      "implementation": "./src/migrations/update-16-3-1/update-webpack-executor"
-    },
-    "update-16-4-0-replace-node-executor": {
-      "cli": "nx",
-      "version": "16.4.0-beta.8",
-      "description": "Replace @nx/node:node with @nx/js:node for all project targets",
-      "implementation": "./src/migrations/update-16-4-0/replace-node-executor"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
     "17.3.0": {
       "version": "17.3.0-beta.3",

package/package.json

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

package/src/generators/application/application.js

@@ -7,6 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("@nx/js/src/utils/versions");
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
@@ -276,6 +277,7 @@ async function applicationGenerator(tree, schema) {
     });
 }
 async function applicationGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'application');
     const options = await normalizeOptions(tree, schema);
     const tasks = [];
     if (options.framework === 'nest') {
@@ -359,7 +361,6 @@ async function applicationGeneratorInternal(tree, schema) {
             projectType: options.framework === 'none' ? 'cli' : 'server',
             name: options.rootProject ? 'e2e' : `${options.name}-e2e`,
             directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`,
-            projectNameAndRootFormat: 'as-provided',
             project: options.name,
             port: options.port,
             isNest: options.isNest,
@@ -390,15 +391,14 @@ async function applicationGeneratorInternal(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     options.bundler = options.bundler ?? 'esbuild';
     options.e2eTestRunner = options.e2eTestRunner ?? 'jest';
     const parsedTags = options.tags

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

@@ -1,12 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
   linter?: Linter | LinterType;

package/src/generators/application/schema.json

@@ -6,27 +6,21 @@
   "description": "Nx Application Options Schema.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the node application?",
-      "x-priority": "important",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
+      "pattern": "^[a-zA-Z][^:]*$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
@@ -126,5 +120,5 @@
       "description": "Add a docker build target"
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/e2e-project/e2e-project.js

@@ -126,13 +126,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(tree, options) {
+    options.directory = options.directory ?? `${options.project}-e2e`;
     const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-        name: options.name ?? `${options.project}-e2e`,
+        name: options.name,
         projectType: 'library',
         directory: options.rootProject ? 'e2e' : options.directory,
-        projectNameAndRootFormat: options.rootProject
-            ? 'as-provided'
-            : options.projectNameAndRootFormat,
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/e2e-project/schema.d.ts

@@ -1,10 +1,7 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-
 export interface Schema {
   project: string;
   projectType: 'server' | 'cli';
   directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   name?: string;
   port?: number;
   linter?: 'eslint' | 'none';

package/src/generators/e2e-project/schema.json

@@ -18,11 +18,6 @@
       "type": "string",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "name": {
       "description": "The name of the e2e project. Defaults to the project name with '-e2e' suffix.",
       "type": "string"

package/src/generators/init/init.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, options) {
     const tasks = [];
@@ -10,6 +11,7 @@ function updateDependencies(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function initGenerator(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'init');
     let installTask = () => { };
     if (!options.skipPackageJson) {
         installTask = updateDependencies(tree, options);

package/src/generators/library/library.js

@@ -7,6 +7,7 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
@@ -18,6 +19,7 @@ async function libraryGenerator(tree, schema) {
     });
 }
 async function libraryGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'node', 'library');
     const options = await normalizeOptions(tree, schema);
     const tasks = [
         await (0, init_1.initGenerator)(tree, {
@@ -30,7 +32,7 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     const libraryInstall = await (0, js_1.libraryGenerator)(tree, {
         ...options,
-        bundler: schema.buildable ? 'tsc' : 'none',
+        bundler: schema.buildable || schema.publishable ? 'tsc' : 'none',
         includeBabelRc: schema.babelJest,
         importPath: options.importPath,
         testEnvironment: 'node',
@@ -51,14 +53,13 @@ async function libraryGeneratorInternal(tree, schema) {
 }
 exports.default = libraryGenerator;
 async function normalizeOptions(tree, options) {
-    const { projectName, names: projectNames, projectRoot, importPath, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,10 +1,8 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   simpleModuleName?: boolean;
   skipTsConfig?: boolean;
   skipFormat?: boolean;

package/src/generators/library/schema.json

@@ -12,29 +12,24 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed",
+      "alias": "dir",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "simpleModuleName": {
-      "description": "Keep the module name simple (when using `--directory`).",
+      "description": "Keep the module name simple.",
       "type": "boolean",
       "default": false
     },
@@ -126,5 +121,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/migrations/update-16-0-0/update-webpack-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0/update-webpack-executor.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-        projectConfig.targets[targetName].options.compiler = 'tsc';
-        projectConfig.targets[targetName].options.target = 'node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/node', '@nx/node');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-3-1/update-webpack-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-3-1/update-webpack-executor.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/webpack:webpack';
-        projectConfig.targets[targetName].options.compiler = 'tsc';
-        projectConfig.targets[targetName].options.target = 'node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:webpack', migrateProject);
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/node:webpack', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-4-0/replace-node-executor.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/replace-node-executor.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function update(tree) {
-    const migrateProject = (_options, projectName, targetName) => {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-        projectConfig.targets[targetName].executor = '@nx/js:node';
-        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-    };
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/node:node', migrateProject);
-    await (0, devkit_1.formatFiles)(tree);
-}