Skip to content

build: include cdk-experimental/dialog in various configs #11891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2018
Merged

build: include cdk-experimental/dialog in various configs #11891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/cdk-experimental/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
*/

export * from './version';
export * from '@angular/cdk-experimental/scrolling';
4 changes: 3 additions & 1 deletion src/demo-app/demo-material-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -110,6 +111,7 @@ import {
PlatformModule,
PortalModule,
ScrollingModule,
DialogModule,
]
})
export class DemoMaterialModule {}
1 change: 1 addition & 0 deletions src/demo-app/system-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 3 additions & 1 deletion src/e2e-app/e2e-app-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -69,6 +70,7 @@ import {VirtualScrollE2E} from './virtual-scroll/virtual-scroll-e2e';
MatTabsModule,
MatNativeDateModule,
ScrollingModule,
DialogModule,
]
})
export class E2eMaterialModule {}
Expand Down
1 change: 1 addition & 0 deletions src/e2e-app/system-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions test/karma-test-shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down