Skip to content

Commit ee2439c

Browse files
crisbetocrisbeto
authored
fix(material/schematics): switch away from legacy components (#25839)
Fixes that the various `ng generate` schematics were based on top of the legacy components.
1 parent cc7d5fb commit ee2439c

File tree

17 files changed

+56
-128
lines changed

17 files changed

+56
-128
lines changed

‎src/material/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { ReactiveFormsModule } from '@angular/forms';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import { MatLegacyButtonModule } from '@angular/material/legacy-button';
5-
import { MatLegacyCardModule } from '@angular/material/legacy-card';
6-
import { MatLegacyInputModule } from '@angular/material/legacy-input';
7-
import { MatLegacyRadioModule } from '@angular/material/legacy-radio';
8-
import { MatLegacySelectModule } from '@angular/material/legacy-select';
4+
import { MatButtonModule } from '@angular/material/button';
5+
import { MatCardModule } from '@angular/material/card';
6+
import { MatInputModule } from '@angular/material/input';
7+
import { MatRadioModule } from '@angular/material/radio';
8+
import { MatSelectModule } from '@angular/material/select';
99

1010
import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';
1111

@@ -19,11 +19,11 @@ describe('<%= classify(name) %>Component', () => {
1919
imports: [
2020
NoopAnimationsModule,
2121
ReactiveFormsModule,
22-
MatLegacyButtonModule,
23-
MatLegacyCardModule,
24-
MatLegacyInputModule,
25-
MatLegacyRadioModule,
26-
MatLegacySelectModule,
22+
MatButtonModule,
23+
MatCardModule,
24+
MatInputModule,
25+
MatRadioModule,
26+
MatSelectModule,
2727
]
2828
}).compileComponents();
2929
}));

‎src/material/schematics/ng-generate/address-form/index.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ describe('Material address-form schematic', () => {
3535
const tree = await runner.runSchematicAsync('address-form', baseOptions, app).toPromise();
3636
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
3737

38-
expect(moduleContent).toContain('MatLegacyInputModule');
39-
expect(moduleContent).toContain('MatLegacyButtonModule');
40-
expect(moduleContent).toContain('MatLegacySelectModule');
41-
expect(moduleContent).toContain('MatLegacyRadioModule');
38+
expect(moduleContent).toContain('MatInputModule');
39+
expect(moduleContent).toContain('MatButtonModule');
40+
expect(moduleContent).toContain('MatSelectModule');
41+
expect(moduleContent).toContain('MatRadioModule');
4242
expect(moduleContent).toContain('ReactiveFormsModule');
4343
});
4444

‎src/material/schematics/ng-generate/address-form/index.ts

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,11 @@ export default function (options: Schema): Rule {
3939
function addFormModulesToModule(options: Schema) {
4040
return async (host: Tree) => {
4141
const modulePath = (await findModuleFromOptions(host, options))!;
42-
addModuleImportToModule(
43-
host,
44-
modulePath,
45-
'MatLegacyInputModule',
46-
'@angular/material/legacy-input',
47-
);
48-
addModuleImportToModule(
49-
host,
50-
modulePath,
51-
'MatLegacyButtonModule',
52-
'@angular/material/legacy-button',
53-
);
54-
addModuleImportToModule(
55-
host,
56-
modulePath,
57-
'MatLegacySelectModule',
58-
'@angular/material/legacy-select',
59-
);
60-
addModuleImportToModule(
61-
host,
62-
modulePath,
63-
'MatLegacyRadioModule',
64-
'@angular/material/legacy-radio',
65-
);
66-
addModuleImportToModule(
67-
host,
68-
modulePath,
69-
'MatLegacyCardModule',
70-
'@angular/material/legacy-card',
71-
);
42+
addModuleImportToModule(host, modulePath, 'MatInputModule', '@angular/material/input');
43+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
44+
addModuleImportToModule(host, modulePath, 'MatSelectModule', '@angular/material/select');
45+
addModuleImportToModule(host, modulePath, 'MatRadioModule', '@angular/material/radio');
46+
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material/card');
7247
addModuleImportToModule(host, modulePath, 'ReactiveFormsModule', '@angular/forms');
7348
};
7449
}

‎src/material/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { LayoutModule } from '@angular/cdk/layout';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
33
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
4-
import { MatLegacyButtonModule } from '@angular/material/legacy-button';
5-
import { MatCardModule } from '@angular/material/legacy-card';
4+
import { MatButtonModule } from '@angular/material/button';
5+
import { MatCardModule } from '@angular/material/card';
66
import { MatGridListModule } from '@angular/material/grid-list';
77
import { MatIconModule } from '@angular/material/icon';
8-
import { MatLegacyMenuModule } from '@angular/material/legacy-menu';
8+
import { MatMenuModule } from '@angular/material/menu';
99

1010
import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';
1111

@@ -19,11 +19,11 @@ describe('<%= classify(name) %>Component', () => {
1919
imports: [
2020
NoopAnimationsModule,
2121
LayoutModule,
22-
MatLegacyButtonModule,
22+
MatButtonModule,
2323
MatCardModule,
2424
MatGridListModule,
2525
MatIconModule,
26-
MatLegacyMenuModule,
26+
MatMenuModule,
2727
]
2828
}).compileComponents();
2929
}));

