Skip to content

Commit 8ab0f63

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

17 files changed

+37
-19
lines changed

src/e2e-app/BUILD.bazel

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,26 @@ ng_module(
1616
"@npm//@angular/platform-browser",
1717
"@npm//@angular/router",
1818
"@npm//@angular/animations",
19-
"@npm//material-components-web",
2019
"//src/cdk/drag-drop",
2120
"//src/cdk/overlay",
2221
"//src/cdk/scrolling",
23-
# TODO(devversion): be more explicit by using "@angular/material" with individual entry points.
24-
"//src/material:material",
22+
"//src/material/button",
23+
"//src/material/icon",
24+
"//src/material/checkbox",
25+
"//src/material/dialog",
26+
"//src/material/core",
27+
"//src/material/list",
28+
"//src/material/grid-list",
29+
"//src/material/icon",
30+
"//src/material/form-field",
31+
"//src/material/input",
32+
"//src/material/menu",
33+
"//src/material/progress-bar",
34+
"//src/material/progress-spinner",
35+
"//src/material/radio",
36+
"//src/material/sidenav",
37+
"//src/material/slide-toggle",
38+
"//src/material/tabs",
2539
"//src/material-examples:examples",
2640
"//src/cdk-experimental/dialog",
2741
"//src/cdk-experimental/scrolling",

src/e2e-app/button/button-e2e-module.ts

Lines changed: 2 additions & 1 deletion
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 {ButtonE2E} from './button-e2e';
1213

1314
@NgModule({

src/e2e-app/checkbox/checkbox-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatCheckboxModule} from '@angular/material';
10+
import {MatCheckboxModule} from '@angular/material/checkbox';
1111
import {SimpleCheckboxes} from './checkbox-e2e';
1212

1313
@NgModule({

src/e2e-app/dialog/dialog-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatDialogModule} from '@angular/material';
10+
import {MatDialogModule} from '@angular/material/dialog';
1111
import {DialogE2E, TestDialog} from './dialog-e2e';
1212

1313
@NgModule({

src/e2e-app/dialog/dialog-e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, ViewChild, TemplateRef} from '@angular/core';
2-
import {MatDialog, MatDialogRef, MatDialogConfig} from '@angular/material';
2+
import {MatDialog, MatDialogRef, MatDialogConfig} from '@angular/material/dialog';
33

44
@Component({
55
selector: 'dialog-e2e',

src/e2e-app/e2e-app/e2e-app-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {GestureConfig, MatListModule} from '@angular/material';
11+
import {GestureConfig} from '@angular/material/core';
12+
import {MatListModule} from '@angular/material/list';
1213
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
1314
import {RouterModule} from '@angular/router';
1415
import {E2eAppLayout, Home} from './e2e-app-layout';

src/e2e-app/grid-list/grid-list-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatGridListModule} from '@angular/material';
10+
import {MatGridListModule} from '@angular/material/grid-list';
1111
import {GridListE2E} from './grid-list-e2e';
1212

1313
@NgModule({

src/e2e-app/icon/icon-e2e-module.ts

Lines changed: 1 addition & 1 deletion
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 {IconE2E} from './icon-e2e';
1212

1313
@NgModule({

src/e2e-app/input/input-e2e-module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatFormFieldModule, MatInputModule} from '@angular/material';
10+
import {MatFormFieldModule} from '@angular/material/form-field';
11+
import {MatInputModule} from '@angular/material/input';
1112
import {InputE2E} from './input-e2e';
1213

1314
@NgModule({

src/e2e-app/menu/menu-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatMenuModule} from '@angular/material';
10+
import {MatMenuModule} from '@angular/material/menu';
1111
import {MenuE2E} from './menu-e2e';
1212

1313
@NgModule({

0 commit comments

Comments
 (0)