@nx/devkit 16.9.0-beta.4 → 16.9.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.9.0-beta.4",
+  "version": "16.9.0-rc.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": {

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

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = void 0;
 const enquirer_1 = require("enquirer");
+const path_1 = require("path");
 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 { joinPathFragments, normalizePath, logger, readJson, readNxJson, updateNxJson, stripIndents, workspaceRoot, } = (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.`;
@@ -89,11 +90,28 @@ function getProjectNameAndRootFormats(tree, options) {
         ? normalizePath(options.directory.replace(/^\.?\//, ''))
         : undefined;
     const asProvidedProjectName = name;
-    const asProvidedProjectDirectory = directory
-        ? (0, names_1.names)(directory).fileName
-        : options.rootProject
-            ? '.'
-            : asProvidedProjectName;
+    let asProvidedProjectDirectory;
+    const relativeCwd = normalizePath((0, path_1.relative)(workspaceRoot, getCwd())).replace(/\/$/, '');
+    if (directory) {
+        // append the directory to the current working directory if it doesn't start with it
+        if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
+            asProvidedProjectDirectory = (0, names_1.names)(directory).fileName;
+        }
+        else {
+            asProvidedProjectDirectory = joinPathFragments(relativeCwd, (0, names_1.names)(directory).fileName);
+        }
+    }
+    else if (options.rootProject) {
+        asProvidedProjectDirectory = '.';
+    }
+    else {
+        asProvidedProjectDirectory = relativeCwd;
+        // append the project name to the current working directory if it doesn't end with it
+        if (!relativeCwd.endsWith(asProvidedProjectName) &&
+            !relativeCwd.endsWith(options.name)) {
+            asProvidedProjectDirectory = joinPathFragments(relativeCwd, asProvidedProjectName);
+        }
+    }
     if (name.startsWith('@')) {
         const nameWithoutScope = asProvidedProjectName.split('/')[1];
         return {
@@ -194,3 +212,14 @@ function getNpmScope(tree) {
 function isTTY() {
     return !!process.stdout.isTTY && process.env['CI'] !== 'true';
 }
+/**
+ * When running a script with the package manager (e.g. `npm run`), the package manager will
+ * traverse the directory tree upwards until it finds a `package.json` and will set `process.cwd()`
+ * to the folder where it found it. The actual working directory is stored in the INIT_CWD
+ * environment variable (see here: https://docs.npmjs.com/cli/v9/commands/npm-run-script#description).
+ */
+function getCwd() {
+    return process.env.INIT_CWD?.startsWith(workspaceRoot)
+        ? process.env.INIT_CWD
+        : process.cwd();
+}