Skip to content

Commit 818290b

Browse files
hanslkara
authored andcommitted
refactor(all): add index.ts, and build using es2015 and UMD bundles. (#1158)
1 parent 3669f06 commit 818290b

File tree

94 files changed

+330
-170
lines changed

Some content is hidden

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

94 files changed

+330
-170
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"protractor": "^3.3.0",
7575
"protractor-accessibility-plugin": "0.1.1",
7676
"resolve-bin": "^0.4.0",
77+
"rollup": "^0.34.13",
7778
"run-sequence": "^1.2.2",
7879
"sass": "^0.5.0",
7980
"strip-ansi": "^3.0.0",

scripts/release/inline-resources.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function inlineResources(globs) {
4747
readFile(filePath, 'utf-8')
4848
.then(content => inlineTemplate(filePath, content))
4949
.then(content => inlineStyle(filePath, content))
50+
.then(content => removeModuleId(filePath, content))
5051
.then(content => writeFile(filePath, content))
5152
.catch(err => {
5253
console.error('An error occured: ', err);
@@ -104,4 +105,15 @@ function inlineStyle(filePath, content) {
104105
}
105106

106107

108+
/**
109+
* Remove every mention of `moduleId: module.id`.
110+
* @param _ {string} The file path of the source file, currently ignored.
111+
* @param content {string} The source file's content.
112+
* @returns {string} The content with all moduleId: mentions removed.
113+
*/
114+
function removeModuleId(_, content) {
115+
return content.replace(/\s*moduleId:\s*module\.id\s*,?\s*/gm, '');
116+
}
117+
118+
107119
module.exports = inlineResources;

src/demo-app/button-toggle/button-toggle-demo.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {
3-
MdUniqueSelectionDispatcher
4-
} from '@angular2-material/core/coordination/unique-selection-dispatcher';
2+
import {MdUniqueSelectionDispatcher} from '@angular2-material/core';
53

64
@Component({
75
moduleId: module.id,

src/demo-app/demo-app-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {HttpModule} from '@angular/http';
44
import {FormsModule} from '@angular/forms';
55
import {DemoApp, Home} from './demo-app/demo-app';
66
import {RouterModule} from '@angular/router';
7-
import {MaterialModule} from '@angular2-material/all/all';
7+
import {MaterialModule} from '@angular2-material/all';
88
import {DEMO_APP_ROUTES} from './demo-app/routes';
99
import {ProgressBarDemo} from './progress-bar/progress-bar-demo';
1010
import {JazzDialog, DialogDemo} from './dialog/dialog-demo';

src/demo-app/dialog/dialog-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, ViewContainerRef} from '@angular/core';
2-
import {MdDialog, MdDialogConfig, MdDialogRef} from '@angular2-material/dialog/dialog';
2+
import {MdDialog, MdDialogConfig, MdDialogRef} from '@angular2-material/dialog';
33

44
@Component({
55
moduleId: module.id,

src/demo-app/grid-list/grid-list-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {MdIconRegistry} from '@angular2-material/icon/icon';
2+
import {MdIconRegistry} from '@angular2-material/icon';
33

44

55
@Component({

src/demo-app/icon/icon-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, ViewEncapsulation} from '@angular/core';
2-
import {MdIconRegistry} from '@angular2-material/icon/icon';
2+
import {MdIconRegistry} from '@angular2-material/icon';
33

44
@Component({
55
moduleId: module.id,

src/demo-app/live-announcer/live-announcer-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer';
2+
import {MdLiveAnnouncer} from '@angular2-material/core';
33

44
@Component({
55
moduleId: module.id,

src/demo-app/overlay/overlay-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ComponentPortal,
1414
Portal,
1515
TemplatePortalDirective,
16-
} from '@angular2-material/core/core';
16+
} from '@angular2-material/core';
1717

1818

1919
@Component({

src/demo-app/portal/portal-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Portal,
44
ComponentPortal,
55
TemplatePortalDirective,
6-
} from '@angular2-material/core/core';
6+
} from '@angular2-material/core';
77

88

99
@Component({

src/demo-app/ripple/ripple-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, ViewChild} from '@angular/core';
2-
import {MdRipple} from '@angular2-material/core/core';
2+
import {MdRipple} from '@angular2-material/core';
33

44

55
@Component({

src/demo-app/system-config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const components = [
3030
const packages: any = {
3131
'@angular2-material/core': {
3232
format: 'cjs',
33-
defaultExtension: 'js'
33+
main: 'core.umd.js'
3434
},
3535
// Set the default extension for the root package, because otherwise the demo-app can't
3636
// be built within the production mode. Due to missing file extensions.
@@ -41,7 +41,7 @@ const packages: any = {
4141
components.forEach(name => {
4242
packages[`@angular2-material/${name}`] = {
4343
format: 'cjs',
44-
defaultExtension: 'js'
44+
main: `${name}.umd.js`
4545
};
4646
});
4747

@@ -81,9 +81,9 @@ const barrels: string[] = [
8181
/** @cli-barrel */
8282
];
8383

84-
const _cliSystemConfig = angularPackages;
84+
const _cliSystemConfig: any = angularPackages;
8585
barrels.forEach((barrelName: string) => {
86-
(<any> _cliSystemConfig)[barrelName] = { main: 'index' };
86+
_cliSystemConfig[barrelName] = { main: 'index' };
8787
});
8888

8989
/** Type declaration for ambient System. */

src/demo-app/tooltip/tooltip-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {TooltipPosition} from '@angular2-material/tooltip/tooltip';
2+
import {TooltipPosition} from '@angular2-material/tooltip';
33

44

55
@Component({

src/e2e-app/e2e-app-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {IconE2E} from './icon/icon-e2e';
66
import {ButtonE2E} from './button/button-e2e';
77
import {MenuE2E} from './menu/menu-e2e';
88
import {BasicTabs} from './tabs/tabs-e2e';
9-
import {MaterialModule} from '@angular2-material/all/all';
9+
import {MaterialModule} from '@angular2-material/all';
1010
import {E2E_APP_ROUTES} from './e2e-app/routes';
1111

1212

src/e2e-app/system-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const components = [
3030
const packages: any = {
3131
'@angular2-material/core': {
3232
format: 'cjs',
33-
defaultExtension: 'js'
33+
main: 'core.umd.js'
3434
},
3535
// Set the default extension for the root package, because otherwise the demo-app can't
3636
// be built within the production mode. Due to missing file extensions.
@@ -41,7 +41,7 @@ const packages: any = {
4141
components.forEach(name => {
4242
packages[`@angular2-material/${name}`] = {
4343
format: 'cjs',
44-
defaultExtension: 'js'
44+
main: `${name}.umd.js`
4545
};
4646
});
4747

src/lib/all/all.ts

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
import {NgModule, ModuleWithProviders} 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';
2+
import {MdButtonToggleModule} from '@angular2-material/button-toggle';
3+
import {MdButtonModule} from '@angular2-material/button';
4+
import {MdCheckboxModule} from '@angular2-material/checkbox';
5+
import {MdRadioModule} from '@angular2-material/radio';
6+
import {MdSlideToggleModule} from '@angular2-material/slide-toggle';
7+
import {MdSliderModule} from '@angular2-material/slider';
8+
import {MdSidenavModule} from '@angular2-material/sidenav';
9+
import {MdListModule} from '@angular2-material/list';
10+
import {MdGridListModule} from '@angular2-material/grid-list';
11+
import {MdCardModule} from '@angular2-material/card';
12+
import {MdIconModule} from '@angular2-material/icon';
13+
import {MdProgressCircleModule} from '@angular2-material/progress-circle';
14+
import {MdProgressBarModule} from '@angular2-material/progress-bar';
15+
import {MdInputModule} from '@angular2-material/input';
16+
import {MdTabsModule} from '@angular2-material/tabs';
17+
import {MdToolbarModule} from '@angular2-material/toolbar';
18+
import {MdTooltipModule} from '@angular2-material/tooltip';
19+
import {
20+
MdLiveAnnouncer,
21+
MdRippleModule,
22+
RtlModule,
23+
PortalModule,
24+
OverlayModule
25+
} from '@angular2-material/core';
26+
import {MdMenuModule} from '@angular2-material/menu';
27+
import {MdDialogModule} from '@angular2-material/dialog';
2628

2729

2830
const MATERIAL_MODULES = [

src/lib/all/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './all';

src/lib/button-toggle/button-toggle.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ import {
2020
FormsModule,
2121
} from '@angular/forms';
2222
import {Observable} from 'rxjs/Observable';
23-
import {
24-
MdUniqueSelectionDispatcher
25-
} from '@angular2-material/core/coordination/unique-selection-dispatcher';
26-
import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value';
23+
import {BooleanFieldValue, MdUniqueSelectionDispatcher} from '@angular2-material/core';
2724

2825
export type ToggleType = 'checkbox' | 'radio';
2926

src/lib/button-toggle/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './button-toggle';

src/lib/button-toggle/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"name": "@angular2-material/button-toggle",
33
"version": "2.0.0-alpha.7-12",
44
"description": "Angular 2 Material Button Toggle",
5-
"main": "./button-toggle.js",
6-
"typings": "./button-toggle.d.ts",
5+
"main": "./button-toggle.umd.js",
6+
"module": "./index.js",
7+
"typings": "./index.d.ts",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/angular/material2.git"

src/lib/button/button.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
NgModule,
1010
} from '@angular/core';
1111
import {CommonModule} from '@angular/common';
12-
import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value';
13-
import {MdRippleModule} from '@angular2-material/core/ripple/ripple';
12+
import {BooleanFieldValue} from '@angular2-material/core';
13+
import {MdRippleModule} from '@angular2-material/core';
1414

1515
// TODO(jelbourn): Make the `isMouseDown` stuff done with one global listener.
1616
// TODO(kara): Convert attribute selectors to classes when attr maps become available

src/lib/button/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"name": "@angular2-material/button",
33
"version": "2.0.0-alpha.7-12",
44
"description": "Angular 2 Material button",
5-
"main": "./button.js",
6-
"typings": "./button.d.ts",
5+
"main": "./button.umd.js",
6+
"module": "./index.js",
7+
"typings": "./index.d.ts",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/angular/material2.git"

src/lib/card/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './card';

src/lib/card/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"name": "@angular2-material/card",
33
"version": "2.0.0-alpha.7-12",
44
"description": "Angular 2 Material card",
5-
"main": "./card.js",
6-
"typings": "./card.d.ts",
5+
"main": "./card.umd.js",
6+
"module": "./index.js",
7+
"typings": "./index.d.ts",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/angular/material2.git"

src/lib/checkbox/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './checkbox';

src/lib/checkbox/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"name": "@angular2-material/checkbox",
33
"version": "2.0.0-alpha.7-12",
44
"description": "Angular 2 Material checkbox",
5-
"main": "./checkbox.js",
6-
"typings": "./checkbox.d.ts",
5+
"main": "./checkbox.umd.js",
6+
"module": "./index.js",
7+
"typings": "./index.d.ts",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/angular/material2.git"

src/lib/core/core.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ export {
3434
OverlayOrigin,
3535
OverlayModule,
3636
} from './overlay/overlay-directives';
37-
export {
38-
OverlayConnectionPosition,
39-
OriginConnectionPosition
40-
} from './overlay/position/connected-position';
37+
export * from './overlay/position/connected-position-strategy';
38+
export * from './overlay/position/connected-position';
4139

4240
// Gestures
4341
export {MdGestureConfig} from './gestures/MdGestureConfig';
@@ -59,6 +57,21 @@ export {
5957

6058
export {MdLineModule, MdLine, MdLineSetter} from './line/line';
6159

60+
// Style
61+
export {applyCssTransform} from './style/apply-transform';
62+
63+
// Error
64+
export {MdError} from './errors/error';
65+
66+
// Annotations.
67+
export {BooleanFieldValue} from './annotations/field-value';
68+
69+
// Misc
70+
export {ComponentType} from './overlay/generic-component-type';
71+
72+
// Keybindings
73+
export * from './keyboard/keycodes';
74+
6275

6376
@NgModule({
6477
imports: [MdLineModule, RtlModule, MdRippleModule, PortalModule, OverlayModule],

src/lib/core/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './core';

src/lib/core/overlay/position/connected-position-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {PositionStrategy} from './position-strategy';
22
import {ElementRef} from '@angular/core';
33
import {ViewportRuler} from './viewport-ruler';
4-
import {applyCssTransform} from '@angular2-material/core/style/apply-transform';
4+
import {applyCssTransform} from '@angular2-material/core';
55
import {
66
ConnectionPositionPair,
77
OriginConnectionPosition,

src/lib/core/overlay/position/global-position-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {applyCssTransform} from '@angular2-material/core/style/apply-transform';
1+
import {applyCssTransform} from '@angular2-material/core';
22
import {PositionStrategy} from './position-strategy';
33

44

src/lib/core/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"name": "@angular2-material/core",
33
"version": "2.0.0-alpha.7-12",
44
"description": "Angular 2 Material core",
5-
"main": "./core.js",
6-
"typings": "./core.d.ts",
5+
"main": "./core.umd.js",
6+
"module": "./index.js",
7+
"typings": "./index.d.ts",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/angular/material2.git"

src/lib/dialog/dialog-container.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {Component, ComponentRef, ViewChild} from '@angular/core';
22
import {
33
BasePortalHost,
44
ComponentPortal,
5+
PortalHostDirective,
56
TemplatePortal
6-
} from '@angular2-material/core/portal/portal';
7-
import {PortalHostDirective} from '@angular2-material/core/portal/portal-directives';
7+
} from '@angular2-material/core';
88
import {MdDialogConfig} from './dialog-config';
99
import {MdDialogContentAlreadyAttachedError} from './dialog-errors';
1010

src/lib/dialog/dialog-errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {MdError} from '@angular2-material/core/errors/error';
1+
import {MdError} from '@angular2-material/core';
22

33
/** Exception thrown when a ComponentPortal is attached to a DomPortalHost without an origin. */
44
export class MdDialogContentAlreadyAttachedError extends MdError {

src/lib/dialog/dialog-ref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {OverlayRef} from '@angular2-material/core/overlay/overlay-ref';
1+
import {OverlayRef} from '@angular2-material/core';
22
import {Observable} from 'rxjs/Observable';
33
import {Subject} from 'rxjs/Subject';
44

src/lib/dialog/dialog.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {inject, async, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {NgModule, Component, Directive, ViewChild, ViewContainerRef} from '@angular/core';
33
import {MdDialog, MdDialogModule} from './dialog';
4-
import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container';
4+
import {OverlayContainer} from '@angular2-material/core';
55
import {MdDialogConfig} from './dialog-config';
66
import {MdDialogRef} from './dialog-ref';
77

0 commit comments

Comments
 (0)