Skip to content

Commit e7531b6

Browse files
committed
chore: move to rxjs v6
1 parent 89ea485 commit e7531b6

File tree

142 files changed

+492
-510
lines changed

Some content is hidden

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

142 files changed

+492
-510
lines changed

package-lock.json

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

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@
2626
"node": ">= 5.4.1"
2727
},
2828
"dependencies": {
29-
"@angular/animations": "6.0.0-beta.8",
30-
"@angular/common": "6.0.0-beta.8",
31-
"@angular/compiler": "6.0.0-beta.8",
32-
"@angular/core": "6.0.0-beta.8",
33-
"@angular/forms": "6.0.0-beta.8",
34-
"@angular/platform-browser": "6.0.0-beta.8",
29+
"@angular/animations": "angular/animations-builds#labs/rxjs-v6",
30+
"@angular/common": "angular/common-builds#labs/rxjs-v6",
31+
"@angular/compiler": "angular/compiler-builds#labs/rxjs-v6",
32+
"@angular/core": "angular/core-builds#labs/rxjs-v6",
33+
"@angular/forms": "angular/forms-builds#labs/rxjs-v6",
34+
"@angular/platform-browser": "angular/platform-browser-builds#labs/rxjs-v6",
3535
"core-js": "^2.4.1",
36-
"rxjs": "^5.5.7",
36+
"rxjs": "alpha",
3737
"systemjs": "0.19.43",
3838
"tsickle": "^0.24.x",
39-
"tslib": "^1.7.1",
40-
"zone.js": "^0.8.12"
39+
"tslib": "^1.9.0",
40+
"zone.js": "^0.8.4"
4141
},
4242
"devDependencies": {
4343
"@angular-devkit/core": "^0.4.5",
4444
"@angular-devkit/schematics": "^0.4.5",
45-
"@angular/bazel": "6.0.0-beta.8",
46-
"@angular/compiler-cli": "6.0.0-beta.8",
47-
"@angular/http": "6.0.0-beta.8",
48-
"@angular/platform-browser-dynamic": "6.0.0-beta.8",
49-
"@angular/platform-server": "6.0.0-beta.8",
50-
"@angular/router": ">=6.0.0-beta.7 <7.0.0",
51-
"@angular/upgrade": "^5.0.1",
45+
"@angular/bazel": "angular/bazel-builds#labs/rxjs-v6",
46+
"@angular/compiler-cli": "angular/compiler-cli-builds#labs/rxjs-v6",
47+
"@angular/http": "angular/http-builds#labs/rxjs-v6",
48+
"@angular/platform-browser-dynamic": "angular/platform-browser-dynamic-builds#labs/rxjs-v6",
49+
"@angular/platform-server": "angular/platform-server-builds#labs/rxjs-v6",
50+
"@angular/router": "angular/router-builds#labs/rxjs-v6",
51+
"@angular/upgrade": "angular/upgrade-builds#labs/rxjs-v6",
5252
"@bazel/ibazel": "0.3.1",
5353
"@google-cloud/storage": "^1.1.1",
5454
"@schematics/angular": "^0.4.5",
@@ -126,7 +126,7 @@
126126
"tsconfig-paths": "^2.3.0",
127127
"tslint": "^5.9.1",
128128
"tsutils": "^2.6.0",
129-
"typescript": "~2.7.0",
129+
"typescript": "^2.7.2",
130130
"uglify-js": "^2.8.14",
131131
"web-animations-js": "^2.2.5"
132132
}

src/cdk-experimental/dialog/dialog-container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
} from '@angular/cdk/portal';
3030
import {FocusTrapFactory} from '@angular/cdk/a11y';
3131
import {DialogConfig} from './dialog-config';
32-
import {Subject} from 'rxjs/Subject';
32+
import {Subject} from 'rxjs';
3333

3434

