@nx/devkit 20.5.0-rc.3 → 20.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "20.5.0-rc.3",
+  "version": "20.5.0",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {

package/src/generators/project-name-and-root-utils.d.ts

@@ -31,8 +31,11 @@ export type ProjectNameAndRootOptions = {
     /**
      * Normalized import path for the project.
      */
-    importPath?: string;
+    importPath: string;
 };
 export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions>;
 export declare function resolveImportPath(tree: Tree, projectName: string, projectRoot: string): string;
-export declare function ensureProjectName(tree: Tree, options: Omit<ProjectGenerationOptions, 'projectType'>, projectType: 'application' | 'library'): Promise<void>;
+export declare function ensureRootProjectName(options: {
+    directory: string;
+    name?: string;
+}, projectType: 'application' | 'library'): Promise<void>;

package/src/generators/project-name-and-root-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
 exports.resolveImportPath = resolveImportPath;
-exports.ensureProjectName = ensureProjectName;
+exports.ensureRootProjectName = ensureRootProjectName;
 const enquirer_1 = require("enquirer");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const path_1 = require("path");
@@ -44,11 +44,7 @@ async function determineProjectNameAndRootOptions(tree, options) {
             projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, name);
         }
     }
-    let importPath = undefined;
-    if (options.projectType === 'library') {
-        importPath =
-            options.importPath ?? resolveImportPath(tree, name, projectRoot);
-    }
+    const importPath = options.importPath ?? resolveImportPath(tree, name, projectRoot);
     return {
         projectName: name,
         names: {
@@ -74,20 +70,14 @@ function resolveImportPath(tree, projectName, projectRoot) {
     }
     return importPath;
 }
-async function ensureProjectName(tree, options, projectType) {
-    if (!options.name) {
-        if (options.directory === '.' && getRelativeCwd() === '') {
-            const result = await (0, enquirer_1.prompt)({
-                type: 'input',
-                name: 'name',
-                message: `What do you want to name the ${projectType}?`,
-            }).then(({ name }) => (options.name = name));
-        }
-        const { projectName } = await determineProjectNameAndRootOptions(tree, {
-            ...options,
-            projectType,
+async function ensureRootProjectName(options, projectType) {
+    if (!options.name && options.directory === '.' && getRelativeCwd() === '') {
+        const result = await (0, enquirer_1.prompt)({
+            type: 'input',
+            name: 'name',
+            message: `What do you want to name the ${projectType}?`,
         });
-        options.name = projectName;
+        options.name = result.name;
     }
 }
 function validateOptions(options) {