Skip to content

Commit b823dbd

Browse files
devversionjelbourn
devversion
authored and
jelbourn
committed
refactor(ng-generate): do not generate imports to deprecated primary entry-point (#16480)
Switches all `ng generate` schematics to proper secondary entry-point imports. This is necessary because as of version 8, imports to the primary entry-point are deprecated.
1 parent 738f10c commit b823dbd

File tree

15 files changed

+67
-54
lines changed

15 files changed

+67
-54
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { ReactiveFormsModule } from '@angular/forms';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import {
5-
MatButtonModule,
6-
MatCardModule,
7-
MatInputModule,
8-
MatRadioModule,
9-
MatSelectModule,
10-
} from '@angular/material';
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';
119

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ export default function(options: Schema): Rule {
3535
function addFormModulesToModule(options: Schema) {
3636
return (host: Tree) => {
3737
const modulePath = findModuleFromOptions(host, options)!;
38-
addModuleImportToModule(host, modulePath, 'MatInputModule', '@angular/material');
39-
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');
40-
addModuleImportToModule(host, modulePath, 'MatSelectModule', '@angular/material');
41-
addModuleImportToModule(host, modulePath, 'MatRadioModule', '@angular/material');
42-
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material');
38+
addModuleImportToModule(host, modulePath, 'MatInputModule', '@angular/material/input');
39+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
40+
addModuleImportToModule(host, modulePath, 'MatSelectModule', '@angular/material/select');
41+
addModuleImportToModule(host, modulePath, 'MatRadioModule', '@angular/material/radio');
42+
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material/card');
4343
addModuleImportToModule(host, modulePath, 'ReactiveFormsModule', '@angular/forms');
4444
return host;
4545
};

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import { LayoutModule } from '@angular/cdk/layout';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
33
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
4-
import {
5-
MatButtonModule,
6-
MatCardModule,
7-
MatGridListModule,
8-
MatIconModule,
9-
MatMenuModule,
10-
} from '@angular/material';
4+
import { MatButtonModule } from '@angular/material/button';
5+
import { MatCardModule } from '@angular/material/card';
6+
import { MatGridListModule } from '@angular/material/grid-list';
7+
import { MatIconModule } from '@angular/material/icon';
8+
import { MatMenuModule } from '@angular/material/menu';
119

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

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@ describe('material-dashboard-schematic', () => {
4040
expect(moduleContent).toContain('MatIconModule');
4141
expect(moduleContent).toContain('MatButtonModule');
4242

43-
expect(moduleContent).toContain(
44-
`import { MatGridListModule, MatCardModule, MatMenuModule, MatIconModule, MatButtonModule }` +
45-
` from '@angular/material';`);
43+
expect(moduleContent)
44+
.toContain(`import { MatGridListModule } from '@angular/material/grid-list';`);
45+
expect(moduleContent)
46+
.toContain(`import { MatCardModule } from '@angular/material/card';`);
47+
expect(moduleContent)
48+
.toContain(`import { MatMenuModule } from '@angular/material/menu';`);
49+
expect(moduleContent)
50+
.toContain(`import { MatIconModule } from '@angular/material/icon';`);
51+
expect(moduleContent)
52+
.toContain(`import { MatButtonModule } from '@angular/material/button';`);
4653
});
4754

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ export default function(options: Schema): Rule {
3535
function addNavModulesToModule(options: Schema) {
3636
return (host: Tree) => {
3737
const modulePath = findModuleFromOptions(host, options)!;
38-
addModuleImportToModule(host, modulePath, 'MatGridListModule', '@angular/material');
39-
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material');
40-
addModuleImportToModule(host, modulePath, 'MatMenuModule', '@angular/material');
41-
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material');
42-
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');
38+
addModuleImportToModule(host, modulePath, 'MatGridListModule', '@angular/material/grid-list');
39+
addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material/card');
40+
addModuleImportToModule(host, modulePath, 'MatMenuModule', '@angular/material/menu');
41+
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
42+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
4343
addModuleImportToModule(host, modulePath, 'LayoutModule', '@angular/cdk/layout');
4444
return host;
4545
};

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import { LayoutModule } from '@angular/cdk/layout';
22
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import {
5-
MatButtonModule,
6-
MatIconModule,
7-
MatListModule,
8-
MatSidenavModule,
9-
MatToolbarModule,
10-
} from '@angular/material';
4+
import { MatButtonModule } from '@angular/material/button';
5+
import { MatIconModule } from '@angular/material/icon';
6+
import { MatListModule } from '@angular/material/list';
7+
import { MatSidenavModule } from '@angular/material/sidenav';
8+
import { MatToolbarModule } from '@angular/material/toolbar';
119

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

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ describe('material-nav-schematic', () => {
4343
expect(moduleContent).toContain('MatListModule');
4444

4545
expect(moduleContent).toContain(`import { LayoutModule } from '@angular/cdk/layout';`);
46+
expect(moduleContent).toContain(`import { MatButtonModule } from '@angular/material/button';`);
47+
expect(moduleContent).toContain(`import { MatIconModule } from '@angular/material/icon';`);
48+
expect(moduleContent).toContain(`import { MatListModule } from '@angular/material/list';`);
4649
expect(moduleContent)
47-
.toContain(
48-
`import { MatToolbarModule, MatButtonModule, MatSidenavModule, MatIconModule, ` +
49-
`MatListModule } from '@angular/material';`);
50+
.toContain(`import { MatToolbarModule } from '@angular/material/toolbar';`);
51+
expect(moduleContent)
52+
.toContain(`import { MatSidenavModule } from '@angular/material/sidenav';`);
5053
});
5154

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ function addNavModulesToModule(options: Schema) {
3636
return (host: Tree) => {
3737
const modulePath = findModuleFromOptions(host, options)!;
3838
addModuleImportToModule(host, modulePath, 'LayoutModule', '@angular/cdk/layout');
39-
addModuleImportToModule(host, modulePath, 'MatToolbarModule', '@angular/material');
40-
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');
41-
addModuleImportToModule(host, modulePath, 'MatSidenavModule', '@angular/material');
42-
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material');
43-
addModuleImportToModule(host, modulePath, 'MatListModule', '@angular/material');
39+
addModuleImportToModule(host, modulePath, 'MatToolbarModule', '@angular/material/toolbar');
40+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
41+
addModuleImportToModule(host, modulePath, 'MatSidenavModule', '@angular/material/sidenav');
42+
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
43+
addModuleImportToModule(host, modulePath, 'MatListModule', '@angular/material/list');
4444
return host;
4545
};
4646
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { DataSource } from '@angular/cdk/collections';
2-
import { MatPaginator, MatSort } from '@angular/material';
2+
import { MatPaginator } from '@angular/material/paginator';
3+
import { MatSort } from '@angular/material/sort';
34
import { map } from 'rxjs/operators';
45
import { Observable, of as observableOf, merge } from 'rxjs';
56

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3-
import { MatPaginatorModule, MatSortModule, MatTableModule } from '@angular/material';
3+
import { MatPaginatorModule } from '@angular/material/paginator';
4+
import { MatSortModule } from '@angular/material/sort';
5+
import { MatTableModule } from '@angular/material/table';
46

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

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

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

57
@Component({

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ describe('material-table-schematic', () => {
5050
expect(moduleContent).toContain('MatPaginatorModule');
5151
expect(moduleContent).toContain('MatSortModule');
5252

53-
expect(moduleContent).toContain(
54-
`import { MatTableModule, MatPaginatorModule, MatSortModule } from '@angular/material';`);
53+
expect(moduleContent).toContain(`import { MatTableModule } from '@angular/material/table';`);
54+
expect(moduleContent).toContain(`import { MatSortModule } from '@angular/material/sort';`);
55+
expect(moduleContent)
56+
.toContain(`import { MatPaginatorModule } from '@angular/material/paginator';`);
5557
});
5658

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ export default function(options: Schema): Rule {
3535
function addTableModulesToModule(options: Schema) {
3636
return (host: Tree) => {
3737
const modulePath = findModuleFromOptions(host, options)!;
38-
addModuleImportToModule(host, modulePath, 'MatTableModule', '@angular/material');
39-
addModuleImportToModule(host, modulePath, 'MatPaginatorModule', '@angular/material');
40-
addModuleImportToModule(host, modulePath, 'MatSortModule', '@angular/material');
38+
addModuleImportToModule(host, modulePath, 'MatTableModule', '@angular/material/table');
39+
addModuleImportToModule(host, modulePath, 'MatPaginatorModule', '@angular/material/paginator');
40+
addModuleImportToModule(host, modulePath, 'MatSortModule', '@angular/material/sort');
4141
return host;
4242
};
4343
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { MatButtonModule, MatIconModule, MatTreeModule } from '@angular/material';
2+
import { MatButtonModule } from '@angular/material/button';
3+
import { MatIconModule } from '@angular/material/icon';
4+
import { MatTreeModule } from '@angular/material/tree';
35

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ export default function(options: Schema): Rule {
3535
function addTreeModulesToModule(options: Schema) {
3636
return (host: Tree) => {
3737
const modulePath = findModuleFromOptions(host, options)!;
38-
addModuleImportToModule(host, modulePath, 'MatTreeModule', '@angular/material');
39-
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material');
40-
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');
38+
addModuleImportToModule(host, modulePath, 'MatTreeModule', '@angular/material/tree');
39+
addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material/icon');
40+
addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material/button');
4141
return host;
4242
};
4343
}

0 commit comments

Comments
 (0)