@nx/devkit 18.1.2 → 18.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "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": {
@@ -35,7 +35,7 @@
     "tslib": "^2.3.0",
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
-    "@nrwl/devkit": "18.1.2"
+    "@nrwl/devkit": "18.1.3"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 18"

package/src/generators/artifact-name-and-directory-utils.js

@@ -116,9 +116,20 @@ function getNameAndDirectoryOptionFormats(tree, options) {
 }
 function getAsProvidedOptions(tree, options) {
     const relativeCwd = getRelativeCwd();
-    const asProvidedDirectory = options.directory
-        ? joinPathFragments(relativeCwd, options.directory)
-        : relativeCwd;
+    let asProvidedDirectory;
+    if (options.directory) {
+        // append the directory to the current working directory if it doesn't start with it
+        if (options.directory === relativeCwd ||
+            options.directory.startsWith(`${relativeCwd}/`)) {
+            asProvidedDirectory = options.directory;
+        }
+        else {
+            asProvidedDirectory = joinPathFragments(relativeCwd, options.directory);
+        }
+    }
+    else {
+        asProvidedDirectory = relativeCwd;
+    }
     const asProvidedProject = findProjectFromPath(tree, asProvidedDirectory);
     const asProvidedFileName = options.fileName ??
         (options.suffix ? `${options.name}.${options.suffix}` : options.name);