@nx/devkit 20.0.8 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "20.0.8",
+  "version": "20.1.0-beta.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/format-files.d.ts

@@ -3,4 +3,10 @@ import { Tree } from 'nx/src/devkit-exports';
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
-export declare function formatFiles(tree: Tree): Promise<void>;
+export declare function formatFiles(tree: Tree, options?: {
+    /**
+     * TODO(v21): Stop sorting tsconfig paths by default, paths are now less common/important
+     * in Nx workspace setups, and the sorting causes comments to be lost.
+     */
+    sortRootTsconfigPaths: boolean;
+}): Promise<void>;

package/src/generators/format-files.js

@@ -8,13 +8,21 @@ const devkit_internals_1 = require("nx/src/devkit-internals");
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
-async function formatFiles(tree) {
+async function formatFiles(tree, options = {
+    /**
+     * TODO(v21): Stop sorting tsconfig paths by default, paths are now less common/important
+     * in Nx workspace setups, and the sorting causes comments to be lost.
+     */
+    sortRootTsconfigPaths: true,
+}) {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
     }
     catch { }
-    sortTsConfig(tree);
+    if (options.sortRootTsconfigPaths) {
+        sortTsConfig(tree);
+    }
     if (!prettier)
         return;
     const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));

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

@@ -34,4 +34,5 @@ export type ProjectNameAndRootOptions = {
     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>;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
+exports.resolveImportPath = resolveImportPath;
 exports.ensureProjectName = ensureProjectName;
 const enquirer_1 = require("enquirer");
 const devkit_exports_1 = require("nx/src/devkit-exports");
@@ -45,20 +46,8 @@ async function determineProjectNameAndRootOptions(tree, options) {
     }
     let importPath = undefined;
     if (options.projectType === 'library') {
-        importPath = options.importPath;
-        if (!importPath) {
-            if (name.startsWith('@')) {
-                importPath = name;
-            }
-            else {
-                const npmScope = getNpmScope(tree);
-                importPath =
-                    projectRoot === '.'
-                        ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
-                            getImportPath(npmScope, name)
-                        : getImportPath(npmScope, name);
-            }
-        }
+        importPath =
+            options.importPath ?? resolveImportPath(tree, name, projectRoot);
     }
     return {
         projectName: name,
@@ -70,6 +59,21 @@ async function determineProjectNameAndRootOptions(tree, options) {
         projectRoot,
     };
 }
+function resolveImportPath(tree, projectName, projectRoot) {
+    let importPath;
+    if (projectName.startsWith('@')) {
+        importPath = projectName;
+    }
+    else {
+        const npmScope = getNpmScope(tree);
+        importPath =
+            projectRoot === '.'
+                ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
+                    getImportPath(npmScope, projectName)
+                : getImportPath(npmScope, projectName);
+    }
+    return importPath;
+}
 async function ensureProjectName(tree, options, projectType) {
     if (!options.name) {
         if (options.directory === '.' && getRelativeCwd() === '') {

package/src/generators/prompt.d.ts

@@ -0,0 +1,2 @@
+import { prompt } from 'enquirer';
+export declare function promptWhenInteractive<T>(questions: Parameters<typeof prompt>[0], defaultValue: T): Promise<T>;

package/src/generators/prompt.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptWhenInteractive = promptWhenInteractive;
+const enquirer_1 = require("enquirer");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+async function promptWhenInteractive(questions, defaultValue) {
+    if (!isInteractive()) {
+        return defaultValue;
+    }
+    return await (0, enquirer_1.prompt)(questions);
+}
+function isInteractive() {
+    return (!(0, devkit_internals_1.isCI)() && !!process.stdout.isTTY && process.env.NX_INTERACTIVE === 'true');
+}