3535
export function throwDialogContentAlreadyAttachedError() {

src/cdk-experimental/dialog/dialog-ref.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99

1010
import {OverlayRef, GlobalPositionStrategy, OverlaySizeConfig} from '@angular/cdk/overlay';
1111
import {ESCAPE} from '@angular/cdk/keycodes';
12-
import {Observable} from 'rxjs/Observable';
13-
import {map} from 'rxjs/operators/map';
14-
import {filter} from 'rxjs/operators/filter';
12+
import {Observable} from 'rxjs';
13+
import {map, filter} from 'rxjs/operators';
1514
import {DialogPosition} from './dialog-config';
1615
import {CdkDialogContainer} from './dialog-container';
1716

src/cdk-experimental/dialog/dialog.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,19 @@ import {
1616
ComponentRef
1717
} from '@angular/core';
1818
import {ComponentPortal, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
19-
import {Observable} from 'rxjs/Observable';
20-
import {Subject} from 'rxjs/Subject';
19+
import {of as observableOf, Observable, Subject, defer} from 'rxjs';
2120
import {DialogRef} from './dialog-ref';
2221
import {Location} from '@angular/common';
2322
import {DialogConfig} from './dialog-config';
2423
import {Directionality} from '@angular/cdk/bidi';
25-
import {of as observableOf} from 'rxjs/observable/of';
2624
import {CdkDialogContainer} from './dialog-container';
2725
import {
2826
ComponentType,
2927
Overlay,
3028
OverlayRef,
3129
OverlayConfig,
3230
} from '@angular/cdk/overlay';
33-
import {startWith} from 'rxjs/operators/startWith';
34-
import {defer} from 'rxjs/observable/defer';
31+
import {startWith} from 'rxjs/operators';
3532

3633
import {
3734
DIALOG_SCROLL_STRATEGY,

src/cdk/a11y/focus-monitor/focus-monitor.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ import {
1818
Output,
1919
SkipSelf,
2020
} from '@angular/core';
21-
import {Observable} from 'rxjs/Observable';
22-
import {of as observableOf} from 'rxjs/observable/of';
23-
import {Subject} from 'rxjs/Subject';
24-
import {Subscription} from 'rxjs/Subscription';
21+
import {of as observableOf, Observable, Subject, Subscription} from 'rxjs';
2522

2623

2724
// This is the value used by AngularJS Material. Through trial and error (on iPhone 6S) they found

src/cdk/a11y/focus-trap/focus-trap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
NgZone,
1919
OnDestroy,
2020
} from '@angular/core';
21-
import {take} from 'rxjs/operators/take';
21+
import {take} from 'rxjs/operators';
2222
import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
2323

2424

src/cdk/a11y/key-manager/list-key-manager.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {DOWN_ARROW, TAB, UP_ARROW, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
2-
import {take} from 'rxjs/operators/take';
2+
import {take} from 'rxjs/operators';
33
import {QueryList} from '@angular/core';
44
import {fakeAsync, tick} from '@angular/core/testing';
55
import {createKeyboardEvent} from '@angular/cdk/testing';
66
import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
77
import {FocusKeyManager} from './focus-key-manager';
88
import {ListKeyManager} from './list-key-manager';
99
import {FocusOrigin} from '../focus-monitor/focus-monitor';
10-
import {Subject} from 'rxjs/Subject';
10+
import {Subject} from 'rxjs';
1111

1212

1313
class FakeFocusable {

src/cdk/a11y/key-manager/list-key-manager.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*/
88

99
import {QueryList} from '@angular/core';
10-
import {Subject} from 'rxjs/Subject';
11-
import {Subscription} from 'rxjs/Subscription';
10+
import {Subject, Subscription} from 'rxjs';
1211
import {
1312
UP_ARROW,
1413
DOWN_ARROW,
@@ -20,10 +19,7 @@ import {
2019
ZERO,
2120
NINE,
2221
} from '@angular/cdk/keycodes';
23-
import {debounceTime} from 'rxjs/operators/debounceTime';
24-
import {filter} from 'rxjs/operators/filter';
25-
import {map} from 'rxjs/operators/map';
26-
import {tap} from 'rxjs/operators/tap';
22+
import {debounceTime, filter, map, tap} from 'rxjs/operators';
2723

2824
/** This interface is for items that can be passed to a ListKeyManager. */
2925
export interface ListKeyManagerOption {

src/cdk/accordion/accordion-item.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
1919
import {CdkAccordion} from './accordion';
2020
import {coerceBooleanProperty} from '@angular/cdk/coercion';
21-
import {Subscription} from 'rxjs/Subscription';
21+
import {Subscription} from 'rxjs';
2222

2323
/** Used to generate unique ID for each accordion item. */
2424
let nextId = 0;

0 commit comments

Comments
 (0)