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

Commit 13c20ac

Browse files
CaerusKaruCaerusKaru
committed
chore: update deps to Angular v5
1 parent b01c2d7 commit 13c20ac

File tree

9 files changed

+7397
-9113
lines changed

9 files changed

+7397
-9113
lines changed

‎package-lock.json

+7,279-9,022
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+25-25
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@
2626
"node": ">= 5.4.1 <= 8"
2727
},
2828
"dependencies": {
29-
"@angular/common": "~4.4.4",
30-
"@angular/compiler": "~4.4.4",
31-
"@angular/core": "~4.4.4",
32-
"@angular/platform-browser": "~4.4.4",
29+
"@angular/common": "^5.1.0",
30+
"@angular/compiler": "^5.1.0",
31+
"@angular/core": "^5.1.0",
32+
"@angular/platform-browser": "^5.1.0",
3333
"core-js": "^2.4.1",
34-
"rxjs": "^5.5.0",
34+
"rxjs": "^5.5.5",
3535
"systemjs": "0.19.43",
36-
"tsickle": "^0.23.5",
36+
"tsickle": "^0.24.1",
3737
"tslib": "^1.8.0",
3838
"zone.js": "^0.8.18"
3939
},
4040
"devDependencies": {
41-
"@angular/animations": "~4.4.4",
42-
"@angular/cdk": "^2.0.0-beta.12",
43-
"@angular/compiler-cli": "~4.4.4",
44-
"@angular/forms": "~4.4.4",
45-
"@angular/http": "~4.4.4",
46-
"@angular/material": "^2.0.0-beta.12",
47-
"@angular/platform-browser-dynamic": "~4.4.4",
48-
"@angular/platform-server": "~4.4.4",
49-
"@angular/router": "~4.4.4",
41+
"@angular/animations": "^5.1.0",
42+
"@angular/cdk": "^5.0.0",
43+
"@angular/compiler-cli": "^5.1.0",
44+
"@angular/forms": "^5.1.0",
45+
"@angular/http": "^5.1.0",
46+
"@angular/material": "^5.0.0",
47+
"@angular/platform-browser-dynamic": "^5.1.0",
48+
"@angular/platform-server": "^5.1.0",
49+
"@angular/router": "^5.1.0",
5050
"@angular/tsc-wrapped": "~4.4.4",
5151
"@google-cloud/storage": "^1.4.0",
5252
"@types/chalk": "^0.4.31",
53-
"@types/fs-extra": "^3.0.1",
53+
"@types/fs-extra": "^4.0.5",
5454
"@types/glob": "^5.0.33",
5555
"@types/gulp": "3.8.32",
5656
"@types/hammerjs": "^2.0.34",
57-
"@types/jasmine": "2.5.45",
57+
"@types/jasmine": "^2.6.3",
5858
"@types/merge2": "^0.3.30",
5959
"@types/minimist": "^1.2.0",
6060
"@types/node": "^7.0.46",
@@ -65,7 +65,7 @@
6565
"chalk": "^1.1.3",
6666
"cli-color": "^1.2.0",
6767
"dgeni": "^0.4.7",
68-
"dgeni-packages": "^0.19.1",
68+
"dgeni-packages": "^0.22.0",
6969
"firebase": "^4.6.0",
7070
"firebase-admin": "^5.4.2",
7171
"firebase-tools": "^3.13.1",
@@ -98,11 +98,11 @@
9898
"karma-chrome-launcher": "^2.1.1",
9999
"karma-coverage": "^1.1.1",
100100
"karma-firefox-launcher": "^1.0.1",
101-
"karma-jasmine": "^1.1.0",
101+
"karma-jasmine": "^1.1.1",
102102
"karma-sauce-launcher": "^1.2.0",
103103
"karma-sourcemap-loader": "^0.3.7",
104-
"madge": "^1.6.0",
105-
"magic-string": "^0.21.3",
104+
"madge": "^2.2.0",
105+
"magic-string": "^0.22.4",
106106
"merge2": "^1.2.0",
107107
"minimatch": "^3.0.4",
108108
"minimist": "^1.2.0",
@@ -121,8 +121,8 @@
121121
"ts-node": "^3.0.4",
122122
"tsconfig-paths": "^2.3.0",
123123
"tslint": "^5.8.0",
124-
"tsutils": "^2.12.1",
125-
"typescript": "~2.4.2",
126-
"uglify-js": "^2.8.14"
124+
"tsutils": "^2.13.0",
125+
"typescript": "^2.4.2",
126+
"uglify-js": "^2.8.29"
127127
}
128-
}
128+
}

