From c21835d40a56341ec3147a36e150b946e82b7d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?=
 <leosvel.perez.espinosa@gmail.com>
Date: Wed, 6 Oct 2021 17:42:36 +0100
Subject: [PATCH] fix(devkit): move files to a directory using normalized paths
 to handle windows correctly (#7264)

---
 packages/devkit/src/utils/move-dir.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/devkit/src/utils/move-dir.ts b/packages/devkit/src/utils/move-dir.ts
index 2e4256962d..1148bce3d7 100644
--- a/packages/devkit/src/utils/move-dir.ts
+++ b/packages/devkit/src/utils/move-dir.ts
@@ -1,4 +1,5 @@
 import { Tree } from '@nrwl/tao/src/shared/tree';
+import { relative } from 'path';
 import { visitNotIgnoredFiles } from '../generators/visit-not-ignored-files';
 import { normalizePath } from './path';
 
@@ -11,7 +12,7 @@ export function moveFilesToNewDirectory(
   newDir = normalizePath(newDir);
   visitNotIgnoredFiles(tree, oldDir, (file) => {
     try {
-      tree.rename(file, file.replace(oldDir, newDir));
+      tree.rename(file, `${newDir}/${relative(oldDir, file)}`);
     } catch (e) {
       if (!tree.exists(oldDir)) {
         console.warn(`Path ${oldDir} does not exist`);