@nx/node 0.0.0-pr-29993-f89d4dd → 0.0.0-pr-3-e51e28c

package/package.json

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

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

@@ -1,10 +1,9 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
+export interface NormalizedSchema extends Schema {
     appProjectRoot: string;
     parsedTags: string[];
     outputPath: string;
-    importPath: string;
     isUsingTsSolutionConfig: boolean;
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

package/src/generators/application/application.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingToApplication = addLintingToApplication;
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 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");
@@ -140,11 +141,13 @@ function addProject(tree, options) {
     project.targets.serve = getServeConfig(options);
     if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: options.importPath,
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
             version: '0.0.1',
             private: true,
             nx: {
-                name: options.name !== options.importPath ? options.name : undefined,
+                name: options.name,
+                projectType: 'application',
+                sourceRoot: project.sourceRoot,
                 targets: project.targets,
                 tags: project.tags?.length ? project.tags : undefined,
             },
@@ -378,11 +381,6 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     addAppFiles(tree, options);
     addProject(tree, options);
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
-    }
     updateTsConfigOptions(tree, options);
     if (options.linter === eslint_1.Linter.EsLint) {
         const lintTask = await addLintingToApplication(tree, options);
@@ -447,6 +445,11 @@ async function applicationGeneratorInternal(tree, schema) {
             ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
             : undefined);
     }
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -457,8 +460,8 @@ async function applicationGeneratorInternal(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, projectRoot: appProjectRoot, importPath, } = 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,
@@ -475,7 +478,6 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const swcJest = options.swcJest ?? isUsingTsSolutionConfig;
-    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     return {
         addPlugin,
         ...options,
@@ -484,7 +486,6 @@ async function normalizeOptions(host, options) {
             ? (0, devkit_1.names)(options.frontendProject).fileName
             : undefined,
         appProjectRoot,
-        importPath,
         parsedTags,
         linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? 'jest',
@@ -492,7 +493,7 @@ async function normalizeOptions(host, options) {
         port: options.port ?? 3000,
         outputPath: isUsingTsSolutionConfig
             ? (0, devkit_1.joinPathFragments)(appProjectRoot, 'dist')
-            : (0, devkit_1.joinPathFragments)('dist', options.rootProject ? appProjectName : appProjectRoot),
+            : (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
         isUsingTsSolutionConfig,
         swcJest,
     };

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

@@ -12,6 +12,7 @@ const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const config_file_1 = require("@nx/jest/src/utils/config/config-file");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const posix_1 = require("node:path/posix");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 async function e2eProjectGenerator(host, options) {
@@ -28,18 +29,17 @@ async function e2eProjectGeneratorInternal(host, _options) {
     // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
     if (isUsingTsSolutionConfig) {
         (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-            name: options.importPath,
+            name: (0, get_import_path_1.getImportPath)(host, options.e2eProjectName),
             version: '0.0.1',
             private: true,
             nx: {
-                name: options.e2eProjectName !== options.importPath
-                    ? options.e2eProjectName
-                    : undefined,
+                name: options.e2eProjectName,
+                projectType: 'application',
                 implicitDependencies: [options.project],
                 targets: {
                     e2e: {
                         executor: '@nx/jest:jest',
-                        outputs: ['{projectRoot}/test-output/jest/coverage'],
+                        outputs: ['{workspaceRoot}/coverage/{e2eProjectRoot}'],
                         options: {
                             jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
                             passWithNoTests: true,
@@ -101,11 +101,10 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const coverageDirectory = isUsingTsSolutionConfig
         ? 'test-output/jest/coverage'
         : (0, devkit_1.joinPathFragments)(rootOffset, 'coverage', options.e2eProjectName);
-    const projectSimpleName = options.project.split('/').pop();
     if (options.projectType === 'server') {
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/common'), options.e2eProjectRoot, {
             ...options,
-            ...(0, devkit_1.names)(options.rootProject ? 'server' : projectSimpleName),
+            ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
             tsConfigFile,
             offsetFromRoot: rootOffset,
             jestPreset,
@@ -116,7 +115,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
         if (options.isNest) {
             (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/nest'), options.e2eProjectRoot, {
                 ...options,
-                ...(0, devkit_1.names)(options.rootProject ? 'server' : projectSimpleName),
+                ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
                 tsConfigFile,
                 offsetFromRoot: rootOffset,
                 tmpl: '',
@@ -127,7 +126,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
         const mainFile = appProject.targets.build?.options?.outputPath;
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/cli'), options.e2eProjectRoot, {
             ...options,
-            ...(0, devkit_1.names)(options.rootProject ? 'cli' : projectSimpleName),
+            ...(0, devkit_1.names)(options.rootProject ? 'cli' : options.project),
             mainFile,
             tsConfigFile,
             offsetFromRoot: rootOffset,
@@ -202,15 +201,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(tree, options) {
-    let directory = options.rootProject ? 'e2e' : options.directory;
-    if (!directory) {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        directory = `${projectConfig.root}-e2e`;
-    }
-    const { projectName: e2eProjectName, projectRoot: e2eProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    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,
-        projectType: 'application',
-        directory,
+        projectType: 'library',
+        directory: options.rootProject ? 'e2e' : options.directory,
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -220,7 +215,6 @@ async function normalizeOptions(tree, options) {
         ...options,
         e2eProjectRoot,
         e2eProjectName,
-        importPath,
         port: options.port ?? 3000,
         rootProject: !!options.rootProject,
     };

package/src/generators/library/library.js

@@ -12,6 +12,7 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -35,7 +36,7 @@ async function libraryGeneratorInternal(tree, schema) {
         options.publishable ||
         options.buildable) {
         (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
-            name: options.importPath,
+            name: (0, get_import_path_1.getImportPath)(tree, options.name),
             version: '0.0.1',
             private: true,
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
@@ -74,7 +75,7 @@ async function libraryGeneratorInternal(tree, schema) {
 }
 exports.default = libraryGenerator;
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    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',
@@ -95,7 +96,9 @@ async function normalizeOptions(tree, options) {
     return {
         ...options,
         fileName,
-        projectName: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(tree, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,