Skip to content

Commit 133a0f9

Browse files
devversionjelbourn
authored andcommitted
chore: switch dev-app to secondary entry-points (angular#15983)
Since the primary entry-point @angular/material is now deprecated with V8, we should no longer use the deprecated entry-point in our dev-app.
1 parent f8a2a9d commit 133a0f9

File tree

59 files changed

+205
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+205
-226
lines changed

src/dev-app/autocomplete/autocomplete-demo-module.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
12-
import {
13-
MatAutocompleteModule,
14-
MatButtonModule,
15-
MatCardModule,
16-
MatFormFieldModule,
17-
MatInputModule
18-
} from '@angular/material';
12+
import {MatAutocompleteModule} from '@angular/material/autocomplete';
13+
import {MatButtonModule} from '@angular/material/button';
14+
import {MatCardModule} from '@angular/material/card';
15+
import {MatFormFieldModule} from '@angular/material/form-field';
16+
import {MatInputModule} from '@angular/material/input';
1917
import {RouterModule} from '@angular/router';
2018
import {AutocompleteDemo} from './autocomplete-demo';
2119

src/dev-app/badge/badge-demo-module.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
12-
import {MatBadgeModule, MatButtonModule, MatIconModule} from '@angular/material';
12+
import {MatBadgeModule} from '@angular/material/badge';
13+
import {MatButtonModule} from '@angular/material/button';
14+
import {MatIconModule} from '@angular/material/icon';
1315
import {RouterModule} from '@angular/router';
1416
import {BadgeDemo} from './badge-demo';
1517

src/dev-app/baseline/baseline-demo-module.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {
12-
MatCardModule,
13-
MatCheckboxModule,
14-
MatFormFieldModule,
15-
MatInputModule,
16-
MatRadioModule,
17-
MatSelectModule,
18-
MatToolbarModule
19-
} from '@angular/material';
11+
import {MatCardModule} from '@angular/material/card';
12+
import {MatCheckboxModule} from '@angular/material/checkbox';
13+
import {MatFormFieldModule} from '@angular/material/form-field';
14+
import {MatInputModule} from '@angular/material/input';
15+
import {MatRadioModule} from '@angular/material/radio';
16+
import {MatSelectModule} from '@angular/material/select';
17+
import {MatToolbarModule} from '@angular/material/toolbar';
2018
import {RouterModule} from '@angular/router';
2119
import {BaselineDemo} from './baseline-demo';
2220

src/dev-app/bottom-sheet/bottom-sheet-demo-module.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
12-
import {
13-
MatBottomSheetModule,
14-
MatButtonModule,
15-
MatCardModule,
16-
MatCheckboxModule,
17-
MatFormFieldModule,
18-
MatIconModule,
19-
MatInputModule,
20-
MatListModule,
21-
MatSelectModule
22-
} from '@angular/material';
12+
import {MatBottomSheetModule} from '@angular/material/bottom-sheet';
13+
import {MatButtonModule} from '@angular/material/button';
14+
import {MatCardModule} from '@angular/material/card';
15+
import {MatCheckboxModule} from '@angular/material/checkbox';
16+
import {MatFormFieldModule} from '@angular/material/form-field';
17+
import {MatIconModule} from '@angular/material/icon';
18+
import {MatInputModule} from '@angular/material/input';
19+
import {MatListModule} from '@angular/material/list';
20+
import {MatSelectModule} from '@angular/material/select';
2321
import {RouterModule} from '@angular/router';
2422
import {BottomSheetDemo, ExampleBottomSheet} from './bottom-sheet-demo';
2523

src/dev-app/button-toggle/button-toggle-demo-module.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
12-
import {MatButtonToggleModule, MatCheckboxModule, MatIconModule} from '@angular/material';
12+
import {MatButtonToggleModule} from '@angular/material/button-toggle';
13+
import {MatCheckboxModule} from '@angular/material/checkbox';
14+
import {MatIconModule} from '@angular/material/icon';
1315
import {RouterModule} from '@angular/router';
1416
import {ButtonToggleDemo} from './button-toggle-demo';
1517

src/dev-app/button/button-demo-module.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatButtonModule, MatIconModule} from '@angular/material';
10+
import {MatButtonModule} from '@angular/material/button';
11+
import {MatIconModule} from '@angular/material/icon';
1112
import {RouterModule} from '@angular/router';
1213
import {ButtonDemo} from './button-demo';
1314

