chore: fix demo app build (#7428)

src/demo-app/system-config.ts

@@ -35,7 +35,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
     '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
-    '@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
+    '@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
     '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',

src/e2e-app/system-config.ts

@@ -32,6 +32,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
     '@angular/cdk/collections': 'dist/bundles/cdk-collections.umd.js',
     '@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
+    '@angular/cdk/layout': 'dist/bundles/cdk-layout.umd.js',
     '@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
     '@angular/cdk/overlay': 'dist/bundles/cdk-overlay.umd.js',
     '@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',

src/lib/chips/chip-list.spec.ts

@@ -1059,5 +1059,5 @@ class SelectedChipList {
     { value: 1, viewValue: 'Pizza', selected: false },
     { value: 2, viewValue: 'Pasta', selected: true },
   ];
-  @ViewChildren(MdChip) chips: QueryList<MdChip>;
+  @ViewChildren(MatChip) chips: QueryList<MatChip>;
 }

src/lib/list/selection-list.spec.ts

@@ -229,13 +229,13 @@ describe('MatSelectionList', () => {
   });
 
   describe('with list option selected', () => {
-    let fixture: ComponentFixture<SelectionListWithListOptions>;
+    let fixture: ComponentFixture<SelectionListWithSelecedOption>;
     let listItemEl: DebugElement;
     let selectionList: DebugElement;
 
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdListModule],
+        imports: [MatListModule],
         declarations: [SelectionListWithSelecedOption],
       });
 
@@ -244,13 +244,13 @@ describe('MatSelectionList', () => {
 
     beforeEach(async(() => {
       fixture = TestBed.createComponent(SelectionListWithSelecedOption);
-      listItemEl = fixture.debugElement.query(By.directive(MdListOption));
-      selectionList = fixture.debugElement.query(By.directive(MdSelectionList));
+      listItemEl = fixture.debugElement.query(By.directive(MatListOption));
+      selectionList = fixture.debugElement.query(By.directive(MatSelectionList));
       fixture.detectChanges();
     }));
 
     it('should set its initial selected state in the selectedOptions', () => {
-      let optionEl = listItemEl.injector.get(MdListOption);
+      let optionEl = listItemEl.injector.get(MatListOption);
       let selectedOptions = selectionList.componentInstance.selectedOptions;
       expect(selectedOptions.isSelected(optionEl)).toBeTruthy();
     });

src/lib/stepper/stepper.spec.ts

@@ -7,7 +7,7 @@ import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatStepperModule} from './index';
-import {MatHorizontalStepper, MatStepper, MatVerticalStepper} from './stepper';
+import {MatHorizontalStepper, MatStep, MatStepper, MatVerticalStepper} from './stepper';
 import {MatStepperNext, MatStepperPrevious} from './stepper-button';
 
 const VALID_REGEX = /valid/;
@@ -306,7 +306,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   let stepperComponent = fixture.debugElement.query(By.directive(MatStepper)).componentInstance;
 
   expect(stepperComponent.selectedIndex).toBe(0);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 
   // select the second step
   let stepHeaderEl = stepHeaders[1].nativeElement;
@@ -314,7 +314,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(1);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 
   // select the third step
   stepHeaderEl = stepHeaders[2].nativeElement;
@@ -322,7 +322,7 @@ function assertSelectionChangeOnHeaderClick(fixture: ComponentFixture<any>,
   fixture.detectChanges();
 
   expect(stepperComponent.selectedIndex).toBe(2);
-  expect(stepperComponent.selected instanceof MdStep).toBe(true);
+  expect(stepperComponent.selected instanceof MatStep).toBe(true);
 }
 
 /** Asserts that 'aria-expanded' attribute is correct for expanded content of step. */

test/karma-test-shim.js

@@ -55,6 +55,7 @@ System.config({
     '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
     '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js',
     '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
+    '@angular/cdk/layout': 'dist/packages/cdk/layout/index.js',
     '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
     '@angular/cdk/overlay': 'dist/packages/cdk/overlay/index.js',
     '@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',

tools/dgeni/index.js

@@ -88,6 +88,7 @@ let apiDocsPackage = new DgeniPackage('material2-api-docs', dgeniPackageDeps)
     'cdk/coercion/index.ts',
     'cdk/collections/index.ts',
     'cdk/keycodes/index.ts',
+    'cdk/layout/index.ts',
     'cdk/overlay/index.ts',
     'cdk/platform/index.ts',
     'cdk/portal/index.ts',