Skip to content

Commit ca351b2

Browse files
jelbournjelbourn
authored
feat: add NgModules for material (#950)
1 parent 0b17cd3 commit ca351b2

File tree

107 files changed

+1140
-758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1140
-758
lines changed

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
"deploy": "firebase deploy",
2323
"webdriver-manager": "webdriver-manager"
2424
},
25-
"version": "2.0.0-alpha.6-2",
25+
"version": "2.0.0-alpha.6-3",
2626
"license": "MIT",
2727
"engines": {
2828
"node": ">= 4.2.1 < 5"
2929
},
3030
"dependencies": {
31-
"@angular/common": "2.0.0-rc.4",
32-
"@angular/compiler": "2.0.0-rc.4",
33-
"@angular/core": "2.0.0-rc.4",
34-
"@angular/http": "2.0.0-rc.4",
35-
"@angular/platform-browser": "2.0.0-rc.4",
36-
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
37-
"@angular/router": "v3.0.0-alpha.8",
38-
"@angular/forms": "^0.2.0",
31+
"@angular/common": "github:angular/common-builds",
32+
"@angular/compiler": "github:angular/compiler-builds",
33+
"@angular/core": "github:angular/core-builds",
34+
"@angular/http": "github:angular/http-builds",
35+
"@angular/platform-browser": "github:angular/platform-browser-builds",
36+
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds",
37+
"@angular/forms": "github:angular/forms-builds",
38+
"@angular/router": "github:angular/router-builds",
3939
"core-js": "^2.4.0",
4040
"hammerjs": "^2.0.8",
4141
"rxjs": "5.0.0-beta.6",

‎scripts/release/stage-release.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ mkdir deploy
1818
# Start off by building normally.
1919
ng build
2020

21+
# `ng build` does not complete synchronously, so wait a moment for it.
22+
sleep 2
23+
2124
# We need to remove moduleId for the ngc build. We do this by simply commenting out with a
2225
# distinguishing marker and then undoing those lines after we've generated the .metadata.json files.
2326
grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g'
@@ -58,6 +61,9 @@ cp -R ./dist/components/* ./deploy/
5861
# Copy the core/ directory directly into ./deploy
5962
cp -R ./dist/core/ ./deploy/core/
6063

64+
# Remove css files from src/
65+
find ./src -iname "*.css" | xargs rm
66+
6167
# Remove test files from deploy/
6268
find ./deploy -iname "*.spec.d.ts" | xargs rm
6369
find ./deploy -iname "*.spec.js" | xargs rm

‎src/components/all/all.ts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import {NgModule} from '@angular/core';
2+
import {MdButtonToggleModule} from '@angular2-material/button-toggle/button-toggle';
3+
import {MdButtonModule} from '@angular2-material/button/button';
4+
import {MdCheckboxModule} from '@angular2-material/checkbox/checkbox';
5+
import {MdRadioModule} from '@angular2-material/radio/radio';
6+
import {MdSlideToggleModule} from '@angular2-material/slide-toggle/slide-toggle';
7+
import {MdSliderModule} from '@angular2-material/slider/slider';
8+
import {MdSidenavModule} from '@angular2-material/sidenav/sidenav';
9+
import {MdListModule} from '@angular2-material/list/list';
10+
import {MdGridListModule} from '@angular2-material/grid-list/grid-list';
11+
import {MdCardModule} from '@angular2-material/card/card';
12+
import {MdIconModule} from '@angular2-material/icon/icon';
13+
import {MdProgressCircleModule} from '@angular2-material/progress-circle/progress-circle';
14+
import {MdProgressBarModule} from '@angular2-material/progress-bar/progress-bar';
15+
import {MdInputModule} from '@angular2-material/input/input';
16+
import {MdTabsModule} from '@angular2-material/tabs/tabs';
17+
import {MdToolbarModule} from '@angular2-material/toolbar/toolbar';
18+
import {MdTooltipModule} from '@angular2-material/tooltip/tooltip';
19+
import {MdRippleModule} from '@angular2-material/core/ripple/ripple';
20+
import {PortalModule} from '@angular2-material/core/portal/portal-directives';
21+
import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives';
22+
import {MdMenuModule} from '@angular2-material/menu/menu';
23+
import {MdDialogModule} from '@angular2-material/dialog/dialog';
24+
import {RtlModule} from '@angular2-material/core/rtl/dir';
25+
import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer';
26+
27+
28+
const MATERIAL_MODULES = [
29+
MdButtonModule,
30+
MdButtonToggleModule,
31+
MdCardModule,
32+
MdCheckboxModule,
33+
MdDialogModule,
34+
MdGridListModule,
35+
MdIconModule,
36+
MdInputModule,
37+
MdListModule,
38+
MdMenuModule,
39+
MdProgressBarModule,
40+
MdProgressCircleModule,
41+
MdRadioModule,
42+
MdRippleModule,
43+
MdSidenavModule,
44+
MdSliderModule,
45+
MdSlideToggleModule,
46+
MdTabsModule,
47+
MdToolbarModule,
48+
MdTooltipModule,
49+
OverlayModule,
50+
PortalModule,
51+
RtlModule,
52+
];
53+
54+
@NgModule({
55+
imports: MATERIAL_MODULES,
56+
exports: MATERIAL_MODULES,
57+
providers: [MdLiveAnnouncer]
58+
})
59+
export class MaterialModule { }

‎src/components/button-toggle/button-toggle.spec.ts‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
import {
2-
addProviders,
32
inject,
43
async,
54
fakeAsync,
65
tick,
6+
TestComponentBuilder,
7+
ComponentFixture,
8+
TestBed,
79
} from '@angular/core/testing';
8-
import {NgControl, disableDeprecatedForms, provideForms} from '@angular/forms';
9-
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
10+
import {NgControl, FormsModule} from '@angular/forms';
1011
import {Component, DebugElement} from '@angular/core';
1112
import {By} from '@angular/platform-browser';
1213
import {
13-
MD_BUTTON_TOGGLE_DIRECTIVES,
14-
MdButtonToggleGroup,
15-
MdButtonToggle,
16-
MdButtonToggleGroupMultiple,
17-
MdButtonToggleChange,
14+
MdButtonToggleGroup,
15+
MdButtonToggle,
16+
MdButtonToggleGroupMultiple,
17+
MdButtonToggleChange, MdButtonToggleModule,
1818
} from './button-toggle';
19-
import {
20-
MdUniqueSelectionDispatcher
21-
} from '@angular2-material/core/coordination/unique-selection-dispatcher';
2219

2320

2421
describe('MdButtonToggle', () => {
2522
let builder: TestComponentBuilder;
26-
let dispatcher: MdUniqueSelectionDispatcher;
27-
28-
beforeEach(() => {
29-
addProviders([
30-
disableDeprecatedForms(),
31-
provideForms(),
32-
{provide: MdUniqueSelectionDispatcher, useFactory: () => {
33-
dispatcher = new MdUniqueSelectionDispatcher();
34-
return dispatcher;
35-
}}
36-
]);
37-
});
23+
24+
beforeEach(async(() => {
25+
TestBed.configureTestingModule({
26+
imports: [MdButtonToggleModule, FormsModule],
27+
declarations: [
28+
ButtonTogglesInsideButtonToggleGroup,
29+
ButtonToggleGroupWithNgModel,
30+
ButtonTogglesInsideButtonToggleGroupMultiple,
31+
StandaloneButtonToggle,
32+
],
33+
});
34+
35+
36+
TestBed.compileComponents();
37+
}));
3838

3939
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
4040
builder = tcb;
@@ -439,7 +439,6 @@ describe('MdButtonToggle', () => {
439439

440440

441441
@Component({
442-
directives: [MD_BUTTON_TOGGLE_DIRECTIVES],
443442
template: `
444443
<md-button-toggle-group [disabled]="isGroupDisabled" [value]="groupValue">
445444
<md-button-toggle value="test1">Test1</md-button-toggle>
@@ -454,7 +453,6 @@ class ButtonTogglesInsideButtonToggleGroup {
454453
}
455454

456455
@Component({
457-
directives: [MD_BUTTON_TOGGLE_DIRECTIVES],
458456
template: `
459457
<md-button-toggle-group [(ngModel)]="modelValue" (change)="lastEvent = $event">
460458
<md-button-toggle *ngFor="let option of options" [value]="option.value">
@@ -474,7 +472,6 @@ class ButtonToggleGroupWithNgModel {
474472
}
475473

476474
@Component({
477-
directives: [MD_BUTTON_TOGGLE_DIRECTIVES],
478475
template: `
479476
<md-button-toggle-group [disabled]="isGroupDisabled" multiple>
480477
<md-button-toggle value="eggs">Eggs</md-button-toggle>
@@ -488,7 +485,6 @@ class ButtonTogglesInsideButtonToggleGroupMultiple {
488485
}
489486

490487
@Component({
491-
directives: [MD_BUTTON_TOGGLE_DIRECTIVES],
492488
template: `
493489
<md-button-toggle>Yes</md-button-toggle>
494490
`

‎src/components/button-toggle/button-toggle.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
NgModule,
23
Component,
34
ContentChildren,
45
Directive,
@@ -15,6 +16,7 @@ import {
1516
import {
1617
NG_VALUE_ACCESSOR,
1718
ControlValueAccessor,
19+
FormsModule,
1820
} from '@angular/forms';
1921
import {Observable} from 'rxjs/Observable';
2022
import {
@@ -374,3 +376,12 @@ export const MD_BUTTON_TOGGLE_DIRECTIVES = [
374376
MdButtonToggleGroupMultiple,
375377
MdButtonToggle
376378
];
379+
380+
381+
@NgModule({
382+
imports: [FormsModule],
383+
exports: MD_BUTTON_TOGGLE_DIRECTIVES,
384+
declarations: MD_BUTTON_TOGGLE_DIRECTIVES,
385+
providers: [MdUniqueSelectionDispatcher],
386+
})
387+
export class MdButtonToggleModule { }

‎src/components/button/button.spec.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
import {inject} from '@angular/core/testing';
2-
import {TestComponentBuilder} from '@angular/compiler/testing';
1+
import {
2+
inject,
3+
TestComponentBuilder,
4+
async,
5+
TestBed,
6+
} from '@angular/core/testing';
37
import {Component} from '@angular/core';
48
import {By} from '@angular/platform-browser';
5-
import {MdButton, MdAnchor} from './button';
9+
import {MdButtonModule} from './button';
610

711

812
describe('MdButton', () => {
913
let builder: TestComponentBuilder;
1014

15+
beforeEach(async(() => {
16+
TestBed.configureTestingModule({
17+
imports: [MdButtonModule],
18+
declarations: [TestApp],
19+
});
20+
21+
TestBed.compileComponents();
22+
}));
23+
1124
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
1225
builder = tcb;
1326
}));
@@ -141,8 +154,7 @@ describe('MdButton', () => {
141154
Go
142155
</button>
143156
<a href="http://www.google.com" md-button [disabled]="isDisabled" [color]="buttonColor">Link</a>
144-
`,
145-
directives: [MdButton, MdAnchor]
157+
`
146158
})
147159
class TestApp {
148160
clickCount: number = 0;

‎src/components/button/button.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
ElementRef,
88
Renderer,
99
Type,
10+
NgModule,
1011
} from '@angular/core';
1112

1213
// TODO(jelbourn): Ink ripples.
@@ -137,3 +138,10 @@ export class MdAnchor extends MdButton {
137138

138139

139140
export const MD_BUTTON_DIRECTIVES: Type[] = [MdButton, MdAnchor];
141+
142+
143+
@NgModule({
144+
exports: MD_BUTTON_DIRECTIVES,
145+
declarations: MD_BUTTON_DIRECTIVES,
146+
})
147+
export class MdButtonModule { }

‎src/components/button/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular2-material/button",
3-
"version": "2.0.0-alpha.6-2",
3+
"version": "2.0.0-alpha.6-3",
44
"description": "Angular 2 Material button",
55
"main": "./button.js",
66
"typings": "./button.d.ts",
@@ -23,6 +23,6 @@
2323
},
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"peerDependencies": {
26-
"@angular2-material/core": "2.0.0-alpha.6-2"
26+
"@angular2-material/core": "2.0.0-alpha.6-3"
2727
}
2828
}

‎src/components/card/card.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
1+
import {NgModule, Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
22

33

44
/*
@@ -75,3 +75,10 @@ TODO(kara): update link to demo site when it exists
7575
export class MdCardTitleGroup {}
7676

7777
export const MD_CARD_DIRECTIVES: any[] = [MdCard, MdCardHeader, MdCardTitleGroup];
78+
79+
80+
@NgModule({
81+
exports: MD_CARD_DIRECTIVES,
82+
declarations: MD_CARD_DIRECTIVES,
83+
})
84+
export class MdCardModule { }

‎src/components/card/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular2-material/card",
3-
"version": "2.0.0-alpha.6-2",
3+
"version": "2.0.0-alpha.6-3",
44
"description": "Angular 2 Material card",
55
"main": "./card.js",
66
"typings": "./card.d.ts",
@@ -21,6 +21,6 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
24-
"@angular2-material/core": "2.0.0-alpha.6-2"
24+
"@angular2-material/core": "2.0.0-alpha.6-3"
2525
}
2626
}

0 commit comments

Comments
 (0)