miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2022-06-29 11:45:36 +01:00 committed by GitHub
parent 769d10fd01
commit 9e6e01b659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/nx/src/generators/utils/project-configuration.ts
View File

@ -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')
)
);
}

3
packages/workspace/src/generators/move/lib/update-eslintrc-json.ts
View File

@ -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);
}
/**

5
packages/workspace/src/generators/move/lib/update-project-root-files.ts
View File

@ -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)) {