fix(misc): normalize paths when moving projects (nrwl#10944)

isaacplmann · Jun 29, 2022 · 9e6e01b · 9e6e01b
1 parent 769d10f
commit 9e6e01b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/nx/src/generators/utils/project-configuration.ts b/packages/nx/src/generators/utils/project-configuration.ts
@@ -12,7 +12,7 @@ import {
   reformattedWorkspaceJsonOrNull,
   toNewFormat,
 } from '../../config/workspaces';
-import { joinPathFragments } from '../../utils/path';
+import { joinPathFragments, normalizePath } from '../../utils/path';
 
 import type { Tree } from '../tree';
 
@@ -319,9 +319,11 @@ export function getRelativeProjectJsonSchemaPath(
   tree: Tree,
   project: ProjectConfiguration
 ): string {
-  return relative(
-    join(tree.root, project.root),
-    join(tree.root, 'node_modules/nx/schemas/project-schema.json')
+  return normalizePath(
+    relative(
+      join(tree.root, project.root),
+      join(tree.root, 'node_modules/nx/schemas/project-schema.json')
+    )
   );
 }
 

diff --git a/packages/workspace/src/generators/move/lib/update-eslintrc-json.ts b/packages/workspace/src/generators/move/lib/update-eslintrc-json.ts
@@ -1,4 +1,5 @@
 import {
+  joinPathFragments,
   offsetFromRoot,
   ProjectConfiguration,
   Tree,
@@ -28,7 +29,7 @@ function offsetFilePath(
     return pathToFile;
   }
   const pathFromRoot = join(project.root, pathToFile);
-  return join(offset, pathFromRoot);
+  return joinPathFragments(offset, pathFromRoot);
 }
 
 /**

diff --git a/packages/workspace/src/generators/move/lib/update-project-root-files.ts b/packages/workspace/src/generators/move/lib/update-project-root-files.ts
@@ -34,7 +34,10 @@ export function updateProjectRootFiles(
   }
 
   const dots = /\./g;
-  const regex = new RegExp(oldRelativeRoot.replace(dots, '\\.'), 'g');
+  const regex = new RegExp(
+    `(?<!\\.\\.\\/)${oldRelativeRoot.replace(dots, '\\.')}(?!\\/\\.\\.)`,
+    'g'
+  );
   for (const file of tree.children(schema.relativeToRootDestination)) {
     const ext = extname(file);
     if (!allowedExt.includes(ext)) {