Skip to content

Commit 349935a

Browse files
devversionalxhub
devversion
authored and
alxhub
committed
fix(core): migrations not always migrating all files (#30269)
In an Angular CLI project scenario where projects only reference top-level source-files through the `tsconfig` `files` option, we currently do not migrate referenced source-files. This can be fixed checking all referenced source-files which aren't coming from an external library. This is similar to how `tslint` determines project source-files. PR Close #30269
1 parent 6357d4a commit 349935a

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

‎packages/core/schematics/migrations/injectable-pipe/index.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ function runInjectablePipeMigration(tree: Tree, tsconfigPath: string, basePath:
5353
const program = ts.createProgram(parsed.fileNames, parsed.options, host);
5454
const typeChecker = program.getTypeChecker();
5555
const visitor = new InjectablePipeVisitor(typeChecker);
56-
const rootSourceFiles = program.getRootFileNames().map(f => program.getSourceFile(f) !);
56+
const sourceFiles = program.getSourceFiles().filter(
57+
f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
5758
const printer = ts.createPrinter();
5859

59-
rootSourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));
60+
sourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));
6061

6162
visitor.missingInjectablePipes.forEach(data => {
6263
const {classDeclaration, importDeclarationMissingImport} = data;

‎packages/core/schematics/migrations/move-document/index.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ function runMoveDocumentMigration(tree: Tree, tsconfigPath: string, basePath: st
5454
const program = ts.createProgram(parsed.fileNames, parsed.options, host);
5555
const typeChecker = program.getTypeChecker();
5656
const visitor = new DocumentImportVisitor(typeChecker);
57-
const rootSourceFiles = program.getRootFileNames().map(f => program.getSourceFile(f) !);
57+
const sourceFiles = program.getSourceFiles().filter(
58+
f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
5859

5960
// Analyze source files by finding imports.
60-
rootSourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));
61+
sourceFiles.forEach(sourceFile => visitor.visitNode(sourceFile));
6162

6263
const {importsMap} = visitor;
6364

‎packages/core/schematics/migrations/static-queries/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ function analyzeProject(tree: Tree, tsconfigPath: string, basePath: string):
117117

118118
const program = ts.createProgram(parsed.fileNames, parsed.options, host);
119119
const typeChecker = program.getTypeChecker();
120-
const sourceFiles = program.getRootFileNames().map(f => program.getSourceFile(f) !);
120+
const sourceFiles = program.getSourceFiles().filter(
121+
f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
121122
const queryVisitor = new NgQueryResolveVisitor(typeChecker);
122123

123124
// Analyze all project source-files and collect all queries that

‎packages/core/schematics/migrations/template-var-assignment/index.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@ function runTemplateVariableAssignmentCheck(
6060
const program = ts.createProgram(parsed.fileNames, parsed.options, host);
6161
const typeChecker = program.getTypeChecker();
6262
const templateVisitor = new NgComponentTemplateVisitor(typeChecker);
63-
const rootSourceFiles = program.getRootFileNames().map(f => program.getSourceFile(f) !);
63+
const sourceFiles = program.getSourceFiles().filter(
64+
f => !f.isDeclarationFile && !program.isSourceFileFromExternalLibrary(f));
6465

6566
// Analyze source files by detecting HTML templates.
66-
rootSourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));
67+
sourceFiles.forEach(sourceFile => templateVisitor.visitNode(sourceFile));
6768

6869
const {resolvedTemplates} = templateVisitor;
6970
const collectedFailures: string[] = [];

0 commit comments

Comments
 (0)