src/dev-app/card/card-demo-module.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {
11-
MatButtonModule,
12-
MatCardModule,
13-
MatDividerModule,
14-
MatProgressBarModule
15-
} from '@angular/material';
10+
import {MatButtonModule} from '@angular/material/button';
11+
import {MatCardModule} from '@angular/material/card';
12+
import {MatDividerModule} from '@angular/material/divider';
13+
import {MatProgressBarModule} from '@angular/material/progress-bar';
1614
import {RouterModule} from '@angular/router';
1715
import {CardDemo} from './card-demo';
1816

src/dev-app/checkbox/checkbox-demo-module.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
12-
import {
13-
MatCheckboxModule,
14-
MatFormFieldModule,
15-
MatInputModule,
16-
MatPseudoCheckboxModule,
17-
MatSelectModule
18-
} from '@angular/material';
12+
import {MatCheckboxModule} from '@angular/material/checkbox';
13+
import {MatPseudoCheckboxModule} from '@angular/material/core';
14+
import {MatFormFieldModule} from '@angular/material/form-field';
15+
import {MatInputModule} from '@angular/material/input';
16+
import {MatSelectModule} from '@angular/material/select';
1917
import {RouterModule} from '@angular/router';
2018
import {
2119
AnimationsNoop,

src/dev-app/checkbox/checkbox-demo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component, Directive} from '@angular/core';
10-
import {MAT_CHECKBOX_CLICK_ACTION} from '@angular/material';
10+
import {MAT_CHECKBOX_CLICK_ACTION} from '@angular/material/checkbox';
1111
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
1212

1313

src/dev-app/chips/chips-demo-module.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
12-
import {
13-
MatButtonModule,
14-
MatCardModule,
15-
MatCheckboxModule,
16-
MatChipsModule,
17-
MatFormFieldModule,
18-
MatIconModule,
19-
MatToolbarModule
20-
} from '@angular/material';
12+
import {MatButtonModule} from '@angular/material/button';
13+
import {MatCardModule} from '@angular/material/card';
14+
import {MatCheckboxModule} from '@angular/material/checkbox';
15+
import {MatChipsModule} from '@angular/material/chips';
16+
import {MatFormFieldModule} from '@angular/material/form-field';
17+
import {MatIconModule} from '@angular/material/icon';
18+
import {MatToolbarModule} from '@angular/material/toolbar';
2119
import {RouterModule} from '@angular/router';
2220
import {ChipsDemo} from './chips-demo';
2321

src/dev-app/chips/chips-demo.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import {COMMA, ENTER} from '@angular/cdk/keycodes';
1010
import {Component} from '@angular/core';
11-
import {MatChipInputEvent, ThemePalette} from '@angular/material';
11+
import {MatChipInputEvent} from '@angular/material/chips';
12+
import {ThemePalette} from '@angular/material/core';
1213

1314

