Skip to content

Commit 25dcb36

Browse files
authored
refactor(cdk/schematics): import AST utilities (#24968)
Imports the AST utilities from `@schematics/angular` instead of vendoring them. Previously they were vendored to avoid TS version mismatches, but now the package comes bundled with its own version of TS so it shouldn't be a problem.
1 parent 2fd651c commit 25dcb36

File tree

7 files changed

+22
-614
lines changed

7 files changed

+22
-614
lines changed

src/cdk/schematics/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ export * from './utils';
1010
export * from './ng-update/public-api';
1111
export * from './update-tool/public-api';
1212

13-
// Re-exported so that Angular Material schematic code can consume the
14-
// vendored "@schematics/angular" AST utils.
15-
export * from './utils/vendored-ast-utils';
13+
// Re-exported so that Angular Material schematic code can consume the same AST utils as the CDK.
14+
export * from '@schematics/angular/utility/ast-utils';
15+
export * from '@schematics/angular/utility/ng-ast-utils';
1616

1717
// Re-export parse5 from the CDK. Material schematics code cannot simply import
1818
// "parse5" because it could result in a different version. As long as we import

src/cdk/schematics/utils/ast.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import {Schema as ComponentOptions} from '@schematics/angular/component/schema';
1111
import {InsertChange} from '@schematics/angular/utility/change';
1212
import {getWorkspace} from '@schematics/angular/utility/workspace';
1313
import {findModuleFromOptions as internalFindModule} from '@schematics/angular/utility/find-module';
14+
import {addImportToModule} from '@schematics/angular/utility/ast-utils';
15+
import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils';
1416
import {ProjectDefinition} from '@angular-devkit/core/src/workspace';
1517
import * as ts from 'typescript';
1618
import {getProjectMainFile} from './project-main-file';
17-
import {addImportToModule, getAppModulePath} from './vendored-ast-utils';
1819

1920
/** Reads file given path and returns TypeScript source file. */
2021
export function parseSourceFile(host: Tree, path: string): ts.SourceFile {

src/cdk/schematics/utils/ast/standalone.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {SchematicsException, Tree} from '@angular-devkit/schematics';
1010
import {InsertChange} from '@schematics/angular/utility/change';
1111
import * as ts from 'typescript';
12-
import {insertImport} from '../vendored-ast-utils';
12+
import {insertImport} from '@schematics/angular/utility/ast-utils';
1313

1414
/**
1515
* Checks whether the providers from a module are being imported in a `bootstrapApplication` call.

src/cdk/schematics/utils/build-component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import {buildRelativePath, findModuleFromOptions} from '@schematics/angular/util
2929
import {parseName} from '@schematics/angular/utility/parse-name';
3030
import {validateHtmlSelector} from '@schematics/angular/utility/validation';
3131
import {ProjectType} from '@schematics/angular/utility/workspace-models';
32+
import {addDeclarationToModule, addExportToModule} from '@schematics/angular/utility/ast-utils';
3233
import {readFileSync, statSync} from 'fs';
3334
import {dirname, join, resolve} from 'path';
3435
import * as ts from 'typescript';
35-
import {addDeclarationToModule, addExportToModule} from '../utils/vendored-ast-utils';
3636
import {getProjectFromWorkspace} from './get-project';
3737
import {getDefaultComponentOptions} from './schematic-options';
3838
import {ProjectDefinition} from '@angular-devkit/core/src/workspace';

0 commit comments

Comments
 (0)