fix: remove cdk re-exports from @angular/material

BREAKING CHANGE: `@angular/material` no longer re-exports symbols from
`@angular/cdk`.

Author: jelbourn

src/lib/core/a11y/_a11y.scss renamed to src/cdk/a11y/_a11y.scss

@@ -1,10 +1,10 @@
-import {ComponentFixture, inject, TestBed, fakeAsync, tick} from '@angular/core/testing';
-import {Component, Renderer2} from '@angular/core';
-import {A11yModule} from './index';
-import {By} from '@angular/platform-browser';
 import {TAB} from '@angular/cdk/keycodes';
-import {FocusOrigin, FocusMonitor, TOUCH_BUFFER_MS} from './focus-monitor';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component, Renderer2} from '@angular/core';
+import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
+import {A11yModule} from './index';
 
 
 describe('FocusMonitor', () => {

src/cdk/a11y/focus-monitor.spec.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Platform} from '@angular/cdk/platform';
 import {
   Directive,
   ElementRef,
@@ -18,11 +19,10 @@ import {
   Renderer2,
   SkipSelf,
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
+import {of as observableOf} from 'rxjs/observable/of';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {of as observableOf} from 'rxjs/observable/of';
 
 
 // This is the value used by AngularJS Material. Through trial and error (on iPhone 6S) they found

src/cdk/a11y/focus-monitor.ts

@@ -1,8 +1,8 @@
-import {ComponentFixture, TestBed, async} from '@angular/core/testing';
+import {Platform} from '@angular/cdk/platform';
 import {Component, ViewChild} from '@angular/core';
-import {FocusTrapFactory, FocusTrapDirective, FocusTrap} from './focus-trap';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FocusTrap, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
 
 
 describe('FocusTrap', () => {

src/cdk/a11y/focus-trap.spec.ts

@@ -1,5 +1,6 @@
+import {Platform} from '@angular/cdk/platform';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
+
 
 describe('InteractivityChecker', () => {
   let testContainerElement: HTMLElement;

src/cdk/a11y/interactivity-checker.spec.ts

@@ -1,11 +1,11 @@
+import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
+import {first} from '@angular/cdk/rxjs';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
+import {createKeyboardEvent} from '../testing/event-objects';
+import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
 import {FocusKeyManager} from './focus-key-manager';
-import {DOWN_ARROW, UP_ARROW, TAB} from '../keycodes/keycodes';
 import {ListKeyManager} from './list-key-manager';
-import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
-import {createKeyboardEvent} from '../testing/event-objects';
-import {first} from '../rxjs/index';
 
 
 class FakeFocusable {

src/cdk/a11y/list-key-manager.spec.ts

@@ -9,3 +9,4 @@
 export * from './portal';
 export * from './dom-portal-host';
 export * from './portal-directives';
+export * from './portal-injector';

src/lib/core/portal/portal-injector.ts renamed to src/cdk/portal/portal-injector.ts

@@ -1,12 +1,13 @@
+import {Dir} from '@angular/cdk/bidi';
 import {Component, ViewEncapsulation} from '@angular/core';
 import {
   MdSnackBar,
   MdSnackBarConfig,
   MdSnackBarHorizontalPosition,
   MdSnackBarVerticalPosition,
-  Dir,
 } from '@angular/material';
 
+
 @Component({
   moduleId: module.id,
   selector: 'snack-bar-demo',
@@ -24,7 +25,8 @@ export class SnackBarDemo {
   horizontalPosition: MdSnackBarHorizontalPosition = 'center';
   verticalPosition: MdSnackBarVerticalPosition = 'bottom';
 
-  constructor(public snackBar: MdSnackBar, private dir: Dir) { }
+  constructor(public snackBar: MdSnackBar, private dir: Dir) {
+  }
 
   open() {
     let config = new MdSnackBarConfig();

src/cdk/portal/public_api.ts

@@ -1,4 +1,3 @@
-@import '../core/a11y/a11y';
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
 @import '../core/style/layout-common';

src/demo-app/snack-bar/snack-bar-demo.ts

@@ -1,7 +1,7 @@
 // TODO(jelbourn): Measure perf benefits for translate3d and will-change.
 // TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser.
 @import 'button-base';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
 
 .mat-button, .mat-icon-button {

src/lib/button-toggle/button-toggle.scss

@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 
 $mat-card-default-padding: 24px !default;

src/lib/button/button.scss

@@ -6,17 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  Directive,
-  ElementRef,
-  Output,
-  EventEmitter,
-  Input,
-} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ENTER} from '@angular/material/core';
+import {ENTER} from '@angular/cdk/keycodes';
+import {Directive, ElementRef, EventEmitter, Input, Output,} from '@angular/core';
 import {MdChipList} from './chip-list';
 
+
 export interface MdChipInputEvent {
   input: HTMLInputElement;
   value: string;

src/lib/card/card.scss

@@ -5,14 +5,17 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
+import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW,} from '@angular/cdk/keycodes';
 import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
-  ChangeDetectorRef,
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   ElementRef,
@@ -28,21 +31,11 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {
-  BACKSPACE,
-  DELETE,
-  Directionality,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  UP_ARROW
-} from '@angular/material/core';
 import {MdFormFieldControl} from '@angular/material/form-field';
-
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-
 import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
 import {MdChipInput} from './chip-input';
 

src/lib/chips/chip-input.ts

@@ -8,6 +8,7 @@
 
 import {FocusableOption} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
 import {
   Directive,
   ElementRef,
@@ -17,17 +18,10 @@ import {
   Output,
   Renderer2,
 } from '@angular/core';
-import {
-  BACKSPACE,
-  CanColor,
-  CanDisable,
-  DELETE,
-  mixinColor,
-  mixinDisabled,
-  SPACE,
-} from '@angular/material/core';
+import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
+
 export interface MdChipEvent {
   chip: MdChip;
 }
@@ -41,8 +35,10 @@ export class MdChipSelectionChange {
 // Boilerplate for applying mixins to MdChip.
 /** @docs-private */
 export class MdChipBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {
+  }
 }
+
 export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary');
 
 
@@ -52,9 +48,10 @@ export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary')
  */
 @Directive({
   selector: `md-basic-chip, [md-basic-chip], mat-basic-chip, [mat-basic-chip]`,
-  host: {'class': 'mat-basic-chip'}
+  host: {'class': 'mat-basic-chip'},
 })
-export class MdBasicChip { }
+export class MdBasicChip {
+}
 
 /**
  * Material design styled Chip component. Used inside the MdChipList component.
@@ -80,7 +77,7 @@ export class MdBasicChip { }
 
 })
 export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestroy, CanColor,
-  CanDisable {
+    CanDisable {
 
   protected _value: any;
 
@@ -95,35 +92,44 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
 
   /** Whether the chip is selected. */
   @Input()
-  get selected(): boolean { return this._selected; }
+  get selected(): boolean {
+    return this._selected;
+  }
   set selected(value: boolean) {
     this._selected = coerceBooleanProperty(value);
     this.onSelectionChange.emit({source: this, isUserInput: false});
   }
-
   /** The value of the chip. Defaults to the content inside <md-chip> tags. */
   @Input()
   get value(): any {
     return this._value != undefined
       ? this._value
       : this._elementRef.nativeElement.textContent;
   }
-  set value(newValue: any) { this._value = newValue; }
+  set value(newValue: any) { this._value = newValue;}
 
   /**
    * Whether or not the chips are selectable. When a chip is not selectable,
    * changes to it's selected state are always ignored.
    */
-  @Input()
-  get selectable(): boolean { return this._selectable; }
-  set selectable(value: boolean) { this._selectable = coerceBooleanProperty(value); }
+  @Input() get selectable(): boolean {
+    return this._selectable;}
+
+
+  set selectable(value: boolean) {
+    this._selectable = coerceBooleanProperty(value);
+  }
 
   /**
    * Determines whether or not the chip displays the remove styling and emits (remove) events.
    */
-  @Input()
-  get removable(): boolean { return this._removable; }
-  set removable(value: boolean) { this._removable = coerceBooleanProperty(value); }
+  @Input() get removable(): boolean {
+    return this._removable;}
+
+
+  set removable(value: boolean) {
+    this._removable = coerceBooleanProperty(value);
+  }
 
   /** Emits when the chip is focused. */
   _onFocus = new Subject<MdChipEvent>();
@@ -259,11 +265,12 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   selector: '[mdChipRemove], [matChipRemove]',
   host: {
     'class': 'mat-chip-remove',
-    '(click)': '_handleClick($event)'
-  }
+    '(click)': '_handleClick($event)',
+  },
 })
 export class MdChipRemove {
-  constructor(protected _parentChip: MdChip) {}
+  constructor(protected _parentChip: MdChip) {
+  }
 
   /** Calls the parent chip's public `remove()` method if applicable. */
   _handleClick() {

src/lib/chips/chip-list.ts

@@ -1,4 +1,4 @@
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/elevation';
 
 $mat-chip-vertical-padding: 7px;

src/lib/chips/chip.ts

@@ -1,9 +1,9 @@
 // We can use relative imports for imports from the cdk because we bundle everything
 // up into a single flat scss file for material.
 @import '../../cdk/overlay/overlay';
+@import '../../cdk/a11y/a11y';
 
 // Core styles that can be used to apply material design treatments to any element.
-@import 'a11y/a11y';
 @import 'style/elevation';
 @import 'ripple/ripple';
 @import 'option/option';