1415
export interface Person {

src/dev-app/connected-overlay/connected-overlay-demo-module.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import {OverlayModule} from '@angular/cdk/overlay';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
1212
import {FormsModule} from '@angular/forms';
13-
import {MatButtonModule, MatCheckboxModule, MatRadioModule} from '@angular/material';
13+
import {MatButtonModule} from '@angular/material/button';
14+
import {MatCheckboxModule} from '@angular/material/checkbox';
15+
import {MatRadioModule} from '@angular/material/radio';
1416
import {RouterModule} from '@angular/router';
1517
import {ConnectedOverlayDemo} from './connected-overlay-demo';
1618

src/dev-app/datepicker/datepicker-demo-module.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
12-
import {
13-
MatButtonModule,
14-
MatCheckboxModule,
15-
MatDatepickerModule,
16-
MatFormFieldModule,
17-
MatIconModule,
18-
MatInputModule,
19-
MatNativeDateModule,
20-
MatSelectModule
21-
} from '@angular/material';
12+
import {MatButtonModule} from '@angular/material/button';
13+
import {MatCheckboxModule} from '@angular/material/checkbox';
14+
import {MatNativeDateModule} from '@angular/material/core';
15+
import {MatDatepickerModule} from '@angular/material/datepicker';
16+
import {MatFormFieldModule} from '@angular/material/form-field';
17+
import {MatIconModule} from '@angular/material/icon';
18+
import {MatInputModule} from '@angular/material/input';
19+
import {MatSelectModule} from '@angular/material/select';
2220
import {RouterModule} from '@angular/router';
2321
import {CustomHeader, CustomHeaderNgContent, DatepickerDemo} from './datepicker-demo';
2422

src/dev-app/datepicker/datepicker-demo.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ import {
1111
ChangeDetectorRef,
1212
Component,
1313
Inject,
14-
ViewChild,
14+
OnDestroy,
1515
Optional,
16-
OnDestroy
16+
ViewChild
1717
} from '@angular/core';
1818
import {FormControl} from '@angular/forms';
19-
import {MatCalendar, MatCalendarHeader} from '@angular/material';
2019
import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats, ThemePalette} from '@angular/material/core';
21-
import {MatDatepickerInputEvent} from '@angular/material/datepicker';
20+
import {
21+
MatCalendar,
22+
MatCalendarHeader,
23+
MatDatepickerInputEvent
24+
} from '@angular/material/datepicker';
2225
import {Subject} from 'rxjs';
2326
import {takeUntil} from 'rxjs/operators';
2427

src/dev-app/dev-app/dev-app-module.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {
12-
MatButtonModule,
13-
MatIconModule,
14-
MatListModule,
15-
MatSidenavModule,
16-
MatToolbarModule,
17-
GestureConfig
18-
} from '@angular/material';
19-
import {RouterModule} from '@angular/router';
11+
import {MatButtonModule} from '@angular/material/button';
12+
import {GestureConfig} from '@angular/material/core';
13+
import {MatIconModule} from '@angular/material/icon';
14+
import {MatListModule} from '@angular/material/list';
15+
import {MatSidenavModule} from '@angular/material/sidenav';
16+
import {MatToolbarModule} from '@angular/material/toolbar';
2017
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
18+
import {RouterModule} from '@angular/router';
2119
import {DevApp404} from './dev-app-404';
2220
import {DevAppHome} from './dev-app-home';
2321
import {DevAppLayout} from './dev-app-layout';

src/dev-app/dialog/dialog-demo-module.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88

99
import {NgModule} from '@angular/core';
1010
import {FormsModule} from '@angular/forms';
11-
import {
12-
MatButtonModule,
13-
MatCardModule,
14-
MatCheckboxModule,
15-
MatDialogModule,
16-
MatFormFieldModule,
17-
MatInputModule,
18-
MatSelectModule
19-
} from '@angular/material';
11+
import {MatButtonModule} from '@angular/material/button';
12+
import {MatCardModule} from '@angular/material/card';
13+
import {MatCheckboxModule} from '@angular/material/checkbox';
14+
import {MatDialogModule} from '@angular/material/dialog';
15+
import {MatFormFieldModule} from '@angular/material/form-field';
16+
import {MatInputModule} from '@angular/material/input';
17+
import {MatSelectModule} from '@angular/material/select';
2018
import {RouterModule} from '@angular/router';
2119
import {ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog} from './dialog-demo';
2220