‎src/material/schematics/ng-generate/dashboard/index.spec.ts

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,18 @@ describe('material-dashboard-schematic', () => {
3636
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
3737

3838
expect(moduleContent).toContain('MatGridListModule');
39-
expect(moduleContent).toContain('MatLegacyCardModule');
40-
expect(moduleContent).toContain('MatLegacyMenuModule');
39+
expect(moduleContent).toContain('MatCardModule');
40+
expect(moduleContent).toContain('MatMenuModule');
4141
expect(moduleContent).toContain('MatIconModule');
42-
expect(moduleContent).toContain('MatLegacyButtonModule');
42+
expect(moduleContent).toContain('MatButtonModule');
4343

4444
expect(moduleContent).toContain(
4545
`import { MatGridListModule } from '@angular/material/grid-list';`,
4646
);
47-
expect(moduleContent).toContain(
48-
`import { MatLegacyCardModule } from '@angular/material/legacy-card';`,
49-
);
50-
expect(moduleContent).toContain(
51-
`import { MatLegacyMenuModule } from '@angular/material/legacy-menu';`,
52-
);
47+
expect(moduleContent).toContain(`import { MatCardModule } from '@angular/material/card';`);
48+
expect(moduleContent).toContain(`import { MatMenuModule } from '@angular/material/menu';`);
5349
expect(moduleContent).toContain(`import { MatIconModule } from '@angular/material/icon';`);
54-
expect(moduleContent).toContain(
55-
`import { MatLegacyButtonModule } from '@angular/material/legacy-button';`,
56-
);
50+
expect(moduleContent).toContain(`import { MatButtonModule } from '@angular/material/button';`);
5751
});
5852

