@nx/devkit 16.7.2 → 16.8.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.7.2",
+  "version": "16.8.0-beta.1",
   "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.",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.7.2",
+    "@nrwl/devkit": "16.8.0-beta.1",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "b024f44a1ad4e1773e80f6dc72f9d22766b950f9"
+  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
 }

package/src/generators/format-files.js

@@ -38,7 +38,9 @@ function formatFiles(tree) {
                 if (support.ignored || !support.inferredParser) {
                     return;
                 }
-                tree.write(file.path, prettier.format(file.content.toString('utf-8'), options));
+                tree.write(file.path, 
+                // In prettier v3 the format result is a promise
+                yield prettier.format(file.content.toString('utf-8'), options));
             }
             catch (e) {
                 console.warn(`Could not format ${file.path}. Error: "${e.message}"`);

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

@@ -4,6 +4,7 @@ export type ProjectNameAndRootFormat = 'as-provided' | 'derived';
 export type ProjectGenerationOptions = {
     name: string;
     projectType: ProjectType;
+    callingGenerator: string;
     directory?: string;
     importPath?: string;
     projectNameAndRootFormat?: ProjectNameAndRootFormat;
@@ -37,4 +38,6 @@ export type ProjectNameAndRootOptions = {
      */
     importPath?: string;
 };
-export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions>;
+export declare function determineProjectNameAndRootOptions(tree: Tree, options: ProjectGenerationOptions): Promise<ProjectNameAndRootOptions & {
+    projectNameAndRootFormat: ProjectNameAndRootFormat;
+}>;

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

@@ -6,14 +6,14 @@ const enquirer_1 = require("enquirer");
 const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
-const { joinPathFragments, readJson, readNxJson } = (0, nx_1.requireNx)();
+const { joinPathFragments, normalizePath, logger, readJson, readNxJson, updateNxJson, } = (0, nx_1.requireNx)();
 function determineProjectNameAndRootOptions(tree, options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         validateName(options.name, options.projectNameAndRootFormat);
         const formats = getProjectNameAndRootFormats(tree, options);
-        const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(formats));
-        return formats[format];
+        const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(tree, formats, options.callingGenerator));
+        return Object.assign(Object.assign({}, formats[format]), { projectNameAndRootFormat: format });
     });
 }
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
@@ -37,7 +37,9 @@ function validateName(name, projectNameAndRootFormat) {
         throw new Error(`The project name should match the pattern "${pattern}". The provided value "${name}" does not match.`);
     }
 }
-function determineFormat(formats) {
+function determineFormat(tree, formats, callingGenerator) {
+    var _a, _b;
+    var _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (!formats.derived) {
             return 'as-provided';
@@ -52,8 +54,8 @@ function determineFormat(formats) {
         const derivedDescription = `Derived:
     Name: ${formats['derived'].projectName}
     Root: ${formats['derived'].projectRoot}`;
-        const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot} (This was derived from the folder structure. Please provide the exact name and directory in the future)`;
-        return yield (0, enquirer_1.prompt)({
+        const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot}`;
+        const result = yield (0, enquirer_1.prompt)({
             type: 'select',
             name: 'format',
             message: 'What should be the project name and where should it be generated?',
@@ -69,12 +71,37 @@ function determineFormat(formats) {
             ],
             initial: 'as-provided',
         }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
+        const deprecationWarning = 'In Nx 18, generating projects will no longer derive the name and root. Please provide the exact project name and root in the future.';
+        if (result === 'as-provided' && callingGenerator) {
+            const { saveDefault } = yield (0, enquirer_1.prompt)({
+                type: 'confirm',
+                message: `Would you like to configure Nx to always take project name and root as provided for ${callingGenerator}?`,
+                name: 'saveDefault',
+                initial: true,
+            });
+            if (saveDefault) {
+                const nxJson = readNxJson(tree);
+                (_a = nxJson.generators) !== null && _a !== void 0 ? _a : (nxJson.generators = {});
+                (_b = (_c = nxJson.generators)[callingGenerator]) !== null && _b !== void 0 ? _b : (_c[callingGenerator] = {});
+                nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
+                updateNxJson(tree, nxJson);
+            }
+            else {
+                logger.warn(deprecationWarning);
+            }
+        }
+        else {
+            logger.warn(deprecationWarning);
+        }
+        return result;
     });
 }
 function getProjectNameAndRootFormats(tree, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const name = (0, names_1.names)(options.name).fileName;
-    const directory = (_a = options.directory) === null || _a === void 0 ? void 0 : _a.replace(/^\.?\//, '');
+    const directory = options.directory
+        ? normalizePath(options.directory.replace(/^\.?\//, ''))
+        : undefined;
     const asProvidedProjectName = name;
     const asProvidedProjectDirectory = directory
         ? (0, names_1.names)(directory).fileName
@@ -90,7 +117,7 @@ function getProjectNameAndRootFormats(tree, options) {
                     projectSimpleName: nameWithoutScope,
                     projectFileName: nameWithoutScope,
                 },
-                importPath: (_b = options.importPath) !== null && _b !== void 0 ? _b : asProvidedProjectName,
+                importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : asProvidedProjectName,
                 projectRoot: asProvidedProjectDirectory,
             },
         };
@@ -103,7 +130,7 @@ function getProjectNameAndRootFormats(tree, options) {
             npmScope = getNpmScope(tree);
             asProvidedImportPath =
                 asProvidedProjectDirectory === '.'
-                    ? (_c = readJson(tree, 'package.json').name) !== null && _c !== void 0 ? _c : getImportPath(npmScope, asProvidedProjectName)
+                    ? (_b = readJson(tree, 'package.json').name) !== null && _b !== void 0 ? _b : getImportPath(npmScope, asProvidedProjectName)
                     : getImportPath(npmScope, asProvidedProjectName);
         }
     }
@@ -129,7 +156,7 @@ function getProjectNameAndRootFormats(tree, options) {
         if (!derivedImportPath) {
             derivedImportPath =
                 derivedProjectDirectory === '.'
-                    ? (_d = readJson(tree, 'package.json').name) !== null && _d !== void 0 ? _d : getImportPath(npmScope, derivedProjectName)
+                    ? (_c = readJson(tree, 'package.json').name) !== null && _c !== void 0 ? _c : getImportPath(npmScope, derivedProjectName)
                     : getImportPath(npmScope, derivedProjectDirectoryWithoutLayout);
         }
     }

package/src/tasks/install-packages-task.js

@@ -29,9 +29,6 @@ function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager =
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
         };
-        if (pmc.preInstall) {
-            (0, child_process_1.execSync)(pmc.preInstall, execSyncOptions);
-        }
         (0, child_process_1.execSync)(pmc.install, execSyncOptions);
     }
 }