Skip to content

Commit 71517ca

Browse files
crisbetocrisbeto
committed
wip: angular 5 support
1 parent 26bbeb2 commit 71517ca

File tree

28 files changed

+236
-278
lines changed

28 files changed

+236
-278
lines changed

‎package-lock.json‎

Lines changed: 108 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,25 @@
2525
"node": ">= 5.4.1"
2626
},
2727
"dependencies": {
28-
"@angular/animations": "~4.4.4",
29-
"@angular/common": "~4.4.4",
30-
"@angular/compiler": "~4.4.4",
31-
"@angular/core": "~4.4.4",
32-
"@angular/forms": "~4.4.4",
33-
"@angular/http": "~4.4.4",
34-
"@angular/platform-browser": "~4.4.4",
28+
"@angular/animations": "~5.0.0-rc.3",
29+
"@angular/common": "~5.0.0-rc.3",
30+
"@angular/compiler": "~5.0.0-rc.3",
31+
"@angular/core": "~5.0.0-rc.3",
32+
"@angular/forms": "~5.0.0-rc.3",
33+
"@angular/http": "~5.0.0-rc.3",
34+
"@angular/platform-browser": "~5.0.0-rc.3",
3535
"core-js": "^2.4.1",
36-
"rxjs": "^5.0.1",
36+
"rxjs": "5.x",
3737
"systemjs": "0.19.43",
38-
"tsickle": "^0.23.5",
38+
"tsickle": "^0.24.x",
3939
"tslib": "^1.7.1",
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43-
"@angular/compiler-cli": "~4.4.4",
44-
"@angular/platform-browser-dynamic": "~4.4.4",
45-
"@angular/platform-server": "~4.4.4",
46-
"@angular/router": "~4.4.4",
47-
"@angular/tsc-wrapped": "~4.4.4",
43+
"@angular/compiler-cli": "~5.0.0-rc.3",
44+
"@angular/platform-browser-dynamic": "~5.0.0-rc.3",
45+
"@angular/platform-server": "~5.0.0-rc.3",
46+
"@angular/router": "~5.0.0-rc.3",
4847
"@google-cloud/storage": "^1.1.1",
4948
"@types/chalk": "^0.4.31",
5049
"@types/fs-extra": "^3.0.1",
@@ -56,6 +55,7 @@
5655
"@types/minimist": "^1.2.0",
5756
"@types/node": "^7.0.21",
5857
"@types/run-sequence": "^0.0.29",
58+
"ajv": "^5.2.3",
5959
"autoprefixer": "^6.7.6",
6060
"axe-core": "^2.3.1",
6161
"axe-webdriverjs": "^1.1.1",
@@ -67,7 +67,7 @@
6767
"firebase-tools": "^3.11.0",
6868
"fs-extra": "^3.0.1",
6969
"glob": "^7.1.2",
70-
"google-closure-compiler": "20170409.0.0",
70+
"google-closure-compiler": "20170806.0.0",
7171
"gulp": "^3.9.1",
7272
"gulp-clean": "^0.3.2",
7373
"gulp-clean-css": "^3.3.1",

‎scripts/closure-compiler/build-devapp-bundle.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ OPTS=(
6363
dist/releases/material-moment-adapter/esm2015/material-moment-adapter.js
6464

6565
# Include all Angular FESM bundles.
66-
node_modules/@angular/core/@angular/core.js
67-
node_modules/@angular/common/@angular/common.js
68-
node_modules/@angular/compiler/@angular/compiler.js
69-
node_modules/@angular/forms/@angular/forms.js
70-
node_modules/@angular/http/@angular/http.js
71-
node_modules/@angular/router/@angular/router.js
72-
node_modules/@angular/platform-browser/@angular/platform-browser.js
73-
node_modules/@angular/platform-browser/@angular/platform-browser/animations.js
74-
node_modules/@angular/platform-browser-dynamic/@angular/platform-browser-dynamic.js
75-
node_modules/@angular/animations/@angular/animations.js
76-
node_modules/@angular/animations/@angular/animations/browser.js
66+
node_modules/@angular/core/esm5/index.js
67+
node_modules/@angular/common/esm5/index.js
68+
node_modules/@angular/compiler/esm5/index.js
69+
node_modules/@angular/forms/esm5/index.js
70+
node_modules/@angular/http/esm5/index.js
71+
node_modules/@angular/router/esm5/index.js
72+
node_modules/@angular/platform-browser/esm5/index.js
73+
node_modules/@angular/platform-browser/esm5/animations/index.js
74+
node_modules/@angular/platform-browser-dynamic/esm5/index.js
75+
node_modules/@angular/animations/esm5/index.js
76+
node_modules/@angular/animations/esm5/browser/index.js
7777

7878
# Include other dependencies like Zone.js, Moment.js, and RxJS
7979
node_modules/zone.js/dist/zone.js

‎src/cdk/scrolling/scroll-dispatcher.spec.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,15 @@ describe('Scroll Dispatcher', () => {
6767
}));
6868

6969
it('should not execute the global events in the Angular zone', () => {
70-
const spy = jasmine.createSpy('zone unstable callback');
71-
const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
72-
7370
scroll.scrolled(0).subscribe(() => {});
7471
dispatchFakeEvent(document, 'scroll', false);
7572

76-
expect(spy).not.toHaveBeenCalled();
77-
subscription.unsubscribe();
73+
expect(fixture.ngZone!.isStable).toBe(true);
7874
});
7975

8076
it('should not execute the scrollable events in the Angular zone', () => {
81-
const spy = jasmine.createSpy('zone unstable callback');
82-
const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
83-
84-
dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll', false);
85-
86-
expect(spy).not.toHaveBeenCalled();
87-
subscription.unsubscribe();
77+
dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
78+
expect(fixture.ngZone!.isStable).toBe(true);
8879
});
8980

9081
it('should be able to unsubscribe from the global scrollable', () => {

‎src/cdk/table/row.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export class CdkCellOutlet {
141141
* a handle to provide that component's cells and context. After init, the CdkCellOutlet will
142142
* construct the cells with the provided context.
143143
*/
144-
static mostRecentCellOutlet: CdkCellOutlet;
144+
static mostRecentCellOutlet: CdkCellOutlet | null = null;
145145

146146
constructor(public _viewContainer: ViewContainerRef) {
147147
CdkCellOutlet.mostRecentCellOutlet = this;

‎src/cdk/table/table.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,9 @@ export class CdkTable<T> implements CollectionViewer {
286286
.createEmbeddedView(this._headerDef.template, {cells});
287287

288288
cells.forEach(cell => {
289-
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
289+
if (CdkCellOutlet.mostRecentCellOutlet) {
290+
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, {});
291+
}
290292
});
291293

292294
this._changeDetectorRef.markForCheck();
@@ -346,7 +348,10 @@ export class CdkTable<T> implements CollectionViewer {
346348
const cells = rowData ? this._getCellTemplatesForRow(row) : [];
347349

348350
cells.forEach(cell => {
349-
CdkCellOutlet.mostRecentCellOutlet._viewContainer.createEmbeddedView(cell.template, context);
351+
if (CdkCellOutlet.mostRecentCellOutlet) {
352+
CdkCellOutlet.mostRecentCellOutlet._viewContainer
353+
.createEmbeddedView(cell.template, context);
354+
}
350355
});
351356

352357
this._changeDetectorRef.markForCheck();

‎src/cdk/tsconfig-build.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"skipLibCheck": true,
2121
"types": [],
2222
"paths": {
23-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
23+
"@angular/cdk/*": ["../../dist/packages/cdk/*"]
2424
}
2525
},
2626
"files": [

‎src/cdk/tsconfig-es5.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"skipLibCheck": true,
2222
"types": [],
2323
"paths": {
24-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
24+
"@angular/cdk/*": ["../../dist/packages/cdk/*"]
2525
}
2626
},
2727
"files": [

‎src/e2e-app/tsconfig-build.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"moduleResolution": "node",
1616
"noEmitOnError": true,
1717
"noImplicitAny": true,
18-
"rootDir": ".",
19-
"outDir": ".",
18+
"outDir": "../../../",
2019
"sourceMap": true,
2120
"target": "es5",
2221
"typeRoots": [

‎src/lib/chips/chip.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
302302
selector: '[matChipRemove]',
303303
host: {
304304
'class': 'mat-chip-remove',
305-
'(click)': '_handleClick($event)',
306-
},
305+
'(click)': '_handleClick()',
306+
}
307307
})
308308
export class MatChipRemove {
309309
constructor(protected _parentChip: MatChip) {

0 commit comments

Comments
 (0)