‎src/demo-app/system-config.ts

+21-9
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,43 @@ System.config({
99
map: {
1010
'rxjs': 'node:rxjs',
1111
'main': 'main.js',
12+
'tslib': 'node:tslib/tslib.js',
1213

1314
// Angular specific mappings.
1415
'@angular/core': 'node:@angular/core/bundles/core.umd.js',
16+
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.js',
1517
'@angular/common': 'node:@angular/common/bundles/common.umd.js',
18+
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.js',
19+
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
20+
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.js',
1621
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
22+
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.js',
1723
'@angular/http': 'node:@angular/http/bundles/http.umd.js',
24+
'@angular/http/testing': 'node:@angular/http/bundles/http-testing.umd.js',
1825
'@angular/forms': 'node:@angular/forms/bundles/forms.umd.js',
19-
'@angular/router': 'node:@angular/router/bundles/router.umd.js',
26+
'@angular/forms/testing': 'node:@angular/forms/bundles/forms-testing.umd.js',
2027
'@angular/animations': 'node:@angular/animations/bundles/animations.umd.js',
2128
'@angular/animations/browser': 'node:@angular/animations/bundles/animations-browser.umd.js',
22-
'@angular/platform-browser': 'node:@angular/platform-browser/bundles/platform-browser.umd.js',
23-
'@angular/platform-browser/animations': 'node:@angular/platform-browser/bundles/platform-browser-animations.umd.js', // tslint:disable-line:max-line-length
24-
'@angular/platform-browser-dynamic': 'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', // tslint:disable-line:max-line-length
25-
26-
'@angular/flex-layout': 'dist/bundles/flex-layout.umd.js',
29+
'@angular/platform-browser/animations':
30+
'node:@angular/platform-browser/bundles/platform-browser-animations.umd',
31+
'@angular/platform-browser':
32+
'node:@angular/platform-browser/bundles/platform-browser.umd.js',
33+
'@angular/platform-browser/testing':
34+
'node:@angular/platform-browser/bundles/platform-browser-testing.umd.js',
35+
'@angular/platform-browser-dynamic':
36+
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
37+
'@angular/platform-browser-dynamic/testing':
38+
'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
2739

2840
'@angular/material': 'node:@angular/material/bundles/material.umd.js',
2941
'@angular/cdk': 'node:@angular/cdk/bundles/cdk.umd.js',
30-
31-
// CDK Secondary entry points
3242
'@angular/cdk/a11y': 'node:@angular/cdk/bundles/cdk-a11y.umd.js',
43+
'@angular/cdk/accordion': 'node:@angular/cdk/bundles/cdk-accordion.umd.js',
3344
'@angular/cdk/bidi': 'node:@angular/cdk/bundles/cdk-bidi.umd.js',
3445
'@angular/cdk/coercion': 'node:@angular/cdk/bundles/cdk-coercion.umd.js',
3546
'@angular/cdk/collections': 'node:@angular/cdk/bundles/cdk-collections.umd.js',
3647
'@angular/cdk/keycodes': 'node:@angular/cdk/bundles/cdk-keycodes.umd.js',
48+
'@angular/cdk/layout': 'node:@angular/cdk/bundles/cdk-layout.umd.js',
3749
'@angular/cdk/observers': 'node:@angular/cdk/bundles/cdk-observers.umd.js',
3850
'@angular/cdk/overlay': 'node:@angular/cdk/bundles/cdk-overlay.umd.js',
3951
'@angular/cdk/platform': 'node:@angular/cdk/bundles/cdk-platform.umd.js',
@@ -42,8 +54,8 @@ System.config({
4254
'@angular/cdk/scrolling': 'node:@angular/cdk/bundles/cdk-scrolling.umd.js',
4355
'@angular/cdk/stepper': 'node:@angular/cdk/bundles/cdk-stepper.umd.js',
4456
'@angular/cdk/table': 'node:@angular/cdk/bundles/cdk-table.umd.js',
45-
'@angular/cdk/testing': 'node:@angular/cdk/bundles/cdk-testing.umd.js'
4657

58+
'@angular/flex-layout': 'dist/bundles/flex-layout.umd.js',
4759

4860
},
4961
packages: {

‎src/lib/api/core/base-adapter.spec.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {ElementRef} from '@angular/core';
8+
import {ElementRef, Renderer2} from '@angular/core';
99
import {BaseFxDirectiveAdapter} from './base-adapter';
1010
import {expect} from '../../utils/testing/custom-matchers';
11+
import {MediaMonitor} from '@angular/flex-layout/media-query';
1112

1213
export class MockElementRef extends ElementRef {
1314
constructor() {
@@ -20,7 +21,7 @@ export class MockElementRef extends ElementRef {
2021
describe('BaseFxDirectiveAdapter class', () => {
2122
let component;
2223
beforeEach(() => {
23-
component = new BaseFxDirectiveAdapter(null, null, new MockElementRef(), null);
24+
component = new BaseFxDirectiveAdapter('', {} as MediaMonitor, new MockElementRef(), {} as Renderer2); // tslint:disable-line:max-line-length
2425
});
2526
describe('cacheInput', () => {
2627
it('should call _cacheInputArray when source is an array', () => {

‎src/lib/media-query/observable-media.spec.ts

+59-53
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ import {OBSERVABLE_MEDIA_PROVIDER} from './observable-media-provider';
2424
import {MockMatchMediaProvider} from './mock/mock-match-media';
2525

2626
describe('observable-media', () => {
27+
2728
describe('with default BreakPoints', () => {
2829
let knownBreakPoints: BreakPoint[] = [];
29-
let findMediaQuery = (alias) => {
30+
let findMediaQuery: (alias: string) => string = (alias) => {
3031
const NOT_FOUND = `${alias} not found`;
3132
return knownBreakPoints.reduce((mediaQuery, bp) => {
3233
return mediaQuery || ((bp.alias === alias) ? bp.mediaQuery : null);
33-
}, null) || NOT_FOUND;
34+
}, null) as string || NOT_FOUND;
3435
};
3536
beforeEach(() => {
3637
// Configure testbed to prepare services
@@ -107,74 +108,79 @@ describe('observable-media', () => {
107108
current = change;
108109
});
109110

110-
// Confirm initial match is for 'all'
111-
expect(current).toBeDefined();
112-
expect(current.matches).toBeTruthy();
113-
expect(current.mediaQuery).toEqual('all');
111+
async(() => {
112+
// Confirm initial match is for 'all'
113+
expect(current).toBeDefined();
114+
expect(current.matches).toBeTruthy();
115+
expect(current.mediaQuery).toEqual('all');
114116

115-
try {
116-
matchMedia.autoRegisterQueries = false;
117+
try {
118+
matchMedia.autoRegisterQueries = false;
117119

118-
// Activate mediaQuery associated with 'md' alias
119-
matchMedia.activate('md');
120-
expect(current.mediaQuery).toEqual(findMediaQuery('md'));
120+
// Activate mediaQuery associated with 'md' alias
121+
matchMedia.activate('md');
122+
expect(current.mediaQuery).toEqual(findMediaQuery('md'));
121123

122-
// Allow overlapping activations to be announced to observers
123-
media$.filterOverlaps = false;
124+
// Allow overlapping activations to be announced to observers
125+
media$.filterOverlaps = false;
124126

125-
matchMedia.activate('gt-lg');
126-
expect(current.mediaQuery).toEqual(findMediaQuery('gt-lg'));
127+
matchMedia.activate('gt-lg');
128+
expect(current.mediaQuery).toEqual(findMediaQuery('gt-lg'));
127129

128-
matchMedia.activate('unknown');
129-
expect(current.mediaQuery).toEqual(findMediaQuery('gt-lg'));
130+
matchMedia.activate('unknown');
131+
expect(current.mediaQuery).toEqual(findMediaQuery('gt-lg'));
130132

131-
} finally {
132-
matchMedia.autoRegisterQueries = true;
133-
subscription.unsubscribe();
134-
}
133+
} finally {
134+
matchMedia.autoRegisterQueries = true;
135+
subscription.unsubscribe();
136+
}
137+
});
135138
}));
136139

137-
it('can `.unsubscribe()` properly', async(inject(
140+
it('can `.unsubscribe()` properly', inject(
138141
[ObservableMedia, MatchMedia],
139142
(media, matchMedia) => {
140143
let current: MediaChange;
141144
let subscription = media.subscribe((change: MediaChange) => {
142145
current = change;
143146
});
144147

145-
// Activate mediaQuery associated with 'md' alias
146-
matchMedia.activate('md');
147-
expect(current.mediaQuery).toEqual(findMediaQuery('md'));
148+
async(() => {
149+
// Activate mediaQuery associated with 'md' alias
150+
matchMedia.activate('md');
151+
expect(current.mediaQuery).toEqual(findMediaQuery('md'));
148152

149-
// Un-subscribe
150-
subscription.unsubscribe();
153+
// Un-subscribe
154+
subscription.unsubscribe();
151155

152-
matchMedia.activate('lg');
153-
expect(current.mqAlias).toBe('md');
156+
matchMedia.activate('lg');
157+
expect(current.mqAlias).toBe('md');
154158

155-
matchMedia.activate('xs');
156-
expect(current.mqAlias).toBe('md');
157-
})));
159+
matchMedia.activate('xs');
160+
expect(current.mqAlias).toBe('md');
161+
});
162+
}));
158163

159-
it('can observe a startup activation of XS', async(inject(
164+
it('can observe a startup activation of XS', inject(
160165
[ObservableMedia, MatchMedia],
161166
(media, matchMedia) => {
162167
let current: MediaChange;
163168
let subscription = media.subscribe((change: MediaChange) => {
164169
current = change;
165170
});
166171

167-
// Activate mediaQuery associated with 'md' alias
168-
matchMedia.activate('xs');
169-
expect(current.mediaQuery).toEqual(findMediaQuery('xs'));
170-
171-
// Un-subscribe
172-
subscription.unsubscribe();
172+
async(() => {
173+
// Activate mediaQuery associated with 'md' alias
174+
matchMedia.activate('xs');
175+
expect(current.mediaQuery).toEqual(findMediaQuery('xs'));
173176

174-
matchMedia.activate('lg');
175-
expect(current.mqAlias).toBe('xs');
177+
// Un-subscribe
178+
subscription.unsubscribe();
176179

177-
})));
180+
matchMedia.activate('lg');
181+
expect(current.mqAlias).toBe('xs');
182+
});
183+
}));
178184
});
179185

180186
describe('with custom BreakPoints', () => {
@@ -198,26 +204,26 @@ describe('observable-media', () => {
198204
});
199205
});
200206

201-
it('can activate custom alias with custom mediaQueries', async(inject(
207+
it('can activate custom alias with custom mediaQueries', inject(
202208
[ObservableMedia, MatchMedia],
203209
(media, matchMedia) => {
204210
let current: MediaChange;
205211
let subscription = media.subscribe((change: MediaChange) => {
206212
current = change;
207213
});
208214

209-
// Activate mediaQuery associated with 'md' alias
210-
matchMedia.activate('print.md');
211-
expect(current.mediaQuery).toEqual(mdMediaQuery);
212-
213-
matchMedia.activate('tablet-gt-xs');
214-
expect(current.mqAlias).toBe('tablet-gt-xs');
215-
expect(current.mediaQuery).toBe(gtXsMediaQuery);
215+
async(() => {
216+
// Activate mediaQuery associated with 'md' alias
217+
matchMedia.activate('print.md');
218+
expect(current.mediaQuery).toEqual(mdMediaQuery);
216219

217-
subscription.unsubscribe();
218-
})));
220+
matchMedia.activate('tablet-gt-xs');
221+
expect(current.mqAlias).toBe('tablet-gt-xs');
222+
expect(current.mediaQuery).toBe(gtXsMediaQuery);
219223

224+
subscription.unsubscribe();
225+
});
226+
}));
220227
});
221-
222228
});
223229

‎src/lib/utils/testing/custom-matchers.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const expect: (actual: any) => NgMatchers = <any> _global.expect;
1919
/**
2020
* Jasmine matchers that check Angular specific conditions.
2121
*/
22-
export interface NgMatchers extends jasmine.Matchers {
22+
export interface NgMatchers extends jasmine.Matchers<any> {
2323
/**
2424
* Expect the element to have exactly the given text.
2525
*
@@ -209,7 +209,7 @@ function buildCompareStyleFunction(inlineOnly = true) {
209209

210210
let allPassed: boolean;
211211
if (typeof styles === 'string') {
212-
styles = {[styles]: null};
212+
styles = {[styles]: ''};
213213
}
214214

215215
allPassed = Object.keys(styles).length !== 0;

‎test/karma-test-shim.js

+5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ System.config({
2020
map: {
2121
'rxjs': 'node:rxjs',
2222
'main': 'main.js',
23+
'tslib': 'node:tslib/tslib.js',
2324

2425
// Angular specific mappings.
2526
'@angular/core': 'node:@angular/core/bundles/core.umd.js',
2627
'@angular/core/testing': 'node:@angular/core/bundles/core-testing.umd.js',
2728
'@angular/common': 'node:@angular/common/bundles/common.umd.js',
2829
'@angular/common/testing': 'node:@angular/common/bundles/common-testing.umd.js',
30+
'@angular/common/http': 'node:@angular/common/bundles/common-http.umd.js',
31+
'@angular/common/http/testing': 'node:@angular/common/bundles/common-http-testing.umd.js',
2932
'@angular/compiler': 'node:@angular/compiler/bundles/compiler.umd.js',
3033
'@angular/compiler/testing': 'node:@angular/compiler/bundles/compiler-testing.umd.js',
3134
'@angular/http': 'node:@angular/http/bundles/http.umd.js',
@@ -48,10 +51,12 @@ System.config({
4851
'@angular/material': 'node:@angular/material/bundles/material.umd.js',
4952
'@angular/cdk': 'node:@angular/cdk/bundles/cdk.umd.js',
5053
'@angular/cdk/a11y': 'node:@angular/cdk/bundles/cdk-a11y.umd.js',
54+
'@angular/cdk/accordion': 'node:@angular/cdk/bundles/cdk-accordion.umd.js',
5155
'@angular/cdk/bidi': 'node:@angular/cdk/bundles/cdk-bidi.umd.js',
5256
'@angular/cdk/coercion': 'node:@angular/cdk/bundles/cdk-coercion.umd.js',
5357
'@angular/cdk/collections': 'node:@angular/cdk/bundles/cdk-collections.umd.js',
5458
'@angular/cdk/keycodes': 'node:@angular/cdk/bundles/cdk-keycodes.umd.js',
59+
'@angular/cdk/layout': 'node:@angular/cdk/bundles/cdk-layout.umd.js',
5560
'@angular/cdk/observers': 'node:@angular/cdk/bundles/cdk-observers.umd.js',
5661
'@angular/cdk/overlay': 'node:@angular/cdk/bundles/cdk-overlay.umd.js',
5762
'@angular/cdk/platform': 'node:@angular/cdk/bundles/cdk-platform.umd.js',

0 commit comments

Comments
 (0)