fix: remove cdk re-exports from @angular/material (#7112)

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',
@@ -25,7 +26,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,9 @@
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {OverlayContainer} from '@angular/cdk/overlay';
+import {map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {ScrollDispatcher} from '@angular/cdk/scrolling';
+import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -8,28 +13,23 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
+import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MdOption} from '@angular/material/core';
+import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
-import {OverlayContainer} from '@angular/cdk/overlay';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {map, RxChain, startWith} from '@angular/cdk/rxjs';
-import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+import {Subscription} from 'rxjs/Subscription';
+import {MdInputModule} from '../input/index';
 import {
   getMdAutocompleteMissingPanelError,
   MdAutocomplete,
   MdAutocompleteModule,
-  MdAutocompleteTrigger,
   MdAutocompleteSelectedEvent,
+  MdAutocompleteTrigger,
 } from './index';
-import {MdInputModule} from '../input/index';
-import {Subscription} from 'rxjs/Subscription';
-import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
-import {MdOption} from '@angular/material/core';
-import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
-import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
 
 
 describe('MdAutocomplete', () => {