@nx/devkit 16.9.0-beta.2 → 16.9.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.9.0-beta.2",
+  "version": "16.9.0-beta.4",
   "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,13 +28,13 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.9.0-beta.2",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
-    "semver": "7.5.3",
     "tmp": "~0.2.1",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "semver": "7.5.3",
+    "@nrwl/devkit": "*"
   },
   "peerDependencies": {
     "nx": ">= 15 <= 17"
@@ -45,6 +45,5 @@
   "nx-migrations": {
     "migrations": "./migrations.json"
   },
-  "type": "commonjs",
-  "gitHead": "e11d538fa2c7266066d554d9405abab8e0a65040"
+  "type": "commonjs"
 }

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

@@ -12,12 +12,7 @@ const deprecationWarning = stripIndents `
 async function determineProjectNameAndRootOptions(tree, options) {
     validateName(options.name, options.projectNameAndRootFormat);
     const formats = getProjectNameAndRootFormats(tree, options);
-    const configuredDefault = getDefaultProjectNameAndRootFormat(tree);
-    if (configuredDefault === 'derived') {
-        logger.warn(deprecationWarning + '\n' + getExample(options.callingGenerator, formats));
-    }
     const format = options.projectNameAndRootFormat ??
-        configuredDefault ??
         (await determineFormat(tree, formats, options.callingGenerator));
     return {
         ...formats[format],
@@ -63,6 +58,9 @@ async function determineFormat(tree, formats, callingGenerator) {
     Name: ${formats['derived'].projectName}
     Root: ${formats['derived'].projectRoot}`;
     const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot}`;
+    if (asProvidedSelectedValue === derivedSelectedValue) {
+        return 'as-provided';
+    }
     const result = await (0, enquirer_1.prompt)({
         type: 'select',
         name: 'format',
@@ -79,36 +77,12 @@ async function determineFormat(tree, formats, callingGenerator) {
         ],
         initial: 'as-provided',
     }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    if (result === 'as-provided' && callingGenerator) {
-        const { saveDefault } = await (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) {
-            setProjectNameAndRootFormatDefault(tree);
-        }
-        else {
-            logger.warn(deprecationWarning);
-        }
-    }
-    else {
+    if (result === 'derived' && callingGenerator) {
         const example = getExample(callingGenerator, formats);
         logger.warn(deprecationWarning + '\n' + example);
     }
     return result;
 }
-function setProjectNameAndRootFormatDefault(tree) {
-    const nxJson = readNxJson(tree);
-    nxJson.workspaceLayout ??= {};
-    nxJson.workspaceLayout.projectNameAndRootFormat = 'as-provided';
-    updateNxJson(tree, nxJson);
-}
-function getDefaultProjectNameAndRootFormat(tree) {
-    const nxJson = readNxJson(tree);
-    return nxJson.workspaceLayout?.projectNameAndRootFormat;
-}
 function getProjectNameAndRootFormats(tree, options) {
     const name = (0, names_1.names)(options.name).fileName;
     const directory = options.directory

package/CHANGELOG.md

@@ -1,8 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-
-
-**Note:** Version bump only for package @nx/devkit