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

Commit 62d0fe1

Browse files
committed
chore: update deps to Angular v5
* fix: import individual rx operators * Removes 'rxjs/operators' import in favor of indivial imports, adds lint rule to prevent that type of import * Maintains parity with angular/components#8160
1 parent b01c2d7 commit 62d0fe1

File tree

16 files changed

+8481
-9863
lines changed

16 files changed

+8481
-9863
lines changed

package-lock.json

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

package.json

Lines changed: 25 additions & 25 deletions
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+
}
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import {Directive, ElementRef, Inject, Output} from '@angular/core';
2-
import {DOCUMENT} from '@angular/platform-browser';
2+
import {DOCUMENT} from '@angular/common';
33

44
import {Observable} from 'rxjs/Observable';
55

6-
import 'rxjs/add/observable/fromEvent';
7-
import 'rxjs/add/operator/takeUntil';
8-
import 'rxjs/add/operator/switchMap';
9-
import 'rxjs/add/operator/map';
6+
import {fromEvent} from 'rxjs/observable/fromEvent';
7+
import {map} from 'rxjs/operators/map';
8+
import {switchMap} from 'rxjs/operators/switchMap';
9+
import {takeUntil} from 'rxjs/operators/takeUntil';
10+
1011

1112
@Directive({
1213
selector: '[ngxSplitHandle]',
@@ -20,14 +21,13 @@ export class SplitHandleDirective {
2021
@Output() drag: Observable<{ x: number, y: number }>;
2122

2223
constructor(ref: ElementRef, @Inject(DOCUMENT) _document: any) {
23-
const fromEvent = Observable.fromEvent;
2424
const getMouseEventPosition = (event: MouseEvent) => ({x: event.movementX, y: event.movementY});
2525

26-
const mousedown$ = fromEvent(ref.nativeElement, 'mousedown').map(getMouseEventPosition);
27-
const mousemove$ = fromEvent(_document, 'mousemove').map(getMouseEventPosition);
28-
const mouseup$ = fromEvent(_document, 'mouseup').map(getMouseEventPosition);
26+
const mousedown$ = fromEvent(ref.nativeElement, 'mousedown').pipe(map(getMouseEventPosition));
27+
const mousemove$ = fromEvent(_document, 'mousemove').pipe(map(getMouseEventPosition));
28+
const mouseup$ = fromEvent(_document, 'mouseup').pipe(map(getMouseEventPosition));
2929

30-
this.drag = mousedown$.switchMap(_ => mousemove$.takeUntil(mouseup$));
30+
this.drag = mousedown$.pipe(switchMap(_ => mousemove$.pipe(takeUntil(mouseup$))));
3131
}
3232

3333
}

src/demo-app/system-config.ts

Lines changed: 21 additions & 10 deletions
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,14 +54,13 @@ 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: {
5062
// 3rd-Party barrels.
5163
'rxjs': { main: 'index' },
52-
'rxjs/operators': {main: 'index'},
5364
// Set the default extension for the root package, because otherwise the demo-app can't
5465
// be built within the production mode. Due to missing file extensions.
5566
'.': {

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

Lines changed: 3 additions & 2 deletions
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/api/core/responsive-activation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88
import {Subscription} from 'rxjs/Subscription';
9-
import {map} from 'rxjs/operators';
9+
import {map} from 'rxjs/operators/map';
1010

1111
import {MediaChange, MediaQuerySubscriber} from '../../media-query/media-change';
1212
import {BreakPoint} from '../../media-query/breakpoints/break-point';

src/lib/media-query/match-media.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {ɵgetDOM as getDom} from '@angular/platform-browser';
1010
import {DOCUMENT} from '@angular/common';
1111
import {BehaviorSubject} from 'rxjs/BehaviorSubject';
1212
import {Observable} from 'rxjs/Observable';
13-
import {filter} from 'rxjs/operators';
13+
import {filter} from 'rxjs/operators/filter';
1414

1515
import {MediaChange} from './media-change';
1616

src/lib/media-query/media-monitor.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import {MediaChange} from './media-change';
1515
import {mergeAlias} from '../utils/add-alias';
1616

1717
import {Observable} from 'rxjs/Observable';
18-
import {filter, map} from 'rxjs/operators';
18+
import {filter} from 'rxjs/operators/filter';
19+
import {map} from 'rxjs/operators/map';
1920

2021
/**
2122
* MediaMonitor uses the MatchMedia service to observe mediaQuery changes (both activations and

0 commit comments

Comments
 (0)