skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(migrations): standalone migration incorrectly throwing path error for multi app projects (#48958)

Browse Source 
Fixes that the standalone migration was throwing the "Could not find any paths to migrate..." error on a per-tsconfig-basis, preventing the migration from running on any configs that might occur further down in the project.

These changes move the error to after all the configs have been checked.

PR Close #48958
This commit is contained in:
Kristiyan Kostadinov
2023-02-05 10:17:08 +01:00
committed by Andrew Scott
parent 54b24eb40f
commit 49a7c9f94a
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/schematics/ng-generate/standalone-migration/index.ts
+16 -9
View File
@@ -38,6 +38,10 @@ export default function(options: Options): Rule {
const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);
const basePath = process.cwd();
const allPaths = [...buildPaths, ...testPaths];
// TS and Schematic use paths in POSIX format even on Windows. This is needed as otherwise
// string matching such as `sourceFile.fileName.startsWith(pathToMigrate)` might not work.
const pathToMigrate = normalizePath(join(basePath, options.path));
let migratedFiles = 0;
if (!allPaths.length) {
throw new SchematicsException(
@@ -45,12 +49,19 @@ export default function(options: Options): Rule {
}
for (const tsconfigPath of allPaths) {
standaloneMigration(tree, tsconfigPath, basePath, options);
migratedFiles += standaloneMigration(tree, tsconfigPath, basePath, pathToMigrate, options);
}
if (migratedFiles === 0) {
throw new SchematicsException(`Could not find any files to migrate under the path ${
pathToMigrate}. Cannot run the standalone migration.`);
}
};
}
function standaloneMigration(tree: Tree, tsconfigPath: string, basePath: string, options: Options) {
function standaloneMigration(
tree: Tree, tsconfigPath: string, basePath: string, pathToMigrate: string,
options: Options): number {
if (options.path.startsWith('..')) {
throw new SchematicsException(
'Cannot run standalone migration outside of the current project.');
@@ -64,11 +75,6 @@ function standaloneMigration(tree: Tree, tsconfigPath: string, basePath: string,
}) as NgtscProgram;
const printer = ts.createPrinter();
// TS and Schematic use paths in POSIX format even on Windows.
// This is needed as otherwise string matching such as
// `sourceFile.fileName.startsWith(pathToMigrate)` will not work correctly.
const pathToMigrate = normalizePath(join(basePath, options.path));
if (existsSync(pathToMigrate) && !statSync(pathToMigrate).isDirectory()) {
throw new SchematicsException(`Migration path ${
pathToMigrate} has to be a directory. Cannot run the standalone migration.`);
@@ -80,8 +86,7 @@ function standaloneMigration(tree: Tree, tsconfigPath: string, basePath: string,
});
if (sourceFiles.length === 0) {
throw new SchematicsException(`Could not find any files to migrate under the path ${
pathToMigrate}. Cannot run the standalone migration.`);
return 0;
}
let pendingChanges: ChangesByFile;
@@ -122,4 +127,6 @@ function standaloneMigration(tree: Tree, tsconfigPath: string, basePath: string,
tree.delete(relative(basePath, file.fileName));
}
}
return sourceFiles.length;
}