From 908c90ba1701ba0028067077ab94e01f538a62ff Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Sat, 23 Jun 2018 10:21:00 +0200
Subject: [PATCH] build: include cdk-experimental/dialog in various configs

* Removes the exports of `cdk-experimental/scrolling` from the root `cdk-experimental`.
* Adds the dialog package to a handful of configs that didn't have it. Mostly for consistency.
---
 src/cdk-experimental/public-api.ts   | 1 -
 src/demo-app/demo-material-module.ts | 4 +++-
 src/demo-app/system-config.ts        | 1 +
 src/e2e-app/e2e-app-module.ts        | 4 +++-
 src/e2e-app/system-config.ts         | 1 +
 test/karma-test-shim.js              | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/cdk-experimental/public-api.ts b/src/cdk-experimental/public-api.ts
index 8b70da4e86c8..326c704b094c 100644
--- a/src/cdk-experimental/public-api.ts
+++ b/src/cdk-experimental/public-api.ts
@@ -7,4 +7,3 @@
  */
 
 export * from './version';
-export * from '@angular/cdk-experimental/scrolling';
diff --git a/src/demo-app/demo-material-module.ts b/src/demo-app/demo-material-module.ts
index f561ecc47674..eeb003dc9380 100644
--- a/src/demo-app/demo-material-module.ts
+++ b/src/demo-app/demo-material-module.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ScrollingModule} from '@angular/cdk-experimental';
+import {ScrollingModule} from '@angular/cdk-experimental/scrolling';
+import {DialogModule} from '@angular/cdk-experimental/dialog';
 import {A11yModule} from '@angular/cdk/a11y';
 import {CdkAccordionModule} from '@angular/cdk/accordion';
 import {BidiModule} from '@angular/cdk/bidi';
@@ -110,6 +111,7 @@ import {
     PlatformModule,
     PortalModule,
     ScrollingModule,
+    DialogModule,
   ]
 })
 export class DemoMaterialModule {}
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index 7e5b2048ff9b..38094f42ddd9 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -63,6 +63,7 @@ System.config({
     '@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
 
     '@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
+    '@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
 
     '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
     '@angular/material/bottom-sheet': 'dist/packages/material/bottom-sheet/index.js',
diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
index 3f2aa9776358..534041a5d56d 100644
--- a/src/e2e-app/e2e-app-module.ts
+++ b/src/e2e-app/e2e-app-module.ts
@@ -1,4 +1,5 @@
-import {ScrollingModule} from '@angular/cdk-experimental';
+import {ScrollingModule} from '@angular/cdk-experimental/scrolling';
+import {DialogModule} from '@angular/cdk-experimental/dialog';
 import {FullscreenOverlayContainer, OverlayContainer} from '@angular/cdk/overlay';
 import {NgModule} from '@angular/core';
 import {ReactiveFormsModule} from '@angular/forms';
@@ -69,6 +70,7 @@ import {VirtualScrollE2E} from './virtual-scroll/virtual-scroll-e2e';
     MatTabsModule,
     MatNativeDateModule,
     ScrollingModule,
+    DialogModule,
   ]
 })
 export class E2eMaterialModule {}
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index cdd27d78a6df..b5fc698f6f2e 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -53,6 +53,7 @@ System.config({
     '@angular/cdk/text-field': 'dist/bundles/cdk-text-field.umd.js',
 
     '@angular/cdk-experimental/scrolling': 'dist/bundles/cdk-experimental-scrolling.umd.js',
+    '@angular/cdk-experimental/dialog': 'dist/bundles/cdk-experimental-dialog.umd.js',
 
     '@angular/material/autocomplete': 'dist/bundles/material-autocomplete.umd.js',
     '@angular/material/bottom-sheet': 'dist/bundles/material-bottom-sheet.umd.js',
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 59d26de72981..7f6eb94644c9 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -73,6 +73,7 @@ System.config({
     '@angular/cdk/tree': 'dist/packages/cdk/tree/index.js',
 
     '@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js',
+    '@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js',
 
     '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js',
     '@angular/material/badge': 'dist/packages/material/badge/index.js',