Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

wip: build: upgrade to Angular v6.1 and TypeScript v2.9 #808

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
154 changes: 104 additions & 50 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@
},
"dependencies": {
"@angular/cdk": "6.0.0",
"@angular/common": "^6.0.0",
"@angular/compiler": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/platform-browser": "^6.0.0",
"@angular/common": "^6.1.0-rc.0",
"@angular/compiler": "^6.1.0-rc.0",
"@angular/core": "^6.1.0-rc.0",
"@angular/platform-browser": "^6.1.0-rc.0",
"core-js": "^2.4.1",
"rxjs": "^6.0.0",
"systemjs": "0.19.43",
"tsickle": "^0.27.0",
"tsickle": "^0.32.0",
"tslib": "^1.8.0",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/animations": "^6.0.0",
"@angular/compiler-cli": "^6.0.0",
"@angular/forms": "^6.0.0",
"@angular/http": "^6.0.0",
"@angular/animations": "^6.1.0-rc.0",
"@angular/compiler-cli": "^6.1.0-rc.0",
"@angular/forms": "^6.1.0-rc.0",
"@angular/http": "^6.1.0-rc.0",
"@angular/material": "6.0.0",
"@angular/platform-browser-dynamic": "^6.0.0",
"@angular/platform-server": "^6.0.0",
"@angular/router": "^6.0.0",
"@angular/platform-browser-dynamic": "^6.1.0-rc.0",
"@angular/platform-server": "^6.1.0-rc.0",
"@angular/router": "^6.1.0-rc.0",
"@google-cloud/storage": "^1.4.0",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^4.0.5",
Expand Down Expand Up @@ -124,7 +124,7 @@
"tsconfig-paths": "^2.3.0",
"tslint": "^5.8.0",
"tsutils": "^2.22.2",
"typescript": "~2.7.2",
"typescript": "~2.9.2",
"uglify-js": "^2.8.14"
}
}
2 changes: 1 addition & 1 deletion src/lib/core/breakpoints/breakpoint-tools.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {ORIENTATION_BREAKPOINTS} from './data/orientation-break-points';

describe('breakpoint-tools', () => {
let all: BreakPoint[];
let findByAlias = (alias): BreakPoint|null => all.reduce((pos, it) => {
let findByAlias = (alias): BreakPoint|null => all.reduce((pos: BreakPoint|null, it) => {
return pos || ((it.alias == alias) ? it : null);
}, null);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {FlexLayoutModule} from '../../../module';

describe('break-point-provider', () => {
let breakPoints: BreakPoint[];
let findByAlias = (alias): BreakPoint|null => breakPoints.reduce((pos, it) => {
let findByAlias = (alias): BreakPoint|null => breakPoints.reduce((pos: BreakPoint|null, it) => {
return pos || ((it.alias == alias) ? it : null);
}, null);

Expand Down
2 changes: 2 additions & 0 deletions src/lib/core/match-media/mock/mock-match-media.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export class MockMatchMedia extends MatchMedia {
*/
useOverlaps = false;

protected _registry: Map<string, MockMediaQueryList>;

constructor(_zone: NgZone,
@Inject(PLATFORM_ID) _platformId: Object,
@Inject(DOCUMENT) _document: any,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/observable-media/observable-media.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('observable-media', () => {
let knownBreakPoints: BreakPoint[] = [];
let findMediaQuery: (alias: string) => string = (alias) => {
const NOT_FOUND = `${alias} not found`;
return knownBreakPoints.reduce((mediaQuery, bp) => {
return knownBreakPoints.reduce((mediaQuery: string|null, bp) => {
return mediaQuery || ((bp.alias === alias) ? bp.mediaQuery : null);
}, null) as string || NOT_FOUND;
};
Expand Down
4 changes: 3 additions & 1 deletion src/lib/core/style-utils/style-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export class StyleUtils {
/**
* Applies styles given via string pair or object map to the directive element
*/
applyStyleToElement(element: HTMLElement, style: StyleDefinition, value?: string | number) {
applyStyleToElement(element: HTMLElement,
style: StyleDefinition | string,
value?: string | number) {
let styles = {};
if (typeof style === 'string') {
styles[style] = value;
Expand Down
Loading