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

fix(core): fix move schematic issues

Browse Source 
Use slashes as path separator even when used on windows environments to avoid mis-identifying escaped characters in file path
Use slash as path separator even when used on windows to get a correct path in extends property
Fix an issue when renaming jest project name where substrings were replaced as well in the file
Fix an issue when renaming imports where substrings in imports where replaced too
This commit is contained in:
Julien Saguet 2020-02-29 16:27:33 +01:00 committed by Jo Hanna Pearce
parent 82e9a5627e
commit df197cf194
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/angular/src/schematics/move/lib/update-module-name.ts
View File

@ -32,7 +32,7 @@ export function updateModuleName(schema: Schema) {
to: classify(newProjectName) to: classify(newProjectName)
}; };
const findModuleName = new RegExp(moduleName.from, 'g'); const findModuleName = new RegExp(`\\b${moduleName.from}`, 'g');
const moduleFile = { const moduleFile = {
from: `${schema.projectName}.module`, from: `${schema.projectName}.module`,

4
packages/workspace/src/schematics/move/lib/update-jest-config.ts
View File

@ -31,11 +31,11 @@ export function updateJestConfig(schema: Schema): Rule {
const oldContent = tree.read(jestConfigPath).toString('utf-8'); const oldContent = tree.read(jestConfigPath).toString('utf-8');
const findName = new RegExp(schema.projectName, 'g'); const findName = new RegExp(`'${schema.projectName}'`, 'g');
const findDir = new RegExp(project.root, 'g'); const findDir = new RegExp(project.root, 'g');
const newContent = oldContent const newContent = oldContent
.replace(findName, newProjectName) .replace(findName, `'${newProjectName}'`)
.replace(findDir, destination); .replace(findDir, destination);
tree.overwrite(jestConfigPath, newContent); tree.overwrite(jestConfigPath, newContent);

16
packages/workspace/src/schematics/move/lib/update-project-root-files.ts
View File

@ -22,14 +22,14 @@ export function updateProjectRootFiles(schema: Schema): Rule {
const project = workspace.projects.get(schema.projectName); const project = workspace.projects.get(schema.projectName);
const destination = getDestination(schema, workspace); const destination = getDestination(schema, workspace);
const newRelativeRoot = path.relative( const newRelativeRoot = path
path.join(appRootPath, destination), .relative(path.join(appRootPath, destination), appRootPath)
appRootPath .split(path.sep)
); .join('/');
const oldRelativeRoot = path.relative( const oldRelativeRoot = path
path.join(appRootPath, project.root), .relative(path.join(appRootPath, project.root), appRootPath)
appRootPath .split(path.sep)
); .join('/');
if (newRelativeRoot === oldRelativeRoot) { if (newRelativeRoot === oldRelativeRoot) {
// nothing to do // nothing to do

5
packages/workspace/src/schematics/move/lib/utils.ts
View File

@ -27,7 +27,10 @@ export function getDestination(
if (projectType === 'application') { if (projectType === 'application') {
rootFolder = 'apps'; rootFolder = 'apps';
} }
return path.join(rootFolder, schema.destination); return path
.join(rootFolder, schema.destination)
.split(path.sep)
.join('/');
} }
/** /**