Skip to content

Commit 6edd468

Browse files
committed
refactor(material-angular-io): remove remaining modules
Reworks the docs site to remove all remaining `@NgModule` usages.
1 parent 696161a commit 6edd468

File tree

5 files changed

+6
-44
lines changed

5 files changed

+6
-44
lines changed

material.angular.io/src/app/pages/component-sidenav/component-sidenav.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {
22
Component,
3-
NgModule,
43
OnDestroy,
54
OnInit,
65
ViewEncapsulation,
@@ -17,7 +16,6 @@ import {MatSidenav, MatSidenavContainer} from '@angular/material/sidenav';
1716
import {
1817
ActivatedRoute,
1918
Params,
20-
RouterModule,
2119
Routes,
2220
RouterOutlet,
2321
RouterLinkActive,
@@ -133,7 +131,7 @@ export class ComponentNav {
133131
);
134132
}
135133

136-
const routes: Routes = [
134+
export const componentSidenavRoutes: Routes = [
137135
{
138136
path: '',
139137
component: ComponentSidenav,
@@ -159,8 +157,3 @@ const routes: Routes = [
159157
],
160158
},
161159
];
162-
163-
@NgModule({
164-
imports: [RouterModule.forChild(routes)],
165-
})
166-
export class ComponentSidenavModule {}

material.angular.io/src/app/pages/guide-viewer/guide-viewer.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {Observable} from 'rxjs';
33
import {ActivatedRoute, provideRouter} from '@angular/router';
4-
import {GuideViewer, GuideViewerModule} from './guide-viewer';
4+
import {GuideViewer} from './guide-viewer';
55
import {provideHttpClient} from '@angular/common/http';
66

77
const guideItemsId = 'getting-started';
@@ -21,7 +21,6 @@ describe('GuideViewer', () => {
2121

2222
beforeEach(() => {
2323
TestBed.configureTestingModule({
24-
imports: [GuideViewerModule],
2524
providers: [
2625
provideRouter([]),
2726
{provide: ActivatedRoute, useValue: mockActivatedRoute},

material.angular.io/src/app/pages/guide-viewer/guide-viewer.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Component, NgModule, OnInit, inject} from '@angular/core';
2-
import {ActivatedRoute, Router, RouterModule, Routes} from '@angular/router';
1+
import {Component, OnInit, inject} from '@angular/core';
2+
import {ActivatedRoute, Router} from '@angular/router';
33
import {GuideItem, GuideItems} from '../../shared/guide-items/guide-items';
44
import {Footer} from '../../shared/footer/footer';
55

@@ -47,10 +47,3 @@ export class GuideViewer implements OnInit {
4747
}
4848
}
4949
}
50-
51-
const routes: Routes = [{path: '', component: GuideViewer}];
52-
53-
@NgModule({
54-
imports: [RouterModule.forChild(routes)],
55-
})
56-
export class GuideViewerModule {}

material.angular.io/src/app/routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const MATERIAL_DOCS_ROUTES: Routes = [
2727
{path: 'guide/duplicate-theming-styles', redirectTo: '/guide/theming'},
2828
{
2929
path: 'guide/:id',
30-
loadChildren: () => import('./pages/guide-viewer').then(m => m.GuideViewerModule),
30+
loadComponent: () => import('./pages/guide-viewer').then(m => m.GuideViewer),
3131
},
3232
// Needs to be defined before `:section` so it gets picked first when redirecting a missing page.
3333
{
@@ -38,7 +38,7 @@ export const MATERIAL_DOCS_ROUTES: Routes = [
3838
path: ':section',
3939
canActivate: [CanActivateComponentSidenav],
4040
loadChildren: () =>
41-
import('./pages/component-sidenav/component-sidenav').then(m => m.ComponentSidenavModule),
41+
import('./pages/component-sidenav/component-sidenav').then(m => m.componentSidenavRoutes),
4242
},
4343
{path: '**', redirectTo: '/404'},
4444
];

material.angular.io/src/app/shared/example-viewer/example-viewer.spec.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
import {NgModule} from '@angular/core';
21
import {ComponentFixture, TestBed} from '@angular/core/testing';
3-
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
4-
import {MatAutocompleteModule} from '@angular/material/autocomplete';
5-
import {MatInputModule} from '@angular/material/input';
6-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
72

83
import {EXAMPLE_COMPONENTS} from '@angular/components-examples';
9-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
104
import {ExampleViewer} from './example-viewer';
11-
import {AutocompleteOverviewExample} from '@angular/components-examples/material/autocomplete';
125
import {MatTabGroupHarness} from '@angular/material/tabs/testing';
136
import {HarnessLoader} from '@angular/cdk/testing';
147
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
@@ -36,7 +29,6 @@ describe('ExampleViewer', () => {
3629

3730
beforeEach(() => {
3831
TestBed.configureTestingModule({
39-
imports: [ReactiveFormsModule, TestExampleModule],
4032
providers: [provideHttpClient(), provideRouter([])],
4133
});
4234

@@ -195,18 +187,3 @@ describe('ExampleViewer', () => {
195187
});
196188
});
197189
});
198-
199-
// Create a version of ExampleModule for testing with only one component so that we don't have
200-
// to compile all of the examples for these tests.
201-
@NgModule({
202-
imports: [
203-
MatInputModule,
204-
MatAutocompleteModule,
205-
MatSlideToggleModule,
206-
FormsModule,
207-
ReactiveFormsModule,
208-
NoopAnimationsModule,
209-
AutocompleteOverviewExample,
210-
],
211-
})
212-
class TestExampleModule {}

0 commit comments

Comments
 (0)