Skip to content

refactor(cdk/schematics): clean up TypeScript 6 workaround #33104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crisbeto merged 1 commit into from
Apr 18, 2026
+3 −16
Merged

refactor(cdk/schematics): clean up TypeScript 6 workaround #33104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions src/cdk/schematics/utils/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils';
import * as ts from 'typescript';
import {getProjectMainFile} from './project-main-file';

/**
* Temporary type until the CLI starts bundling TS6.
*
* TODO(crisbeto): clean this up eventually.
*/
export type AnyDuringTs6Migration = any;

/** Reads file given path and returns TypeScript source file. */
export function parseSourceFile(host: Tree, path: string): ts.SourceFile {
const buffer = host.read(path);
Expand Down Expand Up @@ -62,12 +55,7 @@ export function addModuleImportToModule(
throw new SchematicsException(`Module not found: ${modulePath}`);
}

const changes = addImportToModule(
moduleSource as AnyDuringTs6Migration,
modulePath,
moduleName,
src,
);
const changes = addImportToModule(moduleSource, modulePath, moduleName, src);
const recorder = host.beginUpdate(modulePath);

changes.forEach(change => {
Expand Down
5 changes: 2 additions & 3 deletions src/cdk/schematics/utils/build-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import {dirname, join, resolve} from 'path';
import * as ts from 'typescript';
import {getProjectFromWorkspace} from './get-project';
import {getDefaultComponentOptions, isStandaloneSchematic} from './schematic-options';
import {AnyDuringTs6Migration} from './ast';

/**
* Build a default project path for generating.
Expand Down Expand Up @@ -84,7 +83,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
const classifiedName = strings.classify(`${options.name}Component`);

const declarationChanges = addDeclarationToModule(
source as AnyDuringTs6Migration,
source,
modulePath,
classifiedName,
relativePath,
Expand All @@ -104,7 +103,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {

const exportRecorder = host.beginUpdate(modulePath);
const exportChanges = addExportToModule(
source as AnyDuringTs6Migration,
source,
modulePath,
strings.classify(`${options.name}Component`),
relativePath,
Expand Down
Loading