@nx/devkit 16.8.0-rc.0 → 16.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.8.0-rc.0",
+  "version": "16.8.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.8.0-rc.0",
+    "@nrwl/devkit": "16.8.1",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "44d0b22f4f6c4a790e2ad4702bf27ffa15073582"
+  "gitHead": "29a7b8575e683d3a581b4bf6f82ee4486bfa94dd"
 }

package/src/executors/read-target-options.js

@@ -27,6 +27,6 @@ function readTargetOptions({ project, target, configuration }, context) {
         ? calculateDefaultProjectName(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration)
         : // TODO(v18): remove calculateDefaultProjectName. This is to be backwards compatible with Nx 16.5 and below.
             ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
-    return combineOptionsForExecutor({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.cwd, context.root));
+    return combineOptionsForExecutor({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.root, context.cwd));
 }
 exports.readTargetOptions = readTargetOptions;

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

@@ -6,13 +6,19 @@ const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
 const { joinPathFragments, normalizePath, logger, readJson, readNxJson, updateNxJson, stripIndents, } = (0, nx_1.requireNx)();
+const deprecationWarning = stripIndents `
+    In Nx 18, generating projects will no longer derive the name and root.
+    Please provide the exact project name and root in the future.`;
 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 ??
-        (getDefaultProjectNameAndRootFormat(tree) === 'as-provided'
-            ? 'as-provided'
-            : await determineFormat(tree, formats, options.callingGenerator));
+        configuredDefault ??
+        (await determineFormat(tree, formats, options.callingGenerator));
     return {
         ...formats[format],
         projectNameAndRootFormat: format,
@@ -39,6 +45,9 @@ function validateName(name, projectNameAndRootFormat) {
         throw new Error(`The project name should match the pattern "${pattern}". The provided value "${name}" does not match.`);
     }
 }
+function getExample(callingGenerator, formats) {
+    return `Example: nx g ${callingGenerator} ${formats['as-provided'].projectName} --directory ${formats['as-provided'].projectRoot}`;
+}
 async function determineFormat(tree, formats, callingGenerator) {
     if (!formats.derived) {
         return 'as-provided';
@@ -70,9 +79,6 @@ async function determineFormat(tree, formats, callingGenerator) {
         ],
         initial: 'as-provided',
     }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-    const deprecationWarning = stripIndents `
-    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 } = await (0, enquirer_1.prompt)({
             type: 'confirm',
@@ -88,7 +94,7 @@ async function determineFormat(tree, formats, callingGenerator) {
         }
     }
     else {
-        const example = `Example: nx g ${callingGenerator} ${formats[result].projectName} --directory ${formats[result].projectRoot}`;
+        const example = getExample(callingGenerator, formats);
         logger.warn(deprecationWarning + '\n' + example);
     }
     return result;
@@ -101,7 +107,7 @@ function setProjectNameAndRootFormatDefault(tree) {
 }
 function getDefaultProjectNameAndRootFormat(tree) {
     const nxJson = readNxJson(tree);
-    return nxJson.workspaceLayout?.projectNameAndRootFormat ?? 'derived';
+    return nxJson.workspaceLayout?.projectNameAndRootFormat;
 }
 function getProjectNameAndRootFormats(tree, options) {
     const name = (0, names_1.names)(options.name).fileName;