src/dev-app/dialog/dialog-demo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {DOCUMENT} from '@angular/common';
1010
import {Component, Inject, TemplateRef, ViewChild, ViewEncapsulation} from '@angular/core';
11-
import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material';
11+
import {MAT_DIALOG_DATA, MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
1212

1313

1414
const defaultDialogConfig = new MatDialogConfig();

src/dev-app/drag-drop/drag-drop-demo-module.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ import {DragDropModule} from '@angular/cdk/drag-drop';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
1212
import {FormsModule} from '@angular/forms';
13-
import {MatFormFieldModule, MatIconModule, MatSelectModule} from '@angular/material';
13+
import {MatFormFieldModule} from '@angular/material/form-field';
14+
import {MatIconModule} from '@angular/material/icon';
15+
import {MatSelectModule} from '@angular/material/select';
1416
import {RouterModule} from '@angular/router';
1517
import {DragAndDropDemo} from './drag-drop-demo';
1618

src/dev-app/drawer/drawer-demo-module.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatButtonModule, MatListModule, MatSidenavModule} from '@angular/material';
10+
import {MatButtonModule} from '@angular/material/button';
11+
import {MatListModule} from '@angular/material/list';
12+
import {MatSidenavModule} from '@angular/material/sidenav';
1113
import {RouterModule} from '@angular/router';
1214
import {DrawerDemo} from './drawer-demo';
1315

src/dev-app/example/example-module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {MatExpansionModule} from '@angular/material';
11+
import {MatExpansionModule} from '@angular/material/expansion';
1212
import {ExampleModule as ExampleDataModule} from '@angular/material-examples';
1313
import {Example} from './example';
1414

src/dev-app/expansion/expansion-demo-module.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ import {CdkAccordionModule} from '@angular/cdk/accordion';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
1212
import {FormsModule} from '@angular/forms';
13-
import {
14-
MatButtonModule,
15-
MatCheckboxModule,
16-
MatExpansionModule,
17-
MatFormFieldModule,
18-
MatInputModule,
19-
MatRadioModule,
20-
MatSlideToggleModule
21-
} from '@angular/material';
13+
import {MatButtonModule} from '@angular/material/button';
14+
import {MatCheckboxModule} from '@angular/material/checkbox';
15+
import {MatExpansionModule} from '@angular/material/expansion';
16+
import {MatFormFieldModule} from '@angular/material/form-field';
17+
import {MatInputModule} from '@angular/material/input';
18+
import {MatRadioModule} from '@angular/material/radio';
19+
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
2220
import {RouterModule} from '@angular/router';
2321
import {ExpansionDemo} from './expansion-demo';
2422

src/dev-app/expansion/expansion-demo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component, ViewChild} from '@angular/core';
10-
import {MatAccordion} from '@angular/material';
10+
import {MatAccordion} from '@angular/material/expansion';
1111

1212

1313
@Component({

src/dev-app/grid-list/grid-list-demo-module.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';
12-
import {MatButtonModule, MatCardModule, MatGridListModule, MatIconModule} from '@angular/material';
12+
import {MatButtonModule} from '@angular/material/button';
13+
import {MatCardModule} from '@angular/material/card';
14+
import {MatGridListModule} from '@angular/material/grid-list';
15+
import {MatIconModule} from '@angular/material/icon';
1316
import {RouterModule} from '@angular/router';
1417
import {GridListDemo} from './grid-list-demo';
1518

src/dev-app/icon/icon-demo-module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatIconModule} from '@angular/material';
10+
import {MatIconModule} from '@angular/material/icon';
1111
import {RouterModule} from '@angular/router';
1212
import {IconDemo} from './icon-demo';
1313

src/dev-app/icon/icon-demo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {MatIconRegistry} from '@angular/material';
10+
import {MatIconRegistry} from '@angular/material/icon';
1111
import {DomSanitizer} from '@angular/platform-browser';
1212

1313

0 commit comments

Comments
 (0)