@nx/js 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.5.0-rc.3",
-    "@nx/workspace": "20.5.0-rc.3",
+    "@nx/devkit": "20.5.0",
+    "@nx/workspace": "20.5.0",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

package/src/generators/library/library.js

@@ -22,7 +22,6 @@ const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
-const get_import_path_1 = require("../../utils/get-import-path");
 const add_release_config_1 = require("./utils/add-release-config");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
@@ -236,9 +235,7 @@ async function configureProject(tree, options) {
             }
         }
         // empty targets are cleaned up automatically by `updateProjectConfiguration`
-        (0, devkit_1.updateProjectConfiguration)(tree, options.isUsingTsSolutionConfig
-            ? options.importPath ?? options.name
-            : options.name, projectConfiguration);
+        (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfiguration);
     }
     else if (options.config === 'workspace' || options.config === 'project') {
         (0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration);
@@ -468,6 +465,11 @@ function createFiles(tree, options) {
                 format: ['esm'],
             });
         }
+        if (!options.useProjectJson && options.name !== options.importPath) {
+            packageJson.nx = {
+                name: options.name,
+            };
+        }
         (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
     }
     if (options.config === 'npm-scripts') {
@@ -527,7 +529,7 @@ function replaceJestConfig(tree, options) {
     });
 }
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=
         process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -629,9 +631,7 @@ async function normalizeOptions(tree, options) {
     return {
         ...options,
         fileName,
-        name: isUsingTsSolutionConfig
-            ? (0, get_import_path_1.getImportPath)(tree, projectName)
-            : projectName,
+        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectNames,
         projectRoot,
         parsedTags,

package/src/utils/typescript/ts-solution-setup.d.ts

@@ -6,3 +6,4 @@ export declare function findRuntimeTsConfigName(projectRoot: string, tree?: Tree
 export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, runtimeTsconfigFileName: string, compilerOptions: Record<string, string | boolean | string[]>, exclude?: string[], rootDir?: string): void;
 export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): void;
 export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';
+export declare function getProjectSourceRoot(tree: Tree, projectSourceRoot: string | undefined, projectRoot: string): string | undefined;

package/src/utils/typescript/ts-solution-setup.js

@@ -7,6 +7,7 @@ exports.findRuntimeTsConfigName = findRuntimeTsConfigName;
 exports.updateTsconfigFiles = updateTsconfigFiles;
 exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 exports.getProjectType = getProjectType;
+exports.getProjectSourceRoot = getProjectSourceRoot;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
@@ -192,3 +193,9 @@ function getProjectType(tree, projectRoot, projectType) {
         return 'application';
     return 'library';
 }
+function getProjectSourceRoot(tree, projectSourceRoot, projectRoot) {
+    return (projectSourceRoot ??
+        (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'src'))
+            ? (0, devkit_1.joinPathFragments)(projectRoot, 'src')
+            : projectRoot));
+}