5953
it('should throw if no name has been specified', async () => {

‎src/material/schematics/ng-generate/dashboard/index.ts

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,10 @@ function addNavModulesToModule(options: Schema) {
4040
return async (host: Tree) => {
4141
const modulePath = (await findModuleFromOptions(host, options))!;
4242
addModuleImportToModule(host, modulePath, 'MatGridListModule', '@angular/material/grid-list');
43-
addModuleImportToModule(
44-
host,
45-
modulePath,
46-
'MatLegacyCardModule',
47-
'@angular/material/legacy-card',
48-
);
49-
addModuleImportToModule(
50-
host,
51-
modulePath,
52-
'MatLegacyMenuModule',
53-
'@angular/material/legacy-menu',
54-
);
43+
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material/card');
44+
addModuleImportToModule(host, modulePath, 'MatMenuModule', '@angular/material/menu');
5545
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
56-
addModuleImportToModule(
57-
host,
58-
modulePath,
59-
'MatLegacyButtonModule',
60-
'@angular/material/legacy-button',
61-
);
46+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
6247
addModuleImportToModule(host, modulePath, 'LayoutModule', '@angular/cdk/layout');
6348
};
6449
}

‎src/material/schematics/ng-generate/navigation/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { LayoutModule } from '@angular/cdk/layout';
22
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import { MatLegacyButtonModule } from '@angular/material/legacy-button';
4+
import { MatButtonModule } from '@angular/material/button';
55
import { MatIconModule } from '@angular/material/icon';
6-
import { MatLegacyListModule } from '@angular/material/legacy-list';
6+
import { MatListModule } from '@angular/material/list';
77
import { MatSidenavModule } from '@angular/material/sidenav';
88
import { MatToolbarModule } from '@angular/material/toolbar';
99

@@ -19,9 +19,9 @@ describe('<%= classify(name) %>Component', () => {
1919
imports: [
2020
NoopAnimationsModule,
2121
LayoutModule,
22-
MatLegacyButtonModule,
22+
MatButtonModule,
2323
MatIconModule,
24-
MatLegacyListModule,
24+
MatListModule,
2525
MatSidenavModule,
2626
MatToolbarModule,
2727
]

‎src/material/schematics/ng-generate/navigation/index.spec.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,14 @@ describe('material-navigation-schematic', () => {
2020
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
2121
expect(moduleContent).toMatch(/LayoutModule,\s+/);
2222
expect(moduleContent).toMatch(/MatToolbarModule,\s+/);
23-
expect(moduleContent).toMatch(/MatLegacyButtonModule,\s+/);
23+
expect(moduleContent).toMatch(/MatButtonModule,\s+/);
2424
expect(moduleContent).toMatch(/MatSidenavModule,\s+/);
2525
expect(moduleContent).toMatch(/MatIconModule,\s+/);
26-
expect(moduleContent).toMatch(/MatLegacyListModule\s+],/);
26+
expect(moduleContent).toMatch(/MatListModule\s+],/);
2727
expect(moduleContent).toContain(`import { LayoutModule } from '@angular/cdk/layout';`);
28-
expect(moduleContent).toContain(
29-
`import { MatLegacyButtonModule } from '@angular/material/legacy-button';`,
30-
);
28+
expect(moduleContent).toContain(`import { MatButtonModule } from '@angular/material/button';`);
3129
expect(moduleContent).toContain(`import { MatIconModule } from '@angular/material/icon';`);
32-
expect(moduleContent).toContain(
33-
`import { MatLegacyListModule } from '@angular/material/legacy-list';`,
34-
);
30+
expect(moduleContent).toContain(`import { MatListModule } from '@angular/material/list';`);
3531
expect(moduleContent).toContain(
3632
`import { MatToolbarModule } from '@angular/material/toolbar';`,
3733
);

‎src/material/schematics/ng-generate/navigation/index.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,9 @@ function addNavModulesToModule(options: Schema) {
4141
const modulePath = (await findModuleFromOptions(host, options))!;
4242
addModuleImportToModule(host, modulePath, 'LayoutModule', '@angular/cdk/layout');
4343
addModuleImportToModule(host, modulePath, 'MatToolbarModule', '@angular/material/toolbar');
44-
addModuleImportToModule(
45-
host,
46-
modulePath,
47-
'MatLegacyButtonModule',
48-
'@angular/material/legacy-button',
49-
);
44+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
5045
addModuleImportToModule(host, modulePath, 'MatSidenavModule', '@angular/material/sidenav');
5146
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
52-
addModuleImportToModule(
53-
host,
54-
modulePath,
55-
'MatLegacyListModule',
56-
'@angular/material/legacy-list',
57-
);
47+
addModuleImportToModule(host, modulePath, 'MatListModule', '@angular/material/list');
5848
};
5949
}

‎src/material/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DataSource } from '@angular/cdk/collections';
2-
import { MatPaginator } from '@angular/material/legacy-paginator';
2+
import { MatPaginator } from '@angular/material/paginator';
33
import { MatSort } from '@angular/material/sort';
44
import { map } from 'rxjs/operators';
55
import { Observable, of as observableOf, merge } from 'rxjs';

‎src/material/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3-
import { MatPaginatorModule } from '@angular/material/legacy-paginator';
3+
import { MatPaginatorModule } from '@angular/material/paginator';
44
import { MatSortModule } from '@angular/material/sort';
5-
import { MatTableModule } from '@angular/material/legacy-table';
5+
import { MatTableModule } from '@angular/material/table';
66

77
import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';
88

‎src/material/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AfterViewInit, Component, ViewChild<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
2-
import { MatPaginator } from '@angular/material/legacy-paginator';
2+
import { MatPaginator } from '@angular/material/paginator';
33
import { MatSort } from '@angular/material/sort';
4-
import { MatTable } from '@angular/material/legacy-table';
4+
import { MatTable } from '@angular/material/table';
55
import { <%= classify(name) %>DataSource, <%= classify(name) %>Item } from './<%= dasherize(name) %>-datasource';
66

77
@Component({

‎src/material/schematics/ng-generate/table/index.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ describe('material-table-schematic', () => {
5555
expect(moduleContent).toContain('MatPaginatorModule');
5656
expect(moduleContent).toContain('MatSortModule');
5757

58-
expect(moduleContent).toContain(
59-
`import { MatTableModule } from '@angular/material/legacy-table';`,
60-
);
58+
expect(moduleContent).toContain(`import { MatTableModule } from '@angular/material/table';`);
6159
expect(moduleContent).toContain(`import { MatSortModule } from '@angular/material/sort';`);
6260
expect(moduleContent).toContain(
63-
`import { MatPaginatorModule } from '@angular/material/legacy-paginator';`,
61+
`import { MatPaginatorModule } from '@angular/material/paginator';`,
6462
);
6563
});
6664

‎src/material/schematics/ng-generate/table/index.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,8 @@ export default function (options: Schema): Rule {
3939
function addTableModulesToModule(options: Schema) {
4040
return async (host: Tree) => {
4141
const modulePath = (await findModuleFromOptions(host, options))!;
42-
addModuleImportToModule(host, modulePath, 'MatTableModule', '@angular/material/legacy-table');
43-
addModuleImportToModule(
44-
host,
45-
modulePath,
46-
'MatPaginatorModule',
47-
'@angular/material/legacy-paginator',
48-
);
42+
addModuleImportToModule(host, modulePath, 'MatTableModule', '@angular/material/table');
43+
addModuleImportToModule(host, modulePath, 'MatPaginatorModule', '@angular/material/paginator');
4944
addModuleImportToModule(host, modulePath, 'MatSortModule', '@angular/material/sort');
5045
};
5146
}

‎src/material/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { MatLegacyButtonModule } from '@angular/material/legacy-button';
2+
import { MatButtonModule } from '@angular/material/button';
33
import { MatIconModule } from '@angular/material/icon';
44
import { MatTreeModule } from '@angular/material/tree';
55

@@ -13,7 +13,7 @@ describe('<%= classify(name) %>Component', () => {
1313
TestBed.configureTestingModule({
1414
declarations: [ <%= classify(name) %>Component ],
1515
imports: [
16-
MatLegacyButtonModule,
16+
MatButtonModule,
1717
MatIconModule,
1818
MatTreeModule,
1919
]

‎src/material/schematics/ng-generate/tree/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Material tree schematic', () => {
3737

3838
expect(moduleContent).toContain('MatTreeModule');
3939
expect(moduleContent).toContain('MatIconModule');
40-
expect(moduleContent).toContain('MatLegacyButtonModule');
40+
expect(moduleContent).toContain('MatButtonModule');
4141
});
4242

4343
it('should throw if no name has been specified', async () => {

‎src/material/schematics/ng-generate/tree/index.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ function addTreeModulesToModule(options: Schema) {
4141
const modulePath = (await findModuleFromOptions(host, options))!;
4242
addModuleImportToModule(host, modulePath, 'MatTreeModule', '@angular/material/tree');
4343
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
44-
addModuleImportToModule(
45-
host,
46-
modulePath,
47-
'MatLegacyButtonModule',
48-
'@angular/material/legacy-button',
49-
);
44+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
5045
};
5146
}

0 commit comments

Comments
 (0)